update all translation files to js and json

351 files changed, 22246 insertions, 11144 deletions

diff --git a/core/l10n/ach.js b/core/l10n/ach.js
new file mode 100644
index 00000000000..bc4e6c6bc64
--- /dev/null
+++ b/core/l10n/ach.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/ach.json b/core/l10n/ach.json
new file mode 100644
index 00000000000..4ebc0d2d45d
--- /dev/null
+++ b/core/l10n/ach.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ach.php b/core/l10n/ach.php
deleted file mode 100644
index e012fb1656e..00000000000
--- a/core/l10n/ach.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/ady.js b/core/l10n/ady.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/ady.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ady.json b/core/l10n/ady.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/ady.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ady.php b/core/l10n/ady.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/ady.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js
new file mode 100644
index 00000000000..c74d7112e61
--- /dev/null
+++ b/core/l10n/af_ZA.js
@@ -0,0 +1,129 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Kon nie e-pos aan die volgende gebruikers stuur nie: %s",
+    "Turned on maintenance mode" : "Instandhouding aangeskakel",
+    "Turned off maintenance mode" : "Instandhouding uitgeskakel",
+    "Updated database" : "Databasis opgedateer",
+    "Checked database schema update" : "Databasis skema opdatering nagegaan",
+    "Checked database schema update for apps" : "Databasis skema opdatering nagegaan vir sagteware",
+    "Updated \"%s\" to %s" : "\"%s\" opgedateer na %s",
+    "Disabled incompatible apps: %s" : "Onversoenbare sagteware onaktief gemaak: %s",
+    "No image or file provided" : "Geen prent of lêer voorsien",
+    "Unknown filetype" : "Onbekende lêertipe",
+    "Invalid image" : "Ongeldige prent",
+    "No temporary profile picture available, try again" : "Geen tydelike profiel foto beskikbaar nie, probeer weer",
+    "No crop data provided" : "Geen \"crop\" data verskaf",
+    "Sunday" : "Sondag",
+    "Monday" : "Maandag",
+    "Tuesday" : "Dinsdag",
+    "Wednesday" : "Woensdag",
+    "Thursday" : "Donderdag",
+    "Friday" : "Vrydag",
+    "Saturday" : "Saterdag",
+    "January" : "Januarie",
+    "February" : "Februarie",
+    "March" : "Maart",
+    "April" : "April",
+    "May" : "Mei",
+    "June" : "Junie",
+    "July" : "Julie",
+    "August" : "Augustus",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Instellings",
+    "File" : "Lêer",
+    "Folder" : "Omslag",
+    "Image" : "Prent",
+    "Audio" : "Audio",
+    "Saving..." : "Stoor...",
+    "Couldn't send reset email. Please contact your administrator." : "Die herstel epos kon nie gestuur word nie. Kontak asseblief die stelsel administrateur.",
+    "The link to reset your password has been sent to your email. 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." : "Die \"link\" vir die herstel van jou wagwoord is na jou epos gestuur. As jy dit nie binne 'n redelike tyd ontvang nie, soek deur jou \"spam/junk\" omslagte.<br>As dit nie daar is nie vra jou administrateur vir hulp.",
+    "I know what I'm doing" : "Ek weet wat ek doen",
+    "Reset password" : "Herstel wagwoord",
+    "Password can not be changed. Please contact your administrator." : "Wagwoord kan nie verander word nie. Kontak asseblief jou stelsel administrateur.",
+    "No" : "Nee",
+    "Yes" : "Ja",
+    "Choose" : "Kies",
+    "Ok" : "OK",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "One file conflict" : "Een lêer konflik",
+    "New Files" : "Nuwe lêers",
+    "Already existing files" : "Bestaande lêers",
+    "Cancel" : "Kanselleer",
+    "Continue" : "Gaan voort",
+    "Very weak password" : "Baie swak wagwoord",
+    "Weak password" : "Swak wagwoord",
+    "So-so password" : "So-so wagwoord",
+    "Good password" : "Goeie wagwoord",
+    "Strong password" : "Sterk wagwoord",
+    "Shared" : "Gedeel",
+    "Share" : "Deel",
+    "Error" : "Fout",
+    "Error while sharing" : "Deel veroorsaak fout",
+    "Error while unsharing" : "Deel terugneem veroorsaak fout",
+    "Error while changing permissions" : "Fout met verandering van regte",
+    "Shared with you and the group {group} by {owner}" : "Met jou en die groep {group} gedeel deur {owner}",
+    "Shared with you by {owner}" : "Met jou gedeel deur {owner}",
+    "Password protect" : "Beskerm met Wagwoord",
+    "Allow Public Upload" : "Laat Publieke Oplaai toe",
+    "Email link to person" : "E-pos aan persoon",
+    "Send" : "Stuur",
+    "Set expiration date" : "Stel verval datum",
+    "Expiration date" : "Verval datum",
+    "group" : "groep",
+    "Resharing is not allowed" : "Herdeling is nie toegelaat nie ",
+    "Shared in {item} with {user}" : "Gedeel in {item} met {user}",
+    "Unshare" : "Deel terug neem",
+    "can edit" : "kan wysig",
+    "access control" : "toegang beheer",
+    "create" : "skep",
+    "update" : "opdateer",
+    "delete" : "uitvee",
+    "Password protected" : "Beskerm met wagwoord",
+    "Error unsetting expiration date" : "Fout met skrapping van verval datum",
+    "Error setting expiration date" : "Fout met opstel van verval datum",
+    "Sending ..." : "Stuur ...",
+    "Email sent" : "E-pos gestuur",
+    "Warning" : "Waarskuwing",
+    "The object type is not specified." : "Hierdie objek tipe is nie gespesifiseer nie.",
+    "Add" : "Voeg by",
+    "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
+    "%s password reset" : "%s wagwoord herstel",
+    "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
+    "You will receive a link to reset your password via Email." : "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
+    "Username" : "Gebruikersnaam",
+    "Yes, I really want to reset my password now" : "Ja, Ek wil regtig my wagwoord herstel",
+    "New password" : "Nuwe wagwoord",
+    "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.",
+    "Personal" : "Persoonlik",
+    "Users" : "Gebruikers",
+    "Apps" : "Toepassings",
+    "Admin" : "Admin",
+    "Help" : "Hulp",
+    "Access forbidden" : "Toegang verbode",
+    "Security Warning" : "Sekuriteits waarskuwing",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Jou PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Opdateer asseblief jou PHP installasie om %s veilig te gebruik",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
+    "Create an <strong>admin account</strong>" : "Skep `n <strong>admin-rekening</strong>",
+    "Password" : "Wagwoord",
+    "Data folder" : "Data omslag",
+    "Configure the database" : "Stel databasis op",
+    "Database user" : "Databasis-gebruiker",
+    "Database password" : "Databasis-wagwoord",
+    "Database name" : "Databasis naam",
+    "Database tablespace" : "Databasis tabelspasie",
+    "Database host" : "Databasis gasheer",
+    "Finish setup" : "Maak opstelling klaar",
+    "%s is available. Get more information on how to update." : "%s is beskikbaar. Kry meer inligting oor opdatering.",
+    "Log out" : "Teken uit",
+    "remember" : "onthou",
+    "Log in" : "Teken aan",
+    "Alternative Logins" : "Alternatiewe aantekeninge",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json
new file mode 100644
index 00000000000..2065555d7d3
--- /dev/null
+++ b/core/l10n/af_ZA.json
@@ -0,0 +1,127 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Kon nie e-pos aan die volgende gebruikers stuur nie: %s",
+    "Turned on maintenance mode" : "Instandhouding aangeskakel",
+    "Turned off maintenance mode" : "Instandhouding uitgeskakel",
+    "Updated database" : "Databasis opgedateer",
+    "Checked database schema update" : "Databasis skema opdatering nagegaan",
+    "Checked database schema update for apps" : "Databasis skema opdatering nagegaan vir sagteware",
+    "Updated \"%s\" to %s" : "\"%s\" opgedateer na %s",
+    "Disabled incompatible apps: %s" : "Onversoenbare sagteware onaktief gemaak: %s",
+    "No image or file provided" : "Geen prent of lêer voorsien",
+    "Unknown filetype" : "Onbekende lêertipe",
+    "Invalid image" : "Ongeldige prent",
+    "No temporary profile picture available, try again" : "Geen tydelike profiel foto beskikbaar nie, probeer weer",
+    "No crop data provided" : "Geen \"crop\" data verskaf",
+    "Sunday" : "Sondag",
+    "Monday" : "Maandag",
+    "Tuesday" : "Dinsdag",
+    "Wednesday" : "Woensdag",
+    "Thursday" : "Donderdag",
+    "Friday" : "Vrydag",
+    "Saturday" : "Saterdag",
+    "January" : "Januarie",
+    "February" : "Februarie",
+    "March" : "Maart",
+    "April" : "April",
+    "May" : "Mei",
+    "June" : "Junie",
+    "July" : "Julie",
+    "August" : "Augustus",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Instellings",
+    "File" : "Lêer",
+    "Folder" : "Omslag",
+    "Image" : "Prent",
+    "Audio" : "Audio",
+    "Saving..." : "Stoor...",
+    "Couldn't send reset email. Please contact your administrator." : "Die herstel epos kon nie gestuur word nie. Kontak asseblief die stelsel administrateur.",
+    "The link to reset your password has been sent to your email. 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." : "Die \"link\" vir die herstel van jou wagwoord is na jou epos gestuur. As jy dit nie binne 'n redelike tyd ontvang nie, soek deur jou \"spam/junk\" omslagte.<br>As dit nie daar is nie vra jou administrateur vir hulp.",
+    "I know what I'm doing" : "Ek weet wat ek doen",
+    "Reset password" : "Herstel wagwoord",
+    "Password can not be changed. Please contact your administrator." : "Wagwoord kan nie verander word nie. Kontak asseblief jou stelsel administrateur.",
+    "No" : "Nee",
+    "Yes" : "Ja",
+    "Choose" : "Kies",
+    "Ok" : "OK",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "One file conflict" : "Een lêer konflik",
+    "New Files" : "Nuwe lêers",
+    "Already existing files" : "Bestaande lêers",
+    "Cancel" : "Kanselleer",
+    "Continue" : "Gaan voort",
+    "Very weak password" : "Baie swak wagwoord",
+    "Weak password" : "Swak wagwoord",
+    "So-so password" : "So-so wagwoord",
+    "Good password" : "Goeie wagwoord",
+    "Strong password" : "Sterk wagwoord",
+    "Shared" : "Gedeel",
+    "Share" : "Deel",
+    "Error" : "Fout",
+    "Error while sharing" : "Deel veroorsaak fout",
+    "Error while unsharing" : "Deel terugneem veroorsaak fout",
+    "Error while changing permissions" : "Fout met verandering van regte",
+    "Shared with you and the group {group} by {owner}" : "Met jou en die groep {group} gedeel deur {owner}",
+    "Shared with you by {owner}" : "Met jou gedeel deur {owner}",
+    "Password protect" : "Beskerm met Wagwoord",
+    "Allow Public Upload" : "Laat Publieke Oplaai toe",
+    "Email link to person" : "E-pos aan persoon",
+    "Send" : "Stuur",
+    "Set expiration date" : "Stel verval datum",
+    "Expiration date" : "Verval datum",
+    "group" : "groep",
+    "Resharing is not allowed" : "Herdeling is nie toegelaat nie ",
+    "Shared in {item} with {user}" : "Gedeel in {item} met {user}",
+    "Unshare" : "Deel terug neem",
+    "can edit" : "kan wysig",
+    "access control" : "toegang beheer",
+    "create" : "skep",
+    "update" : "opdateer",
+    "delete" : "uitvee",
+    "Password protected" : "Beskerm met wagwoord",
+    "Error unsetting expiration date" : "Fout met skrapping van verval datum",
+    "Error setting expiration date" : "Fout met opstel van verval datum",
+    "Sending ..." : "Stuur ...",
+    "Email sent" : "E-pos gestuur",
+    "Warning" : "Waarskuwing",
+    "The object type is not specified." : "Hierdie objek tipe is nie gespesifiseer nie.",
+    "Add" : "Voeg by",
+    "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
+    "%s password reset" : "%s wagwoord herstel",
+    "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
+    "You will receive a link to reset your password via Email." : "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
+    "Username" : "Gebruikersnaam",
+    "Yes, I really want to reset my password now" : "Ja, Ek wil regtig my wagwoord herstel",
+    "New password" : "Nuwe wagwoord",
+    "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.",
+    "Personal" : "Persoonlik",
+    "Users" : "Gebruikers",
+    "Apps" : "Toepassings",
+    "Admin" : "Admin",
+    "Help" : "Hulp",
+    "Access forbidden" : "Toegang verbode",
+    "Security Warning" : "Sekuriteits waarskuwing",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Jou PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Opdateer asseblief jou PHP installasie om %s veilig te gebruik",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
+    "Create an <strong>admin account</strong>" : "Skep `n <strong>admin-rekening</strong>",
+    "Password" : "Wagwoord",
+    "Data folder" : "Data omslag",
+    "Configure the database" : "Stel databasis op",
+    "Database user" : "Databasis-gebruiker",
+    "Database password" : "Databasis-wagwoord",
+    "Database name" : "Databasis naam",
+    "Database tablespace" : "Databasis tabelspasie",
+    "Database host" : "Databasis gasheer",
+    "Finish setup" : "Maak opstelling klaar",
+    "%s is available. Get more information on how to update." : "%s is beskikbaar. Kry meer inligting oor opdatering.",
+    "Log out" : "Teken uit",
+    "remember" : "onthou",
+    "Log in" : "Teken aan",
+    "Alternative Logins" : "Alternatiewe aantekeninge",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
deleted file mode 100644
index 404c7195c07..00000000000
--- a/core/l10n/af_ZA.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Kon nie e-pos aan die volgende gebruikers stuur nie: %s",
-"Turned on maintenance mode" => "Instandhouding aangeskakel",
-"Turned off maintenance mode" => "Instandhouding uitgeskakel",
-"Updated database" => "Databasis opgedateer",
-"Checked database schema update" => "Databasis skema opdatering nagegaan",
-"Checked database schema update for apps" => "Databasis skema opdatering nagegaan vir sagteware",
-"Updated \"%s\" to %s" => "\"%s\" opgedateer na %s",
-"Disabled incompatible apps: %s" => "Onversoenbare sagteware onaktief gemaak: %s",
-"No image or file provided" => "Geen prent of lêer voorsien",
-"Unknown filetype" => "Onbekende lêertipe",
-"Invalid image" => "Ongeldige prent",
-"No temporary profile picture available, try again" => "Geen tydelike profiel foto beskikbaar nie, probeer weer",
-"No crop data provided" => "Geen \"crop\" data verskaf",
-"Sunday" => "Sondag",
-"Monday" => "Maandag",
-"Tuesday" => "Dinsdag",
-"Wednesday" => "Woensdag",
-"Thursday" => "Donderdag",
-"Friday" => "Vrydag",
-"Saturday" => "Saterdag",
-"January" => "Januarie",
-"February" => "Februarie",
-"March" => "Maart",
-"April" => "April",
-"May" => "Mei",
-"June" => "Junie",
-"July" => "Julie",
-"August" => "Augustus",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"Settings" => "Instellings",
-"File" => "Lêer",
-"Folder" => "Omslag",
-"Image" => "Prent",
-"Audio" => "Audio",
-"Saving..." => "Stoor...",
-"Couldn't send reset email. Please contact your administrator." => "Die herstel epos kon nie gestuur word nie. Kontak asseblief die stelsel administrateur.",
-"The link to reset your password has been sent to your email. 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." => "Die \"link\" vir die herstel van jou wagwoord is na jou epos gestuur. As jy dit nie binne 'n redelike tyd ontvang nie, soek deur jou \"spam/junk\" omslagte.<br>As dit nie daar is nie vra jou administrateur vir hulp.",
-"I know what I'm doing" => "Ek weet wat ek doen",
-"Reset password" => "Herstel wagwoord",
-"Password can not be changed. Please contact your administrator." => "Wagwoord kan nie verander word nie. Kontak asseblief jou stelsel administrateur.",
-"No" => "Nee",
-"Yes" => "Ja",
-"Choose" => "Kies",
-"Ok" => "OK",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"One file conflict" => "Een lêer konflik",
-"New Files" => "Nuwe lêers",
-"Already existing files" => "Bestaande lêers",
-"Cancel" => "Kanselleer",
-"Continue" => "Gaan voort",
-"Very weak password" => "Baie swak wagwoord",
-"Weak password" => "Swak wagwoord",
-"So-so password" => "So-so wagwoord",
-"Good password" => "Goeie wagwoord",
-"Strong password" => "Sterk wagwoord",
-"Shared" => "Gedeel",
-"Share" => "Deel",
-"Error" => "Fout",
-"Error while sharing" => "Deel veroorsaak fout",
-"Error while unsharing" => "Deel terugneem veroorsaak fout",
-"Error while changing permissions" => "Fout met verandering van regte",
-"Shared with you and the group {group} by {owner}" => "Met jou en die groep {group} gedeel deur {owner}",
-"Shared with you by {owner}" => "Met jou gedeel deur {owner}",
-"Password protect" => "Beskerm met Wagwoord",
-"Allow Public Upload" => "Laat Publieke Oplaai toe",
-"Email link to person" => "E-pos aan persoon",
-"Send" => "Stuur",
-"Set expiration date" => "Stel verval datum",
-"Expiration date" => "Verval datum",
-"group" => "groep",
-"Resharing is not allowed" => "Herdeling is nie toegelaat nie ",
-"Shared in {item} with {user}" => "Gedeel in {item} met {user}",
-"Unshare" => "Deel terug neem",
-"can edit" => "kan wysig",
-"access control" => "toegang beheer",
-"create" => "skep",
-"update" => "opdateer",
-"delete" => "uitvee",
-"Password protected" => "Beskerm met wagwoord",
-"Error unsetting expiration date" => "Fout met skrapping van verval datum",
-"Error setting expiration date" => "Fout met opstel van verval datum",
-"Sending ..." => "Stuur ...",
-"Email sent" => "E-pos gestuur",
-"Warning" => "Waarskuwing",
-"The object type is not specified." => "Hierdie objek tipe is nie gespesifiseer nie.",
-"Add" => "Voeg by",
-"The update was successful. Redirecting you to ownCloud now." => "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
-"%s password reset" => "%s wagwoord herstel",
-"Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
-"You will receive a link to reset your password via Email." => "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
-"Username" => "Gebruikersnaam",
-"Yes, I really want to reset my password now" => "Ja, Ek wil regtig my wagwoord herstel",
-"New password" => "Nuwe wagwoord",
-"For the best results, please consider using a GNU/Linux server instead." => "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.",
-"Personal" => "Persoonlik",
-"Users" => "Gebruikers",
-"Apps" => "Toepassings",
-"Admin" => "Admin",
-"Help" => "Hulp",
-"Access forbidden" => "Toegang verbode",
-"Security Warning" => "Sekuriteits waarskuwing",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jou PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Opdateer asseblief jou PHP installasie om %s veilig te gebruik",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
-"Create an <strong>admin account</strong>" => "Skep `n <strong>admin-rekening</strong>",
-"Password" => "Wagwoord",
-"Data folder" => "Data omslag",
-"Configure the database" => "Stel databasis op",
-"Database user" => "Databasis-gebruiker",
-"Database password" => "Databasis-wagwoord",
-"Database name" => "Databasis naam",
-"Database tablespace" => "Databasis tabelspasie",
-"Database host" => "Databasis gasheer",
-"Finish setup" => "Maak opstelling klaar",
-"%s is available. Get more information on how to update." => "%s is beskikbaar. Kry meer inligting oor opdatering.",
-"Log out" => "Teken uit",
-"remember" => "onthou",
-"Log in" => "Teken aan",
-"Alternative Logins" => "Alternatiewe aantekeninge",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ak.js b/core/l10n/ak.js
new file mode 100644
index 00000000000..8d5d3325583
--- /dev/null
+++ b/core/l10n/ak.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=n > 1;");
diff --git a/core/l10n/ak.json b/core/l10n/ak.json
new file mode 100644
index 00000000000..eda7891f2e2
--- /dev/null
+++ b/core/l10n/ak.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=n > 1;"
+}
\ No newline at end of file
diff --git a/core/l10n/ak.php b/core/l10n/ak.php
deleted file mode 100644
index df47d5b95c2..00000000000
--- a/core/l10n/ak.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=n > 1;";
diff --git a/core/l10n/am_ET.js b/core/l10n/am_ET.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/am_ET.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/am_ET.json b/core/l10n/am_ET.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/am_ET.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/am_ET.php b/core/l10n/am_ET.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/am_ET.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
new file mode 100644
index 00000000000..e7a2a1df351
--- /dev/null
+++ b/core/l10n/ar.js
@@ -0,0 +1,110 @@
+OC.L10N.register(
+    "core",
+    {
+    "Updated database" : "قاعدة بيانات المرفوعات",
+    "Unknown filetype" : "نوع الملف غير معروف",
+    "Invalid image" : "الصورة غير صالحة",
+    "Sunday" : "الأحد",
+    "Monday" : "الأثنين",
+    "Tuesday" : "الثلاثاء",
+    "Wednesday" : "الاربعاء",
+    "Thursday" : "الخميس",
+    "Friday" : "الجمعه",
+    "Saturday" : "السبت",
+    "January" : "كانون الثاني",
+    "February" : "شباط",
+    "March" : "آذار",
+    "April" : "نيسان",
+    "May" : "أيار",
+    "June" : "حزيران",
+    "July" : "تموز",
+    "August" : "آب",
+    "September" : "أيلول",
+    "October" : "تشرين الاول",
+    "November" : "تشرين الثاني",
+    "December" : "كانون الاول",
+    "Settings" : "إعدادات",
+    "File" : "ملف",
+    "Folder" : "مجلد",
+    "Saving..." : "جاري الحفظ...",
+    "Reset password" : "تعديل كلمة السر",
+    "No" : "لا",
+    "Yes" : "نعم",
+    "Choose" : "اختيار",
+    "Ok" : "موافق",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","","","",""],
+    "Cancel" : "الغاء",
+    "Very weak password" : "كلمة السر ضعيفة جدا",
+    "Weak password" : "كلمة السر ضعيفة",
+    "Good password" : "كلمة السر جيدة",
+    "Strong password" : "كلمة السر قوية",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "هذا الخادم لا يوجد لدية اتصال انترنت. هذا يعني ان بعض الميزات مثل mounting التخزين الخارجي , تنبيهات عن التحديثات او تنزيلات برامج الطرف الثالث3  لا تعمل. الدخول للملفات البعيدة و ارسال تنبيهات البريد الالكتروني ممكن ان لا تعمل ايضا. نحن نقترح بتفعيل اتصال الانترنت لهذا الخادم لتتمكن من الاستفادة من كل الميزات",
+    "Shared" : "مشارك",
+    "Share" : "شارك",
+    "Error" : "خطأ",
+    "Error while sharing" : "حصل خطأ عند عملية المشاركة",
+    "Error while unsharing" : "حصل خطأ عند عملية إزالة المشاركة",
+    "Error while changing permissions" : "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
+    "Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
+    "Shared with you by {owner}" : "شورك معك من قبل {owner}",
+    "Share link" : "شارك الرابط",
+    "Password protect" : "حماية كلمة السر",
+    "Allow Public Upload" : "اسمح بالرفع للعامة",
+    "Email link to person" : "ارسل الرابط بالبريد الى صديق",
+    "Send" : "أرسل",
+    "Set expiration date" : "تعيين تاريخ إنتهاء الصلاحية",
+    "Expiration date" : "تاريخ إنتهاء الصلاحية",
+    "group" : "مجموعة",
+    "Resharing is not allowed" : "لا يسمح بعملية إعادة المشاركة",
+    "Shared in {item} with {user}" : "شورك في {item} مع {user}",
+    "Unshare" : "إلغاء مشاركة",
+    "can share" : "يمكن المشاركة",
+    "can edit" : "التحرير مسموح",
+    "access control" : "ضبط الوصول",
+    "create" : "إنشاء",
+    "update" : "تحديث",
+    "delete" : "حذف",
+    "Password protected" : "محمي بكلمة السر",
+    "Error unsetting expiration date" : "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
+    "Error setting expiration date" : "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
+    "Sending ..." : "جاري الارسال ...",
+    "Email sent" : "تم ارسال البريد الالكتروني",
+    "Warning" : "تحذير",
+    "The object type is not specified." : "نوع العنصر غير محدد.",
+    "Delete" : "إلغاء",
+    "Add" : "اضف",
+    "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
+    "%s password reset" : "تمت إعادة ضبط كلمة مرور %s",
+    "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
+    "You will receive a link to reset your password via Email." : "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
+    "Username" : "إسم المستخدم",
+    "Yes, I really want to reset my password now" : "نعم، أريد إعادة ضبظ كلمة مروري",
+    "New password" : "كلمات سر جديدة",
+    "Personal" : "شخصي",
+    "Users" : "المستخدمين",
+    "Apps" : "التطبيقات",
+    "Admin" : "المدير",
+    "Help" : "المساعدة",
+    "Access forbidden" : "التوصّل محظور",
+    "Security Warning" : "تحذير أمان",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "يرجى تحديث نسخة PHP لاستخدام %s بطريقة آمنة",
+    "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>.",
+    "Create an <strong>admin account</strong>" : "أضف </strong>مستخدم رئيسي <strong>",
+    "Password" : "كلمة المرور",
+    "Data folder" : "مجلد المعلومات",
+    "Configure the database" : "أسس قاعدة البيانات",
+    "Database user" : "مستخدم قاعدة البيانات",
+    "Database password" : "كلمة سر مستخدم قاعدة البيانات",
+    "Database name" : "إسم قاعدة البيانات",
+    "Database tablespace" : "مساحة جدول قاعدة البيانات",
+    "Database host" : "خادم قاعدة البيانات",
+    "Finish setup" : "انهاء التعديلات",
+    "Log out" : "الخروج",
+    "remember" : "تذكر",
+    "Log in" : "أدخل",
+    "Alternative Logins" : "اسماء دخول بديلة"
+},
+"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/core/l10n/ar.json b/core/l10n/ar.json
new file mode 100644
index 00000000000..7a26a719cec
--- /dev/null
+++ b/core/l10n/ar.json
@@ -0,0 +1,108 @@
+{ "translations": {
+    "Updated database" : "قاعدة بيانات المرفوعات",
+    "Unknown filetype" : "نوع الملف غير معروف",
+    "Invalid image" : "الصورة غير صالحة",
+    "Sunday" : "الأحد",
+    "Monday" : "الأثنين",
+    "Tuesday" : "الثلاثاء",
+    "Wednesday" : "الاربعاء",
+    "Thursday" : "الخميس",
+    "Friday" : "الجمعه",
+    "Saturday" : "السبت",
+    "January" : "كانون الثاني",
+    "February" : "شباط",
+    "March" : "آذار",
+    "April" : "نيسان",
+    "May" : "أيار",
+    "June" : "حزيران",
+    "July" : "تموز",
+    "August" : "آب",
+    "September" : "أيلول",
+    "October" : "تشرين الاول",
+    "November" : "تشرين الثاني",
+    "December" : "كانون الاول",
+    "Settings" : "إعدادات",
+    "File" : "ملف",
+    "Folder" : "مجلد",
+    "Saving..." : "جاري الحفظ...",
+    "Reset password" : "تعديل كلمة السر",
+    "No" : "لا",
+    "Yes" : "نعم",
+    "Choose" : "اختيار",
+    "Ok" : "موافق",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","","","",""],
+    "Cancel" : "الغاء",
+    "Very weak password" : "كلمة السر ضعيفة جدا",
+    "Weak password" : "كلمة السر ضعيفة",
+    "Good password" : "كلمة السر جيدة",
+    "Strong password" : "كلمة السر قوية",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "هذا الخادم لا يوجد لدية اتصال انترنت. هذا يعني ان بعض الميزات مثل mounting التخزين الخارجي , تنبيهات عن التحديثات او تنزيلات برامج الطرف الثالث3  لا تعمل. الدخول للملفات البعيدة و ارسال تنبيهات البريد الالكتروني ممكن ان لا تعمل ايضا. نحن نقترح بتفعيل اتصال الانترنت لهذا الخادم لتتمكن من الاستفادة من كل الميزات",
+    "Shared" : "مشارك",
+    "Share" : "شارك",
+    "Error" : "خطأ",
+    "Error while sharing" : "حصل خطأ عند عملية المشاركة",
+    "Error while unsharing" : "حصل خطأ عند عملية إزالة المشاركة",
+    "Error while changing permissions" : "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
+    "Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
+    "Shared with you by {owner}" : "شورك معك من قبل {owner}",
+    "Share link" : "شارك الرابط",
+    "Password protect" : "حماية كلمة السر",
+    "Allow Public Upload" : "اسمح بالرفع للعامة",
+    "Email link to person" : "ارسل الرابط بالبريد الى صديق",
+    "Send" : "أرسل",
+    "Set expiration date" : "تعيين تاريخ إنتهاء الصلاحية",
+    "Expiration date" : "تاريخ إنتهاء الصلاحية",
+    "group" : "مجموعة",
+    "Resharing is not allowed" : "لا يسمح بعملية إعادة المشاركة",
+    "Shared in {item} with {user}" : "شورك في {item} مع {user}",
+    "Unshare" : "إلغاء مشاركة",
+    "can share" : "يمكن المشاركة",
+    "can edit" : "التحرير مسموح",
+    "access control" : "ضبط الوصول",
+    "create" : "إنشاء",
+    "update" : "تحديث",
+    "delete" : "حذف",
+    "Password protected" : "محمي بكلمة السر",
+    "Error unsetting expiration date" : "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
+    "Error setting expiration date" : "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
+    "Sending ..." : "جاري الارسال ...",
+    "Email sent" : "تم ارسال البريد الالكتروني",
+    "Warning" : "تحذير",
+    "The object type is not specified." : "نوع العنصر غير محدد.",
+    "Delete" : "إلغاء",
+    "Add" : "اضف",
+    "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
+    "%s password reset" : "تمت إعادة ضبط كلمة مرور %s",
+    "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
+    "You will receive a link to reset your password via Email." : "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
+    "Username" : "إسم المستخدم",
+    "Yes, I really want to reset my password now" : "نعم، أريد إعادة ضبظ كلمة مروري",
+    "New password" : "كلمات سر جديدة",
+    "Personal" : "شخصي",
+    "Users" : "المستخدمين",
+    "Apps" : "التطبيقات",
+    "Admin" : "المدير",
+    "Help" : "المساعدة",
+    "Access forbidden" : "التوصّل محظور",
+    "Security Warning" : "تحذير أمان",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "يرجى تحديث نسخة PHP لاستخدام %s بطريقة آمنة",
+    "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>.",
+    "Create an <strong>admin account</strong>" : "أضف </strong>مستخدم رئيسي <strong>",
+    "Password" : "كلمة المرور",
+    "Data folder" : "مجلد المعلومات",
+    "Configure the database" : "أسس قاعدة البيانات",
+    "Database user" : "مستخدم قاعدة البيانات",
+    "Database password" : "كلمة سر مستخدم قاعدة البيانات",
+    "Database name" : "إسم قاعدة البيانات",
+    "Database tablespace" : "مساحة جدول قاعدة البيانات",
+    "Database host" : "خادم قاعدة البيانات",
+    "Finish setup" : "انهاء التعديلات",
+    "Log out" : "الخروج",
+    "remember" : "تذكر",
+    "Log in" : "أدخل",
+    "Alternative Logins" : "اسماء دخول بديلة"
+},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
+}
\ No newline at end of file
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
deleted file mode 100644
index 0f1f613b801..00000000000
--- a/core/l10n/ar.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Updated database" => "قاعدة بيانات المرفوعات",
-"Unknown filetype" => "نوع الملف غير معروف",
-"Invalid image" => "الصورة غير صالحة",
-"Sunday" => "الأحد",
-"Monday" => "الأثنين",
-"Tuesday" => "الثلاثاء",
-"Wednesday" => "الاربعاء",
-"Thursday" => "الخميس",
-"Friday" => "الجمعه",
-"Saturday" => "السبت",
-"January" => "كانون الثاني",
-"February" => "شباط",
-"March" => "آذار",
-"April" => "نيسان",
-"May" => "أيار",
-"June" => "حزيران",
-"July" => "تموز",
-"August" => "آب",
-"September" => "أيلول",
-"October" => "تشرين الاول",
-"November" => "تشرين الثاني",
-"December" => "كانون الاول",
-"Settings" => "إعدادات",
-"File" => "ملف",
-"Folder" => "مجلد",
-"Saving..." => "جاري الحفظ...",
-"Reset password" => "تعديل كلمة السر",
-"No" => "لا",
-"Yes" => "نعم",
-"Choose" => "اختيار",
-"Ok" => "موافق",
-"_{count} file conflict_::_{count} file conflicts_" => array("","","","","",""),
-"Cancel" => "الغاء",
-"Very weak password" => "كلمة السر ضعيفة جدا",
-"Weak password" => "كلمة السر ضعيفة",
-"Good password" => "كلمة السر جيدة",
-"Strong password" => "كلمة السر قوية",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "هذا الخادم لا يوجد لدية اتصال انترنت. هذا يعني ان بعض الميزات مثل mounting التخزين الخارجي , تنبيهات عن التحديثات او تنزيلات برامج الطرف الثالث3  لا تعمل. الدخول للملفات البعيدة و ارسال تنبيهات البريد الالكتروني ممكن ان لا تعمل ايضا. نحن نقترح بتفعيل اتصال الانترنت لهذا الخادم لتتمكن من الاستفادة من كل الميزات",
-"Shared" => "مشارك",
-"Share" => "شارك",
-"Error" => "خطأ",
-"Error while sharing" => "حصل خطأ عند عملية المشاركة",
-"Error while unsharing" => "حصل خطأ عند عملية إزالة المشاركة",
-"Error while changing permissions" => "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
-"Shared with you and the group {group} by {owner}" => "شورك معك ومع المجموعة {group} من قبل {owner}",
-"Shared with you by {owner}" => "شورك معك من قبل {owner}",
-"Share link" => "شارك الرابط",
-"Password protect" => "حماية كلمة السر",
-"Allow Public Upload" => "اسمح بالرفع للعامة",
-"Email link to person" => "ارسل الرابط بالبريد الى صديق",
-"Send" => "أرسل",
-"Set expiration date" => "تعيين تاريخ إنتهاء الصلاحية",
-"Expiration date" => "تاريخ إنتهاء الصلاحية",
-"group" => "مجموعة",
-"Resharing is not allowed" => "لا يسمح بعملية إعادة المشاركة",
-"Shared in {item} with {user}" => "شورك في {item} مع {user}",
-"Unshare" => "إلغاء مشاركة",
-"can share" => "يمكن المشاركة",
-"can edit" => "التحرير مسموح",
-"access control" => "ضبط الوصول",
-"create" => "إنشاء",
-"update" => "تحديث",
-"delete" => "حذف",
-"Password protected" => "محمي بكلمة السر",
-"Error unsetting expiration date" => "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
-"Error setting expiration date" => "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
-"Sending ..." => "جاري الارسال ...",
-"Email sent" => "تم ارسال البريد الالكتروني",
-"Warning" => "تحذير",
-"The object type is not specified." => "نوع العنصر غير محدد.",
-"Delete" => "إلغاء",
-"Add" => "اضف",
-"The update was successful. Redirecting you to ownCloud now." => "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
-"%s password reset" => "تمت إعادة ضبط كلمة مرور %s",
-"Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
-"You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
-"Username" => "إسم المستخدم",
-"Yes, I really want to reset my password now" => "نعم، أريد إعادة ضبظ كلمة مروري",
-"New password" => "كلمات سر جديدة",
-"Personal" => "شخصي",
-"Users" => "المستخدمين",
-"Apps" => "التطبيقات",
-"Admin" => "المدير",
-"Help" => "المساعدة",
-"Access forbidden" => "التوصّل محظور",
-"Security Warning" => "تحذير أمان",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "يرجى تحديث نسخة PHP لاستخدام %s بطريقة آمنة",
-"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>.",
-"Create an <strong>admin account</strong>" => "أضف </strong>مستخدم رئيسي <strong>",
-"Password" => "كلمة المرور",
-"Data folder" => "مجلد المعلومات",
-"Configure the database" => "أسس قاعدة البيانات",
-"Database user" => "مستخدم قاعدة البيانات",
-"Database password" => "كلمة سر مستخدم قاعدة البيانات",
-"Database name" => "إسم قاعدة البيانات",
-"Database tablespace" => "مساحة جدول قاعدة البيانات",
-"Database host" => "خادم قاعدة البيانات",
-"Finish setup" => "انهاء التعديلات",
-"Log out" => "الخروج",
-"remember" => "تذكر",
-"Log in" => "أدخل",
-"Alternative Logins" => "اسماء دخول بديلة"
-);
-$PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
new file mode 100644
index 00000000000..54be6e32d84
--- /dev/null
+++ b/core/l10n/ast.js
@@ -0,0 +1,189 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nun pudo unviase'l corréu a los usuarios siguientes: %s",
+    "Turned on maintenance mode" : "Activáu'l mou de caltenimientu",
+    "Turned off maintenance mode" : "Apagáu'l mou de caltenimientu",
+    "Updated database" : "Base de datos anovada",
+    "Checked database schema update" : "Anovamientu del esquema de base de datos revisáu",
+    "Updated \"%s\" to %s" : "Anováu \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Aplicaciones incompatibles desactivaes: %s",
+    "No image or file provided" : "Nun s'especificó nenguna imaxe o ficheru",
+    "Unknown filetype" : "Triba de ficheru desconocida",
+    "Invalid image" : "Imaxe inválida",
+    "No temporary profile picture available, try again" : "Nengún perfil d'imaxe temporal disponible, intentalo de nueves",
+    "No crop data provided" : "Nun s'apurrió'l retayu de datos",
+    "Sunday" : "Domingu",
+    "Monday" : "Llunes",
+    "Tuesday" : "Martes",
+    "Wednesday" : "Miércoles",
+    "Thursday" : "Xueves",
+    "Friday" : "Vienres",
+    "Saturday" : "Sábadu",
+    "January" : "Xineru",
+    "February" : "Febreru",
+    "March" : "Marzu",
+    "April" : "Abril",
+    "May" : "Mayu",
+    "June" : "Xunu",
+    "July" : "Xunetu",
+    "August" : "Agostu",
+    "September" : "Setiembre",
+    "October" : "Ochobre",
+    "November" : "Payares",
+    "December" : "Avientu",
+    "Settings" : "Axustes",
+    "File" : "Ficheru",
+    "Folder" : "Carpeta",
+    "Image" : "Imaxe",
+    "Audio" : "Audiu",
+    "Saving..." : "Guardando...",
+    "Couldn't send reset email. Please contact your administrator." : "Nun pudo unviase'l corréu de reaniciu. Por favor, contauta col alministrador.",
+    "The link to reset your password has been sent to your email. 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." : "Unviósete al corréu l'enllaz pa reaniciar la to contraseña. Si nun lu recibes nuna cantidá razonable de tiempu, comprueba les tos carpetes de corréu puxarra. <br>Si nun ta ehí, entruga al to alministrador llocal",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Los tos ficheros tán crifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que se reanicie la to contraseña.<br />Si nun tas seguru de qué facer, por favor contauta col to alministrador enantes que sigas. <br />¿De xuru quies siguir?",
+    "I know what I'm doing" : "Sé lo que toi faciendo",
+    "Reset password" : "Restablecer contraseña",
+    "Password can not be changed. Please contact your administrator." : "Nun pue camudase la contraseña. Por favor, contauta col alministrador.",
+    "No" : "Non",
+    "Yes" : "Sí",
+    "Choose" : "Esbillar",
+    "Error loading file picker template: {error}" : "Fallu cargando'l ficheru de plantía d'escoyeta: {error}",
+    "Ok" : "Aceutar",
+    "Error loading message template: {error}" : "Fallu cargando'l mensaxe de la plantía: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflictu de ficheru","{count} conflictos de ficheru "],
+    "One file conflict" : "Conflictu nun ficheru",
+    "New Files" : "Ficheros nuevos",
+    "Already existing files" : "Ficheros qu'esisten yá",
+    "Which files do you want to keep?" : "¿Qué ficheros quies caltener?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si seleiciones dambes versiones, el ficheru copiáu va tener un númberu amestáu al so nome",
+    "Cancel" : "Encaboxar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(esbillao too)",
+    "({count} selected)" : "(esbillaos {count})",
+    "Error loading file exists template" : "Falu cargando plantía de ficheru esistente",
+    "Very weak password" : "Contraseña mui feble",
+    "Weak password" : "Contraseña feble",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña bona",
+    "Strong password" : "Contraseña mui bona",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "El to sirvidor web entá nun ta configuráu afayadizamente pa permitir la sincronización de ficheros porque la interfaz WebDAV paez tar rota.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Esti sirvidor nun tien conexón a Internet. Esto significa que dalgunes de les carauterístiques nun van funcionar, como'l montaxe d'almacenamiento esternu, les notificaciones sobre anovamientos, la instalación d'aplicaciones de terceros, l'accesu a los ficheros de mou remotu o l'unviu de correos-e de notificación. Suxerimos habilitar una conexón a Internet nesti sirvidor pa esfrutar de toles funciones.",
+    "Shared" : "Compartíu",
+    "Shared with {recipients}" : "Compartío con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Fallu",
+    "Error while sharing" : "Fallu mientres la compartición",
+    "Error while unsharing" : "Fallu mientres se dexaba de compartir",
+    "Error while changing permissions" : "Fallu mientres camudaben los permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
+    "Shared with you by {owner}" : "Compartíu contigo por {owner}",
+    "Share with user or group …" : "Compartir col usuariu o grupu ...",
+    "Share link" : "Compartir enllaz",
+    "The public link will expire no later than {days} days after it is created" : "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
+    "Password protect" : "Protexer con contraseña",
+    "Choose a password for the public link" : "Escueyi una contraseña pal enllaz públicu",
+    "Allow Public Upload" : "Permitir xuba pública",
+    "Email link to person" : "Enllaz de corréu-e a la persona",
+    "Send" : "Unviar",
+    "Set expiration date" : "Afitar la data de caducidá",
+    "Expiration date" : "Data de caducidá",
+    "group" : "grupu",
+    "Resharing is not allowed" : "Recompartir nun ta permitíu",
+    "Shared in {item} with {user}" : "Compartíu en {item} con {user}",
+    "Unshare" : "Dexar de compartir",
+    "notify by email" : "notificar per corréu",
+    "can share" : "pue compartir",
+    "can edit" : "pue editar",
+    "access control" : "control d'accesu",
+    "create" : "crear",
+    "update" : "xubir",
+    "delete" : "desaniciar",
+    "Password protected" : "Contraseña protexida",
+    "Error unsetting expiration date" : "Fallu desafitando la data de caducidá",
+    "Error setting expiration date" : "Fallu afitando la fecha de caducidá",
+    "Sending ..." : "Unviando ...",
+    "Email sent" : "Corréu unviáu",
+    "Warning" : "Avisu",
+    "The object type is not specified." : "El tipu d'oxetu nun ta especificáu.",
+    "Enter new" : "Introducir nueva",
+    "Delete" : "Desaniciar",
+    "Add" : "Amestar",
+    "Edit tags" : "Editar etiquetes",
+    "Error loading dialog template: {error}" : "Fallu cargando plantía de diálogu: {error}",
+    "No tags selected for deletion." : "Nun s'esbillaron etiquetes pa desaniciar.",
+    "Updating {productName} to version {version}, this may take a while." : "Anovando {productName} a la versión {version}, esto pue llevar un tiempu.",
+    "Please reload the page." : "Por favor, recarga la páxina",
+    "The update was unsuccessful." : "L'anovamientu nun foi esitosu.",
+    "The update was successful. Redirecting you to ownCloud now." : "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Nun pudo reaniciase la contraseña porque'l token ye inválidu",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nun pudo unviase'l corréu. Por favor, asegurate que'l to nome d'usuariu seya correutu",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador",
+    "%s password reset" : "%s restablecer contraseña",
+    "Use the following link to reset your password: {link}" : "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
+    "You will receive a link to reset your password via Email." : "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña",
+    "Username" : "Nome d'usuariu",
+    "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?" : "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?",
+    "Yes, I really want to reset my password now" : "Sí, quiero reaniciar daveres la mio contraseña agora",
+    "Reset" : "Reaniciar",
+    "New password" : "Contraseña nueva",
+    "New Password" : "Contraseña nueva",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Apps" : "Aplicaciones",
+    "Admin" : "Alministrador",
+    "Help" : "Ayuda",
+    "Error loading tags" : "Fallu cargando les etiquetes",
+    "Tag already exists" : "Yá esiste la etiqueta",
+    "Error deleting tag(s)" : "Fallu desaniciando etiqueta(es)",
+    "Error tagging" : "Fallu etiquetando",
+    "Error untagging" : "Fallu al quitar etiquetes",
+    "Error favoriting" : "Fallu al marcar favoritos",
+    "Error unfavoriting" : "Fallu al desmarcar favoritos",
+    "Access forbidden" : "Accesu denegáu",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n",
+    "The share will expire on %s." : "La compartición va caducar el %s.",
+    "Cheers!" : "¡Salú!",
+    "Security Warning" : "Avisu de seguridá",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La to versión de PHP ye vulnerable al ataque NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, anova la to instalación de PHP pa usar %s de mou seguru.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crea una <strong>cuenta d'alministrador</strong>",
+    "Password" : "Contraseña",
+    "Storage & database" : "Almacenamientu y Base de datos",
+    "Data folder" : "Carpeta de datos",
+    "Configure the database" : "Configura la base de datos",
+    "Only %s is available." : "Namái ta disponible %s",
+    "Database user" : "Usuariu de la base de datos",
+    "Database password" : "Contraseña de la base de datos",
+    "Database name" : "Nome de la base de datos",
+    "Database tablespace" : "Espaciu de tables de la base de datos",
+    "Database host" : "Agospiador de la base de datos",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Va usase SQLite como base de datos. Pa instalaciones más grandes, recomiéndase cambiar esto.",
+    "Finish setup" : "Finar la configuración ",
+    "Finishing …" : "Finando ...",
+    "%s is available. Get more information on how to update." : "Ta disponible %s. Consigui más información en cómo anovar·",
+    "Log out" : "Zarrar sesión",
+    "Server side authentication failed!" : "Falló l'autenticación nel sirvidor!",
+    "Please contact your administrator." : "Por favor, contauta col to alministrador",
+    "Forgot your password? Reset it!" : "¿Escaeciesti la to contraseña? ¡Reaníciala!",
+    "remember" : "recordar",
+    "Log in" : "Aniciar sesión",
+    "Alternative Logins" : "Anicios de sesión alternativos",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Esta instalación d'ownCloud ta en mou d'usuariu únicu.",
+    "This means only administrators can use the instance." : "Esto quier dicir que namái pue usala un alministrador.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contauta col alministrador si esti problema sigui apaeciendo.",
+    "Thank you for your patience." : "Gracies pola to paciencia.",
+    "You are accessing the server from an untrusted domain." : "Tas accediendo al sirvidor dende un dominiu non confiáu.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor, contauta col alministrador. Si yes l'alministrador, configura l'axuste \"trusted_domain\" en config/config.php. Hai un exemplu en config/config.sample.php.",
+    "Add \"%s\" as trusted domain" : "Amestáu \"%s\" como dominiu de confianza",
+    "%s will be updated to version %s." : "%s anovaráse a la versión %s.",
+    "The following apps will be disabled:" : "Deshabilitaránse les siguientes aplicaciones:",
+    "The theme %s has been disabled." : "Deshabilitóse'l tema %s.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enantes de siguir, asegúrate de que se fizo una copia de seguridá de la base de datos, la carpeta de configuración y la carpeta de datos.",
+    "Start update" : "Aniciar anovamientu"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
new file mode 100644
index 00000000000..f8e69885e07
--- /dev/null
+++ b/core/l10n/ast.json
@@ -0,0 +1,187 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nun pudo unviase'l corréu a los usuarios siguientes: %s",
+    "Turned on maintenance mode" : "Activáu'l mou de caltenimientu",
+    "Turned off maintenance mode" : "Apagáu'l mou de caltenimientu",
+    "Updated database" : "Base de datos anovada",
+    "Checked database schema update" : "Anovamientu del esquema de base de datos revisáu",
+    "Updated \"%s\" to %s" : "Anováu \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Aplicaciones incompatibles desactivaes: %s",
+    "No image or file provided" : "Nun s'especificó nenguna imaxe o ficheru",
+    "Unknown filetype" : "Triba de ficheru desconocida",
+    "Invalid image" : "Imaxe inválida",
+    "No temporary profile picture available, try again" : "Nengún perfil d'imaxe temporal disponible, intentalo de nueves",
+    "No crop data provided" : "Nun s'apurrió'l retayu de datos",
+    "Sunday" : "Domingu",
+    "Monday" : "Llunes",
+    "Tuesday" : "Martes",
+    "Wednesday" : "Miércoles",
+    "Thursday" : "Xueves",
+    "Friday" : "Vienres",
+    "Saturday" : "Sábadu",
+    "January" : "Xineru",
+    "February" : "Febreru",
+    "March" : "Marzu",
+    "April" : "Abril",
+    "May" : "Mayu",
+    "June" : "Xunu",
+    "July" : "Xunetu",
+    "August" : "Agostu",
+    "September" : "Setiembre",
+    "October" : "Ochobre",
+    "November" : "Payares",
+    "December" : "Avientu",
+    "Settings" : "Axustes",
+    "File" : "Ficheru",
+    "Folder" : "Carpeta",
+    "Image" : "Imaxe",
+    "Audio" : "Audiu",
+    "Saving..." : "Guardando...",
+    "Couldn't send reset email. Please contact your administrator." : "Nun pudo unviase'l corréu de reaniciu. Por favor, contauta col alministrador.",
+    "The link to reset your password has been sent to your email. 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." : "Unviósete al corréu l'enllaz pa reaniciar la to contraseña. Si nun lu recibes nuna cantidá razonable de tiempu, comprueba les tos carpetes de corréu puxarra. <br>Si nun ta ehí, entruga al to alministrador llocal",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Los tos ficheros tán crifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que se reanicie la to contraseña.<br />Si nun tas seguru de qué facer, por favor contauta col to alministrador enantes que sigas. <br />¿De xuru quies siguir?",
+    "I know what I'm doing" : "Sé lo que toi faciendo",
+    "Reset password" : "Restablecer contraseña",
+    "Password can not be changed. Please contact your administrator." : "Nun pue camudase la contraseña. Por favor, contauta col alministrador.",
+    "No" : "Non",
+    "Yes" : "Sí",
+    "Choose" : "Esbillar",
+    "Error loading file picker template: {error}" : "Fallu cargando'l ficheru de plantía d'escoyeta: {error}",
+    "Ok" : "Aceutar",
+    "Error loading message template: {error}" : "Fallu cargando'l mensaxe de la plantía: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflictu de ficheru","{count} conflictos de ficheru "],
+    "One file conflict" : "Conflictu nun ficheru",
+    "New Files" : "Ficheros nuevos",
+    "Already existing files" : "Ficheros qu'esisten yá",
+    "Which files do you want to keep?" : "¿Qué ficheros quies caltener?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si seleiciones dambes versiones, el ficheru copiáu va tener un númberu amestáu al so nome",
+    "Cancel" : "Encaboxar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(esbillao too)",
+    "({count} selected)" : "(esbillaos {count})",
+    "Error loading file exists template" : "Falu cargando plantía de ficheru esistente",
+    "Very weak password" : "Contraseña mui feble",
+    "Weak password" : "Contraseña feble",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña bona",
+    "Strong password" : "Contraseña mui bona",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "El to sirvidor web entá nun ta configuráu afayadizamente pa permitir la sincronización de ficheros porque la interfaz WebDAV paez tar rota.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Esti sirvidor nun tien conexón a Internet. Esto significa que dalgunes de les carauterístiques nun van funcionar, como'l montaxe d'almacenamiento esternu, les notificaciones sobre anovamientos, la instalación d'aplicaciones de terceros, l'accesu a los ficheros de mou remotu o l'unviu de correos-e de notificación. Suxerimos habilitar una conexón a Internet nesti sirvidor pa esfrutar de toles funciones.",
+    "Shared" : "Compartíu",
+    "Shared with {recipients}" : "Compartío con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Fallu",
+    "Error while sharing" : "Fallu mientres la compartición",
+    "Error while unsharing" : "Fallu mientres se dexaba de compartir",
+    "Error while changing permissions" : "Fallu mientres camudaben los permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
+    "Shared with you by {owner}" : "Compartíu contigo por {owner}",
+    "Share with user or group …" : "Compartir col usuariu o grupu ...",
+    "Share link" : "Compartir enllaz",
+    "The public link will expire no later than {days} days after it is created" : "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
+    "Password protect" : "Protexer con contraseña",
+    "Choose a password for the public link" : "Escueyi una contraseña pal enllaz públicu",
+    "Allow Public Upload" : "Permitir xuba pública",
+    "Email link to person" : "Enllaz de corréu-e a la persona",
+    "Send" : "Unviar",
+    "Set expiration date" : "Afitar la data de caducidá",
+    "Expiration date" : "Data de caducidá",
+    "group" : "grupu",
+    "Resharing is not allowed" : "Recompartir nun ta permitíu",
+    "Shared in {item} with {user}" : "Compartíu en {item} con {user}",
+    "Unshare" : "Dexar de compartir",
+    "notify by email" : "notificar per corréu",
+    "can share" : "pue compartir",
+    "can edit" : "pue editar",
+    "access control" : "control d'accesu",
+    "create" : "crear",
+    "update" : "xubir",
+    "delete" : "desaniciar",
+    "Password protected" : "Contraseña protexida",
+    "Error unsetting expiration date" : "Fallu desafitando la data de caducidá",
+    "Error setting expiration date" : "Fallu afitando la fecha de caducidá",
+    "Sending ..." : "Unviando ...",
+    "Email sent" : "Corréu unviáu",
+    "Warning" : "Avisu",
+    "The object type is not specified." : "El tipu d'oxetu nun ta especificáu.",
+    "Enter new" : "Introducir nueva",
+    "Delete" : "Desaniciar",
+    "Add" : "Amestar",
+    "Edit tags" : "Editar etiquetes",
+    "Error loading dialog template: {error}" : "Fallu cargando plantía de diálogu: {error}",
+    "No tags selected for deletion." : "Nun s'esbillaron etiquetes pa desaniciar.",
+    "Updating {productName} to version {version}, this may take a while." : "Anovando {productName} a la versión {version}, esto pue llevar un tiempu.",
+    "Please reload the page." : "Por favor, recarga la páxina",
+    "The update was unsuccessful." : "L'anovamientu nun foi esitosu.",
+    "The update was successful. Redirecting you to ownCloud now." : "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Nun pudo reaniciase la contraseña porque'l token ye inválidu",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nun pudo unviase'l corréu. Por favor, asegurate que'l to nome d'usuariu seya correutu",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador",
+    "%s password reset" : "%s restablecer contraseña",
+    "Use the following link to reset your password: {link}" : "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
+    "You will receive a link to reset your password via Email." : "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña",
+    "Username" : "Nome d'usuariu",
+    "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?" : "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?",
+    "Yes, I really want to reset my password now" : "Sí, quiero reaniciar daveres la mio contraseña agora",
+    "Reset" : "Reaniciar",
+    "New password" : "Contraseña nueva",
+    "New Password" : "Contraseña nueva",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Apps" : "Aplicaciones",
+    "Admin" : "Alministrador",
+    "Help" : "Ayuda",
+    "Error loading tags" : "Fallu cargando les etiquetes",
+    "Tag already exists" : "Yá esiste la etiqueta",
+    "Error deleting tag(s)" : "Fallu desaniciando etiqueta(es)",
+    "Error tagging" : "Fallu etiquetando",
+    "Error untagging" : "Fallu al quitar etiquetes",
+    "Error favoriting" : "Fallu al marcar favoritos",
+    "Error unfavoriting" : "Fallu al desmarcar favoritos",
+    "Access forbidden" : "Accesu denegáu",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n",
+    "The share will expire on %s." : "La compartición va caducar el %s.",
+    "Cheers!" : "¡Salú!",
+    "Security Warning" : "Avisu de seguridá",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La to versión de PHP ye vulnerable al ataque NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, anova la to instalación de PHP pa usar %s de mou seguru.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crea una <strong>cuenta d'alministrador</strong>",
+    "Password" : "Contraseña",
+    "Storage & database" : "Almacenamientu y Base de datos",
+    "Data folder" : "Carpeta de datos",
+    "Configure the database" : "Configura la base de datos",
+    "Only %s is available." : "Namái ta disponible %s",
+    "Database user" : "Usuariu de la base de datos",
+    "Database password" : "Contraseña de la base de datos",
+    "Database name" : "Nome de la base de datos",
+    "Database tablespace" : "Espaciu de tables de la base de datos",
+    "Database host" : "Agospiador de la base de datos",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Va usase SQLite como base de datos. Pa instalaciones más grandes, recomiéndase cambiar esto.",
+    "Finish setup" : "Finar la configuración ",
+    "Finishing …" : "Finando ...",
+    "%s is available. Get more information on how to update." : "Ta disponible %s. Consigui más información en cómo anovar·",
+    "Log out" : "Zarrar sesión",
+    "Server side authentication failed!" : "Falló l'autenticación nel sirvidor!",
+    "Please contact your administrator." : "Por favor, contauta col to alministrador",
+    "Forgot your password? Reset it!" : "¿Escaeciesti la to contraseña? ¡Reaníciala!",
+    "remember" : "recordar",
+    "Log in" : "Aniciar sesión",
+    "Alternative Logins" : "Anicios de sesión alternativos",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Esta instalación d'ownCloud ta en mou d'usuariu únicu.",
+    "This means only administrators can use the instance." : "Esto quier dicir que namái pue usala un alministrador.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contauta col alministrador si esti problema sigui apaeciendo.",
+    "Thank you for your patience." : "Gracies pola to paciencia.",
+    "You are accessing the server from an untrusted domain." : "Tas accediendo al sirvidor dende un dominiu non confiáu.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor, contauta col alministrador. Si yes l'alministrador, configura l'axuste \"trusted_domain\" en config/config.php. Hai un exemplu en config/config.sample.php.",
+    "Add \"%s\" as trusted domain" : "Amestáu \"%s\" como dominiu de confianza",
+    "%s will be updated to version %s." : "%s anovaráse a la versión %s.",
+    "The following apps will be disabled:" : "Deshabilitaránse les siguientes aplicaciones:",
+    "The theme %s has been disabled." : "Deshabilitóse'l tema %s.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enantes de siguir, asegúrate de que se fizo una copia de seguridá de la base de datos, la carpeta de configuración y la carpeta de datos.",
+    "Start update" : "Aniciar anovamientu"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ast.php b/core/l10n/ast.php
deleted file mode 100644
index 43ea5f16b34..00000000000
--- a/core/l10n/ast.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nun pudo unviase'l corréu a los usuarios siguientes: %s",
-"Turned on maintenance mode" => "Activáu'l mou de caltenimientu",
-"Turned off maintenance mode" => "Apagáu'l mou de caltenimientu",
-"Updated database" => "Base de datos anovada",
-"Checked database schema update" => "Anovamientu del esquema de base de datos revisáu",
-"Updated \"%s\" to %s" => "Anováu \"%s\" a %s",
-"Disabled incompatible apps: %s" => "Aplicaciones incompatibles desactivaes: %s",
-"No image or file provided" => "Nun s'especificó nenguna imaxe o ficheru",
-"Unknown filetype" => "Triba de ficheru desconocida",
-"Invalid image" => "Imaxe inválida",
-"No temporary profile picture available, try again" => "Nengún perfil d'imaxe temporal disponible, intentalo de nueves",
-"No crop data provided" => "Nun s'apurrió'l retayu de datos",
-"Sunday" => "Domingu",
-"Monday" => "Llunes",
-"Tuesday" => "Martes",
-"Wednesday" => "Miércoles",
-"Thursday" => "Xueves",
-"Friday" => "Vienres",
-"Saturday" => "Sábadu",
-"January" => "Xineru",
-"February" => "Febreru",
-"March" => "Marzu",
-"April" => "Abril",
-"May" => "Mayu",
-"June" => "Xunu",
-"July" => "Xunetu",
-"August" => "Agostu",
-"September" => "Setiembre",
-"October" => "Ochobre",
-"November" => "Payares",
-"December" => "Avientu",
-"Settings" => "Axustes",
-"File" => "Ficheru",
-"Folder" => "Carpeta",
-"Image" => "Imaxe",
-"Audio" => "Audiu",
-"Saving..." => "Guardando...",
-"Couldn't send reset email. Please contact your administrator." => "Nun pudo unviase'l corréu de reaniciu. Por favor, contauta col alministrador.",
-"The link to reset your password has been sent to your email. 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." => "Unviósete al corréu l'enllaz pa reaniciar la to contraseña. Si nun lu recibes nuna cantidá razonable de tiempu, comprueba les tos carpetes de corréu puxarra. <br>Si nun ta ehí, entruga al to alministrador llocal",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Los tos ficheros tán crifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que se reanicie la to contraseña.<br />Si nun tas seguru de qué facer, por favor contauta col to alministrador enantes que sigas. <br />¿De xuru quies siguir?",
-"I know what I'm doing" => "Sé lo que toi faciendo",
-"Reset password" => "Restablecer contraseña",
-"Password can not be changed. Please contact your administrator." => "Nun pue camudase la contraseña. Por favor, contauta col alministrador.",
-"No" => "Non",
-"Yes" => "Sí",
-"Choose" => "Esbillar",
-"Error loading file picker template: {error}" => "Fallu cargando'l ficheru de plantía d'escoyeta: {error}",
-"Ok" => "Aceutar",
-"Error loading message template: {error}" => "Fallu cargando'l mensaxe de la plantía: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflictu de ficheru","{count} conflictos de ficheru "),
-"One file conflict" => "Conflictu nun ficheru",
-"New Files" => "Ficheros nuevos",
-"Already existing files" => "Ficheros qu'esisten yá",
-"Which files do you want to keep?" => "¿Qué ficheros quies caltener?",
-"If you select both versions, the copied file will have a number added to its name." => "Si seleiciones dambes versiones, el ficheru copiáu va tener un númberu amestáu al so nome",
-"Cancel" => "Encaboxar",
-"Continue" => "Continuar",
-"(all selected)" => "(esbillao too)",
-"({count} selected)" => "(esbillaos {count})",
-"Error loading file exists template" => "Falu cargando plantía de ficheru esistente",
-"Very weak password" => "Contraseña mui feble",
-"Weak password" => "Contraseña feble",
-"So-so password" => "Contraseña pasable",
-"Good password" => "Contraseña bona",
-"Strong password" => "Contraseña mui bona",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El to sirvidor web entá nun ta configuráu afayadizamente pa permitir la sincronización de ficheros porque la interfaz WebDAV paez tar rota.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Esti sirvidor nun tien conexón a Internet. Esto significa que dalgunes de les carauterístiques nun van funcionar, como'l montaxe d'almacenamiento esternu, les notificaciones sobre anovamientos, la instalación d'aplicaciones de terceros, l'accesu a los ficheros de mou remotu o l'unviu de correos-e de notificación. Suxerimos habilitar una conexón a Internet nesti sirvidor pa esfrutar de toles funciones.",
-"Shared" => "Compartíu",
-"Shared with {recipients}" => "Compartío con {recipients}",
-"Share" => "Compartir",
-"Error" => "Fallu",
-"Error while sharing" => "Fallu mientres la compartición",
-"Error while unsharing" => "Fallu mientres se dexaba de compartir",
-"Error while changing permissions" => "Fallu mientres camudaben los permisos",
-"Shared with you and the group {group} by {owner}" => "Compartíu contigo y col grupu {group} por {owner}",
-"Shared with you by {owner}" => "Compartíu contigo por {owner}",
-"Share with user or group …" => "Compartir col usuariu o grupu ...",
-"Share link" => "Compartir enllaz",
-"The public link will expire no later than {days} days after it is created" => "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
-"Password protect" => "Protexer con contraseña",
-"Choose a password for the public link" => "Escueyi una contraseña pal enllaz públicu",
-"Allow Public Upload" => "Permitir xuba pública",
-"Email link to person" => "Enllaz de corréu-e a la persona",
-"Send" => "Unviar",
-"Set expiration date" => "Afitar la data de caducidá",
-"Expiration date" => "Data de caducidá",
-"group" => "grupu",
-"Resharing is not allowed" => "Recompartir nun ta permitíu",
-"Shared in {item} with {user}" => "Compartíu en {item} con {user}",
-"Unshare" => "Dexar de compartir",
-"notify by email" => "notificar per corréu",
-"can share" => "pue compartir",
-"can edit" => "pue editar",
-"access control" => "control d'accesu",
-"create" => "crear",
-"update" => "xubir",
-"delete" => "desaniciar",
-"Password protected" => "Contraseña protexida",
-"Error unsetting expiration date" => "Fallu desafitando la data de caducidá",
-"Error setting expiration date" => "Fallu afitando la fecha de caducidá",
-"Sending ..." => "Unviando ...",
-"Email sent" => "Corréu unviáu",
-"Warning" => "Avisu",
-"The object type is not specified." => "El tipu d'oxetu nun ta especificáu.",
-"Enter new" => "Introducir nueva",
-"Delete" => "Desaniciar",
-"Add" => "Amestar",
-"Edit tags" => "Editar etiquetes",
-"Error loading dialog template: {error}" => "Fallu cargando plantía de diálogu: {error}",
-"No tags selected for deletion." => "Nun s'esbillaron etiquetes pa desaniciar.",
-"Updating {productName} to version {version}, this may take a while." => "Anovando {productName} a la versión {version}, esto pue llevar un tiempu.",
-"Please reload the page." => "Por favor, recarga la páxina",
-"The update was unsuccessful." => "L'anovamientu nun foi esitosu.",
-"The update was successful. Redirecting you to ownCloud now." => "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
-"Couldn't reset password because the token is invalid" => "Nun pudo reaniciase la contraseña porque'l token ye inválidu",
-"Couldn't send reset email. Please make sure your username is correct." => "Nun pudo unviase'l corréu. Por favor, asegurate que'l to nome d'usuariu seya correutu",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador",
-"%s password reset" => "%s restablecer contraseña",
-"Use the following link to reset your password: {link}" => "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
-"You will receive a link to reset your password via Email." => "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña",
-"Username" => "Nome d'usuariu",
-"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?" => "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?",
-"Yes, I really want to reset my password now" => "Sí, quiero reaniciar daveres la mio contraseña agora",
-"Reset" => "Reaniciar",
-"New password" => "Contraseña nueva",
-"New Password" => "Contraseña nueva",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!",
-"For the best results, please consider using a GNU/Linux server instead." => "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
-"Personal" => "Personal",
-"Users" => "Usuarios",
-"Apps" => "Aplicaciones",
-"Admin" => "Alministrador",
-"Help" => "Ayuda",
-"Error loading tags" => "Fallu cargando les etiquetes",
-"Tag already exists" => "Yá esiste la etiqueta",
-"Error deleting tag(s)" => "Fallu desaniciando etiqueta(es)",
-"Error tagging" => "Fallu etiquetando",
-"Error untagging" => "Fallu al quitar etiquetes",
-"Error favoriting" => "Fallu al marcar favoritos",
-"Error unfavoriting" => "Fallu al desmarcar favoritos",
-"Access forbidden" => "Accesu denegáu",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n",
-"The share will expire on %s." => "La compartición va caducar el %s.",
-"Cheers!" => "¡Salú!",
-"Security Warning" => "Avisu de seguridá",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La to versión de PHP ye vulnerable al ataque NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Por favor, anova la to instalación de PHP pa usar %s de mou seguru.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>.",
-"Create an <strong>admin account</strong>" => "Crea una <strong>cuenta d'alministrador</strong>",
-"Password" => "Contraseña",
-"Storage & database" => "Almacenamientu y Base de datos",
-"Data folder" => "Carpeta de datos",
-"Configure the database" => "Configura la base de datos",
-"Only %s is available." => "Namái ta disponible %s",
-"Database user" => "Usuariu de la base de datos",
-"Database password" => "Contraseña de la base de datos",
-"Database name" => "Nome de la base de datos",
-"Database tablespace" => "Espaciu de tables de la base de datos",
-"Database host" => "Agospiador de la base de datos",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Va usase SQLite como base de datos. Pa instalaciones más grandes, recomiéndase cambiar esto.",
-"Finish setup" => "Finar la configuración ",
-"Finishing …" => "Finando ...",
-"%s is available. Get more information on how to update." => "Ta disponible %s. Consigui más información en cómo anovar·",
-"Log out" => "Zarrar sesión",
-"Server side authentication failed!" => "Falló l'autenticación nel sirvidor!",
-"Please contact your administrator." => "Por favor, contauta col to alministrador",
-"Forgot your password? Reset it!" => "¿Escaeciesti la to contraseña? ¡Reaníciala!",
-"remember" => "recordar",
-"Log in" => "Aniciar sesión",
-"Alternative Logins" => "Anicios de sesión alternativos",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Esta instalación d'ownCloud ta en mou d'usuariu únicu.",
-"This means only administrators can use the instance." => "Esto quier dicir que namái pue usala un alministrador.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contauta col alministrador si esti problema sigui apaeciendo.",
-"Thank you for your patience." => "Gracies pola to paciencia.",
-"You are accessing the server from an untrusted domain." => "Tas accediendo al sirvidor dende un dominiu non confiáu.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Por favor, contauta col alministrador. Si yes l'alministrador, configura l'axuste \"trusted_domain\" en config/config.php. Hai un exemplu en config/config.sample.php.",
-"Add \"%s\" as trusted domain" => "Amestáu \"%s\" como dominiu de confianza",
-"%s will be updated to version %s." => "%s anovaráse a la versión %s.",
-"The following apps will be disabled:" => "Deshabilitaránse les siguientes aplicaciones:",
-"The theme %s has been disabled." => "Deshabilitóse'l tema %s.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Enantes de siguir, asegúrate de que se fizo una copia de seguridá de la base de datos, la carpeta de configuración y la carpeta de datos.",
-"Start update" => "Aniciar anovamientu"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/az.js b/core/l10n/az.js
new file mode 100644
index 00000000000..c6221df7f2f
--- /dev/null
+++ b/core/l10n/az.js
@@ -0,0 +1,49 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Məktubu göstərilən istifadəçilərə göndərmək mümkün olmadı: %s",
+    "Turned on maintenance mode" : "Xidməti rejimə keçilmişdir",
+    "Turned off maintenance mode" : "Xidməti rejim söndürüldü",
+    "Updated database" : "Yenilənmiş verilənlər bazası",
+    "Checked database schema update" : "Baza sxeminin yenilənməsi yoxlanıldı",
+    "Unknown filetype" : "Fayl tipi bəlli deyil.",
+    "Invalid image" : "Yalnış şəkil",
+    "No temporary profile picture available, try again" : "Profaylın müvəqqəti şəklinə çatmaq mümkün olmadı, yenidən təkrarlayın.",
+    "Sunday" : "Bazar",
+    "Monday" : "Bazar ertəsi",
+    "Settings" : "Quraşdırmalar",
+    "Folder" : "Qovluq",
+    "Saving..." : "Saxlama...",
+    "No" : "Xeyir",
+    "Yes" : "Bəli",
+    "Ok" : "Oldu",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Dayandır",
+    "Very weak password" : "Çox asan şifrə",
+    "Weak password" : "Asan şifrə",
+    "So-so password" : "Elə-belə şifrə",
+    "Good password" : "Yaxşı şifrə",
+    "Strong password" : "Çətin şifrə",
+    "Share" : "Yayımla",
+    "Error" : "Səhv",
+    "Share link" : "Linki yayımla",
+    "Send" : "Göndər",
+    "group" : "qrup",
+    "can share" : "yayımlaya bilərsiniz",
+    "delete" : "sil",
+    "Email sent" : "Məktub göndərildi",
+    "Warning" : "Xəbərdarlıq",
+    "Delete" : "Sil",
+    "Add" : "Əlavə etmək",
+    "Username" : "İstifadəçi adı",
+    "Reset" : "Sıfırla",
+    "Personal" : "Şəxsi",
+    "Users" : "İstifadəçilər",
+    "Admin" : "İnzibatçı",
+    "Help" : "Kömək",
+    "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
+    "Password" : "Şifrə",
+    "You are accessing the server from an untrusted domain." : "Siz serverə inamsız domain-dən girməyə çalışırsız.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin.  Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/az.json b/core/l10n/az.json
new file mode 100644
index 00000000000..927cf0ec0b9
--- /dev/null
+++ b/core/l10n/az.json
@@ -0,0 +1,47 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Məktubu göstərilən istifadəçilərə göndərmək mümkün olmadı: %s",
+    "Turned on maintenance mode" : "Xidməti rejimə keçilmişdir",
+    "Turned off maintenance mode" : "Xidməti rejim söndürüldü",
+    "Updated database" : "Yenilənmiş verilənlər bazası",
+    "Checked database schema update" : "Baza sxeminin yenilənməsi yoxlanıldı",
+    "Unknown filetype" : "Fayl tipi bəlli deyil.",
+    "Invalid image" : "Yalnış şəkil",
+    "No temporary profile picture available, try again" : "Profaylın müvəqqəti şəklinə çatmaq mümkün olmadı, yenidən təkrarlayın.",
+    "Sunday" : "Bazar",
+    "Monday" : "Bazar ertəsi",
+    "Settings" : "Quraşdırmalar",
+    "Folder" : "Qovluq",
+    "Saving..." : "Saxlama...",
+    "No" : "Xeyir",
+    "Yes" : "Bəli",
+    "Ok" : "Oldu",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Dayandır",
+    "Very weak password" : "Çox asan şifrə",
+    "Weak password" : "Asan şifrə",
+    "So-so password" : "Elə-belə şifrə",
+    "Good password" : "Yaxşı şifrə",
+    "Strong password" : "Çətin şifrə",
+    "Share" : "Yayımla",
+    "Error" : "Səhv",
+    "Share link" : "Linki yayımla",
+    "Send" : "Göndər",
+    "group" : "qrup",
+    "can share" : "yayımlaya bilərsiniz",
+    "delete" : "sil",
+    "Email sent" : "Məktub göndərildi",
+    "Warning" : "Xəbərdarlıq",
+    "Delete" : "Sil",
+    "Add" : "Əlavə etmək",
+    "Username" : "İstifadəçi adı",
+    "Reset" : "Sıfırla",
+    "Personal" : "Şəxsi",
+    "Users" : "İstifadəçilər",
+    "Admin" : "İnzibatçı",
+    "Help" : "Kömək",
+    "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
+    "Password" : "Şifrə",
+    "You are accessing the server from an untrusted domain." : "Siz serverə inamsız domain-dən girməyə çalışırsız.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin.  Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/az.php b/core/l10n/az.php
deleted file mode 100644
index a2b65e38217..00000000000
--- a/core/l10n/az.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Məktubu göstərilən istifadəçilərə göndərmək mümkün olmadı: %s",
-"Turned on maintenance mode" => "Xidməti rejimə keçilmişdir",
-"Turned off maintenance mode" => "Xidməti rejim söndürüldü",
-"Updated database" => "Yenilənmiş verilənlər bazası",
-"Checked database schema update" => "Baza sxeminin yenilənməsi yoxlanıldı",
-"Unknown filetype" => "Fayl tipi bəlli deyil.",
-"Invalid image" => "Yalnış şəkil",
-"No temporary profile picture available, try again" => "Profaylın müvəqqəti şəklinə çatmaq mümkün olmadı, yenidən təkrarlayın.",
-"Sunday" => "Bazar",
-"Monday" => "Bazar ertəsi",
-"Settings" => "Quraşdırmalar",
-"Folder" => "Qovluq",
-"Saving..." => "Saxlama...",
-"No" => "Xeyir",
-"Yes" => "Bəli",
-"Ok" => "Oldu",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Dayandır",
-"Very weak password" => "Çox asan şifrə",
-"Weak password" => "Asan şifrə",
-"So-so password" => "Elə-belə şifrə",
-"Good password" => "Yaxşı şifrə",
-"Strong password" => "Çətin şifrə",
-"Share" => "Yayımla",
-"Error" => "Səhv",
-"Share link" => "Linki yayımla",
-"Send" => "Göndər",
-"group" => "qrup",
-"can share" => "yayımlaya bilərsiniz",
-"delete" => "sil",
-"Email sent" => "Məktub göndərildi",
-"Warning" => "Xəbərdarlıq",
-"Delete" => "Sil",
-"Add" => "Əlavə etmək",
-"Username" => "İstifadəçi adı",
-"Reset" => "Sıfırla",
-"Personal" => "Şəxsi",
-"Users" => "İstifadəçilər",
-"Admin" => "İnzibatçı",
-"Help" => "Kömək",
-"Security Warning" => "Təhlükəsizlik xəbərdarlığı",
-"Password" => "Şifrə",
-"You are accessing the server from an untrusted domain." => "Siz serverə inamsız domain-dən girməyə çalışırsız.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin.  Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/be.js b/core/l10n/be.js
new file mode 100644
index 00000000000..4f00b1f6d71
--- /dev/null
+++ b/core/l10n/be.js
@@ -0,0 +1,33 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Нядзеля",
+    "Monday" : "Панядзелак",
+    "Tuesday" : "Аўторак",
+    "Wednesday" : "Серада",
+    "Thursday" : "Чацвер",
+    "Friday" : "Пятніца",
+    "Saturday" : "Субота",
+    "January" : "Студзень",
+    "February" : "Люты",
+    "March" : "Сакавік",
+    "April" : "Красавік",
+    "May" : "Май",
+    "June" : "Чэрвень",
+    "July" : "Ліпень",
+    "August" : "Жнівень",
+    "September" : "Верасень",
+    "October" : "Кастрычнік",
+    "November" : "Лістапад",
+    "December" : "Снежань",
+    "Settings" : "Налады",
+    "No" : "Не",
+    "Yes" : "Так",
+    "Choose" : "Выбар",
+    "Ok" : "Добра",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
+    "Error" : "Памылка",
+    "The object type is not specified." : "Тып аб'екта не ўдакладняецца.",
+    "Finish setup" : "Завяршыць ўстаноўку."
+},
+"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/be.json b/core/l10n/be.json
new file mode 100644
index 00000000000..b055f53ad2b
--- /dev/null
+++ b/core/l10n/be.json
@@ -0,0 +1,31 @@
+{ "translations": {
+    "Sunday" : "Нядзеля",
+    "Monday" : "Панядзелак",
+    "Tuesday" : "Аўторак",
+    "Wednesday" : "Серада",
+    "Thursday" : "Чацвер",
+    "Friday" : "Пятніца",
+    "Saturday" : "Субота",
+    "January" : "Студзень",
+    "February" : "Люты",
+    "March" : "Сакавік",
+    "April" : "Красавік",
+    "May" : "Май",
+    "June" : "Чэрвень",
+    "July" : "Ліпень",
+    "August" : "Жнівень",
+    "September" : "Верасень",
+    "October" : "Кастрычнік",
+    "November" : "Лістапад",
+    "December" : "Снежань",
+    "Settings" : "Налады",
+    "No" : "Не",
+    "Yes" : "Так",
+    "Choose" : "Выбар",
+    "Ok" : "Добра",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
+    "Error" : "Памылка",
+    "The object type is not specified." : "Тып аб'екта не ўдакладняецца.",
+    "Finish setup" : "Завяршыць ўстаноўку."
+},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/core/l10n/be.php b/core/l10n/be.php
deleted file mode 100644
index cf0e5e0c59b..00000000000
--- a/core/l10n/be.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Нядзеля",
-"Monday" => "Панядзелак",
-"Tuesday" => "Аўторак",
-"Wednesday" => "Серада",
-"Thursday" => "Чацвер",
-"Friday" => "Пятніца",
-"Saturday" => "Субота",
-"January" => "Студзень",
-"February" => "Люты",
-"March" => "Сакавік",
-"April" => "Красавік",
-"May" => "Май",
-"June" => "Чэрвень",
-"July" => "Ліпень",
-"August" => "Жнівень",
-"September" => "Верасень",
-"October" => "Кастрычнік",
-"November" => "Лістапад",
-"December" => "Снежань",
-"Settings" => "Налады",
-"No" => "Не",
-"Yes" => "Так",
-"Choose" => "Выбар",
-"Ok" => "Добра",
-"_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
-"Error" => "Памылка",
-"The object type is not specified." => "Тып аб'екта не ўдакладняецца.",
-"Finish setup" => "Завяршыць ўстаноўку."
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js
new file mode 100644
index 00000000000..e99c1be0532
--- /dev/null
+++ b/core/l10n/bg_BG.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Неуспешно изпращане на имейл до следните потребители: %s.",
+    "Turned on maintenance mode" : "Режим за поддръжка включен.",
+    "Turned off maintenance mode" : "Режим за поддръжка изключен.",
+    "Updated database" : "Базата данни обоновена.",
+    "Checked database schema update" : "Промяна на схемата на базата данни проверена.",
+    "Checked database schema update for apps" : "Промяна на схемата на базата данни за приложения проверена.",
+    "Updated \"%s\" to %s" : "Обновен \"%s\" до %s",
+    "Disabled incompatible apps: %s" : "Изключени са несъвместимите програми: %s.",
+    "No image or file provided" : "Нито Изображение, нито файл бяха зададени.",
+    "Unknown filetype" : "Непознат тип файл.",
+    "Invalid image" : "Невалидно изображение.",
+    "No temporary profile picture available, try again" : "Липсва временен аватар, опитай отново.",
+    "No crop data provided" : "Липсва информация за клъцването.",
+    "Sunday" : "Неделя",
+    "Monday" : "Понеделник",
+    "Tuesday" : "Вторник",
+    "Wednesday" : "Сряда",
+    "Thursday" : "Четвъртък",
+    "Friday" : "Петък",
+    "Saturday" : "Събота",
+    "January" : "Януари",
+    "February" : "Февруари",
+    "March" : "Март",
+    "April" : "Април",
+    "May" : "Май",
+    "June" : "Юни",
+    "July" : "Юли",
+    "August" : "Август",
+    "September" : "Септември",
+    "October" : "Октомври",
+    "November" : "Ноември",
+    "December" : "Декември",
+    "Settings" : "Настройки",
+    "File" : "Файл",
+    "Folder" : "Папка",
+    "Image" : "Изображение",
+    "Audio" : "Аудио",
+    "Saving..." : "Записване...",
+    "Couldn't send reset email. Please contact your administrator." : "Неуспешено изпращане на имейл. Моля, свържи се с администратора.",
+    "The link to reset your password has been sent to your email. 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>Ако не е там се свържи с администратора.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата.<br /> Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш.<br/>Наистина ли си сигурен, че искаш да продължиш?",
+    "I know what I'm doing" : "Знам какво правя!",
+    "Reset password" : "Възстановяване на парола",
+    "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържи се с администратора.",
+    "No" : "Не",
+    "Yes" : "Да",
+    "Choose" : "Избери",
+    "Error loading file picker template: {error}" : "Грешка при зареждането на шаблон за избор на файл: {error}",
+    "Ok" : "Добре",
+    "Error loading message template: {error}" : "Грешка при зареждането на шаблон за съобщения: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} файлов проблем","{count} файлови проблема"],
+    "One file conflict" : "Един файлов проблем",
+    "New Files" : "Нови файлове",
+    "Already existing files" : "Вече съществуващи файлове",
+    "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} избрани)",
+    "Error loading file exists template" : "Грешка при зареждането на шаблон за вече съществуваш файл.",
+    "Very weak password" : "Много слаба парола",
+    "Weak password" : "Слаба парола",
+    "So-so password" : "Не особено добра парола",
+    "Good password" : "Добра парола",
+    "Strong password" : "Сигурна парола",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Твоят web сървър все още не е правилно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Сървърът няма работеща интернет връзка. Това означава, че някои функции като прикачването на външни дискови устройства, уведомления за обновяване или инсталиране на външни приложения няма да работят. Достъпът на файлове отвън или изпращане на имейли за уведомление вероятно също няма да работят. Препоръчваме да включиш интернет връзката за този сървър ако искаш да използваш всички тези функции.",
+    "Error occurred while checking server setup" : "Настъпи грешка при проверката на настройките на сървъра.",
+    "Shared" : "Споделено",
+    "Shared with {recipients}" : "Споделено с {recipients}.",
+    "Share" : "Споделяне",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка при споделянето.",
+    "Error while unsharing" : "Грешка докато се премахва споделянето.",
+    "Error while changing permissions" : "Грешка при промяна на достъпа.",
+    "Shared with you and the group {group} by {owner}" : "Споделено с теб и група {group} от {owner}.",
+    "Shared with you by {owner}" : "Споделено с теб от {owner}.",
+    "Share with user or group …" : "Сподели с потребител или група...",
+    "Share link" : "Връзка за споделяне",
+    "The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дена след създаването й.",
+    "Password protect" : "Защитено с парола",
+    "Choose a password for the public link" : "Избери парола за общодостъпната връзка",
+    "Allow Public Upload" : "Разреши Общодостъпно Качване",
+    "Email link to person" : "Изпрати връзка до нечия пощата",
+    "Send" : "Изпрати",
+    "Set expiration date" : "Посочи дата на изтичане",
+    "Expiration date" : "Дата на изтичане",
+    "Adding user..." : "Добавяне на потребител...",
+    "group" : "група",
+    "Resharing is not allowed" : "Повторно споделяне не е разрешено.",
+    "Shared in {item} with {user}" : "Споделено в {item} с {user}.",
+    "Unshare" : "Премахни споделяне",
+    "notify by email" : "уведоми по имейла",
+    "can share" : "може да споделя",
+    "can edit" : "може да променя",
+    "access control" : "контрол на достъпа",
+    "create" : "Създаване",
+    "update" : "Обновяване",
+    "delete" : "изтрий",
+    "Password protected" : "Защитено с парола",
+    "Error unsetting expiration date" : "Грешка при премахване на дата за изтичане",
+    "Error setting expiration date" : "Грешка при поставяне на дата за изтичане",
+    "Sending ..." : "Изпращане ...",
+    "Email sent" : "Имейла е изпратен",
+    "Warning" : "Предупреждение",
+    "The object type is not specified." : "Видът на обекта не е избран.",
+    "Enter new" : "Въведи нов",
+    "Delete" : "Изтрий",
+    "Add" : "Добавяне",
+    "Edit tags" : "Промяна на етикетите",
+    "Error loading dialog template: {error}" : "Грешка при зареждането на шаблоn за диалог: {error}.",
+    "No tags selected for deletion." : "Не са избрани етикети за изтриване.",
+    "Updating {productName} to version {version}, this may take a while." : "Обновява се {productName} на версия {version}, това може да отнеме време.",
+    "Please reload the page." : "Моля, презареди страницата.",
+    "The update was unsuccessful." : "Обновяването неуспешно.",
+    "The update was successful. Redirecting you to ownCloud now." : "Обновяването е успешно. Пренасочване към твоя ownCloud сега.",
+    "Couldn't reset password because the token is invalid" : "Невалиден линк за промяна на паролата.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Неуспешно изпращане на имейл за възстановяване на паролата. Моля, увери се, че потребителското име е правилно.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Неуспешно изпращане на имейл за възстановяване на паролата, защото липсва имейл свързан с това потребителско име. Моля свържи се с админстратора.",
+    "%s password reset" : "Паролата на %s е променена.",
+    "Use the following link to reset your password: {link}" : "Използвай следната връзка, за да възстановиш паролата си: {link}",
+    "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" : "Да, наистина желая да възстановя паролата си сега.",
+    "Reset" : "Възстанови",
+    "New password" : "Нова парола",
+    "New Password" : "Нова Парола",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!",
+    "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.",
+    "Personal" : "Лични",
+    "Users" : "Потребители",
+    "Apps" : "Приложения",
+    "Admin" : "Админ",
+    "Help" : "Помощ",
+    "Error loading tags" : "Грешка при зареждане на етикети.",
+    "Tag already exists" : "Етикетите вече съществуват.",
+    "Error deleting tag(s)" : "Грешка при изтриване на етикет(и).",
+    "Error tagging" : "Грешка при задаване на етикета.",
+    "Error untagging" : "Грешка при премахване на етикета.",
+    "Error favoriting" : "Грешка при отбелязване за любим.",
+    "Error unfavoriting" : "Грешка при премахване отбелязването за любим.",
+    "Access forbidden" : "Достъпът е забранен",
+    "File not found" : "Файлът не е открит.",
+    "The specified document has not been found on the server." : "Избраният документ не е намерн на сървъра.",
+    "You can click here to return to %s." : "Можеш да натиснеш тук, за да се върнеш на %s",
+    "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!" : "Поздрави!",
+    "Internal Server Error" : "Вътрешна системна грешка",
+    "The server encountered an internal error and was unable to complete your request." : "Сървърът се натъкна на вътрешна грешка и неуспя да завърши заявката.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Моля, свържи се със сървърния администратор ако тази грешка се появи отново, моля, включи техническите данни показани в доклада по-долу.",
+    "More details can be found in the server log." : "Допълнителна информация може да бъде открита в сървърните доклади.",
+    "Technical details" : "Техническа информация",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Line: %s",
+    "Trace" : "Trace",
+    "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 сигурно.",
+    "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>.",
+    "Create an <strong>admin account</strong>" : "Създаване на <strong>админ профил</strong>.",
+    "Password" : "Парола",
+    "Storage & database" : "Дисково пространство и база данни",
+    "Data folder" : "Директория за данни",
+    "Configure the database" : "Конфигуриране на базата данни",
+    "Only %s is available." : "Само %s е достъпен.",
+    "Database user" : "Потребител за базата данни",
+    "Database password" : "Парола за базата данни",
+    "Database name" : "Име на базата данни",
+    "Database tablespace" : "Tablespace-а за базата данни",
+    "Database host" : "Хост за базата данни",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite ще бъде използван за база данни. За по-големи инсталации препоръчваме това да бъде променено.",
+    "Finish setup" : "Завършване на настройките",
+    "Finishing …" : "Завършване...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Програмата изисква JavaScript, за да функционира правилно. Моля, <a href=\"http://enable-javascript.com/\" target=\"_blank\">включи JavaScript</a> и презареди страницата.",
+    "%s is available. Get more information on how to update." : "%s е на разположение. Прочети повече как да обновиш. ",
+    "Log out" : "Отписване",
+    "Server side authentication failed!" : "Заверяването в сървъра неуспешно!",
+    "Please contact your administrator." : "Моля, свържи се с админстратора.",
+    "Forgot your password? Reset it!" : "Забрави паролата? Възстанови я!",
+    "remember" : "запомни",
+    "Log in" : "Вписване",
+    "Alternative Logins" : "Други Потребителски Имена",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<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." : "Благодарим за търпението.",
+    "You are accessing the server from an untrusted domain." : "Свръзваш се със сървъра от неодобрен домейн.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Моля, свържи се с администратора. Ако ти си администраторът, на този сървър, промени \"trusted_domain\" настройките в  config/config.php. Примерна конфигурация е приложена в config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимост от конфигурацията ти, като администратор може натискайки бутонът по-долу да отбележиш домейнът като сигурен.",
+    "Add \"%s\" as trusted domain" : "Добави \"%s\" като сигурен домейн",
+    "%s will be updated to version %s." : "%s ще бъде обновена до версия %s.",
+    "The following apps will be disabled:" : "Следните програми ще бъдат изключени:",
+    "The theme %s has been disabled." : "Темата %s бе изключена.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Моля, увери се, че си направил копия на базата данни, папките с настройки и данни, преди да продължиш.",
+    "Start update" : "Започни обновяването",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "За да избегнеш таймаутове при по-големи инсталации, можеш да изпълниш следните команди в инсталанционната директория:",
+    "This %s instance is currently being updated, which may take a while." : "В момента този %s се обновява, а това може да отнеме време.",
+    "This page will refresh itself when the %s instance is available again." : "Тази страница ще се опресни автоматично, когато %s е отново на линия."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
new file mode 100644
index 00000000000..c918fe20618
--- /dev/null
+++ b/core/l10n/bg_BG.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Неуспешно изпращане на имейл до следните потребители: %s.",
+    "Turned on maintenance mode" : "Режим за поддръжка включен.",
+    "Turned off maintenance mode" : "Режим за поддръжка изключен.",
+    "Updated database" : "Базата данни обоновена.",
+    "Checked database schema update" : "Промяна на схемата на базата данни проверена.",
+    "Checked database schema update for apps" : "Промяна на схемата на базата данни за приложения проверена.",
+    "Updated \"%s\" to %s" : "Обновен \"%s\" до %s",
+    "Disabled incompatible apps: %s" : "Изключени са несъвместимите програми: %s.",
+    "No image or file provided" : "Нито Изображение, нито файл бяха зададени.",
+    "Unknown filetype" : "Непознат тип файл.",
+    "Invalid image" : "Невалидно изображение.",
+    "No temporary profile picture available, try again" : "Липсва временен аватар, опитай отново.",
+    "No crop data provided" : "Липсва информация за клъцването.",
+    "Sunday" : "Неделя",
+    "Monday" : "Понеделник",
+    "Tuesday" : "Вторник",
+    "Wednesday" : "Сряда",
+    "Thursday" : "Четвъртък",
+    "Friday" : "Петък",
+    "Saturday" : "Събота",
+    "January" : "Януари",
+    "February" : "Февруари",
+    "March" : "Март",
+    "April" : "Април",
+    "May" : "Май",
+    "June" : "Юни",
+    "July" : "Юли",
+    "August" : "Август",
+    "September" : "Септември",
+    "October" : "Октомври",
+    "November" : "Ноември",
+    "December" : "Декември",
+    "Settings" : "Настройки",
+    "File" : "Файл",
+    "Folder" : "Папка",
+    "Image" : "Изображение",
+    "Audio" : "Аудио",
+    "Saving..." : "Записване...",
+    "Couldn't send reset email. Please contact your administrator." : "Неуспешено изпращане на имейл. Моля, свържи се с администратора.",
+    "The link to reset your password has been sent to your email. 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>Ако не е там се свържи с администратора.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата.<br /> Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш.<br/>Наистина ли си сигурен, че искаш да продължиш?",
+    "I know what I'm doing" : "Знам какво правя!",
+    "Reset password" : "Възстановяване на парола",
+    "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържи се с администратора.",
+    "No" : "Не",
+    "Yes" : "Да",
+    "Choose" : "Избери",
+    "Error loading file picker template: {error}" : "Грешка при зареждането на шаблон за избор на файл: {error}",
+    "Ok" : "Добре",
+    "Error loading message template: {error}" : "Грешка при зареждането на шаблон за съобщения: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} файлов проблем","{count} файлови проблема"],
+    "One file conflict" : "Един файлов проблем",
+    "New Files" : "Нови файлове",
+    "Already existing files" : "Вече съществуващи файлове",
+    "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} избрани)",
+    "Error loading file exists template" : "Грешка при зареждането на шаблон за вече съществуваш файл.",
+    "Very weak password" : "Много слаба парола",
+    "Weak password" : "Слаба парола",
+    "So-so password" : "Не особено добра парола",
+    "Good password" : "Добра парола",
+    "Strong password" : "Сигурна парола",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Твоят web сървър все още не е правилно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Сървърът няма работеща интернет връзка. Това означава, че някои функции като прикачването на външни дискови устройства, уведомления за обновяване или инсталиране на външни приложения няма да работят. Достъпът на файлове отвън или изпращане на имейли за уведомление вероятно също няма да работят. Препоръчваме да включиш интернет връзката за този сървър ако искаш да използваш всички тези функции.",
+    "Error occurred while checking server setup" : "Настъпи грешка при проверката на настройките на сървъра.",
+    "Shared" : "Споделено",
+    "Shared with {recipients}" : "Споделено с {recipients}.",
+    "Share" : "Споделяне",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка при споделянето.",
+    "Error while unsharing" : "Грешка докато се премахва споделянето.",
+    "Error while changing permissions" : "Грешка при промяна на достъпа.",
+    "Shared with you and the group {group} by {owner}" : "Споделено с теб и група {group} от {owner}.",
+    "Shared with you by {owner}" : "Споделено с теб от {owner}.",
+    "Share with user or group …" : "Сподели с потребител или група...",
+    "Share link" : "Връзка за споделяне",
+    "The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дена след създаването й.",
+    "Password protect" : "Защитено с парола",
+    "Choose a password for the public link" : "Избери парола за общодостъпната връзка",
+    "Allow Public Upload" : "Разреши Общодостъпно Качване",
+    "Email link to person" : "Изпрати връзка до нечия пощата",
+    "Send" : "Изпрати",
+    "Set expiration date" : "Посочи дата на изтичане",
+    "Expiration date" : "Дата на изтичане",
+    "Adding user..." : "Добавяне на потребител...",
+    "group" : "група",
+    "Resharing is not allowed" : "Повторно споделяне не е разрешено.",
+    "Shared in {item} with {user}" : "Споделено в {item} с {user}.",
+    "Unshare" : "Премахни споделяне",
+    "notify by email" : "уведоми по имейла",
+    "can share" : "може да споделя",
+    "can edit" : "може да променя",
+    "access control" : "контрол на достъпа",
+    "create" : "Създаване",
+    "update" : "Обновяване",
+    "delete" : "изтрий",
+    "Password protected" : "Защитено с парола",
+    "Error unsetting expiration date" : "Грешка при премахване на дата за изтичане",
+    "Error setting expiration date" : "Грешка при поставяне на дата за изтичане",
+    "Sending ..." : "Изпращане ...",
+    "Email sent" : "Имейла е изпратен",
+    "Warning" : "Предупреждение",
+    "The object type is not specified." : "Видът на обекта не е избран.",
+    "Enter new" : "Въведи нов",
+    "Delete" : "Изтрий",
+    "Add" : "Добавяне",
+    "Edit tags" : "Промяна на етикетите",
+    "Error loading dialog template: {error}" : "Грешка при зареждането на шаблоn за диалог: {error}.",
+    "No tags selected for deletion." : "Не са избрани етикети за изтриване.",
+    "Updating {productName} to version {version}, this may take a while." : "Обновява се {productName} на версия {version}, това може да отнеме време.",
+    "Please reload the page." : "Моля, презареди страницата.",
+    "The update was unsuccessful." : "Обновяването неуспешно.",
+    "The update was successful. Redirecting you to ownCloud now." : "Обновяването е успешно. Пренасочване към твоя ownCloud сега.",
+    "Couldn't reset password because the token is invalid" : "Невалиден линк за промяна на паролата.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Неуспешно изпращане на имейл за възстановяване на паролата. Моля, увери се, че потребителското име е правилно.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Неуспешно изпращане на имейл за възстановяване на паролата, защото липсва имейл свързан с това потребителско име. Моля свържи се с админстратора.",
+    "%s password reset" : "Паролата на %s е променена.",
+    "Use the following link to reset your password: {link}" : "Използвай следната връзка, за да възстановиш паролата си: {link}",
+    "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" : "Да, наистина желая да възстановя паролата си сега.",
+    "Reset" : "Възстанови",
+    "New password" : "Нова парола",
+    "New Password" : "Нова Парола",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!",
+    "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.",
+    "Personal" : "Лични",
+    "Users" : "Потребители",
+    "Apps" : "Приложения",
+    "Admin" : "Админ",
+    "Help" : "Помощ",
+    "Error loading tags" : "Грешка при зареждане на етикети.",
+    "Tag already exists" : "Етикетите вече съществуват.",
+    "Error deleting tag(s)" : "Грешка при изтриване на етикет(и).",
+    "Error tagging" : "Грешка при задаване на етикета.",
+    "Error untagging" : "Грешка при премахване на етикета.",
+    "Error favoriting" : "Грешка при отбелязване за любим.",
+    "Error unfavoriting" : "Грешка при премахване отбелязването за любим.",
+    "Access forbidden" : "Достъпът е забранен",
+    "File not found" : "Файлът не е открит.",
+    "The specified document has not been found on the server." : "Избраният документ не е намерн на сървъра.",
+    "You can click here to return to %s." : "Можеш да натиснеш тук, за да се върнеш на %s",
+    "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!" : "Поздрави!",
+    "Internal Server Error" : "Вътрешна системна грешка",
+    "The server encountered an internal error and was unable to complete your request." : "Сървърът се натъкна на вътрешна грешка и неуспя да завърши заявката.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Моля, свържи се със сървърния администратор ако тази грешка се появи отново, моля, включи техническите данни показани в доклада по-долу.",
+    "More details can be found in the server log." : "Допълнителна информация може да бъде открита в сървърните доклади.",
+    "Technical details" : "Техническа информация",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Line: %s",
+    "Trace" : "Trace",
+    "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 сигурно.",
+    "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>.",
+    "Create an <strong>admin account</strong>" : "Създаване на <strong>админ профил</strong>.",
+    "Password" : "Парола",
+    "Storage & database" : "Дисково пространство и база данни",
+    "Data folder" : "Директория за данни",
+    "Configure the database" : "Конфигуриране на базата данни",
+    "Only %s is available." : "Само %s е достъпен.",
+    "Database user" : "Потребител за базата данни",
+    "Database password" : "Парола за базата данни",
+    "Database name" : "Име на базата данни",
+    "Database tablespace" : "Tablespace-а за базата данни",
+    "Database host" : "Хост за базата данни",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite ще бъде използван за база данни. За по-големи инсталации препоръчваме това да бъде променено.",
+    "Finish setup" : "Завършване на настройките",
+    "Finishing …" : "Завършване...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Програмата изисква JavaScript, за да функционира правилно. Моля, <a href=\"http://enable-javascript.com/\" target=\"_blank\">включи JavaScript</a> и презареди страницата.",
+    "%s is available. Get more information on how to update." : "%s е на разположение. Прочети повече как да обновиш. ",
+    "Log out" : "Отписване",
+    "Server side authentication failed!" : "Заверяването в сървъра неуспешно!",
+    "Please contact your administrator." : "Моля, свържи се с админстратора.",
+    "Forgot your password? Reset it!" : "Забрави паролата? Възстанови я!",
+    "remember" : "запомни",
+    "Log in" : "Вписване",
+    "Alternative Logins" : "Други Потребителски Имена",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<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." : "Благодарим за търпението.",
+    "You are accessing the server from an untrusted domain." : "Свръзваш се със сървъра от неодобрен домейн.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Моля, свържи се с администратора. Ако ти си администраторът, на този сървър, промени \"trusted_domain\" настройките в  config/config.php. Примерна конфигурация е приложена в config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимост от конфигурацията ти, като администратор може натискайки бутонът по-долу да отбележиш домейнът като сигурен.",
+    "Add \"%s\" as trusted domain" : "Добави \"%s\" като сигурен домейн",
+    "%s will be updated to version %s." : "%s ще бъде обновена до версия %s.",
+    "The following apps will be disabled:" : "Следните програми ще бъдат изключени:",
+    "The theme %s has been disabled." : "Темата %s бе изключена.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Моля, увери се, че си направил копия на базата данни, папките с настройки и данни, преди да продължиш.",
+    "Start update" : "Започни обновяването",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "За да избегнеш таймаутове при по-големи инсталации, можеш да изпълниш следните команди в инсталанционната директория:",
+    "This %s instance is currently being updated, which may take a while." : "В момента този %s се обновява, а това може да отнеме време.",
+    "This page will refresh itself when the %s instance is available again." : "Тази страница ще се опресни автоматично, когато %s е отново на линия."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
deleted file mode 100644
index 717eba17d6c..00000000000
--- a/core/l10n/bg_BG.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Неуспешно изпращане на имейл до следните потребители: %s.",
-"Turned on maintenance mode" => "Режим за поддръжка включен.",
-"Turned off maintenance mode" => "Режим за поддръжка изключен.",
-"Updated database" => "Базата данни обоновена.",
-"Checked database schema update" => "Промяна на схемата на базата данни проверена.",
-"Checked database schema update for apps" => "Промяна на схемата на базата данни за приложения проверена.",
-"Updated \"%s\" to %s" => "Обновен \"%s\" до %s",
-"Disabled incompatible apps: %s" => "Изключени са несъвместимите програми: %s.",
-"No image or file provided" => "Нито Изображение, нито файл бяха зададени.",
-"Unknown filetype" => "Непознат тип файл.",
-"Invalid image" => "Невалидно изображение.",
-"No temporary profile picture available, try again" => "Липсва временен аватар, опитай отново.",
-"No crop data provided" => "Липсва информация за клъцването.",
-"Sunday" => "Неделя",
-"Monday" => "Понеделник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Сряда",
-"Thursday" => "Четвъртък",
-"Friday" => "Петък",
-"Saturday" => "Събота",
-"January" => "Януари",
-"February" => "Февруари",
-"March" => "Март",
-"April" => "Април",
-"May" => "Май",
-"June" => "Юни",
-"July" => "Юли",
-"August" => "Август",
-"September" => "Септември",
-"October" => "Октомври",
-"November" => "Ноември",
-"December" => "Декември",
-"Settings" => "Настройки",
-"File" => "Файл",
-"Folder" => "Папка",
-"Image" => "Изображение",
-"Audio" => "Аудио",
-"Saving..." => "Записване...",
-"Couldn't send reset email. Please contact your administrator." => "Неуспешено изпращане на имейл. Моля, свържи се с администратора.",
-"The link to reset your password has been sent to your email. 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>Ако не е там се свържи с администратора.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата.<br /> Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш.<br/>Наистина ли си сигурен, че искаш да продължиш?",
-"I know what I'm doing" => "Знам какво правя!",
-"Reset password" => "Възстановяване на парола",
-"Password can not be changed. Please contact your administrator." => "Паролата не може да бъде промена. Моля, свържи се с администратора.",
-"No" => "Не",
-"Yes" => "Да",
-"Choose" => "Избери",
-"Error loading file picker template: {error}" => "Грешка при зареждането на шаблон за избор на файл: {error}",
-"Ok" => "Добре",
-"Error loading message template: {error}" => "Грешка при зареждането на шаблон за съобщения: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} файлов проблем","{count} файлови проблема"),
-"One file conflict" => "Един файлов проблем",
-"New Files" => "Нови файлове",
-"Already existing files" => "Вече съществуващи файлове",
-"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} избрани)",
-"Error loading file exists template" => "Грешка при зареждането на шаблон за вече съществуваш файл.",
-"Very weak password" => "Много слаба парола",
-"Weak password" => "Слаба парола",
-"So-so password" => "Не особено добра парола",
-"Good password" => "Добра парола",
-"Strong password" => "Сигурна парола",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Твоят web сървър все още не е правилно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Сървърът няма работеща интернет връзка. Това означава, че някои функции като прикачването на външни дискови устройства, уведомления за обновяване или инсталиране на външни приложения няма да работят. Достъпът на файлове отвън или изпращане на имейли за уведомление вероятно също няма да работят. Препоръчваме да включиш интернет връзката за този сървър ако искаш да използваш всички тези функции.",
-"Error occurred while checking server setup" => "Настъпи грешка при проверката на настройките на сървъра.",
-"Shared" => "Споделено",
-"Shared with {recipients}" => "Споделено с {recipients}.",
-"Share" => "Споделяне",
-"Error" => "Грешка",
-"Error while sharing" => "Грешка при споделянето.",
-"Error while unsharing" => "Грешка докато се премахва споделянето.",
-"Error while changing permissions" => "Грешка при промяна на достъпа.",
-"Shared with you and the group {group} by {owner}" => "Споделено с теб и група {group} от {owner}.",
-"Shared with you by {owner}" => "Споделено с теб от {owner}.",
-"Share with user or group …" => "Сподели с потребител или група...",
-"Share link" => "Връзка за споделяне",
-"The public link will expire no later than {days} days after it is created" => "Общодостъпната връзка ще изтече не по-късно от {days} дена след създаването й.",
-"Password protect" => "Защитено с парола",
-"Choose a password for the public link" => "Избери парола за общодостъпната връзка",
-"Allow Public Upload" => "Разреши Общодостъпно Качване",
-"Email link to person" => "Изпрати връзка до нечия пощата",
-"Send" => "Изпрати",
-"Set expiration date" => "Посочи дата на изтичане",
-"Expiration date" => "Дата на изтичане",
-"Adding user..." => "Добавяне на потребител...",
-"group" => "група",
-"Resharing is not allowed" => "Повторно споделяне не е разрешено.",
-"Shared in {item} with {user}" => "Споделено в {item} с {user}.",
-"Unshare" => "Премахни споделяне",
-"notify by email" => "уведоми по имейла",
-"can share" => "може да споделя",
-"can edit" => "може да променя",
-"access control" => "контрол на достъпа",
-"create" => "Създаване",
-"update" => "Обновяване",
-"delete" => "изтрий",
-"Password protected" => "Защитено с парола",
-"Error unsetting expiration date" => "Грешка при премахване на дата за изтичане",
-"Error setting expiration date" => "Грешка при поставяне на дата за изтичане",
-"Sending ..." => "Изпращане ...",
-"Email sent" => "Имейла е изпратен",
-"Warning" => "Предупреждение",
-"The object type is not specified." => "Видът на обекта не е избран.",
-"Enter new" => "Въведи нов",
-"Delete" => "Изтрий",
-"Add" => "Добавяне",
-"Edit tags" => "Промяна на етикетите",
-"Error loading dialog template: {error}" => "Грешка при зареждането на шаблоn за диалог: {error}.",
-"No tags selected for deletion." => "Не са избрани етикети за изтриване.",
-"Updating {productName} to version {version}, this may take a while." => "Обновява се {productName} на версия {version}, това може да отнеме време.",
-"Please reload the page." => "Моля, презареди страницата.",
-"The update was unsuccessful." => "Обновяването неуспешно.",
-"The update was successful. Redirecting you to ownCloud now." => "Обновяването е успешно. Пренасочване към твоя ownCloud сега.",
-"Couldn't reset password because the token is invalid" => "Невалиден линк за промяна на паролата.",
-"Couldn't send reset email. Please make sure your username is correct." => "Неуспешно изпращане на имейл за възстановяване на паролата. Моля, увери се, че потребителското име е правилно.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Неуспешно изпращане на имейл за възстановяване на паролата, защото липсва имейл свързан с това потребителско име. Моля свържи се с админстратора.",
-"%s password reset" => "Паролата на %s е променена.",
-"Use the following link to reset your password: {link}" => "Използвай следната връзка, за да възстановиш паролата си: {link}",
-"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" => "Да, наистина желая да възстановя паролата си сега.",
-"Reset" => "Възстанови",
-"New password" => "Нова парола",
-"New Password" => "Нова Парола",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!",
-"For the best results, please consider using a GNU/Linux server instead." => "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.",
-"Personal" => "Лични",
-"Users" => "Потребители",
-"Apps" => "Приложения",
-"Admin" => "Админ",
-"Help" => "Помощ",
-"Error loading tags" => "Грешка при зареждане на етикети.",
-"Tag already exists" => "Етикетите вече съществуват.",
-"Error deleting tag(s)" => "Грешка при изтриване на етикет(и).",
-"Error tagging" => "Грешка при задаване на етикета.",
-"Error untagging" => "Грешка при премахване на етикета.",
-"Error favoriting" => "Грешка при отбелязване за любим.",
-"Error unfavoriting" => "Грешка при премахване отбелязването за любим.",
-"Access forbidden" => "Достъпът е забранен",
-"File not found" => "Файлът не е открит.",
-"The specified document has not been found on the server." => "Избраният документ не е намерн на сървъра.",
-"You can click here to return to %s." => "Можеш да натиснеш тук, за да се върнеш на %s",
-"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!" => "Поздрави!",
-"Internal Server Error" => "Вътрешна системна грешка",
-"The server encountered an internal error and was unable to complete your request." => "Сървърът се натъкна на вътрешна грешка и неуспя да завърши заявката.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Моля, свържи се със сървърния администратор ако тази грешка се появи отново, моля, включи техническите данни показани в доклада по-долу.",
-"More details can be found in the server log." => "Допълнителна информация може да бъде открита в сървърните доклади.",
-"Technical details" => "Техническа информация",
-"Remote Address: %s" => "Remote Address: %s",
-"Request ID: %s" => "Request ID: %s",
-"Code: %s" => "Code: %s",
-"Message: %s" => "Message: %s",
-"File: %s" => "File: %s",
-"Line: %s" => "Line: %s",
-"Trace" => "Trace",
-"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 сигурно.",
-"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>.",
-"Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>.",
-"Password" => "Парола",
-"Storage & database" => "Дисково пространство и база данни",
-"Data folder" => "Директория за данни",
-"Configure the database" => "Конфигуриране на базата данни",
-"Only %s is available." => "Само %s е достъпен.",
-"Database user" => "Потребител за базата данни",
-"Database password" => "Парола за базата данни",
-"Database name" => "Име на базата данни",
-"Database tablespace" => "Tablespace-а за базата данни",
-"Database host" => "Хост за базата данни",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite ще бъде използван за база данни. За по-големи инсталации препоръчваме това да бъде променено.",
-"Finish setup" => "Завършване на настройките",
-"Finishing …" => "Завършване...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Програмата изисква JavaScript, за да функционира правилно. Моля, <a href=\"http://enable-javascript.com/\" target=\"_blank\">включи JavaScript</a> и презареди страницата.",
-"%s is available. Get more information on how to update." => "%s е на разположение. Прочети повече как да обновиш. ",
-"Log out" => "Отписване",
-"Server side authentication failed!" => "Заверяването в сървъра неуспешно!",
-"Please contact your administrator." => "Моля, свържи се с админстратора.",
-"Forgot your password? Reset it!" => "Забрави паролата? Възстанови я!",
-"remember" => "запомни",
-"Log in" => "Вписване",
-"Alternative Logins" => "Други Потребителски Имена",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<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." => "Благодарим за търпението.",
-"You are accessing the server from an untrusted domain." => "Свръзваш се със сървъра от неодобрен домейн.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Моля, свържи се с администратора. Ако ти си администраторът, на този сървър, промени \"trusted_domain\" настройките в  config/config.php. Примерна конфигурация е приложена в config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "В зависимост от конфигурацията ти, като администратор може натискайки бутонът по-долу да отбележиш домейнът като сигурен.",
-"Add \"%s\" as trusted domain" => "Добави \"%s\" като сигурен домейн",
-"%s will be updated to version %s." => "%s ще бъде обновена до версия %s.",
-"The following apps will be disabled:" => "Следните програми ще бъдат изключени:",
-"The theme %s has been disabled." => "Темата %s бе изключена.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Моля, увери се, че си направил копия на базата данни, папките с настройки и данни, преди да продължиш.",
-"Start update" => "Започни обновяването",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "За да избегнеш таймаутове при по-големи инсталации, можеш да изпълниш следните команди в инсталанционната директория:",
-"This %s instance is currently being updated, which may take a while." => "В момента този %s се обновява, а това може да отнеме време.",
-"This page will refresh itself when the %s instance is available again." => "Тази страница ще се опресни автоматично, когато %s е отново на линия."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/bn_BD.js b/core/l10n/bn_BD.js
new file mode 100644
index 00000000000..04d9864b5ed
--- /dev/null
+++ b/core/l10n/bn_BD.js
@@ -0,0 +1,120 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "নিম্নোক্ত ব্যবহারকারীকে মেইল পাঠানো গেলনা: %s",
+    "Turned on maintenance mode" : "রক্ষণাবেক্ষণ মোড চালু হয়েছে",
+    "Turned off maintenance mode" : "রক্ষণাবেক্ষণ মোড বন্ধ হয়েছে",
+    "Updated database" : "ডাটাবেজ নবায়ন করা হয়েছে",
+    "No image or file provided" : "কোন ইমেজ বা ফাইল প্রদান করা হয়নি",
+    "Unknown filetype" : "অজানা প্রকৃতির ফাইল",
+    "Invalid image" : "অবৈধ চিত্র",
+    "Sunday" : "রবিবার",
+    "Monday" : "সোমবার",
+    "Tuesday" : "মঙ্গলবার",
+    "Wednesday" : "বুধবার",
+    "Thursday" : "বৃহস্পতিবার",
+    "Friday" : "শুক্রবার",
+    "Saturday" : "শনিবার",
+    "January" : "জানুয়ারি",
+    "February" : "ফেব্রুয়ারি",
+    "March" : "মার্চ",
+    "April" : "এপ্রিল",
+    "May" : "মে",
+    "June" : "জুন",
+    "July" : "জুলাই",
+    "August" : "অগাষ্ট",
+    "September" : "সেপ্টেম্বর",
+    "October" : "অক্টোবর",
+    "November" : "নভেম্বর",
+    "December" : "ডিসেম্বর",
+    "Settings" : "নিয়ামকসমূহ",
+    "File" : "ফাইল",
+    "Folder" : "ফোল্ডার",
+    "Image" : "চিত্র",
+    "Audio" : "অডিও",
+    "Saving..." : "সংরক্ষণ করা হচ্ছে..",
+    "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
+    "No" : "না",
+    "Yes" : "হ্যাঁ",
+    "Choose" : "বেছে নিন",
+    "Ok" : "তথাস্তু",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} সাংঘর্ষিক ফাইল","{count} সাংঘর্ষিক ফাইল"],
+    "One file conflict" : "একটি সাংঘর্ষিক ফাইল",
+    "New Files" : "নতুন ফাইল",
+    "Already existing files" : "বিদ্যমান ফাইল",
+    "Which files do you want to keep?" : "কোন ফাইলগুলো রেখে দিতে চান?",
+    "Cancel" : "বাতিল",
+    "Continue" : "চালিয়ে যাও",
+    "Strong password" : "শক্তিশালী কুটশব্দ",
+    "Shared" : "ভাগাভাগিকৃত",
+    "Share" : "ভাগাভাগি কর",
+    "Error" : "সমস্যা",
+    "Error while sharing" : "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  ",
+    "Error while unsharing" : "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে",
+    "Error while changing permissions" : "অনুমতিসমূহ  পরিবর্তন করতে সমস্যা দেখা দিয়েছে",
+    "Shared with you and the group {group} by {owner}" : "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
+    "Shared with you by {owner}" : "{owner} আপনার সাথে ভাগাভাগি করেছেন",
+    "Share link" : "লিংক ভাগাভাগি করেন",
+    "Password protect" : "কূটশব্দ সুরক্ষিত",
+    "Email link to person" : "ব্যক্তির সাথে ই-মেইল যুক্ত কর",
+    "Send" : "পাঠাও",
+    "Set expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন",
+    "Expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ",
+    "group" : "দল",
+    "Resharing is not allowed" : "পূনঃরায় ভাগাভাগি অনুমোদিত নয়",
+    "Shared in {item} with {user}" : "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে",
+    "Unshare" : "ভাগাভাগি বাতিল ",
+    "can share" : "ভাগাভাগি করেত পারেন",
+    "can edit" : "সম্পাদনা করতে পারবেন",
+    "access control" : "অধিগম্যতা নিয়ন্ত্রণ",
+    "create" : "তৈরী করুন",
+    "update" : "পরিবর্ধন কর",
+    "delete" : "মুছে ফেল",
+    "Password protected" : "কূটশব্দদ্বারা সুরক্ষিত",
+    "Error unsetting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে",
+    "Error setting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে",
+    "Sending ..." : "পাঠানো হচ্ছে......",
+    "Email sent" : "ই-মেইল পাঠানো হয়েছে",
+    "Warning" : "সতর্কবাণী",
+    "The object type is not specified." : "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
+    "Enter new" : "নতুন লিখুন",
+    "Delete" : "মুছে",
+    "Add" : "যোগ কর",
+    "Edit tags" : "ট্যাগ সম্পাদনা",
+    "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
+    "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
+    "You will receive a link to reset your password via Email." : "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
+    "Username" : "ব্যবহারকারী",
+    "Reset" : "পূণঃনির্ধানণ",
+    "New password" : "নতুন কূটশব্দ",
+    "New Password" : "নতুন কূটশব্দ",
+    "Personal" : "ব্যক্তিগত",
+    "Users" : "ব্যবহারকারী",
+    "Apps" : "অ্যাপ",
+    "Admin" : "প্রশাসন",
+    "Help" : "সহায়িকা",
+    "Error deleting tag(s)" : "ট্যাগ(সমূহ) অপসারণে সমস্যা",
+    "Error tagging" : "ট্যাগ করতে সমস্যা",
+    "Error untagging" : "ট্যাগ বাতিল করতে সমস্যা",
+    "Error favoriting" : "প্রিয় তালিকাভুক্তিতে সমস্যা",
+    "Access forbidden" : "অধিগমনের অনুমতি নেই",
+    "File not found" : "ফাইল খুঁজে পাওয়া গেল না",
+    "Cheers!" : "শুভেচ্ছা!",
+    "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
+    "Create an <strong>admin account</strong>" : "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
+    "Password" : "কূটশব্দ",
+    "Data folder" : "ডাটা ফোল্ডার ",
+    "Configure the database" : "ডাটাবেচ কনফিগার করুন",
+    "Database user" : "ডাটাবেজ ব্যবহারকারী",
+    "Database password" : "ডাটাবেজ কূটশব্দ",
+    "Database name" : "ডাটাবেজের নাম",
+    "Database tablespace" : "ডাটাবেজ টেবলস্পেস",
+    "Database host" : "ডাটাবেজ হোস্ট",
+    "Finish setup" : "সেটআপ সুসম্পন্ন কর",
+    "Finishing …" : "সম্পন্ন হচ্ছে....",
+    "Log out" : "প্রস্থান",
+    "remember" : "মনে রাখ",
+    "Log in" : "প্রবেশ",
+    "Alternative Logins" : "বিকল্প লগইন"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/bn_BD.json b/core/l10n/bn_BD.json
new file mode 100644
index 00000000000..95d0ce6fe8b
--- /dev/null
+++ b/core/l10n/bn_BD.json
@@ -0,0 +1,118 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "নিম্নোক্ত ব্যবহারকারীকে মেইল পাঠানো গেলনা: %s",
+    "Turned on maintenance mode" : "রক্ষণাবেক্ষণ মোড চালু হয়েছে",
+    "Turned off maintenance mode" : "রক্ষণাবেক্ষণ মোড বন্ধ হয়েছে",
+    "Updated database" : "ডাটাবেজ নবায়ন করা হয়েছে",
+    "No image or file provided" : "কোন ইমেজ বা ফাইল প্রদান করা হয়নি",
+    "Unknown filetype" : "অজানা প্রকৃতির ফাইল",
+    "Invalid image" : "অবৈধ চিত্র",
+    "Sunday" : "রবিবার",
+    "Monday" : "সোমবার",
+    "Tuesday" : "মঙ্গলবার",
+    "Wednesday" : "বুধবার",
+    "Thursday" : "বৃহস্পতিবার",
+    "Friday" : "শুক্রবার",
+    "Saturday" : "শনিবার",
+    "January" : "জানুয়ারি",
+    "February" : "ফেব্রুয়ারি",
+    "March" : "মার্চ",
+    "April" : "এপ্রিল",
+    "May" : "মে",
+    "June" : "জুন",
+    "July" : "জুলাই",
+    "August" : "অগাষ্ট",
+    "September" : "সেপ্টেম্বর",
+    "October" : "অক্টোবর",
+    "November" : "নভেম্বর",
+    "December" : "ডিসেম্বর",
+    "Settings" : "নিয়ামকসমূহ",
+    "File" : "ফাইল",
+    "Folder" : "ফোল্ডার",
+    "Image" : "চিত্র",
+    "Audio" : "অডিও",
+    "Saving..." : "সংরক্ষণ করা হচ্ছে..",
+    "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
+    "No" : "না",
+    "Yes" : "হ্যাঁ",
+    "Choose" : "বেছে নিন",
+    "Ok" : "তথাস্তু",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} সাংঘর্ষিক ফাইল","{count} সাংঘর্ষিক ফাইল"],
+    "One file conflict" : "একটি সাংঘর্ষিক ফাইল",
+    "New Files" : "নতুন ফাইল",
+    "Already existing files" : "বিদ্যমান ফাইল",
+    "Which files do you want to keep?" : "কোন ফাইলগুলো রেখে দিতে চান?",
+    "Cancel" : "বাতিল",
+    "Continue" : "চালিয়ে যাও",
+    "Strong password" : "শক্তিশালী কুটশব্দ",
+    "Shared" : "ভাগাভাগিকৃত",
+    "Share" : "ভাগাভাগি কর",
+    "Error" : "সমস্যা",
+    "Error while sharing" : "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  ",
+    "Error while unsharing" : "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে",
+    "Error while changing permissions" : "অনুমতিসমূহ  পরিবর্তন করতে সমস্যা দেখা দিয়েছে",
+    "Shared with you and the group {group} by {owner}" : "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
+    "Shared with you by {owner}" : "{owner} আপনার সাথে ভাগাভাগি করেছেন",
+    "Share link" : "লিংক ভাগাভাগি করেন",
+    "Password protect" : "কূটশব্দ সুরক্ষিত",
+    "Email link to person" : "ব্যক্তির সাথে ই-মেইল যুক্ত কর",
+    "Send" : "পাঠাও",
+    "Set expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন",
+    "Expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ",
+    "group" : "দল",
+    "Resharing is not allowed" : "পূনঃরায় ভাগাভাগি অনুমোদিত নয়",
+    "Shared in {item} with {user}" : "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে",
+    "Unshare" : "ভাগাভাগি বাতিল ",
+    "can share" : "ভাগাভাগি করেত পারেন",
+    "can edit" : "সম্পাদনা করতে পারবেন",
+    "access control" : "অধিগম্যতা নিয়ন্ত্রণ",
+    "create" : "তৈরী করুন",
+    "update" : "পরিবর্ধন কর",
+    "delete" : "মুছে ফেল",
+    "Password protected" : "কূটশব্দদ্বারা সুরক্ষিত",
+    "Error unsetting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে",
+    "Error setting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে",
+    "Sending ..." : "পাঠানো হচ্ছে......",
+    "Email sent" : "ই-মেইল পাঠানো হয়েছে",
+    "Warning" : "সতর্কবাণী",
+    "The object type is not specified." : "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
+    "Enter new" : "নতুন লিখুন",
+    "Delete" : "মুছে",
+    "Add" : "যোগ কর",
+    "Edit tags" : "ট্যাগ সম্পাদনা",
+    "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
+    "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
+    "You will receive a link to reset your password via Email." : "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
+    "Username" : "ব্যবহারকারী",
+    "Reset" : "পূণঃনির্ধানণ",
+    "New password" : "নতুন কূটশব্দ",
+    "New Password" : "নতুন কূটশব্দ",
+    "Personal" : "ব্যক্তিগত",
+    "Users" : "ব্যবহারকারী",
+    "Apps" : "অ্যাপ",
+    "Admin" : "প্রশাসন",
+    "Help" : "সহায়িকা",
+    "Error deleting tag(s)" : "ট্যাগ(সমূহ) অপসারণে সমস্যা",
+    "Error tagging" : "ট্যাগ করতে সমস্যা",
+    "Error untagging" : "ট্যাগ বাতিল করতে সমস্যা",
+    "Error favoriting" : "প্রিয় তালিকাভুক্তিতে সমস্যা",
+    "Access forbidden" : "অধিগমনের অনুমতি নেই",
+    "File not found" : "ফাইল খুঁজে পাওয়া গেল না",
+    "Cheers!" : "শুভেচ্ছা!",
+    "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
+    "Create an <strong>admin account</strong>" : "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
+    "Password" : "কূটশব্দ",
+    "Data folder" : "ডাটা ফোল্ডার ",
+    "Configure the database" : "ডাটাবেচ কনফিগার করুন",
+    "Database user" : "ডাটাবেজ ব্যবহারকারী",
+    "Database password" : "ডাটাবেজ কূটশব্দ",
+    "Database name" : "ডাটাবেজের নাম",
+    "Database tablespace" : "ডাটাবেজ টেবলস্পেস",
+    "Database host" : "ডাটাবেজ হোস্ট",
+    "Finish setup" : "সেটআপ সুসম্পন্ন কর",
+    "Finishing …" : "সম্পন্ন হচ্ছে....",
+    "Log out" : "প্রস্থান",
+    "remember" : "মনে রাখ",
+    "Log in" : "প্রবেশ",
+    "Alternative Logins" : "বিকল্প লগইন"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
deleted file mode 100644
index d00864db20b..00000000000
--- a/core/l10n/bn_BD.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "নিম্নোক্ত ব্যবহারকারীকে মেইল পাঠানো গেলনা: %s",
-"Turned on maintenance mode" => "রক্ষণাবেক্ষণ মোড চালু হয়েছে",
-"Turned off maintenance mode" => "রক্ষণাবেক্ষণ মোড বন্ধ হয়েছে",
-"Updated database" => "ডাটাবেজ নবায়ন করা হয়েছে",
-"No image or file provided" => "কোন ইমেজ বা ফাইল প্রদান করা হয়নি",
-"Unknown filetype" => "অজানা প্রকৃতির ফাইল",
-"Invalid image" => "অবৈধ চিত্র",
-"Sunday" => "রবিবার",
-"Monday" => "সোমবার",
-"Tuesday" => "মঙ্গলবার",
-"Wednesday" => "বুধবার",
-"Thursday" => "বৃহস্পতিবার",
-"Friday" => "শুক্রবার",
-"Saturday" => "শনিবার",
-"January" => "জানুয়ারি",
-"February" => "ফেব্রুয়ারি",
-"March" => "মার্চ",
-"April" => "এপ্রিল",
-"May" => "মে",
-"June" => "জুন",
-"July" => "জুলাই",
-"August" => "অগাষ্ট",
-"September" => "সেপ্টেম্বর",
-"October" => "অক্টোবর",
-"November" => "নভেম্বর",
-"December" => "ডিসেম্বর",
-"Settings" => "নিয়ামকসমূহ",
-"File" => "ফাইল",
-"Folder" => "ফোল্ডার",
-"Image" => "চিত্র",
-"Audio" => "অডিও",
-"Saving..." => "সংরক্ষণ করা হচ্ছে..",
-"Reset password" => "কূটশব্দ পূনঃনির্ধারণ কর",
-"No" => "না",
-"Yes" => "হ্যাঁ",
-"Choose" => "বেছে নিন",
-"Ok" => "তথাস্তু",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} সাংঘর্ষিক ফাইল","{count} সাংঘর্ষিক ফাইল"),
-"One file conflict" => "একটি সাংঘর্ষিক ফাইল",
-"New Files" => "নতুন ফাইল",
-"Already existing files" => "বিদ্যমান ফাইল",
-"Which files do you want to keep?" => "কোন ফাইলগুলো রেখে দিতে চান?",
-"Cancel" => "বাতিল",
-"Continue" => "চালিয়ে যাও",
-"Strong password" => "শক্তিশালী কুটশব্দ",
-"Shared" => "ভাগাভাগিকৃত",
-"Share" => "ভাগাভাগি কর",
-"Error" => "সমস্যা",
-"Error while sharing" => "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  ",
-"Error while unsharing" => "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে",
-"Error while changing permissions" => "অনুমতিসমূহ  পরিবর্তন করতে সমস্যা দেখা দিয়েছে",
-"Shared with you and the group {group} by {owner}" => "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
-"Shared with you by {owner}" => "{owner} আপনার সাথে ভাগাভাগি করেছেন",
-"Share link" => "লিংক ভাগাভাগি করেন",
-"Password protect" => "কূটশব্দ সুরক্ষিত",
-"Email link to person" => "ব্যক্তির সাথে ই-মেইল যুক্ত কর",
-"Send" => "পাঠাও",
-"Set expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন",
-"Expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ",
-"group" => "দল",
-"Resharing is not allowed" => "পূনঃরায় ভাগাভাগি অনুমোদিত নয়",
-"Shared in {item} with {user}" => "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে",
-"Unshare" => "ভাগাভাগি বাতিল ",
-"can share" => "ভাগাভাগি করেত পারেন",
-"can edit" => "সম্পাদনা করতে পারবেন",
-"access control" => "অধিগম্যতা নিয়ন্ত্রণ",
-"create" => "তৈরী করুন",
-"update" => "পরিবর্ধন কর",
-"delete" => "মুছে ফেল",
-"Password protected" => "কূটশব্দদ্বারা সুরক্ষিত",
-"Error unsetting expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে",
-"Error setting expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে",
-"Sending ..." => "পাঠানো হচ্ছে......",
-"Email sent" => "ই-মেইল পাঠানো হয়েছে",
-"Warning" => "সতর্কবাণী",
-"The object type is not specified." => "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
-"Enter new" => "নতুন লিখুন",
-"Delete" => "মুছে",
-"Add" => "যোগ কর",
-"Edit tags" => "ট্যাগ সম্পাদনা",
-"Please reload the page." => "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
-"Use the following link to reset your password: {link}" => "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
-"You will receive a link to reset your password via Email." => "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
-"Username" => "ব্যবহারকারী",
-"Reset" => "পূণঃনির্ধানণ",
-"New password" => "নতুন কূটশব্দ",
-"New Password" => "নতুন কূটশব্দ",
-"Personal" => "ব্যক্তিগত",
-"Users" => "ব্যবহারকারী",
-"Apps" => "অ্যাপ",
-"Admin" => "প্রশাসন",
-"Help" => "সহায়িকা",
-"Error deleting tag(s)" => "ট্যাগ(সমূহ) অপসারণে সমস্যা",
-"Error tagging" => "ট্যাগ করতে সমস্যা",
-"Error untagging" => "ট্যাগ বাতিল করতে সমস্যা",
-"Error favoriting" => "প্রিয় তালিকাভুক্তিতে সমস্যা",
-"Access forbidden" => "অধিগমনের অনুমতি নেই",
-"File not found" => "ফাইল খুঁজে পাওয়া গেল না",
-"Cheers!" => "শুভেচ্ছা!",
-"Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
-"Create an <strong>admin account</strong>" => "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
-"Password" => "কূটশব্দ",
-"Data folder" => "ডাটা ফোল্ডার ",
-"Configure the database" => "ডাটাবেচ কনফিগার করুন",
-"Database user" => "ডাটাবেজ ব্যবহারকারী",
-"Database password" => "ডাটাবেজ কূটশব্দ",
-"Database name" => "ডাটাবেজের নাম",
-"Database tablespace" => "ডাটাবেজ টেবলস্পেস",
-"Database host" => "ডাটাবেজ হোস্ট",
-"Finish setup" => "সেটআপ সুসম্পন্ন কর",
-"Finishing …" => "সম্পন্ন হচ্ছে....",
-"Log out" => "প্রস্থান",
-"remember" => "মনে রাখ",
-"Log in" => "প্রবেশ",
-"Alternative Logins" => "বিকল্প লগইন"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/bn_IN.js b/core/l10n/bn_IN.js
new file mode 100644
index 00000000000..675fbacc07a
--- /dev/null
+++ b/core/l10n/bn_IN.js
@@ -0,0 +1,17 @@
+OC.L10N.register(
+    "core",
+    {
+    "Settings" : "সেটিংস",
+    "Folder" : "ফোল্ডার",
+    "Saving..." : "সংরক্ষণ করা হচ্ছে ...",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "বাতিল করা",
+    "Share" : "শেয়ার",
+    "Error" : "ভুল",
+    "Warning" : "সতর্কীকরণ",
+    "Delete" : "মুছে ফেলা",
+    "Add" : "যোগ করা",
+    "Username" : "ইউজারনেম",
+    "Reset" : "রিসেট করুন"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/bn_IN.json b/core/l10n/bn_IN.json
new file mode 100644
index 00000000000..e0234ccca68
--- /dev/null
+++ b/core/l10n/bn_IN.json
@@ -0,0 +1,15 @@
+{ "translations": {
+    "Settings" : "সেটিংস",
+    "Folder" : "ফোল্ডার",
+    "Saving..." : "সংরক্ষণ করা হচ্ছে ...",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "বাতিল করা",
+    "Share" : "শেয়ার",
+    "Error" : "ভুল",
+    "Warning" : "সতর্কীকরণ",
+    "Delete" : "মুছে ফেলা",
+    "Add" : "যোগ করা",
+    "Username" : "ইউজারনেম",
+    "Reset" : "রিসেট করুন"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/bn_IN.php b/core/l10n/bn_IN.php
deleted file mode 100644
index 987c0c6585d..00000000000
--- a/core/l10n/bn_IN.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Settings" => "সেটিংস",
-"Folder" => "ফোল্ডার",
-"Saving..." => "সংরক্ষণ করা হচ্ছে ...",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "বাতিল করা",
-"Share" => "শেয়ার",
-"Error" => "ভুল",
-"Warning" => "সতর্কীকরণ",
-"Delete" => "মুছে ফেলা",
-"Add" => "যোগ করা",
-"Username" => "ইউজারনেম",
-"Reset" => "রিসেট করুন"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/bs.js b/core/l10n/bs.js
new file mode 100644
index 00000000000..18766a747f9
--- /dev/null
+++ b/core/l10n/bs.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "core",
+    {
+    "Folder" : "Fasikla",
+    "Saving..." : "Spašavam...",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "Share" : "Podijeli",
+    "Add" : "Dodaj"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/bs.json b/core/l10n/bs.json
new file mode 100644
index 00000000000..a79d18e6baa
--- /dev/null
+++ b/core/l10n/bs.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Folder" : "Fasikla",
+    "Saving..." : "Spašavam...",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "Share" : "Podijeli",
+    "Add" : "Dodaj"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/core/l10n/bs.php b/core/l10n/bs.php
deleted file mode 100644
index 69e8e29f438..00000000000
--- a/core/l10n/bs.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Folder" => "Fasikla",
-"Saving..." => "Spašavam...",
-"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
-"Share" => "Podijeli",
-"Add" => "Dodaj"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/ca.js b/core/l10n/ca.js
new file mode 100644
index 00000000000..6702145e121
--- /dev/null
+++ b/core/l10n/ca.js
@@ -0,0 +1,205 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "No s'ha pogut enviar correu als usuaris següents: %s",
+    "Turned on maintenance mode" : "Activat el mode de manteniment",
+    "Turned off maintenance mode" : "Desactivat el mode de manteniment",
+    "Updated database" : "Actualitzada la base de dades",
+    "Checked database schema update" : "S'ha comprobat l'actualització de l'esquema de la base de dades",
+    "Checked database schema update for apps" : "S'ha comprobat l'actualització de l'esquema de la base de dades per les apps",
+    "Updated \"%s\" to %s" : "Actualitzat \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Aplicacions incompatibles desactivades: %s",
+    "No image or file provided" : "No s'han proporcionat imatges o fitxers",
+    "Unknown filetype" : "Tipus de fitxer desconegut",
+    "Invalid image" : "Imatge no vàlida",
+    "No temporary profile picture available, try again" : "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho",
+    "No crop data provided" : "No heu proporcionat dades del retall",
+    "Sunday" : "Diumenge",
+    "Monday" : "Dilluns",
+    "Tuesday" : "Dimarts",
+    "Wednesday" : "Dimecres",
+    "Thursday" : "Dijous",
+    "Friday" : "Divendres",
+    "Saturday" : "Dissabte",
+    "January" : "Gener",
+    "February" : "Febrer",
+    "March" : "Març",
+    "April" : "Abril",
+    "May" : "Maig",
+    "June" : "Juny",
+    "July" : "Juliol",
+    "August" : "Agost",
+    "September" : "Setembre",
+    "October" : "Octubre",
+    "November" : "Novembre",
+    "December" : "Desembre",
+    "Settings" : "Configuració",
+    "File" : "Fitxer",
+    "Folder" : "Carpeta",
+    "Image" : "Imatge",
+    "Audio" : "Audio",
+    "Saving..." : "Desant...",
+    "Couldn't send reset email. Please contact your administrator." : "No s'ha pogut restablir el correu. Contacteu amb l'administrador.",
+    "The link to reset your password has been sent to your email. 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." : "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu. Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. <br />Si sabeu què fer, contacteu amb l'administrador abans de continuar.<br />Voleu continuar?",
+    "I know what I'm doing" : "Sé el que faig",
+    "Reset password" : "Reinicialitza la contrasenya",
+    "Password can not be changed. Please contact your administrator." : "La contrasenya no es pot canviar. Contacteu amb l'administrador.",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Escull",
+    "Error loading file picker template: {error}" : "Error en carregar la plantilla de càrrega de fitxers: {error}",
+    "Ok" : "D'acord",
+    "Error loading message template: {error}" : "Error en carregar la plantilla de missatge: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicte de fitxer","{count} conflictes de fitxer"],
+    "One file conflict" : "Un fitxer en conflicte",
+    "New Files" : "Fitxers nous",
+    "Already existing files" : "Fitxers que ja existeixen",
+    "Which files do you want to keep?" : "Quin fitxer voleu conservar?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom.",
+    "Cancel" : "Cancel·la",
+    "Continue" : "Continua",
+    "(all selected)" : "(selecciona-ho tot)",
+    "({count} selected)" : "({count} seleccionats)",
+    "Error loading file exists template" : "Error en carregar la plantilla de fitxer existent",
+    "Very weak password" : "Contrasenya massa feble",
+    "Weak password" : "Contrasenya feble",
+    "So-so password" : "Contrasenya passable",
+    "Good password" : "Contrasenya bona",
+    "Strong password" : "Contrasenya forta",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Aquest servidor no té cap connexió a internet que funcioni. Això significa que algunes de les característiques com el muntatge d'emmagatzemament extern, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu tenir totes les característiques.",
+    "Error occurred while checking server setup" : "Hi ha hagut un error en comprovar la configuració del servidor",
+    "Shared" : "Compartit",
+    "Shared with {recipients}" : "Compartit amb {recipients}",
+    "Share" : "Comparteix",
+    "Error" : "Error",
+    "Error while sharing" : "Error en compartir",
+    "Error while unsharing" : "Error en deixar de compartir",
+    "Error while changing permissions" : "Error en canviar els permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartit amb vos i amb el grup {group} per {owner}",
+    "Shared with you by {owner}" : "Compartit amb vos per {owner}",
+    "Share with user or group …" : "Comparteix amb usuari o grup...",
+    "Share link" : "Enllaç de compartició",
+    "The public link will expire no later than {days} days after it is created" : "L'enllaç públic tindrà venciment abans de {days} dies després de crear-lo",
+    "Password protect" : "Protegir amb contrasenya",
+    "Choose a password for the public link" : "Escolliu una contrasenya per l'enllaç públic",
+    "Allow Public Upload" : "Permet pujada pública",
+    "Email link to person" : "Enllaç per correu electrónic amb la persona",
+    "Send" : "Envia",
+    "Set expiration date" : "Estableix la data de venciment",
+    "Expiration date" : "Data de venciment",
+    "Adding user..." : "Afegint usuari...",
+    "group" : "grup",
+    "Resharing is not allowed" : "No es permet compartir de nou",
+    "Shared in {item} with {user}" : "Compartit en {item} amb {user}",
+    "Unshare" : "Deixa de compartir",
+    "notify by email" : "notifica per correu electrònic",
+    "can share" : "pot compartir",
+    "can edit" : "pot editar",
+    "access control" : "control d'accés",
+    "create" : "crea",
+    "update" : "actualitza",
+    "delete" : "elimina",
+    "Password protected" : "Protegeix amb contrasenya",
+    "Error unsetting expiration date" : "Error en eliminar la data de venciment",
+    "Error setting expiration date" : "Error en establir la data de venciment",
+    "Sending ..." : "Enviant...",
+    "Email sent" : "El correu electrónic s'ha enviat",
+    "Warning" : "Avís",
+    "The object type is not specified." : "No s'ha especificat el tipus d'objecte.",
+    "Enter new" : "Escriu nou",
+    "Delete" : "Esborra",
+    "Add" : "Afegeix",
+    "Edit tags" : "Edita etiquetes",
+    "Error loading dialog template: {error}" : "Error en carregar la plantilla de diàleg: {error}",
+    "No tags selected for deletion." : "No heu seleccionat les etiquetes a eliminar.",
+    "Updating {productName} to version {version}, this may take a while." : "Actualitzant {productName} a la versió {version}. Pot trigar una estona.",
+    "Please reload the page." : "Carregueu la pàgina de nou.",
+    "The update was unsuccessful." : "L'actualització no ha tingut èxit.",
+    "The update was successful. Redirecting you to ownCloud now." : "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
+    "Couldn't reset password because the token is invalid" : "No es pot restablir la contrasenya perquè el testimoni no és vàlid",
+    "Couldn't send reset email. Please make sure your username is correct." : "No s'ha pogut enviar el correu de restabliment. Assegureu-vos que el vostre nom d'usuari és correcte.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No s'ha pogut enviar el correu de restabliment perquè no hi ha cap correu electrònic per aquest usuari. Contacteu amb l'administrador.",
+    "%s password reset" : "restableix la contrasenya %s",
+    "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.",
+    "Username" : "Nom d'usuari",
+    "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?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
+    "Yes, I really want to reset my password now" : "Sí, vull restablir ara la contrasenya",
+    "Reset" : "Estableix de nou",
+    "New password" : "Contrasenya nova",
+    "New Password" : "Contrasenya nova",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.",
+    "Personal" : "Personal",
+    "Users" : "Usuaris",
+    "Apps" : "Aplicacions",
+    "Admin" : "Administració",
+    "Help" : "Ajuda",
+    "Error loading tags" : "Error en carregar les etiquetes",
+    "Tag already exists" : "L'etiqueta ja existeix",
+    "Error deleting tag(s)" : "Error en eliminar etiqueta(s)",
+    "Error tagging" : "Error en etiquetar",
+    "Error untagging" : "Error en treure les etiquetes",
+    "Error favoriting" : "Error en posar a preferits",
+    "Error unfavoriting" : "Error en treure de preferits",
+    "Access forbidden" : "Accés prohibit",
+    "File not found" : "No s'ha trobat l'arxiu",
+    "The specified document has not been found on the server." : "El document especificat no s'ha trobat al servidor.",
+    "You can click here to return to %s." : "Pots clicar aquí per tornar a %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho a: %s\n\n",
+    "The share will expire on %s." : "La compartició venç el %s.",
+    "Cheers!" : "Salut!",
+    "The server encountered an internal error and was unable to complete your request." : "El servidor ha trobat un error intern i no pot finalitzar la teva petició.",
+    "More details can be found in the server log." : "Pots trobar més detalls al llistat del servidor.",
+    "Technical details" : "Detalls tècnics",
+    "Remote Address: %s" : "Adreça remota: %s",
+    "Code: %s" : "Codi: %s",
+    "Message: %s" : "Missatge: %s",
+    "File: %s" : "Fitxer: %s",
+    "Security Warning" : "Avís de seguretat",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La versió de PHP que useu és vulnerable a l'atac per NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Actualitzeu la instal·lació de PHP per usar %s de forma segura.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
+    "Create an <strong>admin account</strong>" : "Crea un <strong>compte d'administrador</strong>",
+    "Password" : "Contrasenya",
+    "Storage & database" : "Emmagatzematge i base de dades",
+    "Data folder" : "Carpeta de dades",
+    "Configure the database" : "Configura la base de dades",
+    "Only %s is available." : "Només hi ha disponible %s",
+    "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",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "S'utilitzarà SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu.",
+    "Finish setup" : "Acaba la configuració",
+    "Finishing …" : "Acabant...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aquesta aplicació requereix JavaScrip pel seu correcte funcionament. Si us plau <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeu JavaScript</a> i actualitzeu la pàgina.",
+    "%s is available. Get more information on how to update." : "%s està disponible. Obtingueu més informació de com actualitzar.",
+    "Log out" : "Surt",
+    "Server side authentication failed!" : "L'autenticació del servidor ha fallat!",
+    "Please contact your administrator." : "Contacteu amb l'administrador.",
+    "Forgot your password? Reset it!" : "Heu oblidat la contrasenya? Restabliu-la!",
+    "remember" : "recorda'm",
+    "Log in" : "Inici de sessió",
+    "Alternative Logins" : "Acreditacions alternatives",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ei, <br><br>només fer-vos saber que %s us ha comparti <strong>%s</strong>. <br><a href=\"%s\">Mireu-ho!</a>",
+    "This ownCloud instance is currently in single user mode." : "La instància ownCloud està en mode d'usuari únic.",
+    "This means only administrators can use the instance." : "Això significa que només els administradors poden usar la instància.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacteu amb l'administrador del sistema si aquest missatge persisteix o apareix inesperadament.",
+    "Thank you for your patience." : "Gràcies per la paciència.",
+    "You are accessing the server from an untrusted domain." : "Esteu accedint el servidor des d'un domini no fiable",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacteu amb l'administrador. Si sou un administrador d'aquesta instància, configureu el paràmetre \"trusted_domain\" a config/config.php. Hi ha un exemple de configuració a config/config.sampe.php",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En funció de la teva configuració, com a administrador podries utilitzar el botó d'abaix per confiar en aquest domini.",
+    "Add \"%s\" as trusted domain" : "Afegeix \"%s\" com a domini de confiança",
+    "%s will be updated to version %s." : "%s s'actualitzarà a la versió %s.",
+    "The following apps will be disabled:" : "Les següents aplicacions es desactivaran:",
+    "The theme %s has been disabled." : "S'ha desactivat el tema %s",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assegureu-vos que heu fet una còpia de seguretat de la base de dades, del fitxer de configuració i de la carpeta de dades abans de continuar.",
+    "Start update" : "Inicia l'actualització",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Per evitar que s'esgoti el temps d'espera en instalacions grans, pots en el seu lloc fer córrer la següent comanda en el directori d'instalació. "
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
new file mode 100644
index 00000000000..fdebffb0805
--- /dev/null
+++ b/core/l10n/ca.json
@@ -0,0 +1,203 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "No s'ha pogut enviar correu als usuaris següents: %s",
+    "Turned on maintenance mode" : "Activat el mode de manteniment",
+    "Turned off maintenance mode" : "Desactivat el mode de manteniment",
+    "Updated database" : "Actualitzada la base de dades",
+    "Checked database schema update" : "S'ha comprobat l'actualització de l'esquema de la base de dades",
+    "Checked database schema update for apps" : "S'ha comprobat l'actualització de l'esquema de la base de dades per les apps",
+    "Updated \"%s\" to %s" : "Actualitzat \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Aplicacions incompatibles desactivades: %s",
+    "No image or file provided" : "No s'han proporcionat imatges o fitxers",
+    "Unknown filetype" : "Tipus de fitxer desconegut",
+    "Invalid image" : "Imatge no vàlida",
+    "No temporary profile picture available, try again" : "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho",
+    "No crop data provided" : "No heu proporcionat dades del retall",
+    "Sunday" : "Diumenge",
+    "Monday" : "Dilluns",
+    "Tuesday" : "Dimarts",
+    "Wednesday" : "Dimecres",
+    "Thursday" : "Dijous",
+    "Friday" : "Divendres",
+    "Saturday" : "Dissabte",
+    "January" : "Gener",
+    "February" : "Febrer",
+    "March" : "Març",
+    "April" : "Abril",
+    "May" : "Maig",
+    "June" : "Juny",
+    "July" : "Juliol",
+    "August" : "Agost",
+    "September" : "Setembre",
+    "October" : "Octubre",
+    "November" : "Novembre",
+    "December" : "Desembre",
+    "Settings" : "Configuració",
+    "File" : "Fitxer",
+    "Folder" : "Carpeta",
+    "Image" : "Imatge",
+    "Audio" : "Audio",
+    "Saving..." : "Desant...",
+    "Couldn't send reset email. Please contact your administrator." : "No s'ha pogut restablir el correu. Contacteu amb l'administrador.",
+    "The link to reset your password has been sent to your email. 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." : "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu. Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. <br />Si sabeu què fer, contacteu amb l'administrador abans de continuar.<br />Voleu continuar?",
+    "I know what I'm doing" : "Sé el que faig",
+    "Reset password" : "Reinicialitza la contrasenya",
+    "Password can not be changed. Please contact your administrator." : "La contrasenya no es pot canviar. Contacteu amb l'administrador.",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Escull",
+    "Error loading file picker template: {error}" : "Error en carregar la plantilla de càrrega de fitxers: {error}",
+    "Ok" : "D'acord",
+    "Error loading message template: {error}" : "Error en carregar la plantilla de missatge: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicte de fitxer","{count} conflictes de fitxer"],
+    "One file conflict" : "Un fitxer en conflicte",
+    "New Files" : "Fitxers nous",
+    "Already existing files" : "Fitxers que ja existeixen",
+    "Which files do you want to keep?" : "Quin fitxer voleu conservar?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom.",
+    "Cancel" : "Cancel·la",
+    "Continue" : "Continua",
+    "(all selected)" : "(selecciona-ho tot)",
+    "({count} selected)" : "({count} seleccionats)",
+    "Error loading file exists template" : "Error en carregar la plantilla de fitxer existent",
+    "Very weak password" : "Contrasenya massa feble",
+    "Weak password" : "Contrasenya feble",
+    "So-so password" : "Contrasenya passable",
+    "Good password" : "Contrasenya bona",
+    "Strong password" : "Contrasenya forta",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Aquest servidor no té cap connexió a internet que funcioni. Això significa que algunes de les característiques com el muntatge d'emmagatzemament extern, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu tenir totes les característiques.",
+    "Error occurred while checking server setup" : "Hi ha hagut un error en comprovar la configuració del servidor",
+    "Shared" : "Compartit",
+    "Shared with {recipients}" : "Compartit amb {recipients}",
+    "Share" : "Comparteix",
+    "Error" : "Error",
+    "Error while sharing" : "Error en compartir",
+    "Error while unsharing" : "Error en deixar de compartir",
+    "Error while changing permissions" : "Error en canviar els permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartit amb vos i amb el grup {group} per {owner}",
+    "Shared with you by {owner}" : "Compartit amb vos per {owner}",
+    "Share with user or group …" : "Comparteix amb usuari o grup...",
+    "Share link" : "Enllaç de compartició",
+    "The public link will expire no later than {days} days after it is created" : "L'enllaç públic tindrà venciment abans de {days} dies després de crear-lo",
+    "Password protect" : "Protegir amb contrasenya",
+    "Choose a password for the public link" : "Escolliu una contrasenya per l'enllaç públic",
+    "Allow Public Upload" : "Permet pujada pública",
+    "Email link to person" : "Enllaç per correu electrónic amb la persona",
+    "Send" : "Envia",
+    "Set expiration date" : "Estableix la data de venciment",
+    "Expiration date" : "Data de venciment",
+    "Adding user..." : "Afegint usuari...",
+    "group" : "grup",
+    "Resharing is not allowed" : "No es permet compartir de nou",
+    "Shared in {item} with {user}" : "Compartit en {item} amb {user}",
+    "Unshare" : "Deixa de compartir",
+    "notify by email" : "notifica per correu electrònic",
+    "can share" : "pot compartir",
+    "can edit" : "pot editar",
+    "access control" : "control d'accés",
+    "create" : "crea",
+    "update" : "actualitza",
+    "delete" : "elimina",
+    "Password protected" : "Protegeix amb contrasenya",
+    "Error unsetting expiration date" : "Error en eliminar la data de venciment",
+    "Error setting expiration date" : "Error en establir la data de venciment",
+    "Sending ..." : "Enviant...",
+    "Email sent" : "El correu electrónic s'ha enviat",
+    "Warning" : "Avís",
+    "The object type is not specified." : "No s'ha especificat el tipus d'objecte.",
+    "Enter new" : "Escriu nou",
+    "Delete" : "Esborra",
+    "Add" : "Afegeix",
+    "Edit tags" : "Edita etiquetes",
+    "Error loading dialog template: {error}" : "Error en carregar la plantilla de diàleg: {error}",
+    "No tags selected for deletion." : "No heu seleccionat les etiquetes a eliminar.",
+    "Updating {productName} to version {version}, this may take a while." : "Actualitzant {productName} a la versió {version}. Pot trigar una estona.",
+    "Please reload the page." : "Carregueu la pàgina de nou.",
+    "The update was unsuccessful." : "L'actualització no ha tingut èxit.",
+    "The update was successful. Redirecting you to ownCloud now." : "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
+    "Couldn't reset password because the token is invalid" : "No es pot restablir la contrasenya perquè el testimoni no és vàlid",
+    "Couldn't send reset email. Please make sure your username is correct." : "No s'ha pogut enviar el correu de restabliment. Assegureu-vos que el vostre nom d'usuari és correcte.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No s'ha pogut enviar el correu de restabliment perquè no hi ha cap correu electrònic per aquest usuari. Contacteu amb l'administrador.",
+    "%s password reset" : "restableix la contrasenya %s",
+    "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.",
+    "Username" : "Nom d'usuari",
+    "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?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
+    "Yes, I really want to reset my password now" : "Sí, vull restablir ara la contrasenya",
+    "Reset" : "Estableix de nou",
+    "New password" : "Contrasenya nova",
+    "New Password" : "Contrasenya nova",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.",
+    "Personal" : "Personal",
+    "Users" : "Usuaris",
+    "Apps" : "Aplicacions",
+    "Admin" : "Administració",
+    "Help" : "Ajuda",
+    "Error loading tags" : "Error en carregar les etiquetes",
+    "Tag already exists" : "L'etiqueta ja existeix",
+    "Error deleting tag(s)" : "Error en eliminar etiqueta(s)",
+    "Error tagging" : "Error en etiquetar",
+    "Error untagging" : "Error en treure les etiquetes",
+    "Error favoriting" : "Error en posar a preferits",
+    "Error unfavoriting" : "Error en treure de preferits",
+    "Access forbidden" : "Accés prohibit",
+    "File not found" : "No s'ha trobat l'arxiu",
+    "The specified document has not been found on the server." : "El document especificat no s'ha trobat al servidor.",
+    "You can click here to return to %s." : "Pots clicar aquí per tornar a %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho a: %s\n\n",
+    "The share will expire on %s." : "La compartició venç el %s.",
+    "Cheers!" : "Salut!",
+    "The server encountered an internal error and was unable to complete your request." : "El servidor ha trobat un error intern i no pot finalitzar la teva petició.",
+    "More details can be found in the server log." : "Pots trobar més detalls al llistat del servidor.",
+    "Technical details" : "Detalls tècnics",
+    "Remote Address: %s" : "Adreça remota: %s",
+    "Code: %s" : "Codi: %s",
+    "Message: %s" : "Missatge: %s",
+    "File: %s" : "Fitxer: %s",
+    "Security Warning" : "Avís de seguretat",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La versió de PHP que useu és vulnerable a l'atac per NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Actualitzeu la instal·lació de PHP per usar %s de forma segura.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
+    "Create an <strong>admin account</strong>" : "Crea un <strong>compte d'administrador</strong>",
+    "Password" : "Contrasenya",
+    "Storage & database" : "Emmagatzematge i base de dades",
+    "Data folder" : "Carpeta de dades",
+    "Configure the database" : "Configura la base de dades",
+    "Only %s is available." : "Només hi ha disponible %s",
+    "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",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "S'utilitzarà SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu.",
+    "Finish setup" : "Acaba la configuració",
+    "Finishing …" : "Acabant...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aquesta aplicació requereix JavaScrip pel seu correcte funcionament. Si us plau <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeu JavaScript</a> i actualitzeu la pàgina.",
+    "%s is available. Get more information on how to update." : "%s està disponible. Obtingueu més informació de com actualitzar.",
+    "Log out" : "Surt",
+    "Server side authentication failed!" : "L'autenticació del servidor ha fallat!",
+    "Please contact your administrator." : "Contacteu amb l'administrador.",
+    "Forgot your password? Reset it!" : "Heu oblidat la contrasenya? Restabliu-la!",
+    "remember" : "recorda'm",
+    "Log in" : "Inici de sessió",
+    "Alternative Logins" : "Acreditacions alternatives",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ei, <br><br>només fer-vos saber que %s us ha comparti <strong>%s</strong>. <br><a href=\"%s\">Mireu-ho!</a>",
+    "This ownCloud instance is currently in single user mode." : "La instància ownCloud està en mode d'usuari únic.",
+    "This means only administrators can use the instance." : "Això significa que només els administradors poden usar la instància.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacteu amb l'administrador del sistema si aquest missatge persisteix o apareix inesperadament.",
+    "Thank you for your patience." : "Gràcies per la paciència.",
+    "You are accessing the server from an untrusted domain." : "Esteu accedint el servidor des d'un domini no fiable",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacteu amb l'administrador. Si sou un administrador d'aquesta instància, configureu el paràmetre \"trusted_domain\" a config/config.php. Hi ha un exemple de configuració a config/config.sampe.php",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En funció de la teva configuració, com a administrador podries utilitzar el botó d'abaix per confiar en aquest domini.",
+    "Add \"%s\" as trusted domain" : "Afegeix \"%s\" com a domini de confiança",
+    "%s will be updated to version %s." : "%s s'actualitzarà a la versió %s.",
+    "The following apps will be disabled:" : "Les següents aplicacions es desactivaran:",
+    "The theme %s has been disabled." : "S'ha desactivat el tema %s",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assegureu-vos que heu fet una còpia de seguretat de la base de dades, del fitxer de configuració i de la carpeta de dades abans de continuar.",
+    "Start update" : "Inicia l'actualització",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Per evitar que s'esgoti el temps d'espera en instalacions grans, pots en el seu lloc fer córrer la següent comanda en el directori d'instalació. "
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
deleted file mode 100644
index 8f23961feff..00000000000
--- a/core/l10n/ca.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "No s'ha pogut enviar correu als usuaris següents: %s",
-"Turned on maintenance mode" => "Activat el mode de manteniment",
-"Turned off maintenance mode" => "Desactivat el mode de manteniment",
-"Updated database" => "Actualitzada la base de dades",
-"Checked database schema update" => "S'ha comprobat l'actualització de l'esquema de la base de dades",
-"Checked database schema update for apps" => "S'ha comprobat l'actualització de l'esquema de la base de dades per les apps",
-"Updated \"%s\" to %s" => "Actualitzat \"%s\" a %s",
-"Disabled incompatible apps: %s" => "Aplicacions incompatibles desactivades: %s",
-"No image or file provided" => "No s'han proporcionat imatges o fitxers",
-"Unknown filetype" => "Tipus de fitxer desconegut",
-"Invalid image" => "Imatge no vàlida",
-"No temporary profile picture available, try again" => "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho",
-"No crop data provided" => "No heu proporcionat dades del retall",
-"Sunday" => "Diumenge",
-"Monday" => "Dilluns",
-"Tuesday" => "Dimarts",
-"Wednesday" => "Dimecres",
-"Thursday" => "Dijous",
-"Friday" => "Divendres",
-"Saturday" => "Dissabte",
-"January" => "Gener",
-"February" => "Febrer",
-"March" => "Març",
-"April" => "Abril",
-"May" => "Maig",
-"June" => "Juny",
-"July" => "Juliol",
-"August" => "Agost",
-"September" => "Setembre",
-"October" => "Octubre",
-"November" => "Novembre",
-"December" => "Desembre",
-"Settings" => "Configuració",
-"File" => "Fitxer",
-"Folder" => "Carpeta",
-"Image" => "Imatge",
-"Audio" => "Audio",
-"Saving..." => "Desant...",
-"Couldn't send reset email. Please contact your administrator." => "No s'ha pogut restablir el correu. Contacteu amb l'administrador.",
-"The link to reset your password has been sent to your email. 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." => "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu. Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. <br />Si sabeu què fer, contacteu amb l'administrador abans de continuar.<br />Voleu continuar?",
-"I know what I'm doing" => "Sé el que faig",
-"Reset password" => "Reinicialitza la contrasenya",
-"Password can not be changed. Please contact your administrator." => "La contrasenya no es pot canviar. Contacteu amb l'administrador.",
-"No" => "No",
-"Yes" => "Sí",
-"Choose" => "Escull",
-"Error loading file picker template: {error}" => "Error en carregar la plantilla de càrrega de fitxers: {error}",
-"Ok" => "D'acord",
-"Error loading message template: {error}" => "Error en carregar la plantilla de missatge: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicte de fitxer","{count} conflictes de fitxer"),
-"One file conflict" => "Un fitxer en conflicte",
-"New Files" => "Fitxers nous",
-"Already existing files" => "Fitxers que ja existeixen",
-"Which files do you want to keep?" => "Quin fitxer voleu conservar?",
-"If you select both versions, the copied file will have a number added to its name." => "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom.",
-"Cancel" => "Cancel·la",
-"Continue" => "Continua",
-"(all selected)" => "(selecciona-ho tot)",
-"({count} selected)" => "({count} seleccionats)",
-"Error loading file exists template" => "Error en carregar la plantilla de fitxer existent",
-"Very weak password" => "Contrasenya massa feble",
-"Weak password" => "Contrasenya feble",
-"So-so password" => "Contrasenya passable",
-"Good password" => "Contrasenya bona",
-"Strong password" => "Contrasenya forta",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Aquest servidor no té cap connexió a internet que funcioni. Això significa que algunes de les característiques com el muntatge d'emmagatzemament extern, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu tenir totes les característiques.",
-"Error occurred while checking server setup" => "Hi ha hagut un error en comprovar la configuració del servidor",
-"Shared" => "Compartit",
-"Shared with {recipients}" => "Compartit amb {recipients}",
-"Share" => "Comparteix",
-"Error" => "Error",
-"Error while sharing" => "Error en compartir",
-"Error while unsharing" => "Error en deixar de compartir",
-"Error while changing permissions" => "Error en canviar els permisos",
-"Shared with you and the group {group} by {owner}" => "Compartit amb vos i amb el grup {group} per {owner}",
-"Shared with you by {owner}" => "Compartit amb vos per {owner}",
-"Share with user or group …" => "Comparteix amb usuari o grup...",
-"Share link" => "Enllaç de compartició",
-"The public link will expire no later than {days} days after it is created" => "L'enllaç públic tindrà venciment abans de {days} dies després de crear-lo",
-"Password protect" => "Protegir amb contrasenya",
-"Choose a password for the public link" => "Escolliu una contrasenya per l'enllaç públic",
-"Allow Public Upload" => "Permet pujada pública",
-"Email link to person" => "Enllaç per correu electrónic amb la persona",
-"Send" => "Envia",
-"Set expiration date" => "Estableix la data de venciment",
-"Expiration date" => "Data de venciment",
-"Adding user..." => "Afegint usuari...",
-"group" => "grup",
-"Resharing is not allowed" => "No es permet compartir de nou",
-"Shared in {item} with {user}" => "Compartit en {item} amb {user}",
-"Unshare" => "Deixa de compartir",
-"notify by email" => "notifica per correu electrònic",
-"can share" => "pot compartir",
-"can edit" => "pot editar",
-"access control" => "control d'accés",
-"create" => "crea",
-"update" => "actualitza",
-"delete" => "elimina",
-"Password protected" => "Protegeix amb contrasenya",
-"Error unsetting expiration date" => "Error en eliminar la data de venciment",
-"Error setting expiration date" => "Error en establir la data de venciment",
-"Sending ..." => "Enviant...",
-"Email sent" => "El correu electrónic s'ha enviat",
-"Warning" => "Avís",
-"The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
-"Enter new" => "Escriu nou",
-"Delete" => "Esborra",
-"Add" => "Afegeix",
-"Edit tags" => "Edita etiquetes",
-"Error loading dialog template: {error}" => "Error en carregar la plantilla de diàleg: {error}",
-"No tags selected for deletion." => "No heu seleccionat les etiquetes a eliminar.",
-"Updating {productName} to version {version}, this may take a while." => "Actualitzant {productName} a la versió {version}. Pot trigar una estona.",
-"Please reload the page." => "Carregueu la pàgina de nou.",
-"The update was unsuccessful." => "L'actualització no ha tingut èxit.",
-"The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
-"Couldn't reset password because the token is invalid" => "No es pot restablir la contrasenya perquè el testimoni no és vàlid",
-"Couldn't send reset email. Please make sure your username is correct." => "No s'ha pogut enviar el correu de restabliment. Assegureu-vos que el vostre nom d'usuari és correcte.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "No s'ha pogut enviar el correu de restabliment perquè no hi ha cap correu electrònic per aquest usuari. Contacteu amb l'administrador.",
-"%s password reset" => "restableix la contrasenya %s",
-"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.",
-"Username" => "Nom d'usuari",
-"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?" => "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
-"Yes, I really want to reset my password now" => "Sí, vull restablir ara la contrasenya",
-"Reset" => "Estableix de nou",
-"New password" => "Contrasenya nova",
-"New Password" => "Contrasenya nova",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!",
-"For the best results, please consider using a GNU/Linux server instead." => "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.",
-"Personal" => "Personal",
-"Users" => "Usuaris",
-"Apps" => "Aplicacions",
-"Admin" => "Administració",
-"Help" => "Ajuda",
-"Error loading tags" => "Error en carregar les etiquetes",
-"Tag already exists" => "L'etiqueta ja existeix",
-"Error deleting tag(s)" => "Error en eliminar etiqueta(s)",
-"Error tagging" => "Error en etiquetar",
-"Error untagging" => "Error en treure les etiquetes",
-"Error favoriting" => "Error en posar a preferits",
-"Error unfavoriting" => "Error en treure de preferits",
-"Access forbidden" => "Accés prohibit",
-"File not found" => "No s'ha trobat l'arxiu",
-"The specified document has not been found on the server." => "El document especificat no s'ha trobat al servidor.",
-"You can click here to return to %s." => "Pots clicar aquí per tornar a %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho a: %s\n\n",
-"The share will expire on %s." => "La compartició venç el %s.",
-"Cheers!" => "Salut!",
-"The server encountered an internal error and was unable to complete your request." => "El servidor ha trobat un error intern i no pot finalitzar la teva petició.",
-"More details can be found in the server log." => "Pots trobar més detalls al llistat del servidor.",
-"Technical details" => "Detalls tècnics",
-"Remote Address: %s" => "Adreça remota: %s",
-"Code: %s" => "Codi: %s",
-"Message: %s" => "Missatge: %s",
-"File: %s" => "Fitxer: %s",
-"Security Warning" => "Avís de seguretat",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versió de PHP que useu és vulnerable a l'atac per NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Actualitzeu la instal·lació de PHP per usar %s de forma segura.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
-"Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
-"Password" => "Contrasenya",
-"Storage & database" => "Emmagatzematge i base de dades",
-"Data folder" => "Carpeta de dades",
-"Configure the database" => "Configura la base de dades",
-"Only %s is available." => "Només hi ha disponible %s",
-"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",
-"SQLite will be used as database. For larger installations we recommend to change this." => "S'utilitzarà SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu.",
-"Finish setup" => "Acaba la configuració",
-"Finishing …" => "Acabant...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Aquesta aplicació requereix JavaScrip pel seu correcte funcionament. Si us plau <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeu JavaScript</a> i actualitzeu la pàgina.",
-"%s is available. Get more information on how to update." => "%s està disponible. Obtingueu més informació de com actualitzar.",
-"Log out" => "Surt",
-"Server side authentication failed!" => "L'autenticació del servidor ha fallat!",
-"Please contact your administrator." => "Contacteu amb l'administrador.",
-"Forgot your password? Reset it!" => "Heu oblidat la contrasenya? Restabliu-la!",
-"remember" => "recorda'm",
-"Log in" => "Inici de sessió",
-"Alternative Logins" => "Acreditacions alternatives",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ei, <br><br>només fer-vos saber que %s us ha comparti <strong>%s</strong>. <br><a href=\"%s\">Mireu-ho!</a>",
-"This ownCloud instance is currently in single user mode." => "La instància ownCloud està en mode d'usuari únic.",
-"This means only administrators can use the instance." => "Això significa que només els administradors poden usar la instància.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacteu amb l'administrador del sistema si aquest missatge persisteix o apareix inesperadament.",
-"Thank you for your patience." => "Gràcies per la paciència.",
-"You are accessing the server from an untrusted domain." => "Esteu accedint el servidor des d'un domini no fiable",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Contacteu amb l'administrador. Si sou un administrador d'aquesta instància, configureu el paràmetre \"trusted_domain\" a config/config.php. Hi ha un exemple de configuració a config/config.sampe.php",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "En funció de la teva configuració, com a administrador podries utilitzar el botó d'abaix per confiar en aquest domini.",
-"Add \"%s\" as trusted domain" => "Afegeix \"%s\" com a domini de confiança",
-"%s will be updated to version %s." => "%s s'actualitzarà a la versió %s.",
-"The following apps will be disabled:" => "Les següents aplicacions es desactivaran:",
-"The theme %s has been disabled." => "S'ha desactivat el tema %s",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Assegureu-vos que heu fet una còpia de seguretat de la base de dades, del fitxer de configuració i de la carpeta de dades abans de continuar.",
-"Start update" => "Inicia l'actualització",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Per evitar que s'esgoti el temps d'espera en instalacions grans, pots en el seu lloc fer córrer la següent comanda en el directori d'instalació. "
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ca@valencia.js b/core/l10n/ca@valencia.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/ca@valencia.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ca@valencia.json b/core/l10n/ca@valencia.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/ca@valencia.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ca@valencia.php b/core/l10n/ca@valencia.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/ca@valencia.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
new file mode 100644
index 00000000000..3ec5192562f
--- /dev/null
+++ b/core/l10n/cs_CZ.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nebylo možné odeslat e-mail následujícím uživatelům: %s",
+    "Turned on maintenance mode" : "Zapnut režim údržby",
+    "Turned off maintenance mode" : "Vypnut režim údržby",
+    "Updated database" : "Zaktualizována databáze",
+    "Checked database schema update" : "Aktualizace schéma databáze byla ověřena",
+    "Checked database schema update for apps" : "Aktualizace schéma databáze aplikací byla ověřena",
+    "Updated \"%s\" to %s" : "Aktualizováno z \"%s\" na %s",
+    "Disabled incompatible apps: %s" : "Zakázané nekompatibilní aplikace: %s",
+    "No image or file provided" : "Soubor nebo obrázek nebyl zadán",
+    "Unknown filetype" : "Neznámý typ souboru",
+    "Invalid image" : "Chybný obrázek",
+    "No temporary profile picture available, try again" : "Dočasný profilový obrázek není k dispozici, zkuste to znovu",
+    "No crop data provided" : "Nebyla poskytnuta data pro oříznutí obrázku",
+    "Sunday" : "Neděle",
+    "Monday" : "Pondělí",
+    "Tuesday" : "Úterý",
+    "Wednesday" : "Středa",
+    "Thursday" : "Čtvrtek",
+    "Friday" : "Pátek",
+    "Saturday" : "Sobota",
+    "January" : "Leden",
+    "February" : "Únor",
+    "March" : "Březen",
+    "April" : "Duben",
+    "May" : "Květen",
+    "June" : "Červen",
+    "July" : "Červenec",
+    "August" : "Srpen",
+    "September" : "Září",
+    "October" : "Říjen",
+    "November" : "Listopad",
+    "December" : "Prosinec",
+    "Settings" : "Nastavení",
+    "File" : "Soubor",
+    "Folder" : "Složka",
+    "Image" : "Obrázek",
+    "Audio" : "Audio",
+    "Saving..." : "Ukládám...",
+    "Couldn't send reset email. Please contact your administrator." : "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte vašeho administrátora.",
+    "The link to reset your password has been sent to your email. 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." : "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu. Pokud jej v krátké době neobdržíte, zkontrolujte složku nevyžádané pošty a koš.<br>Pokud jej nenaleznete, kontaktujte svého administrátora.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše soubory jsou šifrovány. Pokud jste nepovolili klíč pro obnovení, neexistuje způsob jak získat po změně hesla vaše data.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého administrátora než budete pokračovat. <br />Opravdu si přejete pokračovat?",
+    "I know what I'm doing" : "Vím co dělám",
+    "Reset password" : "Obnovit heslo",
+    "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého administrátora.",
+    "No" : "Ne",
+    "Yes" : "Ano",
+    "Choose" : "Vybrat",
+    "Error loading file picker template: {error}" : "Chyba při nahrávání šablony výběru souborů: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Chyba při nahrávání šablony zprávy: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} souborový konflikt","{count} souborové konflikty","{count} souborových konfliktů"],
+    "One file conflict" : "Jeden konflikt souboru",
+    "New Files" : "Nové soubory",
+    "Already existing files" : "Již existující soubory",
+    "Which files do you want to keep?" : "Které soubory chcete ponechat?",
+    "If you select both versions, the copied file will have a number added to its name." : "Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo.",
+    "Cancel" : "Zrušit",
+    "Continue" : "Pokračovat",
+    "(all selected)" : "(vybráno vše)",
+    "({count} selected)" : "(vybráno {count})",
+    "Error loading file exists template" : "Chyba při nahrávání šablony existence souboru",
+    "Very weak password" : "Velmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Středně silné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Váš webový server není správně nastaven pro umožnění synchronizace, rozhraní WebDAV se zdá být rozbité.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Server nemá funkční připojení k internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit připojení k internetu tomuto serveru.",
+    "Error occurred while checking server setup" : "Při ověřování nastavení serveru došlo k chybě",
+    "Shared" : "Sdílené",
+    "Shared with {recipients}" : "Sdíleno s {recipients}",
+    "Share" : "Sdílet",
+    "Error" : "Chyba",
+    "Error while sharing" : "Chyba při sdílení",
+    "Error while unsharing" : "Chyba při rušení sdílení",
+    "Error while changing permissions" : "Chyba při změně oprávnění",
+    "Shared with you and the group {group} by {owner}" : "S Vámi a skupinou {group} sdílí {owner}",
+    "Shared with you by {owner}" : "S Vámi sdílí {owner}",
+    "Share with user or group …" : "Sdílet s uživatelem nebo skupinou",
+    "Share link" : "Sdílet odkaz",
+    "The public link will expire no later than {days} days after it is created" : "Veřejný odkaz vyprší nejpozději {days} dní od svého vytvoření",
+    "Password protect" : "Chránit heslem",
+    "Choose a password for the public link" : "Zadej heslo pro tento veřejný odkaz",
+    "Allow Public Upload" : "Povolit veřejné nahrávání",
+    "Email link to person" : "Odeslat osobě odkaz e-mailem",
+    "Send" : "Odeslat",
+    "Set expiration date" : "Nastavit datum vypršení platnosti",
+    "Expiration date" : "Datum vypršení platnosti",
+    "Adding user..." : "Přidávám uživatele...",
+    "group" : "skupina",
+    "Resharing is not allowed" : "Sdílení již sdílené položky není povoleno",
+    "Shared in {item} with {user}" : "Sdíleno v {item} s {user}",
+    "Unshare" : "Zrušit sdílení",
+    "notify by email" : "upozornit e-mailem",
+    "can share" : "může sdílet",
+    "can edit" : "lze upravovat",
+    "access control" : "řízení přístupu",
+    "create" : "vytvořit",
+    "update" : "aktualizovat",
+    "delete" : "smazat",
+    "Password protected" : "Chráněno heslem",
+    "Error unsetting expiration date" : "Chyba při odstraňování data vypršení platnosti",
+    "Error setting expiration date" : "Chyba při nastavení data vypršení platnosti",
+    "Sending ..." : "Odesílám ...",
+    "Email sent" : "E-mail odeslán",
+    "Warning" : "Varování",
+    "The object type is not specified." : "Není určen typ objektu.",
+    "Enter new" : "Zadat nový",
+    "Delete" : "Smazat",
+    "Add" : "Přidat",
+    "Edit tags" : "Editovat štítky",
+    "Error loading dialog template: {error}" : "Chyba při načítání šablony dialogu: {error}",
+    "No tags selected for deletion." : "Žádné štítky nebyly vybrány ke smazání.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.",
+    "Please reload the page." : "Načtěte stránku znovu, prosím.",
+    "The update was unsuccessful." : "Aktualizace nebyla úspěšná.",
+    "The update was successful. Redirecting you to ownCloud now." : "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Heslo nebylo změněno kvůli neplatnému tokenu",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nelze odeslat email pro změnu hesla. Ujistěte se prosím, že zadáváte správné uživatelské jméno.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nelze odeslat email pro změnu hesla, protože u tohoto uživatelského jména není uvedena e-mailová adresa. Kontaktujte prosím svého administrátora.",
+    "%s password reset" : "reset hesla %s",
+    "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." : "E-mailem Vám bude zaslán odkaz pro obnovu hesla.",
+    "Username" : "Uživatelské jméno",
+    "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?" : "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
+    "Yes, I really want to reset my password now" : "Ano, opravdu si nyní přeji obnovit mé heslo",
+    "Reset" : "Restartovat složku",
+    "New password" : "Nové heslo",
+    "New Password" : "Nové heslo",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
+    "Personal" : "Osobní",
+    "Users" : "Uživatelé",
+    "Apps" : "Aplikace",
+    "Admin" : "Administrace",
+    "Help" : "Nápověda",
+    "Error loading tags" : "Chyba při načítání štítků",
+    "Tag already exists" : "Štítek již existuje",
+    "Error deleting tag(s)" : "Chyba při mazání štítku(ů)",
+    "Error tagging" : "Chyba při označování štítkem",
+    "Error untagging" : "Chyba při odznačování štítků",
+    "Error favoriting" : "Chyba při označování jako oblíbené",
+    "Error unfavoriting" : "Chyba při odznačování jako oblíbené",
+    "Access forbidden" : "Přístup zakázán",
+    "File not found" : "Soubor nenalezen",
+    "The specified document has not been found on the server." : "Požadovaný dokument nebyl na serveru nalezen.",
+    "You can click here to return to %s." : "Klikněte zde pro návrat na %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej ty tam,\n\njen ti chci dát vědět, že %s sdílel %s s tebou.\nZobraz si to: %s\n\n",
+    "The share will expire on %s." : "Sdílení vyprší %s.",
+    "Cheers!" : "Ať slouží!",
+    "Internal Server Error" : "Vnitřní chyba serveru",
+    "The server encountered an internal error and was unable to complete your request." : "Server zaznamenal interní chybu a nebyl schopen dokončit váš požadavek.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontaktujte prosím administrátora serveru, pokud se bude tato chyba opakovat. Připojte do svého hlášení níže zobrazené technické detaily.",
+    "More details can be found in the server log." : "Více podrobností k nalezení v serverovém logu.",
+    "Technical details" : "Technické detaily",
+    "Remote Address: %s" : "Vzdálená adresa: %s",
+    "Request ID: %s" : "ID požadavku: %s",
+    "Code: %s" : "Kód: %s",
+    "Message: %s" : "Zpráva: %s",
+    "File: %s" : "Soubor: %s",
+    "Line: %s" : "Řádka: %s",
+    "Trace" : "Trasa",
+    "Security Warning" : "Bezpečnostní upozornění",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Verze vašeho PHP je napadnutelná pomocí techniky \"NULL Byte\" (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aktualizujte prosím vaši instanci PHP pro bezpečné používání %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
+    "Create an <strong>admin account</strong>" : "Vytvořit <strong>účet správce</strong>",
+    "Password" : "Heslo",
+    "Storage & database" : "Úložiště & databáze",
+    "Data folder" : "Složka s daty",
+    "Configure the database" : "Nastavit databázi",
+    "Only %s is available." : "Pouze %s je dostupný.",
+    "Database user" : "Uživatel databáze",
+    "Database password" : "Heslo databáze",
+    "Database name" : "Název databáze",
+    "Database tablespace" : "Tabulkový prostor databáze",
+    "Database host" : "Hostitel databáze",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Bude použita databáze SQLite. Pro větší instalace doporučujeme toto změnit.",
+    "Finish setup" : "Dokončit nastavení",
+    "Finishing …" : "Dokončuji...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">povolte JavaScript</a> a znovu načtěte stránku.",
+    "%s is available. Get more information on how to update." : "%s je dostupná. Získejte více informací k postupu aktualizace.",
+    "Log out" : "Odhlásit se",
+    "Server side authentication failed!" : "Autentizace na serveru selhala!",
+    "Please contact your administrator." : "Kontaktujte prosím vašeho správce.",
+    "Forgot your password? Reset it!" : "Zapomenuté heslo? Nastavte si nové!",
+    "remember" : "zapamatovat",
+    "Log in" : "Přihlásit",
+    "Alternative Logins" : "Alternativní přihlášení",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej ty,<br><br>jen ti dávám vědět, že %s sdílí <strong>%s</strong> s tebou.<br><a href=\"%s\">Zobrazit!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
+    "This means only administrators can use the instance." : "To znamená, že pouze správci systému mohou aplikaci používat.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte, prosím, správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.",
+    "Thank you for your patience." : "Děkuji za trpělivost.",
+    "You are accessing the server from an untrusted domain." : "Přistupujete na server z nedůvěryhodné domény.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na vaší konfiguraci vám může být, jako administrátorovi, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
+    "Add \"%s\" as trusted domain" : "Přidat \"%s\" jako důvěryhodnou doménu",
+    "%s will be updated to version %s." : "%s bude aktualizován na verzi %s.",
+    "The following apps will be disabled:" : "Následující aplikace budou zakázány:",
+    "The theme %s has been disabled." : "Vzhled %s byl zakázán.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Před provedením dalšího kroku se prosím ujistěte, že databáze a konfigurační a datový adresář byly zazálohovány.  ",
+    "Start update" : "Spustit aktualizaci",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Abyste zabránili vypršení časového limitu u větších instalací, můžete namísto toho spustit následující příkaz v hlavním adresáři:",
+    "This %s instance is currently being updated, which may take a while." : "Tato instalace %s je právě aktualizována a to může chvíli trvat.",
+    "This page will refresh itself when the %s instance is available again." : "Tato stránka se automaticky načte poté, co bude opět dostupná instance %s."
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
new file mode 100644
index 00000000000..2102050a976
--- /dev/null
+++ b/core/l10n/cs_CZ.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nebylo možné odeslat e-mail následujícím uživatelům: %s",
+    "Turned on maintenance mode" : "Zapnut režim údržby",
+    "Turned off maintenance mode" : "Vypnut režim údržby",
+    "Updated database" : "Zaktualizována databáze",
+    "Checked database schema update" : "Aktualizace schéma databáze byla ověřena",
+    "Checked database schema update for apps" : "Aktualizace schéma databáze aplikací byla ověřena",
+    "Updated \"%s\" to %s" : "Aktualizováno z \"%s\" na %s",
+    "Disabled incompatible apps: %s" : "Zakázané nekompatibilní aplikace: %s",
+    "No image or file provided" : "Soubor nebo obrázek nebyl zadán",
+    "Unknown filetype" : "Neznámý typ souboru",
+    "Invalid image" : "Chybný obrázek",
+    "No temporary profile picture available, try again" : "Dočasný profilový obrázek není k dispozici, zkuste to znovu",
+    "No crop data provided" : "Nebyla poskytnuta data pro oříznutí obrázku",
+    "Sunday" : "Neděle",
+    "Monday" : "Pondělí",
+    "Tuesday" : "Úterý",
+    "Wednesday" : "Středa",
+    "Thursday" : "Čtvrtek",
+    "Friday" : "Pátek",
+    "Saturday" : "Sobota",
+    "January" : "Leden",
+    "February" : "Únor",
+    "March" : "Březen",
+    "April" : "Duben",
+    "May" : "Květen",
+    "June" : "Červen",
+    "July" : "Červenec",
+    "August" : "Srpen",
+    "September" : "Září",
+    "October" : "Říjen",
+    "November" : "Listopad",
+    "December" : "Prosinec",
+    "Settings" : "Nastavení",
+    "File" : "Soubor",
+    "Folder" : "Složka",
+    "Image" : "Obrázek",
+    "Audio" : "Audio",
+    "Saving..." : "Ukládám...",
+    "Couldn't send reset email. Please contact your administrator." : "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte vašeho administrátora.",
+    "The link to reset your password has been sent to your email. 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." : "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu. Pokud jej v krátké době neobdržíte, zkontrolujte složku nevyžádané pošty a koš.<br>Pokud jej nenaleznete, kontaktujte svého administrátora.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše soubory jsou šifrovány. Pokud jste nepovolili klíč pro obnovení, neexistuje způsob jak získat po změně hesla vaše data.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého administrátora než budete pokračovat. <br />Opravdu si přejete pokračovat?",
+    "I know what I'm doing" : "Vím co dělám",
+    "Reset password" : "Obnovit heslo",
+    "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého administrátora.",
+    "No" : "Ne",
+    "Yes" : "Ano",
+    "Choose" : "Vybrat",
+    "Error loading file picker template: {error}" : "Chyba při nahrávání šablony výběru souborů: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Chyba při nahrávání šablony zprávy: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} souborový konflikt","{count} souborové konflikty","{count} souborových konfliktů"],
+    "One file conflict" : "Jeden konflikt souboru",
+    "New Files" : "Nové soubory",
+    "Already existing files" : "Již existující soubory",
+    "Which files do you want to keep?" : "Které soubory chcete ponechat?",
+    "If you select both versions, the copied file will have a number added to its name." : "Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo.",
+    "Cancel" : "Zrušit",
+    "Continue" : "Pokračovat",
+    "(all selected)" : "(vybráno vše)",
+    "({count} selected)" : "(vybráno {count})",
+    "Error loading file exists template" : "Chyba při nahrávání šablony existence souboru",
+    "Very weak password" : "Velmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Středně silné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Váš webový server není správně nastaven pro umožnění synchronizace, rozhraní WebDAV se zdá být rozbité.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Server nemá funkční připojení k internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit připojení k internetu tomuto serveru.",
+    "Error occurred while checking server setup" : "Při ověřování nastavení serveru došlo k chybě",
+    "Shared" : "Sdílené",
+    "Shared with {recipients}" : "Sdíleno s {recipients}",
+    "Share" : "Sdílet",
+    "Error" : "Chyba",
+    "Error while sharing" : "Chyba při sdílení",
+    "Error while unsharing" : "Chyba při rušení sdílení",
+    "Error while changing permissions" : "Chyba při změně oprávnění",
+    "Shared with you and the group {group} by {owner}" : "S Vámi a skupinou {group} sdílí {owner}",
+    "Shared with you by {owner}" : "S Vámi sdílí {owner}",
+    "Share with user or group …" : "Sdílet s uživatelem nebo skupinou",
+    "Share link" : "Sdílet odkaz",
+    "The public link will expire no later than {days} days after it is created" : "Veřejný odkaz vyprší nejpozději {days} dní od svého vytvoření",
+    "Password protect" : "Chránit heslem",
+    "Choose a password for the public link" : "Zadej heslo pro tento veřejný odkaz",
+    "Allow Public Upload" : "Povolit veřejné nahrávání",
+    "Email link to person" : "Odeslat osobě odkaz e-mailem",
+    "Send" : "Odeslat",
+    "Set expiration date" : "Nastavit datum vypršení platnosti",
+    "Expiration date" : "Datum vypršení platnosti",
+    "Adding user..." : "Přidávám uživatele...",
+    "group" : "skupina",
+    "Resharing is not allowed" : "Sdílení již sdílené položky není povoleno",
+    "Shared in {item} with {user}" : "Sdíleno v {item} s {user}",
+    "Unshare" : "Zrušit sdílení",
+    "notify by email" : "upozornit e-mailem",
+    "can share" : "může sdílet",
+    "can edit" : "lze upravovat",
+    "access control" : "řízení přístupu",
+    "create" : "vytvořit",
+    "update" : "aktualizovat",
+    "delete" : "smazat",
+    "Password protected" : "Chráněno heslem",
+    "Error unsetting expiration date" : "Chyba při odstraňování data vypršení platnosti",
+    "Error setting expiration date" : "Chyba při nastavení data vypršení platnosti",
+    "Sending ..." : "Odesílám ...",
+    "Email sent" : "E-mail odeslán",
+    "Warning" : "Varování",
+    "The object type is not specified." : "Není určen typ objektu.",
+    "Enter new" : "Zadat nový",
+    "Delete" : "Smazat",
+    "Add" : "Přidat",
+    "Edit tags" : "Editovat štítky",
+    "Error loading dialog template: {error}" : "Chyba při načítání šablony dialogu: {error}",
+    "No tags selected for deletion." : "Žádné štítky nebyly vybrány ke smazání.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.",
+    "Please reload the page." : "Načtěte stránku znovu, prosím.",
+    "The update was unsuccessful." : "Aktualizace nebyla úspěšná.",
+    "The update was successful. Redirecting you to ownCloud now." : "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Heslo nebylo změněno kvůli neplatnému tokenu",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nelze odeslat email pro změnu hesla. Ujistěte se prosím, že zadáváte správné uživatelské jméno.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nelze odeslat email pro změnu hesla, protože u tohoto uživatelského jména není uvedena e-mailová adresa. Kontaktujte prosím svého administrátora.",
+    "%s password reset" : "reset hesla %s",
+    "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." : "E-mailem Vám bude zaslán odkaz pro obnovu hesla.",
+    "Username" : "Uživatelské jméno",
+    "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?" : "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
+    "Yes, I really want to reset my password now" : "Ano, opravdu si nyní přeji obnovit mé heslo",
+    "Reset" : "Restartovat složku",
+    "New password" : "Nové heslo",
+    "New Password" : "Nové heslo",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
+    "Personal" : "Osobní",
+    "Users" : "Uživatelé",
+    "Apps" : "Aplikace",
+    "Admin" : "Administrace",
+    "Help" : "Nápověda",
+    "Error loading tags" : "Chyba při načítání štítků",
+    "Tag already exists" : "Štítek již existuje",
+    "Error deleting tag(s)" : "Chyba při mazání štítku(ů)",
+    "Error tagging" : "Chyba při označování štítkem",
+    "Error untagging" : "Chyba při odznačování štítků",
+    "Error favoriting" : "Chyba při označování jako oblíbené",
+    "Error unfavoriting" : "Chyba při odznačování jako oblíbené",
+    "Access forbidden" : "Přístup zakázán",
+    "File not found" : "Soubor nenalezen",
+    "The specified document has not been found on the server." : "Požadovaný dokument nebyl na serveru nalezen.",
+    "You can click here to return to %s." : "Klikněte zde pro návrat na %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej ty tam,\n\njen ti chci dát vědět, že %s sdílel %s s tebou.\nZobraz si to: %s\n\n",
+    "The share will expire on %s." : "Sdílení vyprší %s.",
+    "Cheers!" : "Ať slouží!",
+    "Internal Server Error" : "Vnitřní chyba serveru",
+    "The server encountered an internal error and was unable to complete your request." : "Server zaznamenal interní chybu a nebyl schopen dokončit váš požadavek.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontaktujte prosím administrátora serveru, pokud se bude tato chyba opakovat. Připojte do svého hlášení níže zobrazené technické detaily.",
+    "More details can be found in the server log." : "Více podrobností k nalezení v serverovém logu.",
+    "Technical details" : "Technické detaily",
+    "Remote Address: %s" : "Vzdálená adresa: %s",
+    "Request ID: %s" : "ID požadavku: %s",
+    "Code: %s" : "Kód: %s",
+    "Message: %s" : "Zpráva: %s",
+    "File: %s" : "Soubor: %s",
+    "Line: %s" : "Řádka: %s",
+    "Trace" : "Trasa",
+    "Security Warning" : "Bezpečnostní upozornění",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Verze vašeho PHP je napadnutelná pomocí techniky \"NULL Byte\" (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aktualizujte prosím vaši instanci PHP pro bezpečné používání %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
+    "Create an <strong>admin account</strong>" : "Vytvořit <strong>účet správce</strong>",
+    "Password" : "Heslo",
+    "Storage & database" : "Úložiště & databáze",
+    "Data folder" : "Složka s daty",
+    "Configure the database" : "Nastavit databázi",
+    "Only %s is available." : "Pouze %s je dostupný.",
+    "Database user" : "Uživatel databáze",
+    "Database password" : "Heslo databáze",
+    "Database name" : "Název databáze",
+    "Database tablespace" : "Tabulkový prostor databáze",
+    "Database host" : "Hostitel databáze",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Bude použita databáze SQLite. Pro větší instalace doporučujeme toto změnit.",
+    "Finish setup" : "Dokončit nastavení",
+    "Finishing …" : "Dokončuji...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">povolte JavaScript</a> a znovu načtěte stránku.",
+    "%s is available. Get more information on how to update." : "%s je dostupná. Získejte více informací k postupu aktualizace.",
+    "Log out" : "Odhlásit se",
+    "Server side authentication failed!" : "Autentizace na serveru selhala!",
+    "Please contact your administrator." : "Kontaktujte prosím vašeho správce.",
+    "Forgot your password? Reset it!" : "Zapomenuté heslo? Nastavte si nové!",
+    "remember" : "zapamatovat",
+    "Log in" : "Přihlásit",
+    "Alternative Logins" : "Alternativní přihlášení",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej ty,<br><br>jen ti dávám vědět, že %s sdílí <strong>%s</strong> s tebou.<br><a href=\"%s\">Zobrazit!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
+    "This means only administrators can use the instance." : "To znamená, že pouze správci systému mohou aplikaci používat.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte, prosím, správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.",
+    "Thank you for your patience." : "Děkuji za trpělivost.",
+    "You are accessing the server from an untrusted domain." : "Přistupujete na server z nedůvěryhodné domény.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na vaší konfiguraci vám může být, jako administrátorovi, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
+    "Add \"%s\" as trusted domain" : "Přidat \"%s\" jako důvěryhodnou doménu",
+    "%s will be updated to version %s." : "%s bude aktualizován na verzi %s.",
+    "The following apps will be disabled:" : "Následující aplikace budou zakázány:",
+    "The theme %s has been disabled." : "Vzhled %s byl zakázán.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Před provedením dalšího kroku se prosím ujistěte, že databáze a konfigurační a datový adresář byly zazálohovány.  ",
+    "Start update" : "Spustit aktualizaci",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Abyste zabránili vypršení časového limitu u větších instalací, můžete namísto toho spustit následující příkaz v hlavním adresáři:",
+    "This %s instance is currently being updated, which may take a while." : "Tato instalace %s je právě aktualizována a to může chvíli trvat.",
+    "This page will refresh itself when the %s instance is available again." : "Tato stránka se automaticky načte poté, co bude opět dostupná instance %s."
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
deleted file mode 100644
index ac7642f6c86..00000000000
--- a/core/l10n/cs_CZ.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nebylo možné odeslat e-mail následujícím uživatelům: %s",
-"Turned on maintenance mode" => "Zapnut režim údržby",
-"Turned off maintenance mode" => "Vypnut režim údržby",
-"Updated database" => "Zaktualizována databáze",
-"Checked database schema update" => "Aktualizace schéma databáze byla ověřena",
-"Checked database schema update for apps" => "Aktualizace schéma databáze aplikací byla ověřena",
-"Updated \"%s\" to %s" => "Aktualizováno z \"%s\" na %s",
-"Disabled incompatible apps: %s" => "Zakázané nekompatibilní aplikace: %s",
-"No image or file provided" => "Soubor nebo obrázek nebyl zadán",
-"Unknown filetype" => "Neznámý typ souboru",
-"Invalid image" => "Chybný obrázek",
-"No temporary profile picture available, try again" => "Dočasný profilový obrázek není k dispozici, zkuste to znovu",
-"No crop data provided" => "Nebyla poskytnuta data pro oříznutí obrázku",
-"Sunday" => "Neděle",
-"Monday" => "Pondělí",
-"Tuesday" => "Úterý",
-"Wednesday" => "Středa",
-"Thursday" => "Čtvrtek",
-"Friday" => "Pátek",
-"Saturday" => "Sobota",
-"January" => "Leden",
-"February" => "Únor",
-"March" => "Březen",
-"April" => "Duben",
-"May" => "Květen",
-"June" => "Červen",
-"July" => "Červenec",
-"August" => "Srpen",
-"September" => "Září",
-"October" => "Říjen",
-"November" => "Listopad",
-"December" => "Prosinec",
-"Settings" => "Nastavení",
-"File" => "Soubor",
-"Folder" => "Složka",
-"Image" => "Obrázek",
-"Audio" => "Audio",
-"Saving..." => "Ukládám...",
-"Couldn't send reset email. Please contact your administrator." => "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte vašeho administrátora.",
-"The link to reset your password has been sent to your email. 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." => "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu. Pokud jej v krátké době neobdržíte, zkontrolujte složku nevyžádané pošty a koš.<br>Pokud jej nenaleznete, kontaktujte svého administrátora.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Vaše soubory jsou šifrovány. Pokud jste nepovolili klíč pro obnovení, neexistuje způsob jak získat po změně hesla vaše data.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého administrátora než budete pokračovat. <br />Opravdu si přejete pokračovat?",
-"I know what I'm doing" => "Vím co dělám",
-"Reset password" => "Obnovit heslo",
-"Password can not be changed. Please contact your administrator." => "Heslo nelze změnit. Kontaktujte prosím svého administrátora.",
-"No" => "Ne",
-"Yes" => "Ano",
-"Choose" => "Vybrat",
-"Error loading file picker template: {error}" => "Chyba při nahrávání šablony výběru souborů: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Chyba při nahrávání šablony zprávy: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} souborový konflikt","{count} souborové konflikty","{count} souborových konfliktů"),
-"One file conflict" => "Jeden konflikt souboru",
-"New Files" => "Nové soubory",
-"Already existing files" => "Již existující soubory",
-"Which files do you want to keep?" => "Které soubory chcete ponechat?",
-"If you select both versions, the copied file will have a number added to its name." => "Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo.",
-"Cancel" => "Zrušit",
-"Continue" => "Pokračovat",
-"(all selected)" => "(vybráno vše)",
-"({count} selected)" => "(vybráno {count})",
-"Error loading file exists template" => "Chyba při nahrávání šablony existence souboru",
-"Very weak password" => "Velmi slabé heslo",
-"Weak password" => "Slabé heslo",
-"So-so password" => "Středně silné heslo",
-"Good password" => "Dobré heslo",
-"Strong password" => "Silné heslo",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server není správně nastaven pro umožnění synchronizace, rozhraní WebDAV se zdá být rozbité.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Server nemá funkční připojení k internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit připojení k internetu tomuto serveru.",
-"Error occurred while checking server setup" => "Při ověřování nastavení serveru došlo k chybě",
-"Shared" => "Sdílené",
-"Shared with {recipients}" => "Sdíleno s {recipients}",
-"Share" => "Sdílet",
-"Error" => "Chyba",
-"Error while sharing" => "Chyba při sdílení",
-"Error while unsharing" => "Chyba při rušení sdílení",
-"Error while changing permissions" => "Chyba při změně oprávnění",
-"Shared with you and the group {group} by {owner}" => "S Vámi a skupinou {group} sdílí {owner}",
-"Shared with you by {owner}" => "S Vámi sdílí {owner}",
-"Share with user or group …" => "Sdílet s uživatelem nebo skupinou",
-"Share link" => "Sdílet odkaz",
-"The public link will expire no later than {days} days after it is created" => "Veřejný odkaz vyprší nejpozději {days} dní od svého vytvoření",
-"Password protect" => "Chránit heslem",
-"Choose a password for the public link" => "Zadej heslo pro tento veřejný odkaz",
-"Allow Public Upload" => "Povolit veřejné nahrávání",
-"Email link to person" => "Odeslat osobě odkaz e-mailem",
-"Send" => "Odeslat",
-"Set expiration date" => "Nastavit datum vypršení platnosti",
-"Expiration date" => "Datum vypršení platnosti",
-"Adding user..." => "Přidávám uživatele...",
-"group" => "skupina",
-"Resharing is not allowed" => "Sdílení již sdílené položky není povoleno",
-"Shared in {item} with {user}" => "Sdíleno v {item} s {user}",
-"Unshare" => "Zrušit sdílení",
-"notify by email" => "upozornit e-mailem",
-"can share" => "může sdílet",
-"can edit" => "lze upravovat",
-"access control" => "řízení přístupu",
-"create" => "vytvořit",
-"update" => "aktualizovat",
-"delete" => "smazat",
-"Password protected" => "Chráněno heslem",
-"Error unsetting expiration date" => "Chyba při odstraňování data vypršení platnosti",
-"Error setting expiration date" => "Chyba při nastavení data vypršení platnosti",
-"Sending ..." => "Odesílám ...",
-"Email sent" => "E-mail odeslán",
-"Warning" => "Varování",
-"The object type is not specified." => "Není určen typ objektu.",
-"Enter new" => "Zadat nový",
-"Delete" => "Smazat",
-"Add" => "Přidat",
-"Edit tags" => "Editovat štítky",
-"Error loading dialog template: {error}" => "Chyba při načítání šablony dialogu: {error}",
-"No tags selected for deletion." => "Žádné štítky nebyly vybrány ke smazání.",
-"Updating {productName} to version {version}, this may take a while." => "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.",
-"Please reload the page." => "Načtěte stránku znovu, prosím.",
-"The update was unsuccessful." => "Aktualizace nebyla úspěšná.",
-"The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
-"Couldn't reset password because the token is invalid" => "Heslo nebylo změněno kvůli neplatnému tokenu",
-"Couldn't send reset email. Please make sure your username is correct." => "Nelze odeslat email pro změnu hesla. Ujistěte se prosím, že zadáváte správné uživatelské jméno.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Nelze odeslat email pro změnu hesla, protože u tohoto uživatelského jména není uvedena e-mailová adresa. Kontaktujte prosím svého administrátora.",
-"%s password reset" => "reset hesla %s",
-"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." => "E-mailem Vám bude zaslán odkaz pro obnovu hesla.",
-"Username" => "Uživatelské jméno",
-"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?" => "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
-"Yes, I really want to reset my password now" => "Ano, opravdu si nyní přeji obnovit mé heslo",
-"Reset" => "Restartovat složku",
-"New password" => "Nové heslo",
-"New Password" => "Nové heslo",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
-"For the best results, please consider using a GNU/Linux server instead." => "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
-"Personal" => "Osobní",
-"Users" => "Uživatelé",
-"Apps" => "Aplikace",
-"Admin" => "Administrace",
-"Help" => "Nápověda",
-"Error loading tags" => "Chyba při načítání štítků",
-"Tag already exists" => "Štítek již existuje",
-"Error deleting tag(s)" => "Chyba při mazání štítku(ů)",
-"Error tagging" => "Chyba při označování štítkem",
-"Error untagging" => "Chyba při odznačování štítků",
-"Error favoriting" => "Chyba při označování jako oblíbené",
-"Error unfavoriting" => "Chyba při odznačování jako oblíbené",
-"Access forbidden" => "Přístup zakázán",
-"File not found" => "Soubor nenalezen",
-"The specified document has not been found on the server." => "Požadovaný dokument nebyl na serveru nalezen.",
-"You can click here to return to %s." => "Klikněte zde pro návrat na %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej ty tam,\n\njen ti chci dát vědět, že %s sdílel %s s tebou.\nZobraz si to: %s\n\n",
-"The share will expire on %s." => "Sdílení vyprší %s.",
-"Cheers!" => "Ať slouží!",
-"Internal Server Error" => "Vnitřní chyba serveru",
-"The server encountered an internal error and was unable to complete your request." => "Server zaznamenal interní chybu a nebyl schopen dokončit váš požadavek.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Kontaktujte prosím administrátora serveru, pokud se bude tato chyba opakovat. Připojte do svého hlášení níže zobrazené technické detaily.",
-"More details can be found in the server log." => "Více podrobností k nalezení v serverovém logu.",
-"Technical details" => "Technické detaily",
-"Remote Address: %s" => "Vzdálená adresa: %s",
-"Request ID: %s" => "ID požadavku: %s",
-"Code: %s" => "Kód: %s",
-"Message: %s" => "Zpráva: %s",
-"File: %s" => "Soubor: %s",
-"Line: %s" => "Řádka: %s",
-"Trace" => "Trasa",
-"Security Warning" => "Bezpečnostní upozornění",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verze vašeho PHP je napadnutelná pomocí techniky \"NULL Byte\" (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Aktualizujte prosím vaši instanci PHP pro bezpečné používání %s.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
-"Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
-"Password" => "Heslo",
-"Storage & database" => "Úložiště & databáze",
-"Data folder" => "Složka s daty",
-"Configure the database" => "Nastavit databázi",
-"Only %s is available." => "Pouze %s je dostupný.",
-"Database user" => "Uživatel databáze",
-"Database password" => "Heslo databáze",
-"Database name" => "Název databáze",
-"Database tablespace" => "Tabulkový prostor databáze",
-"Database host" => "Hostitel databáze",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Bude použita databáze SQLite. Pro větší instalace doporučujeme toto změnit.",
-"Finish setup" => "Dokončit nastavení",
-"Finishing …" => "Dokončuji...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">povolte JavaScript</a> a znovu načtěte stránku.",
-"%s is available. Get more information on how to update." => "%s je dostupná. Získejte více informací k postupu aktualizace.",
-"Log out" => "Odhlásit se",
-"Server side authentication failed!" => "Autentizace na serveru selhala!",
-"Please contact your administrator." => "Kontaktujte prosím vašeho správce.",
-"Forgot your password? Reset it!" => "Zapomenuté heslo? Nastavte si nové!",
-"remember" => "zapamatovat",
-"Log in" => "Přihlásit",
-"Alternative Logins" => "Alternativní přihlášení",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej ty,<br><br>jen ti dávám vědět, že %s sdílí <strong>%s</strong> s tebou.<br><a href=\"%s\">Zobrazit!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
-"This means only administrators can use the instance." => "To znamená, že pouze správci systému mohou aplikaci používat.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktujte, prosím, správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.",
-"Thank you for your patience." => "Děkuji za trpělivost.",
-"You are accessing the server from an untrusted domain." => "Přistupujete na server z nedůvěryhodné domény.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "V závislosti na vaší konfiguraci vám může být, jako administrátorovi, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
-"Add \"%s\" as trusted domain" => "Přidat \"%s\" jako důvěryhodnou doménu",
-"%s will be updated to version %s." => "%s bude aktualizován na verzi %s.",
-"The following apps will be disabled:" => "Následující aplikace budou zakázány:",
-"The theme %s has been disabled." => "Vzhled %s byl zakázán.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Před provedením dalšího kroku se prosím ujistěte, že databáze a konfigurační a datový adresář byly zazálohovány.  ",
-"Start update" => "Spustit aktualizaci",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Abyste zabránili vypršení časového limitu u větších instalací, můžete namísto toho spustit následující příkaz v hlavním adresáři:",
-"This %s instance is currently being updated, which may take a while." => "Tato instalace %s je právě aktualizována a to může chvíli trvat.",
-"This page will refresh itself when the %s instance is available again." => "Tato stránka se automaticky načte poté, co bude opět dostupná instance %s."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js
new file mode 100644
index 00000000000..62231977115
--- /dev/null
+++ b/core/l10n/cy_GB.js
@@ -0,0 +1,95 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Sul",
+    "Monday" : "Llun",
+    "Tuesday" : "Mawrth",
+    "Wednesday" : "Mercher",
+    "Thursday" : "Iau",
+    "Friday" : "Gwener",
+    "Saturday" : "Sadwrn",
+    "January" : "Ionawr",
+    "February" : "Chwefror",
+    "March" : "Mawrth",
+    "April" : "Ebrill",
+    "May" : "Mai",
+    "June" : "Mehefin",
+    "July" : "Gorffennaf",
+    "August" : "Awst",
+    "September" : "Medi",
+    "October" : "Hydref",
+    "November" : "Tachwedd",
+    "December" : "Rhagfyr",
+    "Settings" : "Gosodiadau",
+    "Folder" : "Plygell",
+    "Saving..." : "Yn cadw...",
+    "Reset password" : "Ailosod cyfrinair",
+    "No" : "Na",
+    "Yes" : "Ie",
+    "Choose" : "Dewisiwch",
+    "Ok" : "Iawn",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
+    "Cancel" : "Diddymu",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
+    "Shared" : "Rhannwyd",
+    "Share" : "Rhannu",
+    "Error" : "Gwall",
+    "Error while sharing" : "Gwall wrth rannu",
+    "Error while unsharing" : "Gwall wrth ddad-rannu",
+    "Error while changing permissions" : "Gwall wrth newid caniatâd",
+    "Shared with you and the group {group} by {owner}" : "Rhannwyd â chi a'r grŵp {group} gan {owner}",
+    "Shared with you by {owner}" : "Rhannwyd â chi gan {owner}",
+    "Password protect" : "Diogelu cyfrinair",
+    "Email link to person" : "E-bostio dolen at berson",
+    "Send" : "Anfon",
+    "Set expiration date" : "Gosod dyddiad dod i ben",
+    "Expiration date" : "Dyddiad dod i ben",
+    "group" : "grŵp",
+    "Resharing is not allowed" : "Does dim hawl ail-rannu",
+    "Shared in {item} with {user}" : "Rhannwyd yn {item} â {user}",
+    "Unshare" : "Dad-rannu",
+    "can edit" : "yn gallu golygu",
+    "access control" : "rheolaeth mynediad",
+    "create" : "creu",
+    "update" : "diweddaru",
+    "delete" : "dileu",
+    "Password protected" : "Diogelwyd â chyfrinair",
+    "Error unsetting expiration date" : "Gwall wrth ddad-osod dyddiad dod i ben",
+    "Error setting expiration date" : "Gwall wrth osod dyddiad dod i ben",
+    "Sending ..." : "Yn anfon ...",
+    "Email sent" : "Anfonwyd yr e-bost",
+    "Warning" : "Rhybudd",
+    "The object type is not specified." : "Nid yw'r math o wrthrych wedi cael ei nodi.",
+    "Delete" : "Dileu",
+    "Add" : "Ychwanegu",
+    "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
+    "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
+    "You will receive a link to reset your password via Email." : "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
+    "Username" : "Enw defnyddiwr",
+    "New password" : "Cyfrinair newydd",
+    "Personal" : "Personol",
+    "Users" : "Defnyddwyr",
+    "Apps" : "Pecynnau",
+    "Admin" : "Gweinyddu",
+    "Help" : "Cymorth",
+    "Access forbidden" : "Mynediad wedi'i wahardd",
+    "Security Warning" : "Rhybudd Diogelwch",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
+    "Create an <strong>admin account</strong>" : "Crewch <strong>gyfrif gweinyddol</strong>",
+    "Password" : "Cyfrinair",
+    "Data folder" : "Plygell data",
+    "Configure the database" : "Cyflunio'r gronfa ddata",
+    "Database user" : "Defnyddiwr cronfa ddata",
+    "Database password" : "Cyfrinair cronfa ddata",
+    "Database name" : "Enw cronfa ddata",
+    "Database tablespace" : "Tablespace cronfa ddata",
+    "Database host" : "Gwesteiwr cronfa ddata",
+    "Finish setup" : "Gorffen sefydlu",
+    "%s is available. Get more information on how to update." : "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru.",
+    "Log out" : "Allgofnodi",
+    "remember" : "cofio",
+    "Log in" : "Mewngofnodi",
+    "Alternative Logins" : "Mewngofnodiadau Amgen"
+},
+"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/core/l10n/cy_GB.json b/core/l10n/cy_GB.json
new file mode 100644
index 00000000000..fc9664a8236
--- /dev/null
+++ b/core/l10n/cy_GB.json
@@ -0,0 +1,93 @@
+{ "translations": {
+    "Sunday" : "Sul",
+    "Monday" : "Llun",
+    "Tuesday" : "Mawrth",
+    "Wednesday" : "Mercher",
+    "Thursday" : "Iau",
+    "Friday" : "Gwener",
+    "Saturday" : "Sadwrn",
+    "January" : "Ionawr",
+    "February" : "Chwefror",
+    "March" : "Mawrth",
+    "April" : "Ebrill",
+    "May" : "Mai",
+    "June" : "Mehefin",
+    "July" : "Gorffennaf",
+    "August" : "Awst",
+    "September" : "Medi",
+    "October" : "Hydref",
+    "November" : "Tachwedd",
+    "December" : "Rhagfyr",
+    "Settings" : "Gosodiadau",
+    "Folder" : "Plygell",
+    "Saving..." : "Yn cadw...",
+    "Reset password" : "Ailosod cyfrinair",
+    "No" : "Na",
+    "Yes" : "Ie",
+    "Choose" : "Dewisiwch",
+    "Ok" : "Iawn",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
+    "Cancel" : "Diddymu",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
+    "Shared" : "Rhannwyd",
+    "Share" : "Rhannu",
+    "Error" : "Gwall",
+    "Error while sharing" : "Gwall wrth rannu",
+    "Error while unsharing" : "Gwall wrth ddad-rannu",
+    "Error while changing permissions" : "Gwall wrth newid caniatâd",
+    "Shared with you and the group {group} by {owner}" : "Rhannwyd â chi a'r grŵp {group} gan {owner}",
+    "Shared with you by {owner}" : "Rhannwyd â chi gan {owner}",
+    "Password protect" : "Diogelu cyfrinair",
+    "Email link to person" : "E-bostio dolen at berson",
+    "Send" : "Anfon",
+    "Set expiration date" : "Gosod dyddiad dod i ben",
+    "Expiration date" : "Dyddiad dod i ben",
+    "group" : "grŵp",
+    "Resharing is not allowed" : "Does dim hawl ail-rannu",
+    "Shared in {item} with {user}" : "Rhannwyd yn {item} â {user}",
+    "Unshare" : "Dad-rannu",
+    "can edit" : "yn gallu golygu",
+    "access control" : "rheolaeth mynediad",
+    "create" : "creu",
+    "update" : "diweddaru",
+    "delete" : "dileu",
+    "Password protected" : "Diogelwyd â chyfrinair",
+    "Error unsetting expiration date" : "Gwall wrth ddad-osod dyddiad dod i ben",
+    "Error setting expiration date" : "Gwall wrth osod dyddiad dod i ben",
+    "Sending ..." : "Yn anfon ...",
+    "Email sent" : "Anfonwyd yr e-bost",
+    "Warning" : "Rhybudd",
+    "The object type is not specified." : "Nid yw'r math o wrthrych wedi cael ei nodi.",
+    "Delete" : "Dileu",
+    "Add" : "Ychwanegu",
+    "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
+    "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
+    "You will receive a link to reset your password via Email." : "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
+    "Username" : "Enw defnyddiwr",
+    "New password" : "Cyfrinair newydd",
+    "Personal" : "Personol",
+    "Users" : "Defnyddwyr",
+    "Apps" : "Pecynnau",
+    "Admin" : "Gweinyddu",
+    "Help" : "Cymorth",
+    "Access forbidden" : "Mynediad wedi'i wahardd",
+    "Security Warning" : "Rhybudd Diogelwch",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
+    "Create an <strong>admin account</strong>" : "Crewch <strong>gyfrif gweinyddol</strong>",
+    "Password" : "Cyfrinair",
+    "Data folder" : "Plygell data",
+    "Configure the database" : "Cyflunio'r gronfa ddata",
+    "Database user" : "Defnyddiwr cronfa ddata",
+    "Database password" : "Cyfrinair cronfa ddata",
+    "Database name" : "Enw cronfa ddata",
+    "Database tablespace" : "Tablespace cronfa ddata",
+    "Database host" : "Gwesteiwr cronfa ddata",
+    "Finish setup" : "Gorffen sefydlu",
+    "%s is available. Get more information on how to update." : "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru.",
+    "Log out" : "Allgofnodi",
+    "remember" : "cofio",
+    "Log in" : "Mewngofnodi",
+    "Alternative Logins" : "Mewngofnodiadau Amgen"
+},"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
+}
\ No newline at end of file
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
deleted file mode 100644
index 4b805f11899..00000000000
--- a/core/l10n/cy_GB.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Sul",
-"Monday" => "Llun",
-"Tuesday" => "Mawrth",
-"Wednesday" => "Mercher",
-"Thursday" => "Iau",
-"Friday" => "Gwener",
-"Saturday" => "Sadwrn",
-"January" => "Ionawr",
-"February" => "Chwefror",
-"March" => "Mawrth",
-"April" => "Ebrill",
-"May" => "Mai",
-"June" => "Mehefin",
-"July" => "Gorffennaf",
-"August" => "Awst",
-"September" => "Medi",
-"October" => "Hydref",
-"November" => "Tachwedd",
-"December" => "Rhagfyr",
-"Settings" => "Gosodiadau",
-"Folder" => "Plygell",
-"Saving..." => "Yn cadw...",
-"Reset password" => "Ailosod cyfrinair",
-"No" => "Na",
-"Yes" => "Ie",
-"Choose" => "Dewisiwch",
-"Ok" => "Iawn",
-"_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
-"Cancel" => "Diddymu",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
-"Shared" => "Rhannwyd",
-"Share" => "Rhannu",
-"Error" => "Gwall",
-"Error while sharing" => "Gwall wrth rannu",
-"Error while unsharing" => "Gwall wrth ddad-rannu",
-"Error while changing permissions" => "Gwall wrth newid caniatâd",
-"Shared with you and the group {group} by {owner}" => "Rhannwyd â chi a'r grŵp {group} gan {owner}",
-"Shared with you by {owner}" => "Rhannwyd â chi gan {owner}",
-"Password protect" => "Diogelu cyfrinair",
-"Email link to person" => "E-bostio dolen at berson",
-"Send" => "Anfon",
-"Set expiration date" => "Gosod dyddiad dod i ben",
-"Expiration date" => "Dyddiad dod i ben",
-"group" => "grŵp",
-"Resharing is not allowed" => "Does dim hawl ail-rannu",
-"Shared in {item} with {user}" => "Rhannwyd yn {item} â {user}",
-"Unshare" => "Dad-rannu",
-"can edit" => "yn gallu golygu",
-"access control" => "rheolaeth mynediad",
-"create" => "creu",
-"update" => "diweddaru",
-"delete" => "dileu",
-"Password protected" => "Diogelwyd â chyfrinair",
-"Error unsetting expiration date" => "Gwall wrth ddad-osod dyddiad dod i ben",
-"Error setting expiration date" => "Gwall wrth osod dyddiad dod i ben",
-"Sending ..." => "Yn anfon ...",
-"Email sent" => "Anfonwyd yr e-bost",
-"Warning" => "Rhybudd",
-"The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.",
-"Delete" => "Dileu",
-"Add" => "Ychwanegu",
-"The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
-"Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
-"You will receive a link to reset your password via Email." => "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
-"Username" => "Enw defnyddiwr",
-"New password" => "Cyfrinair newydd",
-"Personal" => "Personol",
-"Users" => "Defnyddwyr",
-"Apps" => "Pecynnau",
-"Admin" => "Gweinyddu",
-"Help" => "Cymorth",
-"Access forbidden" => "Mynediad wedi'i wahardd",
-"Security Warning" => "Rhybudd Diogelwch",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
-"Create an <strong>admin account</strong>" => "Crewch <strong>gyfrif gweinyddol</strong>",
-"Password" => "Cyfrinair",
-"Data folder" => "Plygell data",
-"Configure the database" => "Cyflunio'r gronfa ddata",
-"Database user" => "Defnyddiwr cronfa ddata",
-"Database password" => "Cyfrinair cronfa ddata",
-"Database name" => "Enw cronfa ddata",
-"Database tablespace" => "Tablespace cronfa ddata",
-"Database host" => "Gwesteiwr cronfa ddata",
-"Finish setup" => "Gorffen sefydlu",
-"%s is available. Get more information on how to update." => "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru.",
-"Log out" => "Allgofnodi",
-"remember" => "cofio",
-"Log in" => "Mewngofnodi",
-"Alternative Logins" => "Mewngofnodiadau Amgen"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/core/l10n/da.js b/core/l10n/da.js
new file mode 100644
index 00000000000..c75c3d0dace
--- /dev/null
+++ b/core/l10n/da.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Kunne ikke sende mail til følgende brugere: %s",
+    "Turned on maintenance mode" : "Startede vedligeholdelsestilstand",
+    "Turned off maintenance mode" : "standsede vedligeholdelsestilstand",
+    "Updated database" : "Opdaterede database",
+    "Checked database schema update" : "Tjekket database schema opdatering",
+    "Checked database schema update for apps" : "Tjekkede databaseskemaets opdatering for apps",
+    "Updated \"%s\" to %s" : "Opdaterede \"%s\" til %s",
+    "Disabled incompatible apps: %s" : "Deaktiverer inkompatible apps: %s",
+    "No image or file provided" : "Ingen fil eller billede givet",
+    "Unknown filetype" : "Ukendt filtype",
+    "Invalid image" : "Ugyldigt billede",
+    "No temporary profile picture available, try again" : "Intet midlertidigt profilbillede tilgængeligt, prøv igen",
+    "No crop data provided" : "Ingen beskæringsdata give",
+    "Sunday" : "Søndag",
+    "Monday" : "Mandag",
+    "Tuesday" : "Tirsdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Lørdag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Marts",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Indstillinger",
+    "File" : "Fil",
+    "Folder" : "Mappe",
+    "Image" : "Billede",
+    "Audio" : "Lyd",
+    "Saving..." : "Gemmer...",
+    "Couldn't send reset email. Please contact your administrator." : "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.",
+    "The link to reset your password has been sent to your email. 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." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
+    "I know what I'm doing" : "Jeg ved, hvad jeg har gang i",
+    "Reset password" : "Nulstil kodeord",
+    "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.",
+    "No" : "Nej",
+    "Yes" : "Ja",
+    "Choose" : "Vælg",
+    "Error loading file picker template: {error}" : "Fejl ved indlæsning af filvælger skabelon: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Fejl ved indlæsning af besked skabelon: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"],
+    "One file conflict" : "En filkonflikt",
+    "New Files" : "Nye filer",
+    "Already existing files" : "Allerede eksisterende filer",
+    "Which files do you want to keep?" : "Hvilke filer ønsker du at beholde?",
+    "If you select both versions, the copied file will have a number added to its name." : "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn.",
+    "Cancel" : "Annuller",
+    "Continue" : "Videre",
+    "(all selected)" : "(alle valgt)",
+    "({count} selected)" : "({count} valgt)",
+    "Error loading file exists template" : "Fejl ved inlæsning af; fil eksistere skabelon",
+    "Very weak password" : "Meget svagt kodeord",
+    "Weak password" : "Svagt kodeord",
+    "So-so password" : "Jævnt kodeord",
+    "Good password" : "Godt kodeord",
+    "Strong password" : "Stærkt kodeord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informations-e-mails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
+    "Error occurred while checking server setup" : "Der opstod fejl under tjek af serveropsætningen",
+    "Shared" : "Delt",
+    "Shared with {recipients}" : "Delt med {recipients}",
+    "Share" : "Del",
+    "Error" : "Fejl",
+    "Error while sharing" : "Fejl under deling",
+    "Error while unsharing" : "Fejl under annullering af deling",
+    "Error while changing permissions" : "Fejl under justering af rettigheder",
+    "Shared with you and the group {group} by {owner}" : "Delt med dig og gruppen {group} af {owner}",
+    "Shared with you by {owner}" : "Delt med dig af {owner}",
+    "Share with user or group …" : "Del med bruger eller gruppe ...",
+    "Share link" : "Del link",
+    "The public link will expire no later than {days} days after it is created" : "Det offentlige link udløber senest {days} dage efter det blev oprettet",
+    "Password protect" : "Beskyt med adgangskode",
+    "Choose a password for the public link" : "Vælg et kodeord til det offentlige link",
+    "Allow Public Upload" : "Tillad Offentlig Upload",
+    "Email link to person" : "E-mail link til person",
+    "Send" : "Send",
+    "Set expiration date" : "Vælg udløbsdato",
+    "Expiration date" : "Udløbsdato",
+    "Adding user..." : "Tilføjer bruger...",
+    "group" : "gruppe",
+    "Resharing is not allowed" : "Videredeling ikke tilladt",
+    "Shared in {item} with {user}" : "Delt i {item} med {user}",
+    "Unshare" : "Fjern deling",
+    "notify by email" : "Giv besked med mail",
+    "can share" : "kan dele",
+    "can edit" : "kan redigere",
+    "access control" : "Adgangskontrol",
+    "create" : "opret",
+    "update" : "opdater",
+    "delete" : "slet",
+    "Password protected" : "Beskyttet med adgangskode",
+    "Error unsetting expiration date" : "Fejl ved fjernelse af udløbsdato",
+    "Error setting expiration date" : "Fejl under sætning af udløbsdato",
+    "Sending ..." : "Sender ...",
+    "Email sent" : "E-mail afsendt",
+    "Warning" : "Advarsel",
+    "The object type is not specified." : "Objekttypen er ikke angivet.",
+    "Enter new" : "Indtast nyt",
+    "Delete" : "Slet",
+    "Add" : "Tilføj",
+    "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.",
+    "Updating {productName} to version {version}, this may take a while." : "Opdaterer {productName} til version {version}, det kan tage et stykke tid.",
+    "Please reload the page." : "Genindlæs venligst siden",
+    "The update was unsuccessful." : "Opdateringen mislykkedes.",
+    "The update was successful. Redirecting you to ownCloud now." : "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Kunne ikke nulstille kodeordet, fordi symboludtrykket er ugyldigt",
+    "Couldn't send reset email. Please make sure your username is correct." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Kontroller venligst om dit brugernavnet er korrekt",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren",
+    "%s password reset" : "%s adgangskode nulstillet",
+    "Use the following link to reset your password: {link}" : "Anvend følgende link til at nulstille din adgangskode: {link}",
+    "You will receive a link to reset your password via Email." : "Du vil modtage et link til at nulstille dit kodeord via e-mail.",
+    "Username" : "Brugernavn",
+    "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?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?",
+    "Yes, I really want to reset my password now" : "Ja, Jeg ønsker virkelig at nulstille mit kodeord",
+    "Reset" : "Nulstil",
+    "New password" : "Nyt kodeord",
+    "New Password" : "Ny adgangskode",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!",
+    "For the best results, please consider using a GNU/Linux server instead." : "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.",
+    "Personal" : "Personligt",
+    "Users" : "Brugere",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Hjælp",
+    "Error loading tags" : "Fejl ved indlæsning af tags",
+    "Tag already exists" : "Tag eksistere allerede",
+    "Error deleting tag(s)" : "Fejl ved sletning af tag(s)",
+    "Error tagging" : "Fejl ved tagging",
+    "Error untagging" : "Fejl ved fjernelse af tag",
+    "Error favoriting" : "Fejl ved favoritering",
+    "Error unfavoriting" : "Fejl ved fjernelse af favorisering.",
+    "Access forbidden" : "Adgang forbudt",
+    "File not found" : "Filen blev ikke fundet",
+    "The specified document has not been found on the server." : "Det angivne dokument blev ikke fundet på serveren.",
+    "You can click here to return to %s." : "Du kan klikke her for at gå tilbage til %s.",
+    "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!",
+    "Internal Server Error" : "Intern serverfejl",
+    "The server encountered an internal error and was unable to complete your request." : "Servern stødte på en intern fejl og var ikke i stand til at fuldføre din forespørgsel.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontakt venligst serveradministratoren, hvis denne fejl gentager sig flere gange - medtag venligst de tekniske detaljer nedenfor i din rapport.",
+    "More details can be found in the server log." : "Flere detaljer kan fås i serverloggen.",
+    "Technical details" : "Tekniske detaljer",
+    "Remote Address: %s" : "Fjernadresse: %s",
+    "Request ID: %s" : "Forespørgsels-ID: %s",
+    "Code: %s" : "Kode: %s",
+    "Message: %s" : "Besked: %s",
+    "File: %s" : "Fil: %s",
+    "Line: %s" : "Linje: %s",
+    "Trace" : "Sporing",
+    "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)",
+    "Please update your PHP installation to use %s securely." : "Opdater venligst din PHP installation for at anvende %s sikkert.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
+    "Create an <strong>admin account</strong>" : "Opret en <strong>administratorkonto</strong>",
+    "Password" : "Adgangskode",
+    "Storage & database" : "Lager & database",
+    "Data folder" : "Datamappe",
+    "Configure the database" : "Konfigurer databasen",
+    "Only %s is available." : "Kun %s er tilgængelig.",
+    "Database user" : "Databasebruger",
+    "Database password" : "Databasekodeord",
+    "Database name" : "Navn på database",
+    "Database tablespace" : "Database tabelplads",
+    "Database host" : "Databasehost",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite bliver brugt som database. For større installationer anbefaler vi at ændre dette.",
+    "Finish setup" : "Afslut opsætning",
+    "Finishing …" : "Færdigbehandler ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Applikationen kræver JavaScript for at fungere korrekt. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Slå venligst JavaScript til</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",
+    "Server side authentication failed!" : "Server side godkendelse mislykkedes!",
+    "Please contact your administrator." : "Kontakt venligst din administrator",
+    "Forgot your password? Reset it!" : "Glemt din adgangskode? Nulstil det!",
+    "remember" : "husk",
+    "Log in" : "Log ind",
+    "Alternative Logins" : "Alternative logins",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej med dig,<br><br>Dette er blot for at informere dig om, at %s har delt <strong>%s</strong> med dig.<br><a href=\"%s\">Se det her!</a><br><br>",
+    "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.",
+    "You are accessing the server from an untrusted domain." : "Du tilgår serveren fra et utroværdigt domæne",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontakt venligst din administrator. Hvis du er administrator, konfigurer \"trusted_domain\" indstillingen i config/config.php. Et eksempel kan ses i config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Afhænger af din konfiguration, da du som administrator eventuelt også er i stand til at gøre brug af knappen nedenfor til at tildele tillid til dette domæne.",
+    "Add \"%s\" as trusted domain" : "Tilføj \"%s\" som et troværdigt domæne",
+    "%s will be updated to version %s." : "%s vil blive opdateret til version %s.",
+    "The following apps will be disabled:" : "Følgende apps bliver deaktiveret:",
+    "The theme %s has been disabled." : "Temaet, %s, er blevet deaktiveret.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Sørg venligst for at sikre, at databasen, config-mappen og data-mappen er blevet sikkerhedskopieret inden vi fortsætter.",
+    "Start update" : "Begynd opdatering",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "For at undgå tidsudløb med større installationer, så kan du i stedet køre følgende kommando fra din installationsmappe:",
+    "This %s instance is currently being updated, which may take a while." : "Denne %s-instans bliver i øjeblikket opdateret, hvilket kan tage et stykke tid.",
+    "This page will refresh itself when the %s instance is available again." : "Denne side vil genopfriske sig selv, når %s-instancen er tilgængelig igen."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/da.json b/core/l10n/da.json
new file mode 100644
index 00000000000..01d09334568
--- /dev/null
+++ b/core/l10n/da.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Kunne ikke sende mail til følgende brugere: %s",
+    "Turned on maintenance mode" : "Startede vedligeholdelsestilstand",
+    "Turned off maintenance mode" : "standsede vedligeholdelsestilstand",
+    "Updated database" : "Opdaterede database",
+    "Checked database schema update" : "Tjekket database schema opdatering",
+    "Checked database schema update for apps" : "Tjekkede databaseskemaets opdatering for apps",
+    "Updated \"%s\" to %s" : "Opdaterede \"%s\" til %s",
+    "Disabled incompatible apps: %s" : "Deaktiverer inkompatible apps: %s",
+    "No image or file provided" : "Ingen fil eller billede givet",
+    "Unknown filetype" : "Ukendt filtype",
+    "Invalid image" : "Ugyldigt billede",
+    "No temporary profile picture available, try again" : "Intet midlertidigt profilbillede tilgængeligt, prøv igen",
+    "No crop data provided" : "Ingen beskæringsdata give",
+    "Sunday" : "Søndag",
+    "Monday" : "Mandag",
+    "Tuesday" : "Tirsdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Lørdag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Marts",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Indstillinger",
+    "File" : "Fil",
+    "Folder" : "Mappe",
+    "Image" : "Billede",
+    "Audio" : "Lyd",
+    "Saving..." : "Gemmer...",
+    "Couldn't send reset email. Please contact your administrator." : "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.",
+    "The link to reset your password has been sent to your email. 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." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
+    "I know what I'm doing" : "Jeg ved, hvad jeg har gang i",
+    "Reset password" : "Nulstil kodeord",
+    "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.",
+    "No" : "Nej",
+    "Yes" : "Ja",
+    "Choose" : "Vælg",
+    "Error loading file picker template: {error}" : "Fejl ved indlæsning af filvælger skabelon: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Fejl ved indlæsning af besked skabelon: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"],
+    "One file conflict" : "En filkonflikt",
+    "New Files" : "Nye filer",
+    "Already existing files" : "Allerede eksisterende filer",
+    "Which files do you want to keep?" : "Hvilke filer ønsker du at beholde?",
+    "If you select both versions, the copied file will have a number added to its name." : "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn.",
+    "Cancel" : "Annuller",
+    "Continue" : "Videre",
+    "(all selected)" : "(alle valgt)",
+    "({count} selected)" : "({count} valgt)",
+    "Error loading file exists template" : "Fejl ved inlæsning af; fil eksistere skabelon",
+    "Very weak password" : "Meget svagt kodeord",
+    "Weak password" : "Svagt kodeord",
+    "So-so password" : "Jævnt kodeord",
+    "Good password" : "Godt kodeord",
+    "Strong password" : "Stærkt kodeord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informations-e-mails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
+    "Error occurred while checking server setup" : "Der opstod fejl under tjek af serveropsætningen",
+    "Shared" : "Delt",
+    "Shared with {recipients}" : "Delt med {recipients}",
+    "Share" : "Del",
+    "Error" : "Fejl",
+    "Error while sharing" : "Fejl under deling",
+    "Error while unsharing" : "Fejl under annullering af deling",
+    "Error while changing permissions" : "Fejl under justering af rettigheder",
+    "Shared with you and the group {group} by {owner}" : "Delt med dig og gruppen {group} af {owner}",
+    "Shared with you by {owner}" : "Delt med dig af {owner}",
+    "Share with user or group …" : "Del med bruger eller gruppe ...",
+    "Share link" : "Del link",
+    "The public link will expire no later than {days} days after it is created" : "Det offentlige link udløber senest {days} dage efter det blev oprettet",
+    "Password protect" : "Beskyt med adgangskode",
+    "Choose a password for the public link" : "Vælg et kodeord til det offentlige link",
+    "Allow Public Upload" : "Tillad Offentlig Upload",
+    "Email link to person" : "E-mail link til person",
+    "Send" : "Send",
+    "Set expiration date" : "Vælg udløbsdato",
+    "Expiration date" : "Udløbsdato",
+    "Adding user..." : "Tilføjer bruger...",
+    "group" : "gruppe",
+    "Resharing is not allowed" : "Videredeling ikke tilladt",
+    "Shared in {item} with {user}" : "Delt i {item} med {user}",
+    "Unshare" : "Fjern deling",
+    "notify by email" : "Giv besked med mail",
+    "can share" : "kan dele",
+    "can edit" : "kan redigere",
+    "access control" : "Adgangskontrol",
+    "create" : "opret",
+    "update" : "opdater",
+    "delete" : "slet",
+    "Password protected" : "Beskyttet med adgangskode",
+    "Error unsetting expiration date" : "Fejl ved fjernelse af udløbsdato",
+    "Error setting expiration date" : "Fejl under sætning af udløbsdato",
+    "Sending ..." : "Sender ...",
+    "Email sent" : "E-mail afsendt",
+    "Warning" : "Advarsel",
+    "The object type is not specified." : "Objekttypen er ikke angivet.",
+    "Enter new" : "Indtast nyt",
+    "Delete" : "Slet",
+    "Add" : "Tilføj",
+    "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.",
+    "Updating {productName} to version {version}, this may take a while." : "Opdaterer {productName} til version {version}, det kan tage et stykke tid.",
+    "Please reload the page." : "Genindlæs venligst siden",
+    "The update was unsuccessful." : "Opdateringen mislykkedes.",
+    "The update was successful. Redirecting you to ownCloud now." : "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Kunne ikke nulstille kodeordet, fordi symboludtrykket er ugyldigt",
+    "Couldn't send reset email. Please make sure your username is correct." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Kontroller venligst om dit brugernavnet er korrekt",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren",
+    "%s password reset" : "%s adgangskode nulstillet",
+    "Use the following link to reset your password: {link}" : "Anvend følgende link til at nulstille din adgangskode: {link}",
+    "You will receive a link to reset your password via Email." : "Du vil modtage et link til at nulstille dit kodeord via e-mail.",
+    "Username" : "Brugernavn",
+    "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?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?",
+    "Yes, I really want to reset my password now" : "Ja, Jeg ønsker virkelig at nulstille mit kodeord",
+    "Reset" : "Nulstil",
+    "New password" : "Nyt kodeord",
+    "New Password" : "Ny adgangskode",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!",
+    "For the best results, please consider using a GNU/Linux server instead." : "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.",
+    "Personal" : "Personligt",
+    "Users" : "Brugere",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Hjælp",
+    "Error loading tags" : "Fejl ved indlæsning af tags",
+    "Tag already exists" : "Tag eksistere allerede",
+    "Error deleting tag(s)" : "Fejl ved sletning af tag(s)",
+    "Error tagging" : "Fejl ved tagging",
+    "Error untagging" : "Fejl ved fjernelse af tag",
+    "Error favoriting" : "Fejl ved favoritering",
+    "Error unfavoriting" : "Fejl ved fjernelse af favorisering.",
+    "Access forbidden" : "Adgang forbudt",
+    "File not found" : "Filen blev ikke fundet",
+    "The specified document has not been found on the server." : "Det angivne dokument blev ikke fundet på serveren.",
+    "You can click here to return to %s." : "Du kan klikke her for at gå tilbage til %s.",
+    "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!",
+    "Internal Server Error" : "Intern serverfejl",
+    "The server encountered an internal error and was unable to complete your request." : "Servern stødte på en intern fejl og var ikke i stand til at fuldføre din forespørgsel.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontakt venligst serveradministratoren, hvis denne fejl gentager sig flere gange - medtag venligst de tekniske detaljer nedenfor i din rapport.",
+    "More details can be found in the server log." : "Flere detaljer kan fås i serverloggen.",
+    "Technical details" : "Tekniske detaljer",
+    "Remote Address: %s" : "Fjernadresse: %s",
+    "Request ID: %s" : "Forespørgsels-ID: %s",
+    "Code: %s" : "Kode: %s",
+    "Message: %s" : "Besked: %s",
+    "File: %s" : "Fil: %s",
+    "Line: %s" : "Linje: %s",
+    "Trace" : "Sporing",
+    "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)",
+    "Please update your PHP installation to use %s securely." : "Opdater venligst din PHP installation for at anvende %s sikkert.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
+    "Create an <strong>admin account</strong>" : "Opret en <strong>administratorkonto</strong>",
+    "Password" : "Adgangskode",
+    "Storage & database" : "Lager & database",
+    "Data folder" : "Datamappe",
+    "Configure the database" : "Konfigurer databasen",
+    "Only %s is available." : "Kun %s er tilgængelig.",
+    "Database user" : "Databasebruger",
+    "Database password" : "Databasekodeord",
+    "Database name" : "Navn på database",
+    "Database tablespace" : "Database tabelplads",
+    "Database host" : "Databasehost",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite bliver brugt som database. For større installationer anbefaler vi at ændre dette.",
+    "Finish setup" : "Afslut opsætning",
+    "Finishing …" : "Færdigbehandler ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Applikationen kræver JavaScript for at fungere korrekt. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Slå venligst JavaScript til</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",
+    "Server side authentication failed!" : "Server side godkendelse mislykkedes!",
+    "Please contact your administrator." : "Kontakt venligst din administrator",
+    "Forgot your password? Reset it!" : "Glemt din adgangskode? Nulstil det!",
+    "remember" : "husk",
+    "Log in" : "Log ind",
+    "Alternative Logins" : "Alternative logins",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej med dig,<br><br>Dette er blot for at informere dig om, at %s har delt <strong>%s</strong> med dig.<br><a href=\"%s\">Se det her!</a><br><br>",
+    "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.",
+    "You are accessing the server from an untrusted domain." : "Du tilgår serveren fra et utroværdigt domæne",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontakt venligst din administrator. Hvis du er administrator, konfigurer \"trusted_domain\" indstillingen i config/config.php. Et eksempel kan ses i config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Afhænger af din konfiguration, da du som administrator eventuelt også er i stand til at gøre brug af knappen nedenfor til at tildele tillid til dette domæne.",
+    "Add \"%s\" as trusted domain" : "Tilføj \"%s\" som et troværdigt domæne",
+    "%s will be updated to version %s." : "%s vil blive opdateret til version %s.",
+    "The following apps will be disabled:" : "Følgende apps bliver deaktiveret:",
+    "The theme %s has been disabled." : "Temaet, %s, er blevet deaktiveret.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Sørg venligst for at sikre, at databasen, config-mappen og data-mappen er blevet sikkerhedskopieret inden vi fortsætter.",
+    "Start update" : "Begynd opdatering",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "For at undgå tidsudløb med større installationer, så kan du i stedet køre følgende kommando fra din installationsmappe:",
+    "This %s instance is currently being updated, which may take a while." : "Denne %s-instans bliver i øjeblikket opdateret, hvilket kan tage et stykke tid.",
+    "This page will refresh itself when the %s instance is available again." : "Denne side vil genopfriske sig selv, når %s-instancen er tilgængelig igen."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/da.php b/core/l10n/da.php
deleted file mode 100644
index ce415eca549..00000000000
--- a/core/l10n/da.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Kunne ikke sende mail til følgende brugere: %s",
-"Turned on maintenance mode" => "Startede vedligeholdelsestilstand",
-"Turned off maintenance mode" => "standsede vedligeholdelsestilstand",
-"Updated database" => "Opdaterede database",
-"Checked database schema update" => "Tjekket database schema opdatering",
-"Checked database schema update for apps" => "Tjekkede databaseskemaets opdatering for apps",
-"Updated \"%s\" to %s" => "Opdaterede \"%s\" til %s",
-"Disabled incompatible apps: %s" => "Deaktiverer inkompatible apps: %s",
-"No image or file provided" => "Ingen fil eller billede givet",
-"Unknown filetype" => "Ukendt filtype",
-"Invalid image" => "Ugyldigt billede",
-"No temporary profile picture available, try again" => "Intet midlertidigt profilbillede tilgængeligt, prøv igen",
-"No crop data provided" => "Ingen beskæringsdata give",
-"Sunday" => "Søndag",
-"Monday" => "Mandag",
-"Tuesday" => "Tirsdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Lørdag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Marts",
-"April" => "April",
-"May" => "Maj",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "December",
-"Settings" => "Indstillinger",
-"File" => "Fil",
-"Folder" => "Mappe",
-"Image" => "Billede",
-"Audio" => "Lyd",
-"Saving..." => "Gemmer...",
-"Couldn't send reset email. Please contact your administrator." => "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.",
-"The link to reset your password has been sent to your email. 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." => "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
-"I know what I'm doing" => "Jeg ved, hvad jeg har gang i",
-"Reset password" => "Nulstil kodeord",
-"Password can not be changed. Please contact your administrator." => "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.",
-"No" => "Nej",
-"Yes" => "Ja",
-"Choose" => "Vælg",
-"Error loading file picker template: {error}" => "Fejl ved indlæsning af filvælger skabelon: {error}",
-"Ok" => "OK",
-"Error loading message template: {error}" => "Fejl ved indlæsning af besked skabelon: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
-"One file conflict" => "En filkonflikt",
-"New Files" => "Nye filer",
-"Already existing files" => "Allerede eksisterende filer",
-"Which files do you want to keep?" => "Hvilke filer ønsker du at beholde?",
-"If you select both versions, the copied file will have a number added to its name." => "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn.",
-"Cancel" => "Annuller",
-"Continue" => "Videre",
-"(all selected)" => "(alle valgt)",
-"({count} selected)" => "({count} valgt)",
-"Error loading file exists template" => "Fejl ved inlæsning af; fil eksistere skabelon",
-"Very weak password" => "Meget svagt kodeord",
-"Weak password" => "Svagt kodeord",
-"So-so password" => "Jævnt kodeord",
-"Good password" => "Godt kodeord",
-"Strong password" => "Stærkt kodeord",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informations-e-mails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
-"Error occurred while checking server setup" => "Der opstod fejl under tjek af serveropsætningen",
-"Shared" => "Delt",
-"Shared with {recipients}" => "Delt med {recipients}",
-"Share" => "Del",
-"Error" => "Fejl",
-"Error while sharing" => "Fejl under deling",
-"Error while unsharing" => "Fejl under annullering af deling",
-"Error while changing permissions" => "Fejl under justering af rettigheder",
-"Shared with you and the group {group} by {owner}" => "Delt med dig og gruppen {group} af {owner}",
-"Shared with you by {owner}" => "Delt med dig af {owner}",
-"Share with user or group …" => "Del med bruger eller gruppe ...",
-"Share link" => "Del link",
-"The public link will expire no later than {days} days after it is created" => "Det offentlige link udløber senest {days} dage efter det blev oprettet",
-"Password protect" => "Beskyt med adgangskode",
-"Choose a password for the public link" => "Vælg et kodeord til det offentlige link",
-"Allow Public Upload" => "Tillad Offentlig Upload",
-"Email link to person" => "E-mail link til person",
-"Send" => "Send",
-"Set expiration date" => "Vælg udløbsdato",
-"Expiration date" => "Udløbsdato",
-"Adding user..." => "Tilføjer bruger...",
-"group" => "gruppe",
-"Resharing is not allowed" => "Videredeling ikke tilladt",
-"Shared in {item} with {user}" => "Delt i {item} med {user}",
-"Unshare" => "Fjern deling",
-"notify by email" => "Giv besked med mail",
-"can share" => "kan dele",
-"can edit" => "kan redigere",
-"access control" => "Adgangskontrol",
-"create" => "opret",
-"update" => "opdater",
-"delete" => "slet",
-"Password protected" => "Beskyttet med adgangskode",
-"Error unsetting expiration date" => "Fejl ved fjernelse af udløbsdato",
-"Error setting expiration date" => "Fejl under sætning af udløbsdato",
-"Sending ..." => "Sender ...",
-"Email sent" => "E-mail afsendt",
-"Warning" => "Advarsel",
-"The object type is not specified." => "Objekttypen er ikke angivet.",
-"Enter new" => "Indtast nyt",
-"Delete" => "Slet",
-"Add" => "Tilføj",
-"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.",
-"Updating {productName} to version {version}, this may take a while." => "Opdaterer {productName} til version {version}, det kan tage et stykke tid.",
-"Please reload the page." => "Genindlæs venligst siden",
-"The update was unsuccessful." => "Opdateringen mislykkedes.",
-"The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
-"Couldn't reset password because the token is invalid" => "Kunne ikke nulstille kodeordet, fordi symboludtrykket er ugyldigt",
-"Couldn't send reset email. Please make sure your username is correct." => "Der opstod et problem under afsendelse af nulstillings-e-mailen. Kontroller venligst om dit brugernavnet er korrekt",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren",
-"%s password reset" => "%s adgangskode nulstillet",
-"Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
-"You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via e-mail.",
-"Username" => "Brugernavn",
-"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?" => "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?",
-"Yes, I really want to reset my password now" => "Ja, Jeg ønsker virkelig at nulstille mit kodeord",
-"Reset" => "Nulstil",
-"New password" => "Nyt kodeord",
-"New Password" => "Ny adgangskode",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!",
-"For the best results, please consider using a GNU/Linux server instead." => "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.",
-"Personal" => "Personligt",
-"Users" => "Brugere",
-"Apps" => "Apps",
-"Admin" => "Admin",
-"Help" => "Hjælp",
-"Error loading tags" => "Fejl ved indlæsning af tags",
-"Tag already exists" => "Tag eksistere allerede",
-"Error deleting tag(s)" => "Fejl ved sletning af tag(s)",
-"Error tagging" => "Fejl ved tagging",
-"Error untagging" => "Fejl ved fjernelse af tag",
-"Error favoriting" => "Fejl ved favoritering",
-"Error unfavoriting" => "Fejl ved fjernelse af favorisering.",
-"Access forbidden" => "Adgang forbudt",
-"File not found" => "Filen blev ikke fundet",
-"The specified document has not been found on the server." => "Det angivne dokument blev ikke fundet på serveren.",
-"You can click here to return to %s." => "Du kan klikke her for at gå tilbage til %s.",
-"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!",
-"Internal Server Error" => "Intern serverfejl",
-"The server encountered an internal error and was unable to complete your request." => "Servern stødte på en intern fejl og var ikke i stand til at fuldføre din forespørgsel.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Kontakt venligst serveradministratoren, hvis denne fejl gentager sig flere gange - medtag venligst de tekniske detaljer nedenfor i din rapport.",
-"More details can be found in the server log." => "Flere detaljer kan fås i serverloggen.",
-"Technical details" => "Tekniske detaljer",
-"Remote Address: %s" => "Fjernadresse: %s",
-"Request ID: %s" => "Forespørgsels-ID: %s",
-"Code: %s" => "Kode: %s",
-"Message: %s" => "Besked: %s",
-"File: %s" => "Fil: %s",
-"Line: %s" => "Linje: %s",
-"Trace" => "Sporing",
-"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)",
-"Please update your PHP installation to use %s securely." => "Opdater venligst din PHP installation for at anvende %s sikkert.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
-"Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
-"Password" => "Adgangskode",
-"Storage & database" => "Lager & database",
-"Data folder" => "Datamappe",
-"Configure the database" => "Konfigurer databasen",
-"Only %s is available." => "Kun %s er tilgængelig.",
-"Database user" => "Databasebruger",
-"Database password" => "Databasekodeord",
-"Database name" => "Navn på database",
-"Database tablespace" => "Database tabelplads",
-"Database host" => "Databasehost",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite bliver brugt som database. For større installationer anbefaler vi at ændre dette.",
-"Finish setup" => "Afslut opsætning",
-"Finishing …" => "Færdigbehandler ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Applikationen kræver JavaScript for at fungere korrekt. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Slå venligst JavaScript til</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",
-"Server side authentication failed!" => "Server side godkendelse mislykkedes!",
-"Please contact your administrator." => "Kontakt venligst din administrator",
-"Forgot your password? Reset it!" => "Glemt din adgangskode? Nulstil det!",
-"remember" => "husk",
-"Log in" => "Log ind",
-"Alternative Logins" => "Alternative logins",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej med dig,<br><br>Dette er blot for at informere dig om, at %s har delt <strong>%s</strong> med dig.<br><a href=\"%s\">Se det her!</a><br><br>",
-"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.",
-"You are accessing the server from an untrusted domain." => "Du tilgår serveren fra et utroværdigt domæne",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Kontakt venligst din administrator. Hvis du er administrator, konfigurer \"trusted_domain\" indstillingen i config/config.php. Et eksempel kan ses i config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Afhænger af din konfiguration, da du som administrator eventuelt også er i stand til at gøre brug af knappen nedenfor til at tildele tillid til dette domæne.",
-"Add \"%s\" as trusted domain" => "Tilføj \"%s\" som et troværdigt domæne",
-"%s will be updated to version %s." => "%s vil blive opdateret til version %s.",
-"The following apps will be disabled:" => "Følgende apps bliver deaktiveret:",
-"The theme %s has been disabled." => "Temaet, %s, er blevet deaktiveret.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Sørg venligst for at sikre, at databasen, config-mappen og data-mappen er blevet sikkerhedskopieret inden vi fortsætter.",
-"Start update" => "Begynd opdatering",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "For at undgå tidsudløb med større installationer, så kan du i stedet køre følgende kommando fra din installationsmappe:",
-"This %s instance is currently being updated, which may take a while." => "Denne %s-instans bliver i øjeblikket opdateret, hvilket kan tage et stykke tid.",
-"This page will refresh itself when the %s instance is available again." => "Denne side vil genopfriske sig selv, når %s-instancen er tilgængelig igen."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de.js b/core/l10n/de.js
new file mode 100644
index 00000000000..1fda0e1deae
--- /dev/null
+++ b/core/l10n/de.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
+    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
+    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
+    "Updated database" : "Datenbank aktualisiert",
+    "Checked database schema update" : "Datenbank-Schemenaktualisierung geprüft",
+    "Checked database schema update for apps" : "Datenbank-Schemenaktualisierung für Apps geprüft",
+    "Updated \"%s\" to %s" : "\"%s\" zu %s aktualisiert",
+    "Disabled incompatible apps: %s" : "Deaktivierte inkompatible Apps: %s",
+    "No image or file provided" : "Kein Bild oder Datei zur Verfügung gestellt",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "No temporary profile picture available, try again" : "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal",
+    "No crop data provided" : "Keine Zuschnittdaten zur Verfügung gestellt",
+    "Sunday" : "Sonntag",
+    "Monday" : "Montag",
+    "Tuesday" : "Dienstag",
+    "Wednesday" : "Mittwoch",
+    "Thursday" : "Donnerstag",
+    "Friday" : "Freitag",
+    "Saturday" : "Samstag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "März",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Dezember",
+    "Settings" : "Einstellungen",
+    "File" : "Datei",
+    "Folder" : "Ordner",
+    "Image" : "Bild",
+    "Audio" : "Audio",
+    "Saving..." : "Speichern...",
+    "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
+    "The link to reset your password has been sent to your email. 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." : "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
+    "I know what I'm doing" : "Ich weiß, was ich mache",
+    "Reset password" : "Passwort zurücksetzen",
+    "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Error loading file picker template: {error}" : "Fehler beim Laden der Dateiauswahlvorlage: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Fehler beim Laden der Nachrichtenvorlage: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} Dateikonflikt","{count} Dateikonflikte"],
+    "One file conflict" : "Ein Dateikonflikt",
+    "New Files" : "Neue Dateien",
+    "Already existing files" : "Die Dateien existieren bereits",
+    "Which files do you want to keep?" : "Welche Dateien möchtest Du behalten?",
+    "If you select both versions, the copied file will have a number added to its name." : "Wenn Du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
+    "Cancel" : "Abbrechen",
+    "Continue" : "Fortsetzen",
+    "(all selected)" : "(Alle ausgewählt)",
+    "({count} selected)" : "({count} ausgewählt)",
+    "Error loading file exists template" : "Fehler beim Laden der vorhanden Dateivorlage",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Durchschnittliches Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.",
+    "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
+    "Shared" : "Geteilt",
+    "Shared with {recipients}" : "Geteilt mit {recipients}",
+    "Share" : "Teilen",
+    "Error" : "Fehler",
+    "Error while sharing" : "Fehler beim Teilen",
+    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
+    "Error while changing permissions" : "Fehler beim Ändern der Rechte",
+    "Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
+    "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
+    "Share with user or group …" : "Mit Benutzer oder Gruppe teilen ....",
+    "Share link" : "Link Teilen",
+    "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+    "Password protect" : "Passwortschutz",
+    "Choose a password for the public link" : "Wählen Sie ein Passwort für den öffentlichen Link",
+    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
+    "Email link to person" : "Link per E-Mail verschicken",
+    "Send" : "Senden",
+    "Set expiration date" : "Setze ein Ablaufdatum",
+    "Expiration date" : "Ablaufdatum",
+    "Adding user..." : "Benutzer wird hinzugefügt …",
+    "group" : "Gruppe",
+    "Resharing is not allowed" : "Weiterverteilen ist nicht erlaubt",
+    "Shared in {item} with {user}" : "Für {user} in {item} freigegeben",
+    "Unshare" : "Freigabe aufheben",
+    "notify by email" : "Per E-Mail informieren",
+    "can share" : "Kann teilen",
+    "can edit" : "kann bearbeiten",
+    "access control" : "Zugriffskontrolle",
+    "create" : "erstellen",
+    "update" : "aktualisieren",
+    "delete" : "löschen",
+    "Password protected" : "Durch ein Passwort geschützt",
+    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
+    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
+    "Sending ..." : "Sende ...",
+    "Email sent" : "E-Mail wurde verschickt",
+    "Warning" : "Warnung",
+    "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
+    "Enter new" : "Neuen eingeben",
+    "Delete" : "Löschen",
+    "Add" : "Hinzufügen",
+    "Edit tags" : "Schlagwörter bearbeiten",
+    "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
+    "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
+    "Please reload the page." : "Bitte lade diese Seite neu.",
+    "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
+    "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
+    "Couldn't reset password because the token is invalid" : "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
+    "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Stelle sicher, dass Dein Nutzername korrekt ist.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
+    "%s password reset" : "%s-Passwort zurücksetzen",
+    "Use the following link to reset your password: {link}" : "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
+    "You will receive a link to reset your password via Email." : "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
+    "Username" : "Benutzername",
+    "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?" : "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?",
+    "Yes, I really want to reset my password now" : "Ja, ich will mein Passwort jetzt zurücksetzen",
+    "Reset" : "Zurücksetzen",
+    "New password" : "Neues Passwort",
+    "New Password" : "Neues Passwort",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
+    "Personal" : "Persönlich",
+    "Users" : "Benutzer",
+    "Apps" : "Apps",
+    "Admin" : "Administration",
+    "Help" : "Hilfe",
+    "Error loading tags" : "Fehler beim Laden der Schlagwörter",
+    "Tag already exists" : "Schlagwort ist bereits vorhanden",
+    "Error deleting tag(s)" : "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter",
+    "Error tagging" : "Fehler beim Hinzufügen der Schlagwörter",
+    "Error untagging" : "Fehler beim Entfernen der Schlagwörter",
+    "Error favoriting" : "Fehler beim Favorisieren",
+    "Error unfavoriting" : "Fehler beim Entfernen aus den Favoriten",
+    "Access forbidden" : "Zugriff verboten",
+    "File not found" : "Datei nicht gefunden",
+    "The specified document has not been found on the server." : "Das ausgewählte Dokument wurde auf dem Server nicht gefunden.",
+    "You can click here to return to %s." : "Du kannst zur Rückkehr zu %s hier klicken.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\nich wollte Dich nur wissen lassen, dass %s %s mit Dir teilt.\nSchaue es Dir an: %s\n\n",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Hallo!",
+    "Internal Server Error" : "Interner Server-Fehler",
+    "The server encountered an internal error and was unable to complete your request." : "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Bitte wende Dich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt. Füge deinem Bericht, bitte die untenstehenden technischen Details hinzu.",
+    "More details can be found in the server log." : "Weitere Details können im Serverprotokoll gefunden werden.",
+    "Technical details" : "Technische Details",
+    "Remote Address: %s" : "IP Adresse: %s",
+    "Request ID: %s" : "Anforderungskennung: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Nachricht: %s",
+    "File: %s" : "Datei: %s",
+    "Line: %s" : "Zeile: %s",
+    "Trace" : "Spur",
+    "Security Warning" : "Sicherheitswarnung",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
+    "Please update your PHP installation to use %s securely." : "Bitte aktualisiere Deine PHP-Installation um %s sicher nutzen zu können.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
+    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Password" : "Passwort",
+    "Storage & database" : "Speicher & Datenbank",
+    "Data folder" : "Datenverzeichnis",
+    "Configure the database" : "Datenbank einrichten",
+    "Only %s is available." : "Es sind nur %s verfügbar.",
+    "Database user" : "Datenbank-Benutzer",
+    "Database password" : "Datenbank-Passwort",
+    "Database name" : "Datenbank-Name",
+    "Database tablespace" : "Datenbank-Tablespace",
+    "Database host" : "Datenbank-Host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dies zu ändern.",
+    "Finish setup" : "Installation abschließen",
+    "Finishing …" : "Abschließen ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betrieb.  Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiviere JavaScript</a> und lade diese Seite neu.",
+    "%s is available. Get more information on how to update." : "%s ist verfügbar. Hole weitere Informationen zu Aktualisierungen ein.",
+    "Log out" : "Abmelden",
+    "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
+    "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.",
+    "Forgot your password? Reset it!" : "Passwort vergessen? Setze es zurück!",
+    "remember" : "merken",
+    "Log in" : "Einloggen",
+    "Alternative Logins" : "Alternative Logins",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>wir möchten dich nur wissen lassen, dass %s <strong>%s</strong> mit dir geteilt hat.<br><a href=\"%s\">Ansehen!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
+    "This means only administrators can use the instance." : "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktiere Deinen Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
+    "Thank you for your patience." : "Vielen Dank für Deine Geduld.",
+    "You are accessing the server from an untrusted domain." : "Du greifst von einer nicht vertrauenswürdigen Domain auf den Server zu.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktiere Deinen Administrator. Wenn du aktuell Administrator dieser Instanz bist, konfiguriere bitte die \"trusted_domain\" - Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit gestellt.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Abhängig vonDeiner Konfiguration kannst Du auch als Administrator, zum Vertrauen dieser Domain, den unteren Button verwenden.",
+    "Add \"%s\" as trusted domain" : "\"%s\" als vertrauenswürdige Domain hinzufügen",
+    "%s will be updated to version %s." : "%s wird auf Version %s aktualisiert.",
+    "The following apps will be disabled:" : "Die folgenden Apps werden deaktiviert:",
+    "The theme %s has been disabled." : "Das Theme %s wurde deaktiviert.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurde.",
+    "Start update" : "Aktualisierung starten",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen kannst Du stattdessen den folgenden Befehl in Deinem Installationsverzeichnis ausführen:",
+    "This %s instance is currently being updated, which may take a while." : "Diese %s - Instanz wird gerade aktualisiert, was eine Weile dauert.",
+    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisert sich automatisch, wenn die %s - Instanz wieder verfügbar ist."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/de.json b/core/l10n/de.json
new file mode 100644
index 00000000000..42f74fe126f
--- /dev/null
+++ b/core/l10n/de.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
+    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
+    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
+    "Updated database" : "Datenbank aktualisiert",
+    "Checked database schema update" : "Datenbank-Schemenaktualisierung geprüft",
+    "Checked database schema update for apps" : "Datenbank-Schemenaktualisierung für Apps geprüft",
+    "Updated \"%s\" to %s" : "\"%s\" zu %s aktualisiert",
+    "Disabled incompatible apps: %s" : "Deaktivierte inkompatible Apps: %s",
+    "No image or file provided" : "Kein Bild oder Datei zur Verfügung gestellt",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "No temporary profile picture available, try again" : "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal",
+    "No crop data provided" : "Keine Zuschnittdaten zur Verfügung gestellt",
+    "Sunday" : "Sonntag",
+    "Monday" : "Montag",
+    "Tuesday" : "Dienstag",
+    "Wednesday" : "Mittwoch",
+    "Thursday" : "Donnerstag",
+    "Friday" : "Freitag",
+    "Saturday" : "Samstag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "März",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Dezember",
+    "Settings" : "Einstellungen",
+    "File" : "Datei",
+    "Folder" : "Ordner",
+    "Image" : "Bild",
+    "Audio" : "Audio",
+    "Saving..." : "Speichern...",
+    "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
+    "The link to reset your password has been sent to your email. 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." : "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
+    "I know what I'm doing" : "Ich weiß, was ich mache",
+    "Reset password" : "Passwort zurücksetzen",
+    "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Error loading file picker template: {error}" : "Fehler beim Laden der Dateiauswahlvorlage: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Fehler beim Laden der Nachrichtenvorlage: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} Dateikonflikt","{count} Dateikonflikte"],
+    "One file conflict" : "Ein Dateikonflikt",
+    "New Files" : "Neue Dateien",
+    "Already existing files" : "Die Dateien existieren bereits",
+    "Which files do you want to keep?" : "Welche Dateien möchtest Du behalten?",
+    "If you select both versions, the copied file will have a number added to its name." : "Wenn Du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
+    "Cancel" : "Abbrechen",
+    "Continue" : "Fortsetzen",
+    "(all selected)" : "(Alle ausgewählt)",
+    "({count} selected)" : "({count} ausgewählt)",
+    "Error loading file exists template" : "Fehler beim Laden der vorhanden Dateivorlage",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Durchschnittliches Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.",
+    "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
+    "Shared" : "Geteilt",
+    "Shared with {recipients}" : "Geteilt mit {recipients}",
+    "Share" : "Teilen",
+    "Error" : "Fehler",
+    "Error while sharing" : "Fehler beim Teilen",
+    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
+    "Error while changing permissions" : "Fehler beim Ändern der Rechte",
+    "Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
+    "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
+    "Share with user or group …" : "Mit Benutzer oder Gruppe teilen ....",
+    "Share link" : "Link Teilen",
+    "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+    "Password protect" : "Passwortschutz",
+    "Choose a password for the public link" : "Wählen Sie ein Passwort für den öffentlichen Link",
+    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
+    "Email link to person" : "Link per E-Mail verschicken",
+    "Send" : "Senden",
+    "Set expiration date" : "Setze ein Ablaufdatum",
+    "Expiration date" : "Ablaufdatum",
+    "Adding user..." : "Benutzer wird hinzugefügt …",
+    "group" : "Gruppe",
+    "Resharing is not allowed" : "Weiterverteilen ist nicht erlaubt",
+    "Shared in {item} with {user}" : "Für {user} in {item} freigegeben",
+    "Unshare" : "Freigabe aufheben",
+    "notify by email" : "Per E-Mail informieren",
+    "can share" : "Kann teilen",
+    "can edit" : "kann bearbeiten",
+    "access control" : "Zugriffskontrolle",
+    "create" : "erstellen",
+    "update" : "aktualisieren",
+    "delete" : "löschen",
+    "Password protected" : "Durch ein Passwort geschützt",
+    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
+    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
+    "Sending ..." : "Sende ...",
+    "Email sent" : "E-Mail wurde verschickt",
+    "Warning" : "Warnung",
+    "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
+    "Enter new" : "Neuen eingeben",
+    "Delete" : "Löschen",
+    "Add" : "Hinzufügen",
+    "Edit tags" : "Schlagwörter bearbeiten",
+    "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
+    "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
+    "Please reload the page." : "Bitte lade diese Seite neu.",
+    "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
+    "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
+    "Couldn't reset password because the token is invalid" : "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
+    "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Stelle sicher, dass Dein Nutzername korrekt ist.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
+    "%s password reset" : "%s-Passwort zurücksetzen",
+    "Use the following link to reset your password: {link}" : "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
+    "You will receive a link to reset your password via Email." : "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
+    "Username" : "Benutzername",
+    "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?" : "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?",
+    "Yes, I really want to reset my password now" : "Ja, ich will mein Passwort jetzt zurücksetzen",
+    "Reset" : "Zurücksetzen",
+    "New password" : "Neues Passwort",
+    "New Password" : "Neues Passwort",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
+    "Personal" : "Persönlich",
+    "Users" : "Benutzer",
+    "Apps" : "Apps",
+    "Admin" : "Administration",
+    "Help" : "Hilfe",
+    "Error loading tags" : "Fehler beim Laden der Schlagwörter",
+    "Tag already exists" : "Schlagwort ist bereits vorhanden",
+    "Error deleting tag(s)" : "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter",
+    "Error tagging" : "Fehler beim Hinzufügen der Schlagwörter",
+    "Error untagging" : "Fehler beim Entfernen der Schlagwörter",
+    "Error favoriting" : "Fehler beim Favorisieren",
+    "Error unfavoriting" : "Fehler beim Entfernen aus den Favoriten",
+    "Access forbidden" : "Zugriff verboten",
+    "File not found" : "Datei nicht gefunden",
+    "The specified document has not been found on the server." : "Das ausgewählte Dokument wurde auf dem Server nicht gefunden.",
+    "You can click here to return to %s." : "Du kannst zur Rückkehr zu %s hier klicken.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\nich wollte Dich nur wissen lassen, dass %s %s mit Dir teilt.\nSchaue es Dir an: %s\n\n",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Hallo!",
+    "Internal Server Error" : "Interner Server-Fehler",
+    "The server encountered an internal error and was unable to complete your request." : "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Bitte wende Dich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt. Füge deinem Bericht, bitte die untenstehenden technischen Details hinzu.",
+    "More details can be found in the server log." : "Weitere Details können im Serverprotokoll gefunden werden.",
+    "Technical details" : "Technische Details",
+    "Remote Address: %s" : "IP Adresse: %s",
+    "Request ID: %s" : "Anforderungskennung: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Nachricht: %s",
+    "File: %s" : "Datei: %s",
+    "Line: %s" : "Zeile: %s",
+    "Trace" : "Spur",
+    "Security Warning" : "Sicherheitswarnung",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
+    "Please update your PHP installation to use %s securely." : "Bitte aktualisiere Deine PHP-Installation um %s sicher nutzen zu können.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
+    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Password" : "Passwort",
+    "Storage & database" : "Speicher & Datenbank",
+    "Data folder" : "Datenverzeichnis",
+    "Configure the database" : "Datenbank einrichten",
+    "Only %s is available." : "Es sind nur %s verfügbar.",
+    "Database user" : "Datenbank-Benutzer",
+    "Database password" : "Datenbank-Passwort",
+    "Database name" : "Datenbank-Name",
+    "Database tablespace" : "Datenbank-Tablespace",
+    "Database host" : "Datenbank-Host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dies zu ändern.",
+    "Finish setup" : "Installation abschließen",
+    "Finishing …" : "Abschließen ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betrieb.  Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiviere JavaScript</a> und lade diese Seite neu.",
+    "%s is available. Get more information on how to update." : "%s ist verfügbar. Hole weitere Informationen zu Aktualisierungen ein.",
+    "Log out" : "Abmelden",
+    "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
+    "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.",
+    "Forgot your password? Reset it!" : "Passwort vergessen? Setze es zurück!",
+    "remember" : "merken",
+    "Log in" : "Einloggen",
+    "Alternative Logins" : "Alternative Logins",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>wir möchten dich nur wissen lassen, dass %s <strong>%s</strong> mit dir geteilt hat.<br><a href=\"%s\">Ansehen!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
+    "This means only administrators can use the instance." : "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktiere Deinen Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
+    "Thank you for your patience." : "Vielen Dank für Deine Geduld.",
+    "You are accessing the server from an untrusted domain." : "Du greifst von einer nicht vertrauenswürdigen Domain auf den Server zu.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktiere Deinen Administrator. Wenn du aktuell Administrator dieser Instanz bist, konfiguriere bitte die \"trusted_domain\" - Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit gestellt.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Abhängig vonDeiner Konfiguration kannst Du auch als Administrator, zum Vertrauen dieser Domain, den unteren Button verwenden.",
+    "Add \"%s\" as trusted domain" : "\"%s\" als vertrauenswürdige Domain hinzufügen",
+    "%s will be updated to version %s." : "%s wird auf Version %s aktualisiert.",
+    "The following apps will be disabled:" : "Die folgenden Apps werden deaktiviert:",
+    "The theme %s has been disabled." : "Das Theme %s wurde deaktiviert.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurde.",
+    "Start update" : "Aktualisierung starten",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen kannst Du stattdessen den folgenden Befehl in Deinem Installationsverzeichnis ausführen:",
+    "This %s instance is currently being updated, which may take a while." : "Diese %s - Instanz wird gerade aktualisiert, was eine Weile dauert.",
+    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisert sich automatisch, wenn die %s - Instanz wieder verfügbar ist."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/de.php b/core/l10n/de.php
deleted file mode 100644
index 5aa1dc14a9a..00000000000
--- a/core/l10n/de.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
-"Turned on maintenance mode" => "Wartungsmodus eingeschaltet",
-"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
-"Updated database" => "Datenbank aktualisiert",
-"Checked database schema update" => "Datenbank-Schemenaktualisierung geprüft",
-"Checked database schema update for apps" => "Datenbank-Schemenaktualisierung für Apps geprüft",
-"Updated \"%s\" to %s" => "\"%s\" zu %s aktualisiert",
-"Disabled incompatible apps: %s" => "Deaktivierte inkompatible Apps: %s",
-"No image or file provided" => "Kein Bild oder Datei zur Verfügung gestellt",
-"Unknown filetype" => "Unbekannter Dateityp",
-"Invalid image" => "Ungültiges Bild",
-"No temporary profile picture available, try again" => "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal",
-"No crop data provided" => "Keine Zuschnittdaten zur Verfügung gestellt",
-"Sunday" => "Sonntag",
-"Monday" => "Montag",
-"Tuesday" => "Dienstag",
-"Wednesday" => "Mittwoch",
-"Thursday" => "Donnerstag",
-"Friday" => "Freitag",
-"Saturday" => "Samstag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "März",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Dezember",
-"Settings" => "Einstellungen",
-"File" => "Datei",
-"Folder" => "Ordner",
-"Image" => "Bild",
-"Audio" => "Audio",
-"Saving..." => "Speichern...",
-"Couldn't send reset email. Please contact your administrator." => "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
-"The link to reset your password has been sent to your email. 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." => "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
-"I know what I'm doing" => "Ich weiß, was ich mache",
-"Reset password" => "Passwort zurücksetzen",
-"Password can not be changed. Please contact your administrator." => "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.",
-"No" => "Nein",
-"Yes" => "Ja",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
-"Ok" => "OK",
-"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
-"One file conflict" => "Ein Dateikonflikt",
-"New Files" => "Neue Dateien",
-"Already existing files" => "Die Dateien existieren bereits",
-"Which files do you want to keep?" => "Welche Dateien möchtest Du behalten?",
-"If you select both versions, the copied file will have a number added to its name." => "Wenn Du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
-"Cancel" => "Abbrechen",
-"Continue" => "Fortsetzen",
-"(all selected)" => "(Alle ausgewählt)",
-"({count} selected)" => "({count} ausgewählt)",
-"Error loading file exists template" => "Fehler beim Laden der vorhanden Dateivorlage",
-"Very weak password" => "Sehr schwaches Passwort",
-"Weak password" => "Schwaches Passwort",
-"So-so password" => "Durchschnittliches Passwort",
-"Good password" => "Gutes Passwort",
-"Strong password" => "Starkes Passwort",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.",
-"Error occurred while checking server setup" => "Fehler beim Überprüfen der Servereinrichtung",
-"Shared" => "Geteilt",
-"Shared with {recipients}" => "Geteilt mit {recipients}",
-"Share" => "Teilen",
-"Error" => "Fehler",
-"Error while sharing" => "Fehler beim Teilen",
-"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
-"Error while changing permissions" => "Fehler beim Ändern der Rechte",
-"Shared with you and the group {group} by {owner}" => "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
-"Shared with you by {owner}" => "{owner} hat dies mit Dir geteilt",
-"Share with user or group …" => "Mit Benutzer oder Gruppe teilen ....",
-"Share link" => "Link Teilen",
-"The public link will expire no later than {days} days after it is created" => "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
-"Password protect" => "Passwortschutz",
-"Choose a password for the public link" => "Wählen Sie ein Passwort für den öffentlichen Link",
-"Allow Public Upload" => "Öffentliches Hochladen erlauben",
-"Email link to person" => "Link per E-Mail verschicken",
-"Send" => "Senden",
-"Set expiration date" => "Setze ein Ablaufdatum",
-"Expiration date" => "Ablaufdatum",
-"Adding user..." => "Benutzer wird hinzugefügt …",
-"group" => "Gruppe",
-"Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
-"Shared in {item} with {user}" => "Für {user} in {item} freigegeben",
-"Unshare" => "Freigabe aufheben",
-"notify by email" => "Per E-Mail informieren",
-"can share" => "Kann teilen",
-"can edit" => "kann bearbeiten",
-"access control" => "Zugriffskontrolle",
-"create" => "erstellen",
-"update" => "aktualisieren",
-"delete" => "löschen",
-"Password protected" => "Durch ein Passwort geschützt",
-"Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
-"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
-"Sending ..." => "Sende ...",
-"Email sent" => "E-Mail wurde verschickt",
-"Warning" => "Warnung",
-"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
-"Enter new" => "Neuen eingeben",
-"Delete" => "Löschen",
-"Add" => "Hinzufügen",
-"Edit tags" => "Schlagwörter bearbeiten",
-"Error loading dialog template: {error}" => "Fehler beim Laden der Dialogvorlage: {error}",
-"No tags selected for deletion." => "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
-"Updating {productName} to version {version}, this may take a while." => "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
-"Please reload the page." => "Bitte lade diese Seite neu.",
-"The update was unsuccessful." => "Die Aktualisierung war erfolgreich.",
-"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
-"Couldn't reset password because the token is invalid" => "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
-"Couldn't send reset email. Please make sure your username is correct." => "E-Mail zum Zurücksetzen kann nicht versendet werden. Stelle sicher, dass Dein Nutzername korrekt ist.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
-"%s password reset" => "%s-Passwort zurücksetzen",
-"Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
-"You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
-"Username" => "Benutzername",
-"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?" => "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?",
-"Yes, I really want to reset my password now" => "Ja, ich will mein Passwort jetzt zurücksetzen",
-"Reset" => "Zurücksetzen",
-"New password" => "Neues Passwort",
-"New Password" => "Neues Passwort",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
-"For the best results, please consider using a GNU/Linux server instead." => "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
-"Personal" => "Persönlich",
-"Users" => "Benutzer",
-"Apps" => "Apps",
-"Admin" => "Administration",
-"Help" => "Hilfe",
-"Error loading tags" => "Fehler beim Laden der Schlagwörter",
-"Tag already exists" => "Schlagwort ist bereits vorhanden",
-"Error deleting tag(s)" => "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter",
-"Error tagging" => "Fehler beim Hinzufügen der Schlagwörter",
-"Error untagging" => "Fehler beim Entfernen der Schlagwörter",
-"Error favoriting" => "Fehler beim Favorisieren",
-"Error unfavoriting" => "Fehler beim Entfernen aus den Favoriten",
-"Access forbidden" => "Zugriff verboten",
-"File not found" => "Datei nicht gefunden",
-"The specified document has not been found on the server." => "Das ausgewählte Dokument wurde auf dem Server nicht gefunden.",
-"You can click here to return to %s." => "Du kannst zur Rückkehr zu %s hier klicken.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\nich wollte Dich nur wissen lassen, dass %s %s mit Dir teilt.\nSchaue es Dir an: %s\n\n",
-"The share will expire on %s." => "Die Freigabe wird am %s ablaufen.",
-"Cheers!" => "Hallo!",
-"Internal Server Error" => "Interner Server-Fehler",
-"The server encountered an internal error and was unable to complete your request." => "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Bitte wende Dich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt. Füge deinem Bericht, bitte die untenstehenden technischen Details hinzu.",
-"More details can be found in the server log." => "Weitere Details können im Serverprotokoll gefunden werden.",
-"Technical details" => "Technische Details",
-"Remote Address: %s" => "IP Adresse: %s",
-"Request ID: %s" => "Anforderungskennung: %s",
-"Code: %s" => "Code: %s",
-"Message: %s" => "Nachricht: %s",
-"File: %s" => "Datei: %s",
-"Line: %s" => "Zeile: %s",
-"Trace" => "Spur",
-"Security Warning" => "Sicherheitswarnung",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
-"Please update your PHP installation to use %s securely." => "Bitte aktualisiere Deine PHP-Installation um %s sicher nutzen zu können.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
-"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
-"Password" => "Passwort",
-"Storage & database" => "Speicher & Datenbank",
-"Data folder" => "Datenverzeichnis",
-"Configure the database" => "Datenbank einrichten",
-"Only %s is available." => "Es sind nur %s verfügbar.",
-"Database user" => "Datenbank-Benutzer",
-"Database password" => "Datenbank-Passwort",
-"Database name" => "Datenbank-Name",
-"Database tablespace" => "Datenbank-Tablespace",
-"Database host" => "Datenbank-Host",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dies zu ändern.",
-"Finish setup" => "Installation abschließen",
-"Finishing …" => "Abschließen ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betrieb.  Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiviere JavaScript</a> und lade diese Seite neu.",
-"%s is available. Get more information on how to update." => "%s ist verfügbar. Hole weitere Informationen zu Aktualisierungen ein.",
-"Log out" => "Abmelden",
-"Server side authentication failed!" => "Serverseitige Authentifizierung fehlgeschlagen!",
-"Please contact your administrator." => "Bitte kontaktiere Deinen Administrator.",
-"Forgot your password? Reset it!" => "Passwort vergessen? Setze es zurück!",
-"remember" => "merken",
-"Log in" => "Einloggen",
-"Alternative Logins" => "Alternative Logins",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br><br>wir möchten dich nur wissen lassen, dass %s <strong>%s</strong> mit dir geteilt hat.<br><a href=\"%s\">Ansehen!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
-"This means only administrators can use the instance." => "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktiere Deinen Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
-"Thank you for your patience." => "Vielen Dank für Deine Geduld.",
-"You are accessing the server from an untrusted domain." => "Du greifst von einer nicht vertrauenswürdigen Domain auf den Server zu.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Bitte kontaktiere Deinen Administrator. Wenn du aktuell Administrator dieser Instanz bist, konfiguriere bitte die \"trusted_domain\" - Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit gestellt.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Abhängig vonDeiner Konfiguration kannst Du auch als Administrator, zum Vertrauen dieser Domain, den unteren Button verwenden.",
-"Add \"%s\" as trusted domain" => "\"%s\" als vertrauenswürdige Domain hinzufügen",
-"%s will be updated to version %s." => "%s wird auf Version %s aktualisiert.",
-"The following apps will be disabled:" => "Die folgenden Apps werden deaktiviert:",
-"The theme %s has been disabled." => "Das Theme %s wurde deaktiviert.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurde.",
-"Start update" => "Aktualisierung starten",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen kannst Du stattdessen den folgenden Befehl in Deinem Installationsverzeichnis ausführen:",
-"This %s instance is currently being updated, which may take a while." => "Diese %s - Instanz wird gerade aktualisiert, was eine Weile dauert.",
-"This page will refresh itself when the %s instance is available again." => "Diese Seite aktualisert sich automatisch, wenn die %s - Instanz wieder verfügbar ist."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_AT.js b/core/l10n/de_AT.js
new file mode 100644
index 00000000000..98fb44e5d60
--- /dev/null
+++ b/core/l10n/de_AT.js
@@ -0,0 +1,38 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Sonntag",
+    "Monday" : "Montag",
+    "Tuesday" : "Dienstag",
+    "Wednesday" : "Mittwoch",
+    "Thursday" : "Donnerstag",
+    "Friday" : "Freitag",
+    "Saturday" : "Samstag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "März",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Dezember",
+    "Settings" : "Einstellungen",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Abbrechen",
+    "Continue" : "Weiter",
+    "Share" : "Freigeben",
+    "Error" : "Fehler",
+    "group" : "Gruppe",
+    "Unshare" : "Teilung zurücknehmen",
+    "can share" : "Kann teilen",
+    "can edit" : "kann bearbeiten",
+    "Delete" : "Löschen",
+    "Personal" : "Persönlich",
+    "Help" : "Hilfe",
+    "Password" : "Passwort"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/de_AT.json b/core/l10n/de_AT.json
new file mode 100644
index 00000000000..2f44aaea3da
--- /dev/null
+++ b/core/l10n/de_AT.json
@@ -0,0 +1,36 @@
+{ "translations": {
+    "Sunday" : "Sonntag",
+    "Monday" : "Montag",
+    "Tuesday" : "Dienstag",
+    "Wednesday" : "Mittwoch",
+    "Thursday" : "Donnerstag",
+    "Friday" : "Freitag",
+    "Saturday" : "Samstag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "März",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Dezember",
+    "Settings" : "Einstellungen",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Abbrechen",
+    "Continue" : "Weiter",
+    "Share" : "Freigeben",
+    "Error" : "Fehler",
+    "group" : "Gruppe",
+    "Unshare" : "Teilung zurücknehmen",
+    "can share" : "Kann teilen",
+    "can edit" : "kann bearbeiten",
+    "Delete" : "Löschen",
+    "Personal" : "Persönlich",
+    "Help" : "Hilfe",
+    "Password" : "Passwort"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php
deleted file mode 100644
index cd17ea0bc16..00000000000
--- a/core/l10n/de_AT.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Sonntag",
-"Monday" => "Montag",
-"Tuesday" => "Dienstag",
-"Wednesday" => "Mittwoch",
-"Thursday" => "Donnerstag",
-"Friday" => "Freitag",
-"Saturday" => "Samstag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "März",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Dezember",
-"Settings" => "Einstellungen",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Abbrechen",
-"Continue" => "Weiter",
-"Share" => "Freigeben",
-"Error" => "Fehler",
-"group" => "Gruppe",
-"Unshare" => "Teilung zurücknehmen",
-"can share" => "Kann teilen",
-"can edit" => "kann bearbeiten",
-"Delete" => "Löschen",
-"Personal" => "Persönlich",
-"Help" => "Hilfe",
-"Password" => "Passwort"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_CH.js b/core/l10n/de_CH.js
new file mode 100644
index 00000000000..514e2d6c196
--- /dev/null
+++ b/core/l10n/de_CH.js
@@ -0,0 +1,108 @@
+OC.L10N.register(
+    "core",
+    {
+    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
+    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
+    "Updated database" : "Datenbank aktualisiert",
+    "Sunday" : "Sonntag",
+    "Monday" : "Montag",
+    "Tuesday" : "Dienstag",
+    "Wednesday" : "Mittwoch",
+    "Thursday" : "Donnerstag",
+    "Friday" : "Freitag",
+    "Saturday" : "Samstag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "März",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Dezember",
+    "Settings" : "Einstellungen",
+    "File" : "Datei",
+    "Folder" : "Ordner",
+    "Saving..." : "Speichern...",
+    "Reset password" : "Passwort zurücksetzen",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Ok" : "OK",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "New Files" : "Neue Dateien",
+    "Cancel" : "Abbrechen",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
+    "Shared" : "Geteilt",
+    "Share" : "Teilen",
+    "Error" : "Fehler",
+    "Error while sharing" : "Fehler beim Teilen",
+    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
+    "Error while changing permissions" : "Fehler bei der Änderung der Rechte",
+    "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
+    "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
+    "Password protect" : "Passwortschutz",
+    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
+    "Email link to person" : "Link per E-Mail verschicken",
+    "Send" : "Senden",
+    "Set expiration date" : "Ein Ablaufdatum setzen",
+    "Expiration date" : "Ablaufdatum",
+    "group" : "Gruppe",
+    "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
+    "Shared in {item} with {user}" : "Freigegeben in {item} von {user}",
+    "Unshare" : "Freigabe aufheben",
+    "can edit" : "kann bearbeiten",
+    "access control" : "Zugriffskontrolle",
+    "create" : "erstellen",
+    "update" : "aktualisieren",
+    "delete" : "löschen",
+    "Password protected" : "Passwortgeschützt",
+    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
+    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
+    "Sending ..." : "Sende ...",
+    "Email sent" : "Email gesendet",
+    "Warning" : "Warnung",
+    "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
+    "Delete" : "Löschen",
+    "Add" : "Hinzufügen",
+    "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
+    "%s password reset" : "%s-Passwort zurücksetzen",
+    "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
+    "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
+    "Username" : "Benutzername",
+    "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?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
+    "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
+    "Reset" : "Zurücksetzen",
+    "New password" : "Neues Passwort",
+    "Personal" : "Persönlich",
+    "Users" : "Benutzer",
+    "Apps" : "Apps",
+    "Admin" : "Administrator",
+    "Help" : "Hilfe",
+    "Access forbidden" : "Zugriff verboten",
+    "Security Warning" : "Sicherheitshinweis",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
+    "Please update your PHP installation to use %s securely." : "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
+    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Password" : "Passwort",
+    "Data folder" : "Datenverzeichnis",
+    "Configure the database" : "Datenbank einrichten",
+    "Database user" : "Datenbank-Benutzer",
+    "Database password" : "Datenbank-Passwort",
+    "Database name" : "Datenbank-Name",
+    "Database tablespace" : "Datenbank-Tablespace",
+    "Database host" : "Datenbank-Host",
+    "Finish setup" : "Installation abschliessen",
+    "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
+    "Log out" : "Abmelden",
+    "remember" : "merken",
+    "Log in" : "Einloggen",
+    "Alternative Logins" : "Alternative Logins"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/de_CH.json b/core/l10n/de_CH.json
new file mode 100644
index 00000000000..b549592ed06
--- /dev/null
+++ b/core/l10n/de_CH.json
@@ -0,0 +1,106 @@
+{ "translations": {
+    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
+    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
+    "Updated database" : "Datenbank aktualisiert",
+    "Sunday" : "Sonntag",
+    "Monday" : "Montag",
+    "Tuesday" : "Dienstag",
+    "Wednesday" : "Mittwoch",
+    "Thursday" : "Donnerstag",
+    "Friday" : "Freitag",
+    "Saturday" : "Samstag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "März",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Dezember",
+    "Settings" : "Einstellungen",
+    "File" : "Datei",
+    "Folder" : "Ordner",
+    "Saving..." : "Speichern...",
+    "Reset password" : "Passwort zurücksetzen",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Ok" : "OK",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "New Files" : "Neue Dateien",
+    "Cancel" : "Abbrechen",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
+    "Shared" : "Geteilt",
+    "Share" : "Teilen",
+    "Error" : "Fehler",
+    "Error while sharing" : "Fehler beim Teilen",
+    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
+    "Error while changing permissions" : "Fehler bei der Änderung der Rechte",
+    "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
+    "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
+    "Password protect" : "Passwortschutz",
+    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
+    "Email link to person" : "Link per E-Mail verschicken",
+    "Send" : "Senden",
+    "Set expiration date" : "Ein Ablaufdatum setzen",
+    "Expiration date" : "Ablaufdatum",
+    "group" : "Gruppe",
+    "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
+    "Shared in {item} with {user}" : "Freigegeben in {item} von {user}",
+    "Unshare" : "Freigabe aufheben",
+    "can edit" : "kann bearbeiten",
+    "access control" : "Zugriffskontrolle",
+    "create" : "erstellen",
+    "update" : "aktualisieren",
+    "delete" : "löschen",
+    "Password protected" : "Passwortgeschützt",
+    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
+    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
+    "Sending ..." : "Sende ...",
+    "Email sent" : "Email gesendet",
+    "Warning" : "Warnung",
+    "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
+    "Delete" : "Löschen",
+    "Add" : "Hinzufügen",
+    "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
+    "%s password reset" : "%s-Passwort zurücksetzen",
+    "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
+    "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
+    "Username" : "Benutzername",
+    "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?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
+    "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
+    "Reset" : "Zurücksetzen",
+    "New password" : "Neues Passwort",
+    "Personal" : "Persönlich",
+    "Users" : "Benutzer",
+    "Apps" : "Apps",
+    "Admin" : "Administrator",
+    "Help" : "Hilfe",
+    "Access forbidden" : "Zugriff verboten",
+    "Security Warning" : "Sicherheitshinweis",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
+    "Please update your PHP installation to use %s securely." : "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
+    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Password" : "Passwort",
+    "Data folder" : "Datenverzeichnis",
+    "Configure the database" : "Datenbank einrichten",
+    "Database user" : "Datenbank-Benutzer",
+    "Database password" : "Datenbank-Passwort",
+    "Database name" : "Datenbank-Name",
+    "Database tablespace" : "Datenbank-Tablespace",
+    "Database host" : "Datenbank-Host",
+    "Finish setup" : "Installation abschliessen",
+    "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
+    "Log out" : "Abmelden",
+    "remember" : "merken",
+    "Log in" : "Einloggen",
+    "Alternative Logins" : "Alternative Logins"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
deleted file mode 100644
index 749be51dc33..00000000000
--- a/core/l10n/de_CH.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Turned on maintenance mode" => "Wartungsmodus eingeschaltet",
-"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
-"Updated database" => "Datenbank aktualisiert",
-"Sunday" => "Sonntag",
-"Monday" => "Montag",
-"Tuesday" => "Dienstag",
-"Wednesday" => "Mittwoch",
-"Thursday" => "Donnerstag",
-"Friday" => "Freitag",
-"Saturday" => "Samstag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "März",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Dezember",
-"Settings" => "Einstellungen",
-"File" => "Datei",
-"Folder" => "Ordner",
-"Saving..." => "Speichern...",
-"Reset password" => "Passwort zurücksetzen",
-"No" => "Nein",
-"Yes" => "Ja",
-"Choose" => "Auswählen",
-"Ok" => "OK",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"New Files" => "Neue Dateien",
-"Cancel" => "Abbrechen",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
-"Shared" => "Geteilt",
-"Share" => "Teilen",
-"Error" => "Fehler",
-"Error while sharing" => "Fehler beim Teilen",
-"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
-"Error while changing permissions" => "Fehler bei der Änderung der Rechte",
-"Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
-"Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
-"Password protect" => "Passwortschutz",
-"Allow Public Upload" => "Öffentliches Hochladen erlauben",
-"Email link to person" => "Link per E-Mail verschicken",
-"Send" => "Senden",
-"Set expiration date" => "Ein Ablaufdatum setzen",
-"Expiration date" => "Ablaufdatum",
-"group" => "Gruppe",
-"Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt",
-"Shared in {item} with {user}" => "Freigegeben in {item} von {user}",
-"Unshare" => "Freigabe aufheben",
-"can edit" => "kann bearbeiten",
-"access control" => "Zugriffskontrolle",
-"create" => "erstellen",
-"update" => "aktualisieren",
-"delete" => "löschen",
-"Password protected" => "Passwortgeschützt",
-"Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
-"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
-"Sending ..." => "Sende ...",
-"Email sent" => "Email gesendet",
-"Warning" => "Warnung",
-"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
-"Delete" => "Löschen",
-"Add" => "Hinzufügen",
-"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
-"%s password reset" => "%s-Passwort zurücksetzen",
-"Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-"You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
-"Username" => "Benutzername",
-"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?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
-"Yes, I really want to reset my password now" => "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
-"Reset" => "Zurücksetzen",
-"New password" => "Neues Passwort",
-"Personal" => "Persönlich",
-"Users" => "Benutzer",
-"Apps" => "Apps",
-"Admin" => "Administrator",
-"Help" => "Hilfe",
-"Access forbidden" => "Zugriff verboten",
-"Security Warning" => "Sicherheitshinweis",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
-"Please update your PHP installation to use %s securely." => "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
-"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
-"Password" => "Passwort",
-"Data folder" => "Datenverzeichnis",
-"Configure the database" => "Datenbank einrichten",
-"Database user" => "Datenbank-Benutzer",
-"Database password" => "Datenbank-Passwort",
-"Database name" => "Datenbank-Name",
-"Database tablespace" => "Datenbank-Tablespace",
-"Database host" => "Datenbank-Host",
-"Finish setup" => "Installation abschliessen",
-"%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
-"Log out" => "Abmelden",
-"remember" => "merken",
-"Log in" => "Einloggen",
-"Alternative Logins" => "Alternative Logins"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
new file mode 100644
index 00000000000..7de8818152a
--- /dev/null
+++ b/core/l10n/de_DE.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
+    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet ",
+    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
+    "Updated database" : "Datenbank aktualisiert",
+    "Checked database schema update" : "Aktualisierung des Datenbankschemas wurde überprüft",
+    "Checked database schema update for apps" : "Aktualisierung des Datenbankschemas für Apps wurde überprüft",
+    "Updated \"%s\" to %s" : "»%s« zu %s aktualisiert",
+    "Disabled incompatible apps: %s" : "Deaktivierte inkompatible Apps: %s",
+    "No image or file provided" : "Weder Bild noch eine Datei wurden zur Verfügung gestellt",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "No temporary profile picture available, try again" : "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal",
+    "No crop data provided" : "Keine Zuschnittdaten zur Verfügung gestellt",
+    "Sunday" : "Sonntag",
+    "Monday" : "Montag",
+    "Tuesday" : "Dienstag",
+    "Wednesday" : "Mittwoch",
+    "Thursday" : "Donnerstag",
+    "Friday" : "Freitag",
+    "Saturday" : "Samstag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "März",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Dezember",
+    "Settings" : "Einstellungen",
+    "File" : "Datei",
+    "Folder" : "Ordner",
+    "Image" : "Bild",
+    "Audio" : "Audio",
+    "Saving..." : "Speichervorgang …",
+    "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
+    "The link to reset your password has been sent to your email. 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." : "Der Link, zum Zurücksetzen Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
+    "I know what I'm doing" : "Ich weiß, was ich mache",
+    "Reset password" : "Passwort zurücksetzen",
+    "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Error loading file picker template: {error}" : "Fehler beim Laden der Dateiauswahlvorlage: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Fehler beim Laden der Nachrichtenvorlage: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} Dateikonflikt","{count} Dateikonflikte"],
+    "One file conflict" : "Ein Dateikonflikt",
+    "New Files" : "Neue Dateien",
+    "Already existing files" : "Die Dateien existieren bereits",
+    "Which files do you want to keep?" : "Welche Dateien möchten Sie behalten?",
+    "If you select both versions, the copied file will have a number added to its name." : "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
+    "Cancel" : "Abbrechen",
+    "Continue" : "Fortsetzen",
+    "(all selected)" : "(Alle ausgewählt)",
+    "({count} selected)" : "({count} ausgewählt)",
+    "Error loading file exists template" : "Fehler beim Laden der vorhanden Dateivorlage",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Passables Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Internetserver ist noch nicht richtig konfiguriert, um Dateisynchronisation zu erlauben, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dieses bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Aktualisierungsbenachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Versenden von E-Mail-Benachrichtigungen funktionieren eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen benutzen wollen.",
+    "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
+    "Shared" : "Geteilt",
+    "Shared with {recipients}" : "Geteilt mit {recipients}",
+    "Share" : "Teilen",
+    "Error" : "Fehler",
+    "Error while sharing" : "Fehler beim Teilen",
+    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
+    "Error while changing permissions" : "Fehler bei der Änderung der Rechte",
+    "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
+    "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
+    "Share with user or group …" : "Mit Benutzer oder Gruppe teilen …",
+    "Share link" : "Link teilen",
+    "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+    "Password protect" : "Passwortschutz",
+    "Choose a password for the public link" : "Wählen Sie ein Passwort für den öffentlichen Link",
+    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
+    "Email link to person" : "Link per E-Mail verschicken",
+    "Send" : "Senden",
+    "Set expiration date" : "Ein Ablaufdatum setzen",
+    "Expiration date" : "Ablaufdatum",
+    "Adding user..." : "Benutzer wird hinzugefügt …",
+    "group" : "Gruppe",
+    "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
+    "Shared in {item} with {user}" : "Freigegeben in {item} von {user}",
+    "Unshare" : "Freigabe aufheben",
+    "notify by email" : "Per E-Mail informieren",
+    "can share" : "kann geteilt werden",
+    "can edit" : "kann bearbeiten",
+    "access control" : "Zugriffskontrolle",
+    "create" : "erstellen",
+    "update" : "aktualisieren",
+    "delete" : "löschen",
+    "Password protected" : "Passwortgeschützt",
+    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
+    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
+    "Sending ..." : "Sende ...",
+    "Email sent" : "Email gesendet",
+    "Warning" : "Warnung",
+    "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
+    "Enter new" : "Neuen eingeben",
+    "Delete" : "Löschen",
+    "Add" : "Hinzufügen",
+    "Edit tags" : "Schlagwörter bearbeiten",
+    "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
+    "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+    "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
+    "Please reload the page." : "Bitte laden Sie diese Seite neu.",
+    "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
+    "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
+    "Couldn't reset password because the token is invalid" : "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
+    "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Bitte stellen Sie sicher, dass Ihr Benutzername richtig ist.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Die E-Mail, zum Zurücksetzen, kann Aufgrund einer nicht vorhandenen E-Mail-Adresse, für diesen Benutzernamen, nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
+    "%s password reset" : "%s-Passwort zurücksetzen",
+    "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
+    "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
+    "Username" : "Benutzername",
+    "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?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
+    "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
+    "Reset" : "Zurücksetzen",
+    "New password" : "Neues Passwort",
+    "New Password" : "Neues Passwort",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht richtig funktionieren. Benutzung auf eigenes Risiko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
+    "Personal" : "Persönlich",
+    "Users" : "Benutzer",
+    "Apps" : "Apps",
+    "Admin" : "Administrator",
+    "Help" : "Hilfe",
+    "Error loading tags" : "Fehler beim Laden der Schlagwörter",
+    "Tag already exists" : "Schlagwort ist bereits vorhanden",
+    "Error deleting tag(s)" : "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter",
+    "Error tagging" : "Fehler beim Hinzufügen der Schlagwörter",
+    "Error untagging" : "Fehler beim Entfernen der Schlagwörter",
+    "Error favoriting" : "Fehler beim Hinzufügen zu den Favoriten",
+    "Error unfavoriting" : "Fehler beim Entfernen aus den Favoriten",
+    "Access forbidden" : "Zugriff verboten",
+    "File not found" : "Datei nicht gefunden",
+    "The specified document has not been found on the server." : "Das ausgewählte Dokument wurde auf dem Server nicht gefunden.",
+    "You can click here to return to %s." : "Sie können zur Rückkehr zu %s hier klicken.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\n%s hat %s mit Ihnen geteilt.\nAnsehen: %s\n\n",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Noch einen schönen Tag!",
+    "Internal Server Error" : "Interner Server-Fehler",
+    "The server encountered an internal error and was unable to complete your request." : "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Bitte wenden Sie sich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt, geben Sie bitte die, unten stehenden, technischen Details in Ihrem Bericht mit an.",
+    "More details can be found in the server log." : "Weitere Details können im Serverprotokoll gefunden werden.",
+    "Technical details" : "Technische Details",
+    "Remote Address: %s" : "Entfernte Adresse: %s",
+    "Request ID: %s" : "Anforderungskennung: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Nachricht: %s",
+    "File: %s" : "Datei: %s",
+    "Line: %s" : "Zeile: %s",
+    "Trace" : "Spur",
+    "Security Warning" : "Sicherheitshinweis",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
+    "Please update your PHP installation to use %s securely." : "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
+    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Password" : "Passwort",
+    "Storage & database" : "Speicher & Datenbank",
+    "Data folder" : "Datenverzeichnis",
+    "Configure the database" : "Datenbank einrichten",
+    "Only %s is available." : "Es sind nur %s verfügbar.",
+    "Database user" : "Datenbank-Benutzer",
+    "Database password" : "Datenbank-Passwort",
+    "Database name" : "Datenbank-Name",
+    "Database tablespace" : "Datenbank-Tablespace",
+    "Database host" : "Datenbank-Host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dieses zu ändern.",
+    "Finish setup" : "Installation abschließen",
+    "Finishing …" : "Abschließen ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript, um richtig zu funktionieren. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivieren Sie JavaScript</a> und laden Sie diese Seite neu.",
+    "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
+    "Log out" : "Abmelden",
+    "Server side authentication failed!" : "Die Legitimierung auf dem Server ist fehlgeschlagen!",
+    "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.",
+    "Forgot your password? Reset it!" : "Passwort vergessen? Zurückstellen!",
+    "remember" : "merken",
+    "Log in" : "Einloggen",
+    "Alternative Logins" : "Alternative Logins",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>wir möchten Sie wissen lassen, dass %s <strong>%s</strong> mit Ihnen geteilt hat.<br><a href=\"%s\">Ansehen</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
+    "This means only administrators can use the instance." : "Das bedeutet, dass diese Instanz nur von Administratoren benutzt werden kann.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktieren Sie Ihren Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
+    "Thank you for your patience." : "Vielen Dank für Ihre Geduld.",
+    "You are accessing the server from an untrusted domain." : "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktieren Sie Ihren Administrator. Wenn Sie aktuell Administrator dieser Instanz sind, konfigurieren Sie bitte die »trusted_domain«-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit bereitgestellt.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Abhängig von Ihrer Konfiguration, können Sie als Administrator dieser Domain vertrauen, indem Sie den unteren Knopf benutzen.",
+    "Add \"%s\" as trusted domain" : "»%s« als vertrauenswürdige Domain hinzufügen",
+    "%s will be updated to version %s." : "%s wird auf Version %s aktualisiert.",
+    "The following apps will be disabled:" : "Die folgenden Apps werden deaktiviert:",
+    "The theme %s has been disabled." : "Das Thema %s wurde deaktiviert.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Stellen Sie vor dem Fortsetzen bitte sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.",
+    "Start update" : "Aktualisierung starten",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen, bei größeren Installationen, können Sie stattdessen den folgenden Befehl, in Ihrem Installationsverzeichnis, ausführen:",
+    "This %s instance is currently being updated, which may take a while." : "Diese %s - Instanz wird gerade aktualisiert, was eine Weile dauert.",
+    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisert sich automatisch, wenn die %s - Instanz wieder verfügbar ist."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
new file mode 100644
index 00000000000..db643f834f5
--- /dev/null
+++ b/core/l10n/de_DE.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
+    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet ",
+    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
+    "Updated database" : "Datenbank aktualisiert",
+    "Checked database schema update" : "Aktualisierung des Datenbankschemas wurde überprüft",
+    "Checked database schema update for apps" : "Aktualisierung des Datenbankschemas für Apps wurde überprüft",
+    "Updated \"%s\" to %s" : "»%s« zu %s aktualisiert",
+    "Disabled incompatible apps: %s" : "Deaktivierte inkompatible Apps: %s",
+    "No image or file provided" : "Weder Bild noch eine Datei wurden zur Verfügung gestellt",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "No temporary profile picture available, try again" : "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal",
+    "No crop data provided" : "Keine Zuschnittdaten zur Verfügung gestellt",
+    "Sunday" : "Sonntag",
+    "Monday" : "Montag",
+    "Tuesday" : "Dienstag",
+    "Wednesday" : "Mittwoch",
+    "Thursday" : "Donnerstag",
+    "Friday" : "Freitag",
+    "Saturday" : "Samstag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "März",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Dezember",
+    "Settings" : "Einstellungen",
+    "File" : "Datei",
+    "Folder" : "Ordner",
+    "Image" : "Bild",
+    "Audio" : "Audio",
+    "Saving..." : "Speichervorgang …",
+    "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
+    "The link to reset your password has been sent to your email. 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." : "Der Link, zum Zurücksetzen Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
+    "I know what I'm doing" : "Ich weiß, was ich mache",
+    "Reset password" : "Passwort zurücksetzen",
+    "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Error loading file picker template: {error}" : "Fehler beim Laden der Dateiauswahlvorlage: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Fehler beim Laden der Nachrichtenvorlage: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} Dateikonflikt","{count} Dateikonflikte"],
+    "One file conflict" : "Ein Dateikonflikt",
+    "New Files" : "Neue Dateien",
+    "Already existing files" : "Die Dateien existieren bereits",
+    "Which files do you want to keep?" : "Welche Dateien möchten Sie behalten?",
+    "If you select both versions, the copied file will have a number added to its name." : "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
+    "Cancel" : "Abbrechen",
+    "Continue" : "Fortsetzen",
+    "(all selected)" : "(Alle ausgewählt)",
+    "({count} selected)" : "({count} ausgewählt)",
+    "Error loading file exists template" : "Fehler beim Laden der vorhanden Dateivorlage",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Passables Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Internetserver ist noch nicht richtig konfiguriert, um Dateisynchronisation zu erlauben, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dieses bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Aktualisierungsbenachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Versenden von E-Mail-Benachrichtigungen funktionieren eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen benutzen wollen.",
+    "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
+    "Shared" : "Geteilt",
+    "Shared with {recipients}" : "Geteilt mit {recipients}",
+    "Share" : "Teilen",
+    "Error" : "Fehler",
+    "Error while sharing" : "Fehler beim Teilen",
+    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
+    "Error while changing permissions" : "Fehler bei der Änderung der Rechte",
+    "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
+    "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
+    "Share with user or group …" : "Mit Benutzer oder Gruppe teilen …",
+    "Share link" : "Link teilen",
+    "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+    "Password protect" : "Passwortschutz",
+    "Choose a password for the public link" : "Wählen Sie ein Passwort für den öffentlichen Link",
+    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
+    "Email link to person" : "Link per E-Mail verschicken",
+    "Send" : "Senden",
+    "Set expiration date" : "Ein Ablaufdatum setzen",
+    "Expiration date" : "Ablaufdatum",
+    "Adding user..." : "Benutzer wird hinzugefügt …",
+    "group" : "Gruppe",
+    "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
+    "Shared in {item} with {user}" : "Freigegeben in {item} von {user}",
+    "Unshare" : "Freigabe aufheben",
+    "notify by email" : "Per E-Mail informieren",
+    "can share" : "kann geteilt werden",
+    "can edit" : "kann bearbeiten",
+    "access control" : "Zugriffskontrolle",
+    "create" : "erstellen",
+    "update" : "aktualisieren",
+    "delete" : "löschen",
+    "Password protected" : "Passwortgeschützt",
+    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
+    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
+    "Sending ..." : "Sende ...",
+    "Email sent" : "Email gesendet",
+    "Warning" : "Warnung",
+    "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
+    "Enter new" : "Neuen eingeben",
+    "Delete" : "Löschen",
+    "Add" : "Hinzufügen",
+    "Edit tags" : "Schlagwörter bearbeiten",
+    "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
+    "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+    "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
+    "Please reload the page." : "Bitte laden Sie diese Seite neu.",
+    "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
+    "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
+    "Couldn't reset password because the token is invalid" : "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
+    "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Bitte stellen Sie sicher, dass Ihr Benutzername richtig ist.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Die E-Mail, zum Zurücksetzen, kann Aufgrund einer nicht vorhandenen E-Mail-Adresse, für diesen Benutzernamen, nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
+    "%s password reset" : "%s-Passwort zurücksetzen",
+    "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
+    "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
+    "Username" : "Benutzername",
+    "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?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
+    "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
+    "Reset" : "Zurücksetzen",
+    "New password" : "Neues Passwort",
+    "New Password" : "Neues Passwort",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht richtig funktionieren. Benutzung auf eigenes Risiko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
+    "Personal" : "Persönlich",
+    "Users" : "Benutzer",
+    "Apps" : "Apps",
+    "Admin" : "Administrator",
+    "Help" : "Hilfe",
+    "Error loading tags" : "Fehler beim Laden der Schlagwörter",
+    "Tag already exists" : "Schlagwort ist bereits vorhanden",
+    "Error deleting tag(s)" : "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter",
+    "Error tagging" : "Fehler beim Hinzufügen der Schlagwörter",
+    "Error untagging" : "Fehler beim Entfernen der Schlagwörter",
+    "Error favoriting" : "Fehler beim Hinzufügen zu den Favoriten",
+    "Error unfavoriting" : "Fehler beim Entfernen aus den Favoriten",
+    "Access forbidden" : "Zugriff verboten",
+    "File not found" : "Datei nicht gefunden",
+    "The specified document has not been found on the server." : "Das ausgewählte Dokument wurde auf dem Server nicht gefunden.",
+    "You can click here to return to %s." : "Sie können zur Rückkehr zu %s hier klicken.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\n%s hat %s mit Ihnen geteilt.\nAnsehen: %s\n\n",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Noch einen schönen Tag!",
+    "Internal Server Error" : "Interner Server-Fehler",
+    "The server encountered an internal error and was unable to complete your request." : "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Bitte wenden Sie sich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt, geben Sie bitte die, unten stehenden, technischen Details in Ihrem Bericht mit an.",
+    "More details can be found in the server log." : "Weitere Details können im Serverprotokoll gefunden werden.",
+    "Technical details" : "Technische Details",
+    "Remote Address: %s" : "Entfernte Adresse: %s",
+    "Request ID: %s" : "Anforderungskennung: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Nachricht: %s",
+    "File: %s" : "Datei: %s",
+    "Line: %s" : "Zeile: %s",
+    "Trace" : "Spur",
+    "Security Warning" : "Sicherheitshinweis",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
+    "Please update your PHP installation to use %s securely." : "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
+    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Password" : "Passwort",
+    "Storage & database" : "Speicher & Datenbank",
+    "Data folder" : "Datenverzeichnis",
+    "Configure the database" : "Datenbank einrichten",
+    "Only %s is available." : "Es sind nur %s verfügbar.",
+    "Database user" : "Datenbank-Benutzer",
+    "Database password" : "Datenbank-Passwort",
+    "Database name" : "Datenbank-Name",
+    "Database tablespace" : "Datenbank-Tablespace",
+    "Database host" : "Datenbank-Host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dieses zu ändern.",
+    "Finish setup" : "Installation abschließen",
+    "Finishing …" : "Abschließen ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript, um richtig zu funktionieren. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivieren Sie JavaScript</a> und laden Sie diese Seite neu.",
+    "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
+    "Log out" : "Abmelden",
+    "Server side authentication failed!" : "Die Legitimierung auf dem Server ist fehlgeschlagen!",
+    "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.",
+    "Forgot your password? Reset it!" : "Passwort vergessen? Zurückstellen!",
+    "remember" : "merken",
+    "Log in" : "Einloggen",
+    "Alternative Logins" : "Alternative Logins",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>wir möchten Sie wissen lassen, dass %s <strong>%s</strong> mit Ihnen geteilt hat.<br><a href=\"%s\">Ansehen</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
+    "This means only administrators can use the instance." : "Das bedeutet, dass diese Instanz nur von Administratoren benutzt werden kann.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktieren Sie Ihren Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
+    "Thank you for your patience." : "Vielen Dank für Ihre Geduld.",
+    "You are accessing the server from an untrusted domain." : "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktieren Sie Ihren Administrator. Wenn Sie aktuell Administrator dieser Instanz sind, konfigurieren Sie bitte die »trusted_domain«-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit bereitgestellt.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Abhängig von Ihrer Konfiguration, können Sie als Administrator dieser Domain vertrauen, indem Sie den unteren Knopf benutzen.",
+    "Add \"%s\" as trusted domain" : "»%s« als vertrauenswürdige Domain hinzufügen",
+    "%s will be updated to version %s." : "%s wird auf Version %s aktualisiert.",
+    "The following apps will be disabled:" : "Die folgenden Apps werden deaktiviert:",
+    "The theme %s has been disabled." : "Das Thema %s wurde deaktiviert.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Stellen Sie vor dem Fortsetzen bitte sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.",
+    "Start update" : "Aktualisierung starten",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen, bei größeren Installationen, können Sie stattdessen den folgenden Befehl, in Ihrem Installationsverzeichnis, ausführen:",
+    "This %s instance is currently being updated, which may take a while." : "Diese %s - Instanz wird gerade aktualisiert, was eine Weile dauert.",
+    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisert sich automatisch, wenn die %s - Instanz wieder verfügbar ist."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
deleted file mode 100644
index f50b3d6b07b..00000000000
--- a/core/l10n/de_DE.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
-"Turned on maintenance mode" => "Wartungsmodus eingeschaltet ",
-"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
-"Updated database" => "Datenbank aktualisiert",
-"Checked database schema update" => "Aktualisierung des Datenbankschemas wurde überprüft",
-"Checked database schema update for apps" => "Aktualisierung des Datenbankschemas für Apps wurde überprüft",
-"Updated \"%s\" to %s" => "»%s« zu %s aktualisiert",
-"Disabled incompatible apps: %s" => "Deaktivierte inkompatible Apps: %s",
-"No image or file provided" => "Weder Bild noch eine Datei wurden zur Verfügung gestellt",
-"Unknown filetype" => "Unbekannter Dateityp",
-"Invalid image" => "Ungültiges Bild",
-"No temporary profile picture available, try again" => "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal",
-"No crop data provided" => "Keine Zuschnittdaten zur Verfügung gestellt",
-"Sunday" => "Sonntag",
-"Monday" => "Montag",
-"Tuesday" => "Dienstag",
-"Wednesday" => "Mittwoch",
-"Thursday" => "Donnerstag",
-"Friday" => "Freitag",
-"Saturday" => "Samstag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "März",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Dezember",
-"Settings" => "Einstellungen",
-"File" => "Datei",
-"Folder" => "Ordner",
-"Image" => "Bild",
-"Audio" => "Audio",
-"Saving..." => "Speichervorgang …",
-"Couldn't send reset email. Please contact your administrator." => "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
-"The link to reset your password has been sent to your email. 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." => "Der Link, zum Zurücksetzen Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
-"I know what I'm doing" => "Ich weiß, was ich mache",
-"Reset password" => "Passwort zurücksetzen",
-"Password can not be changed. Please contact your administrator." => "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.",
-"No" => "Nein",
-"Yes" => "Ja",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
-"Ok" => "OK",
-"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
-"One file conflict" => "Ein Dateikonflikt",
-"New Files" => "Neue Dateien",
-"Already existing files" => "Die Dateien existieren bereits",
-"Which files do you want to keep?" => "Welche Dateien möchten Sie behalten?",
-"If you select both versions, the copied file will have a number added to its name." => "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
-"Cancel" => "Abbrechen",
-"Continue" => "Fortsetzen",
-"(all selected)" => "(Alle ausgewählt)",
-"({count} selected)" => "({count} ausgewählt)",
-"Error loading file exists template" => "Fehler beim Laden der vorhanden Dateivorlage",
-"Very weak password" => "Sehr schwaches Passwort",
-"Weak password" => "Schwaches Passwort",
-"So-so password" => "Passables Passwort",
-"Good password" => "Gutes Passwort",
-"Strong password" => "Starkes Passwort",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Internetserver ist noch nicht richtig konfiguriert, um Dateisynchronisation zu erlauben, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dieses bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Aktualisierungsbenachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Versenden von E-Mail-Benachrichtigungen funktionieren eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen benutzen wollen.",
-"Error occurred while checking server setup" => "Fehler beim Überprüfen der Servereinrichtung",
-"Shared" => "Geteilt",
-"Shared with {recipients}" => "Geteilt mit {recipients}",
-"Share" => "Teilen",
-"Error" => "Fehler",
-"Error while sharing" => "Fehler beim Teilen",
-"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
-"Error while changing permissions" => "Fehler bei der Änderung der Rechte",
-"Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
-"Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
-"Share with user or group …" => "Mit Benutzer oder Gruppe teilen …",
-"Share link" => "Link teilen",
-"The public link will expire no later than {days} days after it is created" => "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
-"Password protect" => "Passwortschutz",
-"Choose a password for the public link" => "Wählen Sie ein Passwort für den öffentlichen Link",
-"Allow Public Upload" => "Öffentliches Hochladen erlauben",
-"Email link to person" => "Link per E-Mail verschicken",
-"Send" => "Senden",
-"Set expiration date" => "Ein Ablaufdatum setzen",
-"Expiration date" => "Ablaufdatum",
-"Adding user..." => "Benutzer wird hinzugefügt …",
-"group" => "Gruppe",
-"Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt",
-"Shared in {item} with {user}" => "Freigegeben in {item} von {user}",
-"Unshare" => "Freigabe aufheben",
-"notify by email" => "Per E-Mail informieren",
-"can share" => "kann geteilt werden",
-"can edit" => "kann bearbeiten",
-"access control" => "Zugriffskontrolle",
-"create" => "erstellen",
-"update" => "aktualisieren",
-"delete" => "löschen",
-"Password protected" => "Passwortgeschützt",
-"Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
-"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
-"Sending ..." => "Sende ...",
-"Email sent" => "Email gesendet",
-"Warning" => "Warnung",
-"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
-"Enter new" => "Neuen eingeben",
-"Delete" => "Löschen",
-"Add" => "Hinzufügen",
-"Edit tags" => "Schlagwörter bearbeiten",
-"Error loading dialog template: {error}" => "Fehler beim Laden der Dialogvorlage: {error}",
-"No tags selected for deletion." => "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
-"Updating {productName} to version {version}, this may take a while." => "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
-"Please reload the page." => "Bitte laden Sie diese Seite neu.",
-"The update was unsuccessful." => "Die Aktualisierung war erfolgreich.",
-"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
-"Couldn't reset password because the token is invalid" => "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
-"Couldn't send reset email. Please make sure your username is correct." => "E-Mail zum Zurücksetzen kann nicht versendet werden. Bitte stellen Sie sicher, dass Ihr Benutzername richtig ist.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Die E-Mail, zum Zurücksetzen, kann Aufgrund einer nicht vorhandenen E-Mail-Adresse, für diesen Benutzernamen, nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
-"%s password reset" => "%s-Passwort zurücksetzen",
-"Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-"You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
-"Username" => "Benutzername",
-"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?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
-"Yes, I really want to reset my password now" => "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
-"Reset" => "Zurücksetzen",
-"New password" => "Neues Passwort",
-"New Password" => "Neues Passwort",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht richtig funktionieren. Benutzung auf eigenes Risiko!",
-"For the best results, please consider using a GNU/Linux server instead." => "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
-"Personal" => "Persönlich",
-"Users" => "Benutzer",
-"Apps" => "Apps",
-"Admin" => "Administrator",
-"Help" => "Hilfe",
-"Error loading tags" => "Fehler beim Laden der Schlagwörter",
-"Tag already exists" => "Schlagwort ist bereits vorhanden",
-"Error deleting tag(s)" => "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter",
-"Error tagging" => "Fehler beim Hinzufügen der Schlagwörter",
-"Error untagging" => "Fehler beim Entfernen der Schlagwörter",
-"Error favoriting" => "Fehler beim Hinzufügen zu den Favoriten",
-"Error unfavoriting" => "Fehler beim Entfernen aus den Favoriten",
-"Access forbidden" => "Zugriff verboten",
-"File not found" => "Datei nicht gefunden",
-"The specified document has not been found on the server." => "Das ausgewählte Dokument wurde auf dem Server nicht gefunden.",
-"You can click here to return to %s." => "Sie können zur Rückkehr zu %s hier klicken.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\n%s hat %s mit Ihnen geteilt.\nAnsehen: %s\n\n",
-"The share will expire on %s." => "Die Freigabe wird am %s ablaufen.",
-"Cheers!" => "Noch einen schönen Tag!",
-"Internal Server Error" => "Interner Server-Fehler",
-"The server encountered an internal error and was unable to complete your request." => "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Bitte wenden Sie sich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt, geben Sie bitte die, unten stehenden, technischen Details in Ihrem Bericht mit an.",
-"More details can be found in the server log." => "Weitere Details können im Serverprotokoll gefunden werden.",
-"Technical details" => "Technische Details",
-"Remote Address: %s" => "Entfernte Adresse: %s",
-"Request ID: %s" => "Anforderungskennung: %s",
-"Code: %s" => "Code: %s",
-"Message: %s" => "Nachricht: %s",
-"File: %s" => "Datei: %s",
-"Line: %s" => "Zeile: %s",
-"Trace" => "Spur",
-"Security Warning" => "Sicherheitshinweis",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
-"Please update your PHP installation to use %s securely." => "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
-"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
-"Password" => "Passwort",
-"Storage & database" => "Speicher & Datenbank",
-"Data folder" => "Datenverzeichnis",
-"Configure the database" => "Datenbank einrichten",
-"Only %s is available." => "Es sind nur %s verfügbar.",
-"Database user" => "Datenbank-Benutzer",
-"Database password" => "Datenbank-Passwort",
-"Database name" => "Datenbank-Name",
-"Database tablespace" => "Datenbank-Tablespace",
-"Database host" => "Datenbank-Host",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dieses zu ändern.",
-"Finish setup" => "Installation abschließen",
-"Finishing …" => "Abschließen ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Diese Anwendung benötigt ein aktiviertes JavaScript, um richtig zu funktionieren. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivieren Sie JavaScript</a> und laden Sie diese Seite neu.",
-"%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
-"Log out" => "Abmelden",
-"Server side authentication failed!" => "Die Legitimierung auf dem Server ist fehlgeschlagen!",
-"Please contact your administrator." => "Bitte kontaktieren Sie Ihren Administrator.",
-"Forgot your password? Reset it!" => "Passwort vergessen? Zurückstellen!",
-"remember" => "merken",
-"Log in" => "Einloggen",
-"Alternative Logins" => "Alternative Logins",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br><br>wir möchten Sie wissen lassen, dass %s <strong>%s</strong> mit Ihnen geteilt hat.<br><a href=\"%s\">Ansehen</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
-"This means only administrators can use the instance." => "Das bedeutet, dass diese Instanz nur von Administratoren benutzt werden kann.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktieren Sie Ihren Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
-"Thank you for your patience." => "Vielen Dank für Ihre Geduld.",
-"You are accessing the server from an untrusted domain." => "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Bitte kontaktieren Sie Ihren Administrator. Wenn Sie aktuell Administrator dieser Instanz sind, konfigurieren Sie bitte die »trusted_domain«-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit bereitgestellt.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Abhängig von Ihrer Konfiguration, können Sie als Administrator dieser Domain vertrauen, indem Sie den unteren Knopf benutzen.",
-"Add \"%s\" as trusted domain" => "»%s« als vertrauenswürdige Domain hinzufügen",
-"%s will be updated to version %s." => "%s wird auf Version %s aktualisiert.",
-"The following apps will be disabled:" => "Die folgenden Apps werden deaktiviert:",
-"The theme %s has been disabled." => "Das Thema %s wurde deaktiviert.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Stellen Sie vor dem Fortsetzen bitte sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.",
-"Start update" => "Aktualisierung starten",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Zur Vermeidung von Zeitüberschreitungen, bei größeren Installationen, können Sie stattdessen den folgenden Befehl, in Ihrem Installationsverzeichnis, ausführen:",
-"This %s instance is currently being updated, which may take a while." => "Diese %s - Instanz wird gerade aktualisiert, was eine Weile dauert.",
-"This page will refresh itself when the %s instance is available again." => "Diese Seite aktualisert sich automatisch, wenn die %s - Instanz wieder verfügbar ist."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/el.js b/core/l10n/el.js
new file mode 100644
index 00000000000..33bd00826b8
--- /dev/null
+++ b/core/l10n/el.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
+    "Turned on maintenance mode" : "Η κατάσταση συντήρησης ενεργοποιήθηκε",
+    "Turned off maintenance mode" : "Η κατάσταση συντήρησης απενεργοποιήθηκε",
+    "Updated database" : "Ενημερωμένη βάση δεδομένων",
+    "Checked database schema update" : "Έλεγχος ενημέρωσης σχήματος βάσης δεδομένων",
+    "Checked database schema update for apps" : "Έλεγχος ενημέρωσης σχήματος βάσης δεδομένων για εφαρμογές",
+    "Updated \"%s\" to %s" : "Αναβαθμίστηκε \"%s\" σε %s",
+    "Disabled incompatible apps: %s" : "Απενεργοποιημένες μη συμβατές εφαρμογές: %s",
+    "No image or file provided" : "Δεν δόθηκε εικόνα ή αρχείο",
+    "Unknown filetype" : "Άγνωστος τύπος αρχείου",
+    "Invalid image" : "Μη έγκυρη εικόνα",
+    "No temporary profile picture available, try again" : "Δεν υπάρχει προσωρινή φωτογραφία προφίλ διαθέσιμη, δοκιμάστε ξανά",
+    "No crop data provided" : "Δεν δόθηκαν δεδομένα περικοπής",
+    "Sunday" : "Κυριακή",
+    "Monday" : "Δευτέρα",
+    "Tuesday" : "Τρίτη",
+    "Wednesday" : "Τετάρτη",
+    "Thursday" : "Πέμπτη",
+    "Friday" : "Παρασκευή",
+    "Saturday" : "Σάββατο",
+    "January" : "Ιανουάριος",
+    "February" : "Φεβρουάριος",
+    "March" : "Μάρτιος",
+    "April" : "Απρίλιος",
+    "May" : "Μάϊος",
+    "June" : "Ιούνιος",
+    "July" : "Ιούλιος",
+    "August" : "Αύγουστος",
+    "September" : "Σεπτέμβριος",
+    "October" : "Οκτώβριος",
+    "November" : "Νοέμβριος",
+    "December" : "Δεκέμβριος",
+    "Settings" : "Ρυθμίσεις",
+    "File" : "Αρχείο",
+    "Folder" : "Φάκελος",
+    "Image" : "Εικόνα",
+    "Audio" : "Ήχος",
+    "Saving..." : "Γίνεται αποθήκευση...",
+    "Couldn't send reset email. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
+    "The link to reset your password has been sent to your email. 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>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
+    "I know what I'm doing" : "Γνωρίζω τι κάνω",
+    "Reset password" : "Επαναφορά συνθηματικού",
+    "Password can not be changed. Please contact your administrator." : "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
+    "No" : "Όχι",
+    "Yes" : "Ναι",
+    "Choose" : "Επιλέξτε",
+    "Error loading file picker template: {error}" : "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
+    "Ok" : "Οκ",
+    "Error loading message template: {error}" : "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} αρχείο διαφέρει","{count} αρχεία διαφέρουν"],
+    "One file conflict" : "Ένα αρχείο διαφέρει",
+    "New Files" : "Νέα Αρχεία",
+    "Already existing files" : "Ήδη υπάρχοντα αρχεία",
+    "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} επιλέχθησαν)",
+    "Error loading file exists template" : "Σφάλμα κατά την φόρτωση του προτύπου \"αρχείο υπάρχει\"",
+    "Very weak password" : "Πολύ αδύναμο συνθηματικό",
+    "Weak password" : "Αδύναμο συνθηματικό",
+    "So-so password" : "Μέτριο συνθηματικό",
+    "Good password" : "Καλό συνθηματικό",
+    "Strong password" : "Δυνατό συνθηματικό",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Αυτός ο διακομιστής δεν έχει ενεργή σύνδεση στο διαδίκτυο. Αυτό σημαίνει ότι κάποιες υπηρεσίες όπως η σύνδεση με εξωτερικούς αποθηκευτικούς χώρους, ειδοποιήσεις περί ενημερώσεων ή η εγκατάσταση 3ων εφαρμογών δεν θα είναι διαθέσιμες. Η πρόσβαση απομακρυσμένων αρχείων και η αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου μπορεί επίσης να μην είναι διαθέσιμες. Προτείνουμε να ενεργοποιήσετε την πρόσβαση στο διαδίκτυο για αυτόν το διακομιστή εάν θέλετε να χρησιμοποιήσετε όλες τις υπηρεσίες.",
+    "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή",
+    "Shared" : "Κοινόχρηστα",
+    "Shared with {recipients}" : "Διαμοιράστηκε με {recipients}",
+    "Share" : "Διαμοιρασμός",
+    "Error" : "Σφάλμα",
+    "Error while sharing" : "Σφάλμα κατά τον διαμοιρασμό",
+    "Error while unsharing" : "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
+    "Error while changing permissions" : "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
+    "Shared with you and the group {group} by {owner}" : "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
+    "Shared with you by {owner}" : "Διαμοιράστηκε με σας από τον {owner}",
+    "Share with user or group …" : "Διαμοιρασμός με χρήστη ή ομάδα ...",
+    "Share link" : "Διαμοιρασμός συνδέσμου",
+    "The public link will expire no later than {days} days after it is created" : "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
+    "Password protect" : "Προστασία συνθηματικού",
+    "Choose a password for the public link" : "Επιλέξτε κωδικό για τον δημόσιο σύνδεσμο",
+    "Allow Public Upload" : "Επιτρέπεται η Δημόσια Αποστολή",
+    "Email link to person" : "Αποστολή συνδέσμου με email ",
+    "Send" : "Αποστολή",
+    "Set expiration date" : "Ορισμός ημ. λήξης",
+    "Expiration date" : "Ημερομηνία λήξης",
+    "Adding user..." : "Προσθήκη χρήστη ...",
+    "group" : "ομάδα",
+    "Resharing is not allowed" : "Ξαναμοιρασμός δεν επιτρέπεται",
+    "Shared in {item} with {user}" : "Διαμοιρασμός του {item} με τον {user}",
+    "Unshare" : "Διακοπή διαμοιρασμού",
+    "notify by email" : "ειδοποίηση με email",
+    "can share" : "δυνατότητα διαμοιρασμού",
+    "can edit" : "δυνατότητα αλλαγής",
+    "access control" : "έλεγχος πρόσβασης",
+    "create" : "δημιουργία",
+    "update" : "ενημέρωση",
+    "delete" : "διαγραφή",
+    "Password protected" : "Προστασία με συνθηματικό",
+    "Error unsetting expiration date" : "Σφάλμα κατά την διαγραφή της ημ. λήξης",
+    "Error setting expiration date" : "Σφάλμα κατά τον ορισμό ημ. λήξης",
+    "Sending ..." : "Αποστολή...",
+    "Email sent" : "Το Email απεστάλη ",
+    "Warning" : "Προειδοποίηση",
+    "The object type is not specified." : "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
+    "Enter new" : "Εισαγωγή νέου",
+    "Delete" : "Διαγραφή",
+    "Add" : "Προσθήκη",
+    "Edit tags" : "Επεξεργασία ετικετών",
+    "Error loading dialog template: {error}" : "Σφάλμα φόρτωσης προτύπου διαλόγων: {σφάλμα}",
+    "No tags selected for deletion." : "Καμμία ετικέτα δεν επιλέχθηκε για διαγραφή.",
+    "Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.",
+    "Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.",
+    "The update was unsuccessful." : "Η ενημέρωση δεν ήταν επιτυχής.",
+    "The update was successful. Redirecting you to ownCloud now." : "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Αδυναμία επαναφοράς κωδικού πρόσβασης καθώς το τεκμήριο είναι άκυρο",
+    "Couldn't send reset email. Please make sure your username is correct." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ ελέγξτε ότι το όνομα χρήστη σας είναι ορθό.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς καθώς δεν αντιστοιχεί καμμία διεύθυνση ηλ. ταχυδρομείου σε αυτό το όνομα χρήστη. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
+    "%s password reset" : "%s επαναφορά κωδικού πρόσβασης",
+    "Use the following link to reset your password: {link}" : "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
+    "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" : "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
+    "Reset" : "Επαναφορά",
+    "New password" : "Νέο συνθηματικό",
+    "New Password" : "Νέος Κωδικός",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux.",
+    "Personal" : "Προσωπικά",
+    "Users" : "Χρήστες",
+    "Apps" : "Εφαρμογές",
+    "Admin" : "Διαχείριση",
+    "Help" : "Βοήθεια",
+    "Error loading tags" : "Σφάλμα φόρτωσης ετικετών",
+    "Tag already exists" : "Υπάρχει ήδη η ετικέτα",
+    "Error deleting tag(s)" : "Σφάλμα διαγραφής ετικέτας(ων)",
+    "Error tagging" : "Σφάλμα προσθήκης ετικέτας",
+    "Error untagging" : "Σφάλμα αφαίρεσης ετικέτας",
+    "Error favoriting" : "Σφάλμα προσθήκης στα αγαπημένα",
+    "Error unfavoriting" : "Σφάλμα αφαίρεσης από τα αγαπημένα",
+    "Access forbidden" : "Δεν επιτρέπεται η πρόσβαση",
+    "File not found" : "Το αρχείο δεν βρέθηκε",
+    "The specified document has not been found on the server." : "Το συγκεκριμένο έγγραφο δεν έχει βρεθεί στο διακομιστή.",
+    "You can click here to return to %s." : "Μπορείτε να κάνετε κλικ εδώ για να επιστρέψετε στο %s.",
+    "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!" : "Χαιρετισμούς!",
+    "Internal Server Error" : "Εσωτερικό Σφάλμα Διακομιστή",
+    "The server encountered an internal error and was unable to complete your request." : "Ο διακομιστής αντιμετώπισε ένα εσωτερικό σφάλμα και δεν μπόρεσε να ολοκληρώσει το αίτημά σας.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Παρακαλώ επικοινωνήστε με το διαχειριστή του διακομιστή, εάν αυτό το σφάλμα επανεμφανίζεται πολλές φορές, παρακαλούμε να συμπεριλάβετε τις τεχνικές λεπτομέρειες παρακάτω στην αναφορά σας.",
+    "More details can be found in the server log." : "Περισσότερες λεπτομέρειες μπορείτε να βρείτε στο αρχείο καταγραφής του διακομιστή.",
+    "Technical details" : "Τεχνικές λεπτομέρειες",
+    "Remote Address: %s" : "Απομακρυσμένη Διεύθυνση: %s",
+    "Request ID: %s" : "Αίτημα ID: %s",
+    "Code: %s" : "Κωδικός: %s",
+    "Message: %s" : "Μήνυμα: %s",
+    "File: %s" : "Αρχείο: %s",
+    "Line: %s" : "Γραμμή: %s",
+    "Trace" : "Ανίχνευση",
+    "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 με ασφάλεια.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .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>.",
+    "Create an <strong>admin account</strong>" : "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
+    "Password" : "Συνθηματικό",
+    "Storage & database" : "Αποθήκευση & βάση δεδομένων",
+    "Data folder" : "Φάκελος δεδομένων",
+    "Configure the database" : "Ρύθμιση της βάσης δεδομένων",
+    "Only %s is available." : "Μόνο %s είναι διαθέσιμο.",
+    "Database user" : "Χρήστης της βάσης δεδομένων",
+    "Database password" : "Συνθηματικό βάσης δεδομένων",
+    "Database name" : "Όνομα βάσης δεδομένων",
+    "Database tablespace" : "Κενά Πινάκων Βάσης Δεδομένων",
+    "Database host" : "Διακομιστής βάσης δεδομένων",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Η SQLIte θα χρησιμοποιηθεί ως βάση δεδομένων. Για μεγαλύτερες εγκαταστάσεις σας συνιστούμε να το αλλάξετε.",
+    "Finish setup" : "Ολοκλήρωση εγκατάστασης",
+    "Finishing …" : "Ολοκλήρωση...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για τη σωστή λειτουργία. Παρακαλώ  <a href=\"http://enable-javascript.com/\" target=\"_blank\">ενεργοποιήστε τη JavaScript</a> και επαναφορτώστε τη σελίδα.",
+    "%s is available. Get more information on how to update." : "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε.",
+    "Log out" : "Αποσύνδεση",
+    "Server side authentication failed!" : "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!",
+    "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
+    "Forgot your password? Reset it!" : "Ξεχάσατε τον κωδικό πρόσβασής σας; Επαναφέρετέ τον!",
+    "remember" : "απομνημόνευση",
+    "Log in" : "Είσοδος",
+    "Alternative Logins" : "Εναλλακτικές Συνδέσεις",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<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." : "Σας ευχαριστούμε για την υπομονή σας.",
+    "You are accessing the server from an untrusted domain." : "Η προσπέλαση του διακομιστή γίνεται από μη έμπιστο τομέα.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή συστημάτων σας. Αν είστε διαχειριστής αυτού του στιγμιοτύπο, ρυθμίστε το κλειδί \"trusted_domain\" στο αρχείο config/config.php. Ένα παράδειγμα παρέχεται στο αρχείο config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ανάλογα με τις ρυθμίσεις σας, σαν διαχειριστής θα μπορούσατε επίσης να χρησιμοποιήσετε το παρακάτω κουμπί για να εμπιστευθείτε αυτή την περιοχή.",
+    "Add \"%s\" as trusted domain" : "Προσθήκη \"%s\" ως αξιόπιστη περιοχή",
+    "%s will be updated to version %s." : "Το %s θα ενημερωθεί στην έκδοση %s.",
+    "The following apps will be disabled:" : "Οι παρακάτω εφαρμογές θα απενεργοποιηθούν:",
+    "The theme %s has been disabled." : "Το θέμα %s έχει απενεργοποιηθεί.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Παρακαλώ βεβαιωθείτε ότι έχουν ληψθεί αντίγραφα ασφαλείας της βάσης δεδομένων, του φακέλου ρυθμίσεων και του φακέλου δεδομένων πριν προχωρήσετε.",
+    "Start update" : "Έναρξη ενημέρωσης",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Για να αποφύγετε τη λήξη χρόνου με μεγαλύτερες εγκαταστάσεις, μπορείτε αντί αυτού να τρέξετε την ακόλουθη εντολή από τον κατάλογο αρχείων εφαρμογών:",
+    "This %s instance is currently being updated, which may take a while." : "Αυτή %s η εγκατάσταση είναι υπό ενημέρωση, η οποία μπορεί να πάρει κάποιο χρόνο.",
+    "This page will refresh itself when the %s instance is available again." : "Αυτή η σελίδα θα ανανεωθεί από μόνη της όταν η %s εγκατάσταση είναι διαθέσιμη ξανά."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/el.json b/core/l10n/el.json
new file mode 100644
index 00000000000..5a35c89dfc3
--- /dev/null
+++ b/core/l10n/el.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
+    "Turned on maintenance mode" : "Η κατάσταση συντήρησης ενεργοποιήθηκε",
+    "Turned off maintenance mode" : "Η κατάσταση συντήρησης απενεργοποιήθηκε",
+    "Updated database" : "Ενημερωμένη βάση δεδομένων",
+    "Checked database schema update" : "Έλεγχος ενημέρωσης σχήματος βάσης δεδομένων",
+    "Checked database schema update for apps" : "Έλεγχος ενημέρωσης σχήματος βάσης δεδομένων για εφαρμογές",
+    "Updated \"%s\" to %s" : "Αναβαθμίστηκε \"%s\" σε %s",
+    "Disabled incompatible apps: %s" : "Απενεργοποιημένες μη συμβατές εφαρμογές: %s",
+    "No image or file provided" : "Δεν δόθηκε εικόνα ή αρχείο",
+    "Unknown filetype" : "Άγνωστος τύπος αρχείου",
+    "Invalid image" : "Μη έγκυρη εικόνα",
+    "No temporary profile picture available, try again" : "Δεν υπάρχει προσωρινή φωτογραφία προφίλ διαθέσιμη, δοκιμάστε ξανά",
+    "No crop data provided" : "Δεν δόθηκαν δεδομένα περικοπής",
+    "Sunday" : "Κυριακή",
+    "Monday" : "Δευτέρα",
+    "Tuesday" : "Τρίτη",
+    "Wednesday" : "Τετάρτη",
+    "Thursday" : "Πέμπτη",
+    "Friday" : "Παρασκευή",
+    "Saturday" : "Σάββατο",
+    "January" : "Ιανουάριος",
+    "February" : "Φεβρουάριος",
+    "March" : "Μάρτιος",
+    "April" : "Απρίλιος",
+    "May" : "Μάϊος",
+    "June" : "Ιούνιος",
+    "July" : "Ιούλιος",
+    "August" : "Αύγουστος",
+    "September" : "Σεπτέμβριος",
+    "October" : "Οκτώβριος",
+    "November" : "Νοέμβριος",
+    "December" : "Δεκέμβριος",
+    "Settings" : "Ρυθμίσεις",
+    "File" : "Αρχείο",
+    "Folder" : "Φάκελος",
+    "Image" : "Εικόνα",
+    "Audio" : "Ήχος",
+    "Saving..." : "Γίνεται αποθήκευση...",
+    "Couldn't send reset email. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
+    "The link to reset your password has been sent to your email. 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>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
+    "I know what I'm doing" : "Γνωρίζω τι κάνω",
+    "Reset password" : "Επαναφορά συνθηματικού",
+    "Password can not be changed. Please contact your administrator." : "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
+    "No" : "Όχι",
+    "Yes" : "Ναι",
+    "Choose" : "Επιλέξτε",
+    "Error loading file picker template: {error}" : "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
+    "Ok" : "Οκ",
+    "Error loading message template: {error}" : "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} αρχείο διαφέρει","{count} αρχεία διαφέρουν"],
+    "One file conflict" : "Ένα αρχείο διαφέρει",
+    "New Files" : "Νέα Αρχεία",
+    "Already existing files" : "Ήδη υπάρχοντα αρχεία",
+    "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} επιλέχθησαν)",
+    "Error loading file exists template" : "Σφάλμα κατά την φόρτωση του προτύπου \"αρχείο υπάρχει\"",
+    "Very weak password" : "Πολύ αδύναμο συνθηματικό",
+    "Weak password" : "Αδύναμο συνθηματικό",
+    "So-so password" : "Μέτριο συνθηματικό",
+    "Good password" : "Καλό συνθηματικό",
+    "Strong password" : "Δυνατό συνθηματικό",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Αυτός ο διακομιστής δεν έχει ενεργή σύνδεση στο διαδίκτυο. Αυτό σημαίνει ότι κάποιες υπηρεσίες όπως η σύνδεση με εξωτερικούς αποθηκευτικούς χώρους, ειδοποιήσεις περί ενημερώσεων ή η εγκατάσταση 3ων εφαρμογών δεν θα είναι διαθέσιμες. Η πρόσβαση απομακρυσμένων αρχείων και η αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου μπορεί επίσης να μην είναι διαθέσιμες. Προτείνουμε να ενεργοποιήσετε την πρόσβαση στο διαδίκτυο για αυτόν το διακομιστή εάν θέλετε να χρησιμοποιήσετε όλες τις υπηρεσίες.",
+    "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή",
+    "Shared" : "Κοινόχρηστα",
+    "Shared with {recipients}" : "Διαμοιράστηκε με {recipients}",
+    "Share" : "Διαμοιρασμός",
+    "Error" : "Σφάλμα",
+    "Error while sharing" : "Σφάλμα κατά τον διαμοιρασμό",
+    "Error while unsharing" : "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
+    "Error while changing permissions" : "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
+    "Shared with you and the group {group} by {owner}" : "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
+    "Shared with you by {owner}" : "Διαμοιράστηκε με σας από τον {owner}",
+    "Share with user or group …" : "Διαμοιρασμός με χρήστη ή ομάδα ...",
+    "Share link" : "Διαμοιρασμός συνδέσμου",
+    "The public link will expire no later than {days} days after it is created" : "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
+    "Password protect" : "Προστασία συνθηματικού",
+    "Choose a password for the public link" : "Επιλέξτε κωδικό για τον δημόσιο σύνδεσμο",
+    "Allow Public Upload" : "Επιτρέπεται η Δημόσια Αποστολή",
+    "Email link to person" : "Αποστολή συνδέσμου με email ",
+    "Send" : "Αποστολή",
+    "Set expiration date" : "Ορισμός ημ. λήξης",
+    "Expiration date" : "Ημερομηνία λήξης",
+    "Adding user..." : "Προσθήκη χρήστη ...",
+    "group" : "ομάδα",
+    "Resharing is not allowed" : "Ξαναμοιρασμός δεν επιτρέπεται",
+    "Shared in {item} with {user}" : "Διαμοιρασμός του {item} με τον {user}",
+    "Unshare" : "Διακοπή διαμοιρασμού",
+    "notify by email" : "ειδοποίηση με email",
+    "can share" : "δυνατότητα διαμοιρασμού",
+    "can edit" : "δυνατότητα αλλαγής",
+    "access control" : "έλεγχος πρόσβασης",
+    "create" : "δημιουργία",
+    "update" : "ενημέρωση",
+    "delete" : "διαγραφή",
+    "Password protected" : "Προστασία με συνθηματικό",
+    "Error unsetting expiration date" : "Σφάλμα κατά την διαγραφή της ημ. λήξης",
+    "Error setting expiration date" : "Σφάλμα κατά τον ορισμό ημ. λήξης",
+    "Sending ..." : "Αποστολή...",
+    "Email sent" : "Το Email απεστάλη ",
+    "Warning" : "Προειδοποίηση",
+    "The object type is not specified." : "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
+    "Enter new" : "Εισαγωγή νέου",
+    "Delete" : "Διαγραφή",
+    "Add" : "Προσθήκη",
+    "Edit tags" : "Επεξεργασία ετικετών",
+    "Error loading dialog template: {error}" : "Σφάλμα φόρτωσης προτύπου διαλόγων: {σφάλμα}",
+    "No tags selected for deletion." : "Καμμία ετικέτα δεν επιλέχθηκε για διαγραφή.",
+    "Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.",
+    "Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.",
+    "The update was unsuccessful." : "Η ενημέρωση δεν ήταν επιτυχής.",
+    "The update was successful. Redirecting you to ownCloud now." : "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Αδυναμία επαναφοράς κωδικού πρόσβασης καθώς το τεκμήριο είναι άκυρο",
+    "Couldn't send reset email. Please make sure your username is correct." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ ελέγξτε ότι το όνομα χρήστη σας είναι ορθό.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς καθώς δεν αντιστοιχεί καμμία διεύθυνση ηλ. ταχυδρομείου σε αυτό το όνομα χρήστη. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
+    "%s password reset" : "%s επαναφορά κωδικού πρόσβασης",
+    "Use the following link to reset your password: {link}" : "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
+    "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" : "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
+    "Reset" : "Επαναφορά",
+    "New password" : "Νέο συνθηματικό",
+    "New Password" : "Νέος Κωδικός",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux.",
+    "Personal" : "Προσωπικά",
+    "Users" : "Χρήστες",
+    "Apps" : "Εφαρμογές",
+    "Admin" : "Διαχείριση",
+    "Help" : "Βοήθεια",
+    "Error loading tags" : "Σφάλμα φόρτωσης ετικετών",
+    "Tag already exists" : "Υπάρχει ήδη η ετικέτα",
+    "Error deleting tag(s)" : "Σφάλμα διαγραφής ετικέτας(ων)",
+    "Error tagging" : "Σφάλμα προσθήκης ετικέτας",
+    "Error untagging" : "Σφάλμα αφαίρεσης ετικέτας",
+    "Error favoriting" : "Σφάλμα προσθήκης στα αγαπημένα",
+    "Error unfavoriting" : "Σφάλμα αφαίρεσης από τα αγαπημένα",
+    "Access forbidden" : "Δεν επιτρέπεται η πρόσβαση",
+    "File not found" : "Το αρχείο δεν βρέθηκε",
+    "The specified document has not been found on the server." : "Το συγκεκριμένο έγγραφο δεν έχει βρεθεί στο διακομιστή.",
+    "You can click here to return to %s." : "Μπορείτε να κάνετε κλικ εδώ για να επιστρέψετε στο %s.",
+    "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!" : "Χαιρετισμούς!",
+    "Internal Server Error" : "Εσωτερικό Σφάλμα Διακομιστή",
+    "The server encountered an internal error and was unable to complete your request." : "Ο διακομιστής αντιμετώπισε ένα εσωτερικό σφάλμα και δεν μπόρεσε να ολοκληρώσει το αίτημά σας.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Παρακαλώ επικοινωνήστε με το διαχειριστή του διακομιστή, εάν αυτό το σφάλμα επανεμφανίζεται πολλές φορές, παρακαλούμε να συμπεριλάβετε τις τεχνικές λεπτομέρειες παρακάτω στην αναφορά σας.",
+    "More details can be found in the server log." : "Περισσότερες λεπτομέρειες μπορείτε να βρείτε στο αρχείο καταγραφής του διακομιστή.",
+    "Technical details" : "Τεχνικές λεπτομέρειες",
+    "Remote Address: %s" : "Απομακρυσμένη Διεύθυνση: %s",
+    "Request ID: %s" : "Αίτημα ID: %s",
+    "Code: %s" : "Κωδικός: %s",
+    "Message: %s" : "Μήνυμα: %s",
+    "File: %s" : "Αρχείο: %s",
+    "Line: %s" : "Γραμμή: %s",
+    "Trace" : "Ανίχνευση",
+    "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 με ασφάλεια.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .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>.",
+    "Create an <strong>admin account</strong>" : "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
+    "Password" : "Συνθηματικό",
+    "Storage & database" : "Αποθήκευση & βάση δεδομένων",
+    "Data folder" : "Φάκελος δεδομένων",
+    "Configure the database" : "Ρύθμιση της βάσης δεδομένων",
+    "Only %s is available." : "Μόνο %s είναι διαθέσιμο.",
+    "Database user" : "Χρήστης της βάσης δεδομένων",
+    "Database password" : "Συνθηματικό βάσης δεδομένων",
+    "Database name" : "Όνομα βάσης δεδομένων",
+    "Database tablespace" : "Κενά Πινάκων Βάσης Δεδομένων",
+    "Database host" : "Διακομιστής βάσης δεδομένων",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Η SQLIte θα χρησιμοποιηθεί ως βάση δεδομένων. Για μεγαλύτερες εγκαταστάσεις σας συνιστούμε να το αλλάξετε.",
+    "Finish setup" : "Ολοκλήρωση εγκατάστασης",
+    "Finishing …" : "Ολοκλήρωση...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για τη σωστή λειτουργία. Παρακαλώ  <a href=\"http://enable-javascript.com/\" target=\"_blank\">ενεργοποιήστε τη JavaScript</a> και επαναφορτώστε τη σελίδα.",
+    "%s is available. Get more information on how to update." : "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε.",
+    "Log out" : "Αποσύνδεση",
+    "Server side authentication failed!" : "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!",
+    "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
+    "Forgot your password? Reset it!" : "Ξεχάσατε τον κωδικό πρόσβασής σας; Επαναφέρετέ τον!",
+    "remember" : "απομνημόνευση",
+    "Log in" : "Είσοδος",
+    "Alternative Logins" : "Εναλλακτικές Συνδέσεις",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<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." : "Σας ευχαριστούμε για την υπομονή σας.",
+    "You are accessing the server from an untrusted domain." : "Η προσπέλαση του διακομιστή γίνεται από μη έμπιστο τομέα.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή συστημάτων σας. Αν είστε διαχειριστής αυτού του στιγμιοτύπο, ρυθμίστε το κλειδί \"trusted_domain\" στο αρχείο config/config.php. Ένα παράδειγμα παρέχεται στο αρχείο config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ανάλογα με τις ρυθμίσεις σας, σαν διαχειριστής θα μπορούσατε επίσης να χρησιμοποιήσετε το παρακάτω κουμπί για να εμπιστευθείτε αυτή την περιοχή.",
+    "Add \"%s\" as trusted domain" : "Προσθήκη \"%s\" ως αξιόπιστη περιοχή",
+    "%s will be updated to version %s." : "Το %s θα ενημερωθεί στην έκδοση %s.",
+    "The following apps will be disabled:" : "Οι παρακάτω εφαρμογές θα απενεργοποιηθούν:",
+    "The theme %s has been disabled." : "Το θέμα %s έχει απενεργοποιηθεί.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Παρακαλώ βεβαιωθείτε ότι έχουν ληψθεί αντίγραφα ασφαλείας της βάσης δεδομένων, του φακέλου ρυθμίσεων και του φακέλου δεδομένων πριν προχωρήσετε.",
+    "Start update" : "Έναρξη ενημέρωσης",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Για να αποφύγετε τη λήξη χρόνου με μεγαλύτερες εγκαταστάσεις, μπορείτε αντί αυτού να τρέξετε την ακόλουθη εντολή από τον κατάλογο αρχείων εφαρμογών:",
+    "This %s instance is currently being updated, which may take a while." : "Αυτή %s η εγκατάσταση είναι υπό ενημέρωση, η οποία μπορεί να πάρει κάποιο χρόνο.",
+    "This page will refresh itself when the %s instance is available again." : "Αυτή η σελίδα θα ανανεωθεί από μόνη της όταν η %s εγκατάσταση είναι διαθέσιμη ξανά."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/el.php b/core/l10n/el.php
deleted file mode 100644
index c48ac9a4909..00000000000
--- a/core/l10n/el.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
-"Turned on maintenance mode" => "Η κατάσταση συντήρησης ενεργοποιήθηκε",
-"Turned off maintenance mode" => "Η κατάσταση συντήρησης απενεργοποιήθηκε",
-"Updated database" => "Ενημερωμένη βάση δεδομένων",
-"Checked database schema update" => "Έλεγχος ενημέρωσης σχήματος βάσης δεδομένων",
-"Checked database schema update for apps" => "Έλεγχος ενημέρωσης σχήματος βάσης δεδομένων για εφαρμογές",
-"Updated \"%s\" to %s" => "Αναβαθμίστηκε \"%s\" σε %s",
-"Disabled incompatible apps: %s" => "Απενεργοποιημένες μη συμβατές εφαρμογές: %s",
-"No image or file provided" => "Δεν δόθηκε εικόνα ή αρχείο",
-"Unknown filetype" => "Άγνωστος τύπος αρχείου",
-"Invalid image" => "Μη έγκυρη εικόνα",
-"No temporary profile picture available, try again" => "Δεν υπάρχει προσωρινή φωτογραφία προφίλ διαθέσιμη, δοκιμάστε ξανά",
-"No crop data provided" => "Δεν δόθηκαν δεδομένα περικοπής",
-"Sunday" => "Κυριακή",
-"Monday" => "Δευτέρα",
-"Tuesday" => "Τρίτη",
-"Wednesday" => "Τετάρτη",
-"Thursday" => "Πέμπτη",
-"Friday" => "Παρασκευή",
-"Saturday" => "Σάββατο",
-"January" => "Ιανουάριος",
-"February" => "Φεβρουάριος",
-"March" => "Μάρτιος",
-"April" => "Απρίλιος",
-"May" => "Μάϊος",
-"June" => "Ιούνιος",
-"July" => "Ιούλιος",
-"August" => "Αύγουστος",
-"September" => "Σεπτέμβριος",
-"October" => "Οκτώβριος",
-"November" => "Νοέμβριος",
-"December" => "Δεκέμβριος",
-"Settings" => "Ρυθμίσεις",
-"File" => "Αρχείο",
-"Folder" => "Φάκελος",
-"Image" => "Εικόνα",
-"Audio" => "Ήχος",
-"Saving..." => "Γίνεται αποθήκευση...",
-"Couldn't send reset email. Please contact your administrator." => "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
-"The link to reset your password has been sent to your email. 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>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
-"I know what I'm doing" => "Γνωρίζω τι κάνω",
-"Reset password" => "Επαναφορά συνθηματικού",
-"Password can not be changed. Please contact your administrator." => "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
-"No" => "Όχι",
-"Yes" => "Ναι",
-"Choose" => "Επιλέξτε",
-"Error loading file picker template: {error}" => "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
-"Ok" => "Οκ",
-"Error loading message template: {error}" => "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} αρχείο διαφέρει","{count} αρχεία διαφέρουν"),
-"One file conflict" => "Ένα αρχείο διαφέρει",
-"New Files" => "Νέα Αρχεία",
-"Already existing files" => "Ήδη υπάρχοντα αρχεία",
-"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} επιλέχθησαν)",
-"Error loading file exists template" => "Σφάλμα κατά την φόρτωση του προτύπου \"αρχείο υπάρχει\"",
-"Very weak password" => "Πολύ αδύναμο συνθηματικό",
-"Weak password" => "Αδύναμο συνθηματικό",
-"So-so password" => "Μέτριο συνθηματικό",
-"Good password" => "Καλό συνθηματικό",
-"Strong password" => "Δυνατό συνθηματικό",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Αυτός ο διακομιστής δεν έχει ενεργή σύνδεση στο διαδίκτυο. Αυτό σημαίνει ότι κάποιες υπηρεσίες όπως η σύνδεση με εξωτερικούς αποθηκευτικούς χώρους, ειδοποιήσεις περί ενημερώσεων ή η εγκατάσταση 3ων εφαρμογών δεν θα είναι διαθέσιμες. Η πρόσβαση απομακρυσμένων αρχείων και η αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου μπορεί επίσης να μην είναι διαθέσιμες. Προτείνουμε να ενεργοποιήσετε την πρόσβαση στο διαδίκτυο για αυτόν το διακομιστή εάν θέλετε να χρησιμοποιήσετε όλες τις υπηρεσίες.",
-"Error occurred while checking server setup" => "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή",
-"Shared" => "Κοινόχρηστα",
-"Shared with {recipients}" => "Διαμοιράστηκε με {recipients}",
-"Share" => "Διαμοιρασμός",
-"Error" => "Σφάλμα",
-"Error while sharing" => "Σφάλμα κατά τον διαμοιρασμό",
-"Error while unsharing" => "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
-"Error while changing permissions" => "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
-"Shared with you and the group {group} by {owner}" => "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
-"Shared with you by {owner}" => "Διαμοιράστηκε με σας από τον {owner}",
-"Share with user or group …" => "Διαμοιρασμός με χρήστη ή ομάδα ...",
-"Share link" => "Διαμοιρασμός συνδέσμου",
-"The public link will expire no later than {days} days after it is created" => "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
-"Password protect" => "Προστασία συνθηματικού",
-"Choose a password for the public link" => "Επιλέξτε κωδικό για τον δημόσιο σύνδεσμο",
-"Allow Public Upload" => "Επιτρέπεται η Δημόσια Αποστολή",
-"Email link to person" => "Αποστολή συνδέσμου με email ",
-"Send" => "Αποστολή",
-"Set expiration date" => "Ορισμός ημ. λήξης",
-"Expiration date" => "Ημερομηνία λήξης",
-"Adding user..." => "Προσθήκη χρήστη ...",
-"group" => "ομάδα",
-"Resharing is not allowed" => "Ξαναμοιρασμός δεν επιτρέπεται",
-"Shared in {item} with {user}" => "Διαμοιρασμός του {item} με τον {user}",
-"Unshare" => "Διακοπή διαμοιρασμού",
-"notify by email" => "ειδοποίηση με email",
-"can share" => "δυνατότητα διαμοιρασμού",
-"can edit" => "δυνατότητα αλλαγής",
-"access control" => "έλεγχος πρόσβασης",
-"create" => "δημιουργία",
-"update" => "ενημέρωση",
-"delete" => "διαγραφή",
-"Password protected" => "Προστασία με συνθηματικό",
-"Error unsetting expiration date" => "Σφάλμα κατά την διαγραφή της ημ. λήξης",
-"Error setting expiration date" => "Σφάλμα κατά τον ορισμό ημ. λήξης",
-"Sending ..." => "Αποστολή...",
-"Email sent" => "Το Email απεστάλη ",
-"Warning" => "Προειδοποίηση",
-"The object type is not specified." => "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
-"Enter new" => "Εισαγωγή νέου",
-"Delete" => "Διαγραφή",
-"Add" => "Προσθήκη",
-"Edit tags" => "Επεξεργασία ετικετών",
-"Error loading dialog template: {error}" => "Σφάλμα φόρτωσης προτύπου διαλόγων: {σφάλμα}",
-"No tags selected for deletion." => "Καμμία ετικέτα δεν επιλέχθηκε για διαγραφή.",
-"Updating {productName} to version {version}, this may take a while." => "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.",
-"Please reload the page." => "Παρακαλώ επαναφορτώστε τη σελίδα.",
-"The update was unsuccessful." => "Η ενημέρωση δεν ήταν επιτυχής.",
-"The update was successful. Redirecting you to ownCloud now." => "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
-"Couldn't reset password because the token is invalid" => "Αδυναμία επαναφοράς κωδικού πρόσβασης καθώς το τεκμήριο είναι άκυρο",
-"Couldn't send reset email. Please make sure your username is correct." => "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ ελέγξτε ότι το όνομα χρήστη σας είναι ορθό.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς καθώς δεν αντιστοιχεί καμμία διεύθυνση ηλ. ταχυδρομείου σε αυτό το όνομα χρήστη. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
-"%s password reset" => "%s επαναφορά κωδικού πρόσβασης",
-"Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
-"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" => "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
-"Reset" => "Επαναφορά",
-"New password" => "Νέο συνθηματικό",
-"New Password" => "Νέος Κωδικός",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!",
-"For the best results, please consider using a GNU/Linux server instead." => "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux.",
-"Personal" => "Προσωπικά",
-"Users" => "Χρήστες",
-"Apps" => "Εφαρμογές",
-"Admin" => "Διαχείριση",
-"Help" => "Βοήθεια",
-"Error loading tags" => "Σφάλμα φόρτωσης ετικετών",
-"Tag already exists" => "Υπάρχει ήδη η ετικέτα",
-"Error deleting tag(s)" => "Σφάλμα διαγραφής ετικέτας(ων)",
-"Error tagging" => "Σφάλμα προσθήκης ετικέτας",
-"Error untagging" => "Σφάλμα αφαίρεσης ετικέτας",
-"Error favoriting" => "Σφάλμα προσθήκης στα αγαπημένα",
-"Error unfavoriting" => "Σφάλμα αφαίρεσης από τα αγαπημένα",
-"Access forbidden" => "Δεν επιτρέπεται η πρόσβαση",
-"File not found" => "Το αρχείο δεν βρέθηκε",
-"The specified document has not been found on the server." => "Το συγκεκριμένο έγγραφο δεν έχει βρεθεί στο διακομιστή.",
-"You can click here to return to %s." => "Μπορείτε να κάνετε κλικ εδώ για να επιστρέψετε στο %s.",
-"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!" => "Χαιρετισμούς!",
-"Internal Server Error" => "Εσωτερικό Σφάλμα Διακομιστή",
-"The server encountered an internal error and was unable to complete your request." => "Ο διακομιστής αντιμετώπισε ένα εσωτερικό σφάλμα και δεν μπόρεσε να ολοκληρώσει το αίτημά σας.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Παρακαλώ επικοινωνήστε με το διαχειριστή του διακομιστή, εάν αυτό το σφάλμα επανεμφανίζεται πολλές φορές, παρακαλούμε να συμπεριλάβετε τις τεχνικές λεπτομέρειες παρακάτω στην αναφορά σας.",
-"More details can be found in the server log." => "Περισσότερες λεπτομέρειες μπορείτε να βρείτε στο αρχείο καταγραφής του διακομιστή.",
-"Technical details" => "Τεχνικές λεπτομέρειες",
-"Remote Address: %s" => "Απομακρυσμένη Διεύθυνση: %s",
-"Request ID: %s" => "Αίτημα ID: %s",
-"Code: %s" => "Κωδικός: %s",
-"Message: %s" => "Μήνυμα: %s",
-"File: %s" => "Αρχείο: %s",
-"Line: %s" => "Γραμμή: %s",
-"Trace" => "Ανίχνευση",
-"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 με ασφάλεια.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .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>.",
-"Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
-"Password" => "Συνθηματικό",
-"Storage & database" => "Αποθήκευση & βάση δεδομένων",
-"Data folder" => "Φάκελος δεδομένων",
-"Configure the database" => "Ρύθμιση της βάσης δεδομένων",
-"Only %s is available." => "Μόνο %s είναι διαθέσιμο.",
-"Database user" => "Χρήστης της βάσης δεδομένων",
-"Database password" => "Συνθηματικό βάσης δεδομένων",
-"Database name" => "Όνομα βάσης δεδομένων",
-"Database tablespace" => "Κενά Πινάκων Βάσης Δεδομένων",
-"Database host" => "Διακομιστής βάσης δεδομένων",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Η SQLIte θα χρησιμοποιηθεί ως βάση δεδομένων. Για μεγαλύτερες εγκαταστάσεις σας συνιστούμε να το αλλάξετε.",
-"Finish setup" => "Ολοκλήρωση εγκατάστασης",
-"Finishing …" => "Ολοκλήρωση...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Αυτή η εφαρμογή απαιτεί JavaScript για τη σωστή λειτουργία. Παρακαλώ  <a href=\"http://enable-javascript.com/\" target=\"_blank\">ενεργοποιήστε τη JavaScript</a> και επαναφορτώστε τη σελίδα.",
-"%s is available. Get more information on how to update." => "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε.",
-"Log out" => "Αποσύνδεση",
-"Server side authentication failed!" => "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!",
-"Please contact your administrator." => "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
-"Forgot your password? Reset it!" => "Ξεχάσατε τον κωδικό πρόσβασής σας; Επαναφέρετέ τον!",
-"remember" => "απομνημόνευση",
-"Log in" => "Είσοδος",
-"Alternative Logins" => "Εναλλακτικές Συνδέσεις",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<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." => "Σας ευχαριστούμε για την υπομονή σας.",
-"You are accessing the server from an untrusted domain." => "Η προσπέλαση του διακομιστή γίνεται από μη έμπιστο τομέα.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Παρακαλώ επικοινωνήστε με τον διαχειριστή συστημάτων σας. Αν είστε διαχειριστής αυτού του στιγμιοτύπο, ρυθμίστε το κλειδί \"trusted_domain\" στο αρχείο config/config.php. Ένα παράδειγμα παρέχεται στο αρχείο config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Ανάλογα με τις ρυθμίσεις σας, σαν διαχειριστής θα μπορούσατε επίσης να χρησιμοποιήσετε το παρακάτω κουμπί για να εμπιστευθείτε αυτή την περιοχή.",
-"Add \"%s\" as trusted domain" => "Προσθήκη \"%s\" ως αξιόπιστη περιοχή",
-"%s will be updated to version %s." => "Το %s θα ενημερωθεί στην έκδοση %s.",
-"The following apps will be disabled:" => "Οι παρακάτω εφαρμογές θα απενεργοποιηθούν:",
-"The theme %s has been disabled." => "Το θέμα %s έχει απενεργοποιηθεί.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Παρακαλώ βεβαιωθείτε ότι έχουν ληψθεί αντίγραφα ασφαλείας της βάσης δεδομένων, του φακέλου ρυθμίσεων και του φακέλου δεδομένων πριν προχωρήσετε.",
-"Start update" => "Έναρξη ενημέρωσης",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Για να αποφύγετε τη λήξη χρόνου με μεγαλύτερες εγκαταστάσεις, μπορείτε αντί αυτού να τρέξετε την ακόλουθη εντολή από τον κατάλογο αρχείων εφαρμογών:",
-"This %s instance is currently being updated, which may take a while." => "Αυτή %s η εγκατάσταση είναι υπό ενημέρωση, η οποία μπορεί να πάρει κάποιο χρόνο.",
-"This page will refresh itself when the %s instance is available again." => "Αυτή η σελίδα θα ανανεωθεί από μόνη της όταν η %s εγκατάσταση είναι διαθέσιμη ξανά."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/en@pirate.js b/core/l10n/en@pirate.js
new file mode 100644
index 00000000000..0869bb9f0a3
--- /dev/null
+++ b/core/l10n/en@pirate.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Password" : "Passcode"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/en@pirate.json b/core/l10n/en@pirate.json
new file mode 100644
index 00000000000..6a15bfb20b5
--- /dev/null
+++ b/core/l10n/en@pirate.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Password" : "Passcode"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php
deleted file mode 100644
index 44114abbc8d..00000000000
--- a/core/l10n/en@pirate.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Password" => "Passcode"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
new file mode 100644
index 00000000000..9dc918f12eb
--- /dev/null
+++ b/core/l10n/en_GB.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Couldn't send mail to following users: %s ",
+    "Turned on maintenance mode" : "Turned on maintenance mode",
+    "Turned off maintenance mode" : "Turned off maintenance mode",
+    "Updated database" : "Updated database",
+    "Checked database schema update" : "Checked database schema update",
+    "Checked database schema update for apps" : "Checked database schema update for apps",
+    "Updated \"%s\" to %s" : "Updated \"%s\" to %s",
+    "Disabled incompatible apps: %s" : "Disabled incompatible apps: %s",
+    "No image or file provided" : "No image or file provided",
+    "Unknown filetype" : "Unknown filetype",
+    "Invalid image" : "Invalid image",
+    "No temporary profile picture available, try again" : "No temporary profile picture available, try again",
+    "No crop data provided" : "No crop data provided",
+    "Sunday" : "Sunday",
+    "Monday" : "Monday",
+    "Tuesday" : "Tuesday",
+    "Wednesday" : "Wednesday",
+    "Thursday" : "Thursday",
+    "Friday" : "Friday",
+    "Saturday" : "Saturday",
+    "January" : "January",
+    "February" : "February",
+    "March" : "March",
+    "April" : "April",
+    "May" : "May",
+    "June" : "June",
+    "July" : "July",
+    "August" : "August",
+    "September" : "September",
+    "October" : "October",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Settings",
+    "File" : "File",
+    "Folder" : "Folder",
+    "Image" : "Image",
+    "Audio" : "Audio",
+    "Saving..." : "Saving...",
+    "Couldn't send reset email. Please contact your administrator." : "Couldn't send reset email. Please contact your administrator.",
+    "The link to reset your password has been sent to your email. 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." : "The link to reset your password has been sent to your email. 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.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?",
+    "I know what I'm doing" : "I know what I'm doing",
+    "Reset password" : "Reset password",
+    "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.",
+    "No" : "No",
+    "Yes" : "Yes",
+    "Choose" : "Choose",
+    "Error loading file picker template: {error}" : "Error loading file picker template: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Error loading message template: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} file conflict","{count} file conflicts"],
+    "One file conflict" : "One file conflict",
+    "New Files" : "New Files",
+    "Already existing files" : "Already existing files",
+    "Which files do you want to keep?" : "Which files do you wish to keep?",
+    "If you select both versions, the copied file will have a number added to its name." : "If you select both versions, the copied file will have a number added to its name.",
+    "Cancel" : "Cancel",
+    "Continue" : "Continue",
+    "(all selected)" : "(all selected)",
+    "({count} selected)" : "({count} selected)",
+    "Error loading file exists template" : "Error loading file exists template",
+    "Very weak password" : "Very weak password",
+    "Weak password" : "Weak password",
+    "So-so password" : "So-so password",
+    "Good password" : "Good password",
+    "Strong password" : "Strong password",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don't work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.",
+    "Error occurred while checking server setup" : "Error occurred whilst checking server setup",
+    "Shared" : "Shared",
+    "Shared with {recipients}" : "Shared with {recipients}",
+    "Share" : "Share",
+    "Error" : "Error",
+    "Error while sharing" : "Error whilst sharing",
+    "Error while unsharing" : "Error whilst unsharing",
+    "Error while changing permissions" : "Error whilst changing permissions",
+    "Shared with you and the group {group} by {owner}" : "Shared with you and the group {group} by {owner}",
+    "Shared with you by {owner}" : "Shared with you by {owner}",
+    "Share with user or group …" : "Share with user or group …",
+    "Share link" : "Share link",
+    "The public link will expire no later than {days} days after it is created" : "The public link will expire no later than {days} days after it is created",
+    "Password protect" : "Password protect",
+    "Choose a password for the public link" : "Choose a password for the public link",
+    "Allow Public Upload" : "Allow Public Upload",
+    "Email link to person" : "Email link to person",
+    "Send" : "Send",
+    "Set expiration date" : "Set expiration date",
+    "Expiration date" : "Expiration date",
+    "Adding user..." : "Adding user...",
+    "group" : "group",
+    "Resharing is not allowed" : "Resharing is not allowed",
+    "Shared in {item} with {user}" : "Shared in {item} with {user}",
+    "Unshare" : "Unshare",
+    "notify by email" : "notify by email",
+    "can share" : "can share",
+    "can edit" : "can edit",
+    "access control" : "access control",
+    "create" : "create",
+    "update" : "update",
+    "delete" : "delete",
+    "Password protected" : "Password protected",
+    "Error unsetting expiration date" : "Error unsetting expiration date",
+    "Error setting expiration date" : "Error setting expiration date",
+    "Sending ..." : "Sending ...",
+    "Email sent" : "Email sent",
+    "Warning" : "Warning",
+    "The object type is not specified." : "The object type is not specified.",
+    "Enter new" : "Enter new",
+    "Delete" : "Delete",
+    "Add" : "Add",
+    "Edit tags" : "Edit tags",
+    "Error loading dialog template: {error}" : "Error loading dialog template: {error}",
+    "No tags selected for deletion." : "No tags selected for deletion.",
+    "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.",
+    "Please reload the page." : "Please reload the page.",
+    "The update was unsuccessful." : "The update was unsuccessful.",
+    "The update was successful. Redirecting you to ownCloud now." : "The update was successful. Redirecting you to ownCloud now.",
+    "Couldn't reset password because the token is invalid" : "Couldn't reset password because the token is invalid",
+    "Couldn't send reset email. Please make sure your username is correct." : "Couldn't send reset email. Please make sure your username is correct.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Couldn't send reset email because there is no email address for this username. Please contact your administrator.",
+    "%s password reset" : "%s password reset",
+    "Use the following link to reset your password: {link}" : "Use the following link to reset your password: {link}",
+    "You will receive a link to reset your password via Email." : "You will receive a link to reset your password via email.",
+    "Username" : "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?" : "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" : "Yes, I really want to reset my password now",
+    "Reset" : "Reset",
+    "New password" : "New password",
+    "New Password" : "New Password",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "For the best results, please consider using a GNU/Linux server instead.",
+    "Personal" : "Personal",
+    "Users" : "Users",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Help",
+    "Error loading tags" : "Error loading tags",
+    "Tag already exists" : "Tag already exists",
+    "Error deleting tag(s)" : "Error deleting tag(s)",
+    "Error tagging" : "Error tagging",
+    "Error untagging" : "Error untagging",
+    "Error favoriting" : "Error favouriting",
+    "Error unfavoriting" : "Error unfavouriting",
+    "Access forbidden" : "Access denied",
+    "File not found" : "File not found",
+    "The specified document has not been found on the server." : "The specified document has not been found on the server.",
+    "You can click here to return to %s." : "You can click here to return to %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n",
+    "The share will expire on %s." : "The share will expire on %s.",
+    "Cheers!" : "Cheers!",
+    "Internal Server Error" : "Internal Server Error",
+    "The server encountered an internal error and was unable to complete your request." : "The server encountered an internal error and was unable to complete your request.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.",
+    "More details can be found in the server log." : "More details can be found in the server log.",
+    "Technical details" : "Technical details",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Line: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Security Warning",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Please update your PHP installation to use %s securely.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
+    "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>",
+    "Password" : "Password",
+    "Storage & database" : "Storage & database",
+    "Data folder" : "Data folder",
+    "Configure the database" : "Configure the database",
+    "Only %s is available." : "Only %s is available.",
+    "Database user" : "Database user",
+    "Database password" : "Database password",
+    "Database name" : "Database name",
+    "Database tablespace" : "Database tablespace",
+    "Database host" : "Database host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite will be used as database. For larger installations we recommend changing this.",
+    "Finish setup" : "Finish setup",
+    "Finishing …" : "Finishing …",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page.",
+    "%s is available. Get more information on how to update." : "%s is available. Get more information on how to update.",
+    "Log out" : "Log out",
+    "Server side authentication failed!" : "Server side authentication failed!",
+    "Please contact your administrator." : "Please contact your administrator.",
+    "Forgot your password? Reset it!" : "Forgot your password? Reset it!",
+    "remember" : "remember",
+    "Log in" : "Log in",
+    "Alternative Logins" : "Alternative Logins",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "This ownCloud instance is currently in single user mode.",
+    "This means only administrators can use the instance." : "This means only administrators can use the instance.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contact your system administrator if this message persists or appeared unexpectedly.",
+    "Thank you for your patience." : "Thank you for your patience.",
+    "You are accessing the server from an untrusted domain." : "You are accessing the server from an untrusted domain.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.",
+    "Add \"%s\" as trusted domain" : "Add \"%s\" as a trusted domain",
+    "%s will be updated to version %s." : "%s will be updated to version %s.",
+    "The following apps will be disabled:" : "The following apps will be disabled:",
+    "The theme %s has been disabled." : "The theme %s has been disabled.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Please make sure that the database, the config folder and the data folder have been backed up before proceeding.",
+    "Start update" : "Start update",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:",
+    "This %s instance is currently being updated, which may take a while." : "This %s instance is currently being updated, which may take a while.",
+    "This page will refresh itself when the %s instance is available again." : "This page will refresh itself when the %s instance is available again."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
new file mode 100644
index 00000000000..a1768bcf0bd
--- /dev/null
+++ b/core/l10n/en_GB.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Couldn't send mail to following users: %s ",
+    "Turned on maintenance mode" : "Turned on maintenance mode",
+    "Turned off maintenance mode" : "Turned off maintenance mode",
+    "Updated database" : "Updated database",
+    "Checked database schema update" : "Checked database schema update",
+    "Checked database schema update for apps" : "Checked database schema update for apps",
+    "Updated \"%s\" to %s" : "Updated \"%s\" to %s",
+    "Disabled incompatible apps: %s" : "Disabled incompatible apps: %s",
+    "No image or file provided" : "No image or file provided",
+    "Unknown filetype" : "Unknown filetype",
+    "Invalid image" : "Invalid image",
+    "No temporary profile picture available, try again" : "No temporary profile picture available, try again",
+    "No crop data provided" : "No crop data provided",
+    "Sunday" : "Sunday",
+    "Monday" : "Monday",
+    "Tuesday" : "Tuesday",
+    "Wednesday" : "Wednesday",
+    "Thursday" : "Thursday",
+    "Friday" : "Friday",
+    "Saturday" : "Saturday",
+    "January" : "January",
+    "February" : "February",
+    "March" : "March",
+    "April" : "April",
+    "May" : "May",
+    "June" : "June",
+    "July" : "July",
+    "August" : "August",
+    "September" : "September",
+    "October" : "October",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Settings",
+    "File" : "File",
+    "Folder" : "Folder",
+    "Image" : "Image",
+    "Audio" : "Audio",
+    "Saving..." : "Saving...",
+    "Couldn't send reset email. Please contact your administrator." : "Couldn't send reset email. Please contact your administrator.",
+    "The link to reset your password has been sent to your email. 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." : "The link to reset your password has been sent to your email. 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.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?",
+    "I know what I'm doing" : "I know what I'm doing",
+    "Reset password" : "Reset password",
+    "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.",
+    "No" : "No",
+    "Yes" : "Yes",
+    "Choose" : "Choose",
+    "Error loading file picker template: {error}" : "Error loading file picker template: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Error loading message template: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} file conflict","{count} file conflicts"],
+    "One file conflict" : "One file conflict",
+    "New Files" : "New Files",
+    "Already existing files" : "Already existing files",
+    "Which files do you want to keep?" : "Which files do you wish to keep?",
+    "If you select both versions, the copied file will have a number added to its name." : "If you select both versions, the copied file will have a number added to its name.",
+    "Cancel" : "Cancel",
+    "Continue" : "Continue",
+    "(all selected)" : "(all selected)",
+    "({count} selected)" : "({count} selected)",
+    "Error loading file exists template" : "Error loading file exists template",
+    "Very weak password" : "Very weak password",
+    "Weak password" : "Weak password",
+    "So-so password" : "So-so password",
+    "Good password" : "Good password",
+    "Strong password" : "Strong password",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don't work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.",
+    "Error occurred while checking server setup" : "Error occurred whilst checking server setup",
+    "Shared" : "Shared",
+    "Shared with {recipients}" : "Shared with {recipients}",
+    "Share" : "Share",
+    "Error" : "Error",
+    "Error while sharing" : "Error whilst sharing",
+    "Error while unsharing" : "Error whilst unsharing",
+    "Error while changing permissions" : "Error whilst changing permissions",
+    "Shared with you and the group {group} by {owner}" : "Shared with you and the group {group} by {owner}",
+    "Shared with you by {owner}" : "Shared with you by {owner}",
+    "Share with user or group …" : "Share with user or group …",
+    "Share link" : "Share link",
+    "The public link will expire no later than {days} days after it is created" : "The public link will expire no later than {days} days after it is created",
+    "Password protect" : "Password protect",
+    "Choose a password for the public link" : "Choose a password for the public link",
+    "Allow Public Upload" : "Allow Public Upload",
+    "Email link to person" : "Email link to person",
+    "Send" : "Send",
+    "Set expiration date" : "Set expiration date",
+    "Expiration date" : "Expiration date",
+    "Adding user..." : "Adding user...",
+    "group" : "group",
+    "Resharing is not allowed" : "Resharing is not allowed",
+    "Shared in {item} with {user}" : "Shared in {item} with {user}",
+    "Unshare" : "Unshare",
+    "notify by email" : "notify by email",
+    "can share" : "can share",
+    "can edit" : "can edit",
+    "access control" : "access control",
+    "create" : "create",
+    "update" : "update",
+    "delete" : "delete",
+    "Password protected" : "Password protected",
+    "Error unsetting expiration date" : "Error unsetting expiration date",
+    "Error setting expiration date" : "Error setting expiration date",
+    "Sending ..." : "Sending ...",
+    "Email sent" : "Email sent",
+    "Warning" : "Warning",
+    "The object type is not specified." : "The object type is not specified.",
+    "Enter new" : "Enter new",
+    "Delete" : "Delete",
+    "Add" : "Add",
+    "Edit tags" : "Edit tags",
+    "Error loading dialog template: {error}" : "Error loading dialog template: {error}",
+    "No tags selected for deletion." : "No tags selected for deletion.",
+    "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.",
+    "Please reload the page." : "Please reload the page.",
+    "The update was unsuccessful." : "The update was unsuccessful.",
+    "The update was successful. Redirecting you to ownCloud now." : "The update was successful. Redirecting you to ownCloud now.",
+    "Couldn't reset password because the token is invalid" : "Couldn't reset password because the token is invalid",
+    "Couldn't send reset email. Please make sure your username is correct." : "Couldn't send reset email. Please make sure your username is correct.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Couldn't send reset email because there is no email address for this username. Please contact your administrator.",
+    "%s password reset" : "%s password reset",
+    "Use the following link to reset your password: {link}" : "Use the following link to reset your password: {link}",
+    "You will receive a link to reset your password via Email." : "You will receive a link to reset your password via email.",
+    "Username" : "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?" : "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" : "Yes, I really want to reset my password now",
+    "Reset" : "Reset",
+    "New password" : "New password",
+    "New Password" : "New Password",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "For the best results, please consider using a GNU/Linux server instead.",
+    "Personal" : "Personal",
+    "Users" : "Users",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Help",
+    "Error loading tags" : "Error loading tags",
+    "Tag already exists" : "Tag already exists",
+    "Error deleting tag(s)" : "Error deleting tag(s)",
+    "Error tagging" : "Error tagging",
+    "Error untagging" : "Error untagging",
+    "Error favoriting" : "Error favouriting",
+    "Error unfavoriting" : "Error unfavouriting",
+    "Access forbidden" : "Access denied",
+    "File not found" : "File not found",
+    "The specified document has not been found on the server." : "The specified document has not been found on the server.",
+    "You can click here to return to %s." : "You can click here to return to %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n",
+    "The share will expire on %s." : "The share will expire on %s.",
+    "Cheers!" : "Cheers!",
+    "Internal Server Error" : "Internal Server Error",
+    "The server encountered an internal error and was unable to complete your request." : "The server encountered an internal error and was unable to complete your request.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.",
+    "More details can be found in the server log." : "More details can be found in the server log.",
+    "Technical details" : "Technical details",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Line: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Security Warning",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Please update your PHP installation to use %s securely.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
+    "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>",
+    "Password" : "Password",
+    "Storage & database" : "Storage & database",
+    "Data folder" : "Data folder",
+    "Configure the database" : "Configure the database",
+    "Only %s is available." : "Only %s is available.",
+    "Database user" : "Database user",
+    "Database password" : "Database password",
+    "Database name" : "Database name",
+    "Database tablespace" : "Database tablespace",
+    "Database host" : "Database host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite will be used as database. For larger installations we recommend changing this.",
+    "Finish setup" : "Finish setup",
+    "Finishing …" : "Finishing …",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page.",
+    "%s is available. Get more information on how to update." : "%s is available. Get more information on how to update.",
+    "Log out" : "Log out",
+    "Server side authentication failed!" : "Server side authentication failed!",
+    "Please contact your administrator." : "Please contact your administrator.",
+    "Forgot your password? Reset it!" : "Forgot your password? Reset it!",
+    "remember" : "remember",
+    "Log in" : "Log in",
+    "Alternative Logins" : "Alternative Logins",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "This ownCloud instance is currently in single user mode.",
+    "This means only administrators can use the instance." : "This means only administrators can use the instance.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contact your system administrator if this message persists or appeared unexpectedly.",
+    "Thank you for your patience." : "Thank you for your patience.",
+    "You are accessing the server from an untrusted domain." : "You are accessing the server from an untrusted domain.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.",
+    "Add \"%s\" as trusted domain" : "Add \"%s\" as a trusted domain",
+    "%s will be updated to version %s." : "%s will be updated to version %s.",
+    "The following apps will be disabled:" : "The following apps will be disabled:",
+    "The theme %s has been disabled." : "The theme %s has been disabled.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Please make sure that the database, the config folder and the data folder have been backed up before proceeding.",
+    "Start update" : "Start update",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:",
+    "This %s instance is currently being updated, which may take a while." : "This %s instance is currently being updated, which may take a while.",
+    "This page will refresh itself when the %s instance is available again." : "This page will refresh itself when the %s instance is available again."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
deleted file mode 100644
index 831a0dd511f..00000000000
--- a/core/l10n/en_GB.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Couldn't send mail to following users: %s ",
-"Turned on maintenance mode" => "Turned on maintenance mode",
-"Turned off maintenance mode" => "Turned off maintenance mode",
-"Updated database" => "Updated database",
-"Checked database schema update" => "Checked database schema update",
-"Checked database schema update for apps" => "Checked database schema update for apps",
-"Updated \"%s\" to %s" => "Updated \"%s\" to %s",
-"Disabled incompatible apps: %s" => "Disabled incompatible apps: %s",
-"No image or file provided" => "No image or file provided",
-"Unknown filetype" => "Unknown filetype",
-"Invalid image" => "Invalid image",
-"No temporary profile picture available, try again" => "No temporary profile picture available, try again",
-"No crop data provided" => "No crop data provided",
-"Sunday" => "Sunday",
-"Monday" => "Monday",
-"Tuesday" => "Tuesday",
-"Wednesday" => "Wednesday",
-"Thursday" => "Thursday",
-"Friday" => "Friday",
-"Saturday" => "Saturday",
-"January" => "January",
-"February" => "February",
-"March" => "March",
-"April" => "April",
-"May" => "May",
-"June" => "June",
-"July" => "July",
-"August" => "August",
-"September" => "September",
-"October" => "October",
-"November" => "November",
-"December" => "December",
-"Settings" => "Settings",
-"File" => "File",
-"Folder" => "Folder",
-"Image" => "Image",
-"Audio" => "Audio",
-"Saving..." => "Saving...",
-"Couldn't send reset email. Please contact your administrator." => "Couldn't send reset email. Please contact your administrator.",
-"The link to reset your password has been sent to your email. 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." => "The link to reset your password has been sent to your email. 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.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?",
-"I know what I'm doing" => "I know what I'm doing",
-"Reset password" => "Reset password",
-"Password can not be changed. Please contact your administrator." => "Password can not be changed. Please contact your administrator.",
-"No" => "No",
-"Yes" => "Yes",
-"Choose" => "Choose",
-"Error loading file picker template: {error}" => "Error loading file picker template: {error}",
-"Ok" => "OK",
-"Error loading message template: {error}" => "Error loading message template: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} file conflict","{count} file conflicts"),
-"One file conflict" => "One file conflict",
-"New Files" => "New Files",
-"Already existing files" => "Already existing files",
-"Which files do you want to keep?" => "Which files do you wish to keep?",
-"If you select both versions, the copied file will have a number added to its name." => "If you select both versions, the copied file will have a number added to its name.",
-"Cancel" => "Cancel",
-"Continue" => "Continue",
-"(all selected)" => "(all selected)",
-"({count} selected)" => "({count} selected)",
-"Error loading file exists template" => "Error loading file exists template",
-"Very weak password" => "Very weak password",
-"Weak password" => "Weak password",
-"So-so password" => "So-so password",
-"Good password" => "Good password",
-"Strong password" => "Strong password",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don't work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.",
-"Error occurred while checking server setup" => "Error occurred whilst checking server setup",
-"Shared" => "Shared",
-"Shared with {recipients}" => "Shared with {recipients}",
-"Share" => "Share",
-"Error" => "Error",
-"Error while sharing" => "Error whilst sharing",
-"Error while unsharing" => "Error whilst unsharing",
-"Error while changing permissions" => "Error whilst changing permissions",
-"Shared with you and the group {group} by {owner}" => "Shared with you and the group {group} by {owner}",
-"Shared with you by {owner}" => "Shared with you by {owner}",
-"Share with user or group …" => "Share with user or group …",
-"Share link" => "Share link",
-"The public link will expire no later than {days} days after it is created" => "The public link will expire no later than {days} days after it is created",
-"Password protect" => "Password protect",
-"Choose a password for the public link" => "Choose a password for the public link",
-"Allow Public Upload" => "Allow Public Upload",
-"Email link to person" => "Email link to person",
-"Send" => "Send",
-"Set expiration date" => "Set expiration date",
-"Expiration date" => "Expiration date",
-"Adding user..." => "Adding user...",
-"group" => "group",
-"Resharing is not allowed" => "Resharing is not allowed",
-"Shared in {item} with {user}" => "Shared in {item} with {user}",
-"Unshare" => "Unshare",
-"notify by email" => "notify by email",
-"can share" => "can share",
-"can edit" => "can edit",
-"access control" => "access control",
-"create" => "create",
-"update" => "update",
-"delete" => "delete",
-"Password protected" => "Password protected",
-"Error unsetting expiration date" => "Error unsetting expiration date",
-"Error setting expiration date" => "Error setting expiration date",
-"Sending ..." => "Sending ...",
-"Email sent" => "Email sent",
-"Warning" => "Warning",
-"The object type is not specified." => "The object type is not specified.",
-"Enter new" => "Enter new",
-"Delete" => "Delete",
-"Add" => "Add",
-"Edit tags" => "Edit tags",
-"Error loading dialog template: {error}" => "Error loading dialog template: {error}",
-"No tags selected for deletion." => "No tags selected for deletion.",
-"Updating {productName} to version {version}, this may take a while." => "Updating {productName} to version {version}, this may take a while.",
-"Please reload the page." => "Please reload the page.",
-"The update was unsuccessful." => "The update was unsuccessful.",
-"The update was successful. Redirecting you to ownCloud now." => "The update was successful. Redirecting you to ownCloud now.",
-"Couldn't reset password because the token is invalid" => "Couldn't reset password because the token is invalid",
-"Couldn't send reset email. Please make sure your username is correct." => "Couldn't send reset email. Please make sure your username is correct.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Couldn't send reset email because there is no email address for this username. Please contact your administrator.",
-"%s password reset" => "%s password reset",
-"Use the following link to reset your password: {link}" => "Use the following link to reset your password: {link}",
-"You will receive a link to reset your password via Email." => "You will receive a link to reset your password via email.",
-"Username" => "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?" => "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" => "Yes, I really want to reset my password now",
-"Reset" => "Reset",
-"New password" => "New password",
-"New Password" => "New Password",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ",
-"For the best results, please consider using a GNU/Linux server instead." => "For the best results, please consider using a GNU/Linux server instead.",
-"Personal" => "Personal",
-"Users" => "Users",
-"Apps" => "Apps",
-"Admin" => "Admin",
-"Help" => "Help",
-"Error loading tags" => "Error loading tags",
-"Tag already exists" => "Tag already exists",
-"Error deleting tag(s)" => "Error deleting tag(s)",
-"Error tagging" => "Error tagging",
-"Error untagging" => "Error untagging",
-"Error favoriting" => "Error favouriting",
-"Error unfavoriting" => "Error unfavouriting",
-"Access forbidden" => "Access denied",
-"File not found" => "File not found",
-"The specified document has not been found on the server." => "The specified document has not been found on the server.",
-"You can click here to return to %s." => "You can click here to return to %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n",
-"The share will expire on %s." => "The share will expire on %s.",
-"Cheers!" => "Cheers!",
-"Internal Server Error" => "Internal Server Error",
-"The server encountered an internal error and was unable to complete your request." => "The server encountered an internal error and was unable to complete your request.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.",
-"More details can be found in the server log." => "More details can be found in the server log.",
-"Technical details" => "Technical details",
-"Remote Address: %s" => "Remote Address: %s",
-"Request ID: %s" => "Request ID: %s",
-"Code: %s" => "Code: %s",
-"Message: %s" => "Message: %s",
-"File: %s" => "File: %s",
-"Line: %s" => "Line: %s",
-"Trace" => "Trace",
-"Security Warning" => "Security Warning",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Please update your PHP installation to use %s securely.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
-"Create an <strong>admin account</strong>" => "Create an <strong>admin account</strong>",
-"Password" => "Password",
-"Storage & database" => "Storage & database",
-"Data folder" => "Data folder",
-"Configure the database" => "Configure the database",
-"Only %s is available." => "Only %s is available.",
-"Database user" => "Database user",
-"Database password" => "Database password",
-"Database name" => "Database name",
-"Database tablespace" => "Database tablespace",
-"Database host" => "Database host",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite will be used as database. For larger installations we recommend changing this.",
-"Finish setup" => "Finish setup",
-"Finishing …" => "Finishing …",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page.",
-"%s is available. Get more information on how to update." => "%s is available. Get more information on how to update.",
-"Log out" => "Log out",
-"Server side authentication failed!" => "Server side authentication failed!",
-"Please contact your administrator." => "Please contact your administrator.",
-"Forgot your password? Reset it!" => "Forgot your password? Reset it!",
-"remember" => "remember",
-"Log in" => "Log in",
-"Alternative Logins" => "Alternative Logins",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "This ownCloud instance is currently in single user mode.",
-"This means only administrators can use the instance." => "This means only administrators can use the instance.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contact your system administrator if this message persists or appeared unexpectedly.",
-"Thank you for your patience." => "Thank you for your patience.",
-"You are accessing the server from an untrusted domain." => "You are accessing the server from an untrusted domain.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.",
-"Add \"%s\" as trusted domain" => "Add \"%s\" as a trusted domain",
-"%s will be updated to version %s." => "%s will be updated to version %s.",
-"The following apps will be disabled:" => "The following apps will be disabled:",
-"The theme %s has been disabled." => "The theme %s has been disabled.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Please make sure that the database, the config folder and the data folder have been backed up before proceeding.",
-"Start update" => "Start update",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:",
-"This %s instance is currently being updated, which may take a while." => "This %s instance is currently being updated, which may take a while.",
-"This page will refresh itself when the %s instance is available again." => "This page will refresh itself when the %s instance is available again."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/en_NZ.js b/core/l10n/en_NZ.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/en_NZ.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/en_NZ.json b/core/l10n/en_NZ.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/en_NZ.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/en_NZ.php b/core/l10n/en_NZ.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/en_NZ.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eo.js b/core/l10n/eo.js
new file mode 100644
index 00000000000..736d82c9f30
--- /dev/null
+++ b/core/l10n/eo.js
@@ -0,0 +1,128 @@
+OC.L10N.register(
+    "core",
+    {
+    "Updated database" : "Ĝisdatiĝis datumbazo",
+    "Unknown filetype" : "Ne konatas dosiertipo",
+    "Invalid image" : "Ne validas bildo",
+    "Sunday" : "dimanĉo",
+    "Monday" : "lundo",
+    "Tuesday" : "mardo",
+    "Wednesday" : "merkredo",
+    "Thursday" : "ĵaŭdo",
+    "Friday" : "vendredo",
+    "Saturday" : "sabato",
+    "January" : "Januaro",
+    "February" : "Februaro",
+    "March" : "Marto",
+    "April" : "Aprilo",
+    "May" : "Majo",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Aŭgusto",
+    "September" : "Septembro",
+    "October" : "Oktobro",
+    "November" : "Novembro",
+    "December" : "Decembro",
+    "Settings" : "Agordo",
+    "File" : "Dosiero",
+    "Folder" : "Dosierujo",
+    "Image" : "Bildo",
+    "Saving..." : "Konservante...",
+    "Reset password" : "Rekomenci la pasvorton",
+    "No" : "Ne",
+    "Yes" : "Jes",
+    "Choose" : "Elekti",
+    "Ok" : "Akcepti",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} dosierkonflikto","{count} dosierkonfliktoj"],
+    "One file conflict" : "Unu dosierkonflikto",
+    "New Files" : "Novaj dosieroj",
+    "Which files do you want to keep?" : "Kiujn dosierojn vi volas konservi?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se vi elektos ambaŭ eldonojn, la kopiota dosiero havos numeron aldonitan al sia nomo.",
+    "Cancel" : "Nuligi",
+    "(all selected)" : "(ĉiuj elektitas)",
+    "({count} selected)" : "({count} elektitas)",
+    "Very weak password" : "Tre malforta pasvorto",
+    "Weak password" : "Malforta pasvorto",
+    "So-so password" : "Mezaĉa pasvorto",
+    "Good password" : "Bona pasvorto",
+    "Strong password" : "Forta pasvorto",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
+    "Shared" : "Dividita",
+    "Share" : "Kunhavigi",
+    "Error" : "Eraro",
+    "Error while sharing" : "Eraro dum kunhavigo",
+    "Error while unsharing" : "Eraro dum malkunhavigo",
+    "Error while changing permissions" : "Eraro dum ŝanĝo de permesoj",
+    "Shared with you and the group {group} by {owner}" : "Kunhavigita kun vi kaj la grupo {group} de {owner}",
+    "Shared with you by {owner}" : "Kunhavigita kun vi de {owner}",
+    "Share with user or group …" : "Kunhavigi kun uzanto aŭ grupo...",
+    "Share link" : "Konhavigi ligilon",
+    "Password protect" : "Protekti per pasvorto",
+    "Email link to person" : "Retpoŝti la ligilon al ulo",
+    "Send" : "Sendi",
+    "Set expiration date" : "Agordi limdaton",
+    "Expiration date" : "Limdato",
+    "group" : "grupo",
+    "Resharing is not allowed" : "Rekunhavigo ne permesatas",
+    "Shared in {item} with {user}" : "Kunhavigita en {item} kun {user}",
+    "Unshare" : "Malkunhavigi",
+    "notify by email" : "avizi per retpoŝto",
+    "can share" : "kunhavebla",
+    "can edit" : "povas redakti",
+    "access control" : "alirkontrolo",
+    "create" : "krei",
+    "update" : "ĝisdatigi",
+    "delete" : "forigi",
+    "Password protected" : "Protektita per pasvorto",
+    "Error unsetting expiration date" : "Eraro dum malagordado de limdato",
+    "Error setting expiration date" : "Eraro dum agordado de limdato",
+    "Sending ..." : "Sendante...",
+    "Email sent" : "La retpoŝtaĵo sendiĝis",
+    "Warning" : "Averto",
+    "The object type is not specified." : "Ne indikiĝis tipo de la objekto.",
+    "Enter new" : "Enigu novan",
+    "Delete" : "Forigi",
+    "Add" : "Aldoni",
+    "Edit tags" : "Redakti etikedojn",
+    "No tags selected for deletion." : "Neniu etikedo elektitas por forigo.",
+    "Please reload the page." : "Bonvolu reŝargi la paĝon.",
+    "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
+    "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
+    "You will receive a link to reset your password via Email." : "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
+    "Username" : "Uzantonomo",
+    "Yes, I really want to reset my password now" : "Jes, mi vere volas restarigi mian pasvorton nun",
+    "New password" : "Nova pasvorto",
+    "Personal" : "Persona",
+    "Users" : "Uzantoj",
+    "Apps" : "Aplikaĵoj",
+    "Admin" : "Administranto",
+    "Help" : "Helpo",
+    "Error loading tags" : "Eraris ŝargo de etikedoj",
+    "Tag already exists" : "La etikedo jam ekzistas",
+    "Error deleting tag(s)" : "Eraris forigo de etikedo(j)",
+    "Error tagging" : "Eraris etikedado",
+    "Error untagging" : "Eraris maletikedado",
+    "Access forbidden" : "Aliro estas malpermesata",
+    "Security Warning" : "Sekureca averto",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.",
+    "Create an <strong>admin account</strong>" : "Krei <strong>administran konton</strong>",
+    "Password" : "Pasvorto",
+    "Data folder" : "Datuma dosierujo",
+    "Configure the database" : "Agordi la datumbazon",
+    "Database user" : "Datumbaza uzanto",
+    "Database password" : "Datumbaza pasvorto",
+    "Database name" : "Datumbaza nomo",
+    "Database tablespace" : "Datumbaza tabelospaco",
+    "Database host" : "Datumbaza gastigo",
+    "Finish setup" : "Fini la instalon",
+    "Finishing …" : "Finante...",
+    "%s is available. Get more information on how to update." : "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi.",
+    "Log out" : "Elsaluti",
+    "Please contact your administrator." : "Bonvolu kontakti vian administranton.",
+    "remember" : "memori",
+    "Log in" : "Ensaluti",
+    "Alternative Logins" : "Alternativaj ensalutoj",
+    "Thank you for your patience." : "Dankon pro via pacienco."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/eo.json b/core/l10n/eo.json
new file mode 100644
index 00000000000..5520e2beb95
--- /dev/null
+++ b/core/l10n/eo.json
@@ -0,0 +1,126 @@
+{ "translations": {
+    "Updated database" : "Ĝisdatiĝis datumbazo",
+    "Unknown filetype" : "Ne konatas dosiertipo",
+    "Invalid image" : "Ne validas bildo",
+    "Sunday" : "dimanĉo",
+    "Monday" : "lundo",
+    "Tuesday" : "mardo",
+    "Wednesday" : "merkredo",
+    "Thursday" : "ĵaŭdo",
+    "Friday" : "vendredo",
+    "Saturday" : "sabato",
+    "January" : "Januaro",
+    "February" : "Februaro",
+    "March" : "Marto",
+    "April" : "Aprilo",
+    "May" : "Majo",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Aŭgusto",
+    "September" : "Septembro",
+    "October" : "Oktobro",
+    "November" : "Novembro",
+    "December" : "Decembro",
+    "Settings" : "Agordo",
+    "File" : "Dosiero",
+    "Folder" : "Dosierujo",
+    "Image" : "Bildo",
+    "Saving..." : "Konservante...",
+    "Reset password" : "Rekomenci la pasvorton",
+    "No" : "Ne",
+    "Yes" : "Jes",
+    "Choose" : "Elekti",
+    "Ok" : "Akcepti",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} dosierkonflikto","{count} dosierkonfliktoj"],
+    "One file conflict" : "Unu dosierkonflikto",
+    "New Files" : "Novaj dosieroj",
+    "Which files do you want to keep?" : "Kiujn dosierojn vi volas konservi?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se vi elektos ambaŭ eldonojn, la kopiota dosiero havos numeron aldonitan al sia nomo.",
+    "Cancel" : "Nuligi",
+    "(all selected)" : "(ĉiuj elektitas)",
+    "({count} selected)" : "({count} elektitas)",
+    "Very weak password" : "Tre malforta pasvorto",
+    "Weak password" : "Malforta pasvorto",
+    "So-so password" : "Mezaĉa pasvorto",
+    "Good password" : "Bona pasvorto",
+    "Strong password" : "Forta pasvorto",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
+    "Shared" : "Dividita",
+    "Share" : "Kunhavigi",
+    "Error" : "Eraro",
+    "Error while sharing" : "Eraro dum kunhavigo",
+    "Error while unsharing" : "Eraro dum malkunhavigo",
+    "Error while changing permissions" : "Eraro dum ŝanĝo de permesoj",
+    "Shared with you and the group {group} by {owner}" : "Kunhavigita kun vi kaj la grupo {group} de {owner}",
+    "Shared with you by {owner}" : "Kunhavigita kun vi de {owner}",
+    "Share with user or group …" : "Kunhavigi kun uzanto aŭ grupo...",
+    "Share link" : "Konhavigi ligilon",
+    "Password protect" : "Protekti per pasvorto",
+    "Email link to person" : "Retpoŝti la ligilon al ulo",
+    "Send" : "Sendi",
+    "Set expiration date" : "Agordi limdaton",
+    "Expiration date" : "Limdato",
+    "group" : "grupo",
+    "Resharing is not allowed" : "Rekunhavigo ne permesatas",
+    "Shared in {item} with {user}" : "Kunhavigita en {item} kun {user}",
+    "Unshare" : "Malkunhavigi",
+    "notify by email" : "avizi per retpoŝto",
+    "can share" : "kunhavebla",
+    "can edit" : "povas redakti",
+    "access control" : "alirkontrolo",
+    "create" : "krei",
+    "update" : "ĝisdatigi",
+    "delete" : "forigi",
+    "Password protected" : "Protektita per pasvorto",
+    "Error unsetting expiration date" : "Eraro dum malagordado de limdato",
+    "Error setting expiration date" : "Eraro dum agordado de limdato",
+    "Sending ..." : "Sendante...",
+    "Email sent" : "La retpoŝtaĵo sendiĝis",
+    "Warning" : "Averto",
+    "The object type is not specified." : "Ne indikiĝis tipo de la objekto.",
+    "Enter new" : "Enigu novan",
+    "Delete" : "Forigi",
+    "Add" : "Aldoni",
+    "Edit tags" : "Redakti etikedojn",
+    "No tags selected for deletion." : "Neniu etikedo elektitas por forigo.",
+    "Please reload the page." : "Bonvolu reŝargi la paĝon.",
+    "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
+    "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
+    "You will receive a link to reset your password via Email." : "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
+    "Username" : "Uzantonomo",
+    "Yes, I really want to reset my password now" : "Jes, mi vere volas restarigi mian pasvorton nun",
+    "New password" : "Nova pasvorto",
+    "Personal" : "Persona",
+    "Users" : "Uzantoj",
+    "Apps" : "Aplikaĵoj",
+    "Admin" : "Administranto",
+    "Help" : "Helpo",
+    "Error loading tags" : "Eraris ŝargo de etikedoj",
+    "Tag already exists" : "La etikedo jam ekzistas",
+    "Error deleting tag(s)" : "Eraris forigo de etikedo(j)",
+    "Error tagging" : "Eraris etikedado",
+    "Error untagging" : "Eraris maletikedado",
+    "Access forbidden" : "Aliro estas malpermesata",
+    "Security Warning" : "Sekureca averto",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.",
+    "Create an <strong>admin account</strong>" : "Krei <strong>administran konton</strong>",
+    "Password" : "Pasvorto",
+    "Data folder" : "Datuma dosierujo",
+    "Configure the database" : "Agordi la datumbazon",
+    "Database user" : "Datumbaza uzanto",
+    "Database password" : "Datumbaza pasvorto",
+    "Database name" : "Datumbaza nomo",
+    "Database tablespace" : "Datumbaza tabelospaco",
+    "Database host" : "Datumbaza gastigo",
+    "Finish setup" : "Fini la instalon",
+    "Finishing …" : "Finante...",
+    "%s is available. Get more information on how to update." : "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi.",
+    "Log out" : "Elsaluti",
+    "Please contact your administrator." : "Bonvolu kontakti vian administranton.",
+    "remember" : "memori",
+    "Log in" : "Ensaluti",
+    "Alternative Logins" : "Alternativaj ensalutoj",
+    "Thank you for your patience." : "Dankon pro via pacienco."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
deleted file mode 100644
index be5327e8e63..00000000000
--- a/core/l10n/eo.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Updated database" => "Ĝisdatiĝis datumbazo",
-"Unknown filetype" => "Ne konatas dosiertipo",
-"Invalid image" => "Ne validas bildo",
-"Sunday" => "dimanĉo",
-"Monday" => "lundo",
-"Tuesday" => "mardo",
-"Wednesday" => "merkredo",
-"Thursday" => "ĵaŭdo",
-"Friday" => "vendredo",
-"Saturday" => "sabato",
-"January" => "Januaro",
-"February" => "Februaro",
-"March" => "Marto",
-"April" => "Aprilo",
-"May" => "Majo",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Aŭgusto",
-"September" => "Septembro",
-"October" => "Oktobro",
-"November" => "Novembro",
-"December" => "Decembro",
-"Settings" => "Agordo",
-"File" => "Dosiero",
-"Folder" => "Dosierujo",
-"Image" => "Bildo",
-"Saving..." => "Konservante...",
-"Reset password" => "Rekomenci la pasvorton",
-"No" => "Ne",
-"Yes" => "Jes",
-"Choose" => "Elekti",
-"Ok" => "Akcepti",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} dosierkonflikto","{count} dosierkonfliktoj"),
-"One file conflict" => "Unu dosierkonflikto",
-"New Files" => "Novaj dosieroj",
-"Which files do you want to keep?" => "Kiujn dosierojn vi volas konservi?",
-"If you select both versions, the copied file will have a number added to its name." => "Se vi elektos ambaŭ eldonojn, la kopiota dosiero havos numeron aldonitan al sia nomo.",
-"Cancel" => "Nuligi",
-"(all selected)" => "(ĉiuj elektitas)",
-"({count} selected)" => "({count} elektitas)",
-"Very weak password" => "Tre malforta pasvorto",
-"Weak password" => "Malforta pasvorto",
-"So-so password" => "Mezaĉa pasvorto",
-"Good password" => "Bona pasvorto",
-"Strong password" => "Forta pasvorto",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
-"Shared" => "Dividita",
-"Share" => "Kunhavigi",
-"Error" => "Eraro",
-"Error while sharing" => "Eraro dum kunhavigo",
-"Error while unsharing" => "Eraro dum malkunhavigo",
-"Error while changing permissions" => "Eraro dum ŝanĝo de permesoj",
-"Shared with you and the group {group} by {owner}" => "Kunhavigita kun vi kaj la grupo {group} de {owner}",
-"Shared with you by {owner}" => "Kunhavigita kun vi de {owner}",
-"Share with user or group …" => "Kunhavigi kun uzanto aŭ grupo...",
-"Share link" => "Konhavigi ligilon",
-"Password protect" => "Protekti per pasvorto",
-"Email link to person" => "Retpoŝti la ligilon al ulo",
-"Send" => "Sendi",
-"Set expiration date" => "Agordi limdaton",
-"Expiration date" => "Limdato",
-"group" => "grupo",
-"Resharing is not allowed" => "Rekunhavigo ne permesatas",
-"Shared in {item} with {user}" => "Kunhavigita en {item} kun {user}",
-"Unshare" => "Malkunhavigi",
-"notify by email" => "avizi per retpoŝto",
-"can share" => "kunhavebla",
-"can edit" => "povas redakti",
-"access control" => "alirkontrolo",
-"create" => "krei",
-"update" => "ĝisdatigi",
-"delete" => "forigi",
-"Password protected" => "Protektita per pasvorto",
-"Error unsetting expiration date" => "Eraro dum malagordado de limdato",
-"Error setting expiration date" => "Eraro dum agordado de limdato",
-"Sending ..." => "Sendante...",
-"Email sent" => "La retpoŝtaĵo sendiĝis",
-"Warning" => "Averto",
-"The object type is not specified." => "Ne indikiĝis tipo de la objekto.",
-"Enter new" => "Enigu novan",
-"Delete" => "Forigi",
-"Add" => "Aldoni",
-"Edit tags" => "Redakti etikedojn",
-"No tags selected for deletion." => "Neniu etikedo elektitas por forigo.",
-"Please reload the page." => "Bonvolu reŝargi la paĝon.",
-"The update was successful. Redirecting you to ownCloud now." => "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
-"Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
-"You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
-"Username" => "Uzantonomo",
-"Yes, I really want to reset my password now" => "Jes, mi vere volas restarigi mian pasvorton nun",
-"New password" => "Nova pasvorto",
-"Personal" => "Persona",
-"Users" => "Uzantoj",
-"Apps" => "Aplikaĵoj",
-"Admin" => "Administranto",
-"Help" => "Helpo",
-"Error loading tags" => "Eraris ŝargo de etikedoj",
-"Tag already exists" => "La etikedo jam ekzistas",
-"Error deleting tag(s)" => "Eraris forigo de etikedo(j)",
-"Error tagging" => "Eraris etikedado",
-"Error untagging" => "Eraris maletikedado",
-"Access forbidden" => "Aliro estas malpermesata",
-"Security Warning" => "Sekureca averto",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.",
-"Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
-"Password" => "Pasvorto",
-"Data folder" => "Datuma dosierujo",
-"Configure the database" => "Agordi la datumbazon",
-"Database user" => "Datumbaza uzanto",
-"Database password" => "Datumbaza pasvorto",
-"Database name" => "Datumbaza nomo",
-"Database tablespace" => "Datumbaza tabelospaco",
-"Database host" => "Datumbaza gastigo",
-"Finish setup" => "Fini la instalon",
-"Finishing …" => "Finante...",
-"%s is available. Get more information on how to update." => "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi.",
-"Log out" => "Elsaluti",
-"Please contact your administrator." => "Bonvolu kontakti vian administranton.",
-"remember" => "memori",
-"Log in" => "Ensaluti",
-"Alternative Logins" => "Alternativaj ensalutoj",
-"Thank you for your patience." => "Dankon pro via pacienco."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es.js b/core/l10n/es.js
new file mode 100644
index 00000000000..683e03cb708
--- /dev/null
+++ b/core/l10n/es.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "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",
+    "Checked database schema update" : "Actualización del esquema de base de datos revisado",
+    "Checked database schema update for apps" : "Chequeada actualización de esquema de la base de datos para aplicaciones",
+    "Updated \"%s\" to %s" : "Se ha actualizado \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Aplicaciones incompatibles desactivadas: %s",
+    "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",
+    "File" : "Archivo",
+    "Folder" : "Carpeta",
+    "Image" : "Imagen",
+    "Audio" : "Audio",
+    "Saving..." : "Guardando...",
+    "Couldn't send reset email. Please contact your administrator." : "La reiniciación de este  correo electrónico no pudo ser enviada. Por favor, contacte a su administrador.",
+    "The link to reset your password has been sent to your email. 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." : "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte a su administrador local.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sus archivos están cifrados. Si no has activado la clave de recuperación, no habrá manera de recuperar los datos despues de que tu contraseña seá restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte a su administrador antes de continuar.<br />¿Realmente desea continuar?",
+    "I know what I'm doing" : "Yo se lo que estoy haciendo",
+    "Reset password" : "Restablecer contraseña",
+    "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Seleccionar",
+    "Error loading file picker template: {error}" : "Error cargando plantilla del seleccionador de archivos: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Error cargando plantilla del mensaje: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de archivo","{count} conflictos de archivo"],
+    "One file conflict" : "On conflicto de archivo",
+    "New Files" : "Nuevos Archivos",
+    "Already existing files" : "Archivos ya existentes",
+    "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)" : "(seleccionados todos)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Error cargando plantilla de archivo existente",
+    "Very weak password" : "Contraseña muy débil",
+    "Weak password" : "Contraseña débil",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña buena",
+    "Strong password" : "Contraseña muy buena",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
+    "Error occurred while checking server setup" : "Ha ocurrido un error la revisar la configuración del servidor",
+    "Shared" : "Compartido",
+    "Shared with {recipients}" : "Compartido con {recipients}",
+    "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",
+    "The public link will expire no later than {days} days after it is created" : "El link publico no expirará antes de {days} desde que fué creado",
+    "Password protect" : "Protección con contraseña",
+    "Choose a password for the public link" : "Elija una contraseña para el enlace publico",
+    "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",
+    "Adding user..." : "Añadiendo usuario...",
+    "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 por correo electrónico",
+    "can share" : "puede compartir",
+    "can edit" : "puede editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "delete" : "eliminar",
+    "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.",
+    "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a la versión {version}. Esto puede tardar un poco.",
+    "Please reload the page." : "Recargue/Actualice la página",
+    "The update was unsuccessful." : "Falló la actualización",
+    "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
+    "Couldn't reset password because the token is invalid" : "No se puede restablecer la contraseña porque el vale de identificación es nulo.",
+    "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar la reiniciación de su correo electrónico. Por favor, asegúrese de que su nombre de usuario es el correcto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar la reiniciación del correo electrónico, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.",
+    "%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}",
+    "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",
+    "New password" : "Nueva contraseña",
+    "New Password" : "Nueva contraseña",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para óptimos resultados, considere utilizar un servidor GNU/Linux.",
+    "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",
+    "File not found" : "Archivo no encontrado",
+    "The specified document has not been found on the server." : "El documento indicado no se ha encontrado en el servidor.",
+    "You can click here to return to %s." : "Puede hacer clic aquí para volver a %s.",
+    "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!",
+    "Internal Server Error" : "Error interno del servidor",
+    "The server encountered an internal error and was unable to complete your request." : "El servidor ha encontrado un error y no puede completar la solicitud.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Por favor contacte con el administrador del servidor si este error reaparece multiples veces. Por favor incluya los detalles tecnicos que se muestran acontinuación.",
+    "More details can be found in the server log." : "Mas detalles pueden verse en el log del servidor.",
+    "Technical details" : "Detalles tecnicos",
+    "Remote Address: %s" : "Dirección remota: %s",
+    "Request ID: %s" : "ID solicitado: %s",
+    "Code: %s" : "Codigo: %s",
+    "Message: %s" : "Mensaje: %s",
+    "File: %s" : "Archivo: %s",
+    "Line: %s" : "Linea: %s",
+    "Trace" : "Trazas",
+    "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.",
+    "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>",
+    "Password" : "Contraseña",
+    "Storage & database" : "Almacenamiento y base de datos",
+    "Data folder" : "Directorio de datos",
+    "Configure the database" : "Configurar la base de datos",
+    "Only %s is available." : "Solo %s está disponible.",
+    "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",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Se usará SQLite como base de datos. Para instalaciones más grandes, es recomendable cambiar esto.",
+    "Finish setup" : "Completar la instalación",
+    "Finishing …" : "Finalizando...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "La aplicación requiere JavaScript para poder operar correctamente. Sírvase <a href=\"http://enable-javascript.com/\" target=\"_blank\">activar JavaScript</a> y volver a cargar la página.",
+    "%s is available. Get more information on how to update." : "%s está disponible. Obtener más información de como actualizar.",
+    "Log out" : "Salir",
+    "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
+    "Please contact your administrator." : "Por favor, contacte con el administrador.",
+    "Forgot your password? Reset it!" : "¿Olvidó su contraseña? ¡Reiniciala!",
+    "remember" : "recordar",
+    "Log in" : "Entrar",
+    "Alternative Logins" : "Inicios de sesión alternativos",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola:<br><br>Te comentamos que %s compartió <strong>%s</strong> contigo.<br><a href=\"%s\">¡Échale un vistazo!</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.",
+    "You are accessing the server from an untrusted domain." : "Está accediendo al servidor desde un dominio inseguro.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacte a su administrador. Si usted es el administrador, configure \"trusted_domain\" en config/config.php. En config/config.sample.php se encuentra un ejemplo para la configuración.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependiendo de su configuración, como administrador, debería poder usar el botón de abajo para confiar en este dominio.",
+    "Add \"%s\" as trusted domain" : "Agregar \"%s\" como un dominio de confianza",
+    "%s will be updated to version %s." : "%s será actualizado a la versión %s.",
+    "The following apps will be disabled:" : "Las siguientes aplicaciones serán desactivadas:",
+    "The theme %s has been disabled." : "El tema %s ha sido desactivado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Antes de proceder, asegúrese de que se haya hecho un respaldo de la base de datos, la carpeta de configuración y la carpeta de datos.",
+    "Start update" : "Iniciar actualización",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tiempos de espera en grandes instalaciones, en su lugar puede ejecutar el siguiente comando desde el directorio de instalación:",
+    "This %s instance is currently being updated, which may take a while." : "Está instancia %s está siendo actualizada, lo que puede llevar un tiempo.",
+    "This page will refresh itself when the %s instance is available again." : "La página se refrescará por sí misma cuando la instancia %s vuelva a estar disponible."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es.json b/core/l10n/es.json
new file mode 100644
index 00000000000..3eaedab0621
--- /dev/null
+++ b/core/l10n/es.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "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",
+    "Checked database schema update" : "Actualización del esquema de base de datos revisado",
+    "Checked database schema update for apps" : "Chequeada actualización de esquema de la base de datos para aplicaciones",
+    "Updated \"%s\" to %s" : "Se ha actualizado \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Aplicaciones incompatibles desactivadas: %s",
+    "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",
+    "File" : "Archivo",
+    "Folder" : "Carpeta",
+    "Image" : "Imagen",
+    "Audio" : "Audio",
+    "Saving..." : "Guardando...",
+    "Couldn't send reset email. Please contact your administrator." : "La reiniciación de este  correo electrónico no pudo ser enviada. Por favor, contacte a su administrador.",
+    "The link to reset your password has been sent to your email. 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." : "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte a su administrador local.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sus archivos están cifrados. Si no has activado la clave de recuperación, no habrá manera de recuperar los datos despues de que tu contraseña seá restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte a su administrador antes de continuar.<br />¿Realmente desea continuar?",
+    "I know what I'm doing" : "Yo se lo que estoy haciendo",
+    "Reset password" : "Restablecer contraseña",
+    "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Seleccionar",
+    "Error loading file picker template: {error}" : "Error cargando plantilla del seleccionador de archivos: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Error cargando plantilla del mensaje: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de archivo","{count} conflictos de archivo"],
+    "One file conflict" : "On conflicto de archivo",
+    "New Files" : "Nuevos Archivos",
+    "Already existing files" : "Archivos ya existentes",
+    "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)" : "(seleccionados todos)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Error cargando plantilla de archivo existente",
+    "Very weak password" : "Contraseña muy débil",
+    "Weak password" : "Contraseña débil",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña buena",
+    "Strong password" : "Contraseña muy buena",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
+    "Error occurred while checking server setup" : "Ha ocurrido un error la revisar la configuración del servidor",
+    "Shared" : "Compartido",
+    "Shared with {recipients}" : "Compartido con {recipients}",
+    "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",
+    "The public link will expire no later than {days} days after it is created" : "El link publico no expirará antes de {days} desde que fué creado",
+    "Password protect" : "Protección con contraseña",
+    "Choose a password for the public link" : "Elija una contraseña para el enlace publico",
+    "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",
+    "Adding user..." : "Añadiendo usuario...",
+    "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 por correo electrónico",
+    "can share" : "puede compartir",
+    "can edit" : "puede editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "delete" : "eliminar",
+    "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.",
+    "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a la versión {version}. Esto puede tardar un poco.",
+    "Please reload the page." : "Recargue/Actualice la página",
+    "The update was unsuccessful." : "Falló la actualización",
+    "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
+    "Couldn't reset password because the token is invalid" : "No se puede restablecer la contraseña porque el vale de identificación es nulo.",
+    "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar la reiniciación de su correo electrónico. Por favor, asegúrese de que su nombre de usuario es el correcto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar la reiniciación del correo electrónico, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.",
+    "%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}",
+    "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",
+    "New password" : "Nueva contraseña",
+    "New Password" : "Nueva contraseña",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para óptimos resultados, considere utilizar un servidor GNU/Linux.",
+    "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",
+    "File not found" : "Archivo no encontrado",
+    "The specified document has not been found on the server." : "El documento indicado no se ha encontrado en el servidor.",
+    "You can click here to return to %s." : "Puede hacer clic aquí para volver a %s.",
+    "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!",
+    "Internal Server Error" : "Error interno del servidor",
+    "The server encountered an internal error and was unable to complete your request." : "El servidor ha encontrado un error y no puede completar la solicitud.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Por favor contacte con el administrador del servidor si este error reaparece multiples veces. Por favor incluya los detalles tecnicos que se muestran acontinuación.",
+    "More details can be found in the server log." : "Mas detalles pueden verse en el log del servidor.",
+    "Technical details" : "Detalles tecnicos",
+    "Remote Address: %s" : "Dirección remota: %s",
+    "Request ID: %s" : "ID solicitado: %s",
+    "Code: %s" : "Codigo: %s",
+    "Message: %s" : "Mensaje: %s",
+    "File: %s" : "Archivo: %s",
+    "Line: %s" : "Linea: %s",
+    "Trace" : "Trazas",
+    "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.",
+    "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>",
+    "Password" : "Contraseña",
+    "Storage & database" : "Almacenamiento y base de datos",
+    "Data folder" : "Directorio de datos",
+    "Configure the database" : "Configurar la base de datos",
+    "Only %s is available." : "Solo %s está disponible.",
+    "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",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Se usará SQLite como base de datos. Para instalaciones más grandes, es recomendable cambiar esto.",
+    "Finish setup" : "Completar la instalación",
+    "Finishing …" : "Finalizando...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "La aplicación requiere JavaScript para poder operar correctamente. Sírvase <a href=\"http://enable-javascript.com/\" target=\"_blank\">activar JavaScript</a> y volver a cargar la página.",
+    "%s is available. Get more information on how to update." : "%s está disponible. Obtener más información de como actualizar.",
+    "Log out" : "Salir",
+    "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
+    "Please contact your administrator." : "Por favor, contacte con el administrador.",
+    "Forgot your password? Reset it!" : "¿Olvidó su contraseña? ¡Reiniciala!",
+    "remember" : "recordar",
+    "Log in" : "Entrar",
+    "Alternative Logins" : "Inicios de sesión alternativos",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola:<br><br>Te comentamos que %s compartió <strong>%s</strong> contigo.<br><a href=\"%s\">¡Échale un vistazo!</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.",
+    "You are accessing the server from an untrusted domain." : "Está accediendo al servidor desde un dominio inseguro.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacte a su administrador. Si usted es el administrador, configure \"trusted_domain\" en config/config.php. En config/config.sample.php se encuentra un ejemplo para la configuración.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependiendo de su configuración, como administrador, debería poder usar el botón de abajo para confiar en este dominio.",
+    "Add \"%s\" as trusted domain" : "Agregar \"%s\" como un dominio de confianza",
+    "%s will be updated to version %s." : "%s será actualizado a la versión %s.",
+    "The following apps will be disabled:" : "Las siguientes aplicaciones serán desactivadas:",
+    "The theme %s has been disabled." : "El tema %s ha sido desactivado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Antes de proceder, asegúrese de que se haya hecho un respaldo de la base de datos, la carpeta de configuración y la carpeta de datos.",
+    "Start update" : "Iniciar actualización",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tiempos de espera en grandes instalaciones, en su lugar puede ejecutar el siguiente comando desde el directorio de instalación:",
+    "This %s instance is currently being updated, which may take a while." : "Está instancia %s está siendo actualizada, lo que puede llevar un tiempo.",
+    "This page will refresh itself when the %s instance is available again." : "La página se refrescará por sí misma cuando la instancia %s vuelva a estar disponible."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es.php b/core/l10n/es.php
deleted file mode 100644
index c7ca3c1580d..00000000000
--- a/core/l10n/es.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"Checked database schema update" => "Actualización del esquema de base de datos revisado",
-"Checked database schema update for apps" => "Chequeada actualización de esquema de la base de datos para aplicaciones",
-"Updated \"%s\" to %s" => "Se ha actualizado \"%s\" a %s",
-"Disabled incompatible apps: %s" => "Aplicaciones incompatibles desactivadas: %s",
-"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",
-"File" => "Archivo",
-"Folder" => "Carpeta",
-"Image" => "Imagen",
-"Audio" => "Audio",
-"Saving..." => "Guardando...",
-"Couldn't send reset email. Please contact your administrator." => "La reiniciación de este  correo electrónico no pudo ser enviada. Por favor, contacte a su administrador.",
-"The link to reset your password has been sent to your email. 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." => "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte a su administrador local.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Sus archivos están cifrados. Si no has activado la clave de recuperación, no habrá manera de recuperar los datos despues de que tu contraseña seá restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte a su administrador antes de continuar.<br />¿Realmente desea continuar?",
-"I know what I'm doing" => "Yo se lo que estoy haciendo",
-"Reset password" => "Restablecer contraseña",
-"Password can not be changed. Please contact your administrator." => "La contraseña no se puede cambiar. Por favor, contacte a su administrador.",
-"No" => "No",
-"Yes" => "Sí",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
-"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" => "On conflicto de archivo",
-"New Files" => "Nuevos Archivos",
-"Already existing files" => "Archivos ya existentes",
-"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)" => "(seleccionados todos)",
-"({count} selected)" => "({count} seleccionados)",
-"Error loading file exists template" => "Error cargando plantilla de archivo existente",
-"Very weak password" => "Contraseña muy débil",
-"Weak password" => "Contraseña débil",
-"So-so password" => "Contraseña pasable",
-"Good password" => "Contraseña buena",
-"Strong password" => "Contraseña muy buena",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
-"Error occurred while checking server setup" => "Ha ocurrido un error la revisar la configuración del servidor",
-"Shared" => "Compartido",
-"Shared with {recipients}" => "Compartido con {recipients}",
-"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",
-"The public link will expire no later than {days} days after it is created" => "El link publico no expirará antes de {days} desde que fué creado",
-"Password protect" => "Protección con contraseña",
-"Choose a password for the public link" => "Elija una contraseña para el enlace publico",
-"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",
-"Adding user..." => "Añadiendo usuario...",
-"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 por correo electrónico",
-"can share" => "puede compartir",
-"can edit" => "puede editar",
-"access control" => "control de acceso",
-"create" => "crear",
-"update" => "actualizar",
-"delete" => "eliminar",
-"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.",
-"Updating {productName} to version {version}, this may take a while." => "Actualizando {productName} a la versión {version}. Esto puede tardar un poco.",
-"Please reload the page." => "Recargue/Actualice la página",
-"The update was unsuccessful." => "Falló la actualización",
-"The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
-"Couldn't reset password because the token is invalid" => "No se puede restablecer la contraseña porque el vale de identificación es nulo.",
-"Couldn't send reset email. Please make sure your username is correct." => "No se pudo enviar la reiniciación de su correo electrónico. Por favor, asegúrese de que su nombre de usuario es el correcto.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "No se pudo enviar la reiniciación del correo electrónico, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.",
-"%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}",
-"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",
-"New password" => "Nueva contraseña",
-"New Password" => "Nueva contraseña",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ",
-"For the best results, please consider using a GNU/Linux server instead." => "Para óptimos resultados, considere utilizar un servidor GNU/Linux.",
-"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",
-"File not found" => "Archivo no encontrado",
-"The specified document has not been found on the server." => "El documento indicado no se ha encontrado en el servidor.",
-"You can click here to return to %s." => "Puede hacer clic aquí para volver a %s.",
-"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!",
-"Internal Server Error" => "Error interno del servidor",
-"The server encountered an internal error and was unable to complete your request." => "El servidor ha encontrado un error y no puede completar la solicitud.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Por favor contacte con el administrador del servidor si este error reaparece multiples veces. Por favor incluya los detalles tecnicos que se muestran acontinuación.",
-"More details can be found in the server log." => "Mas detalles pueden verse en el log del servidor.",
-"Technical details" => "Detalles tecnicos",
-"Remote Address: %s" => "Dirección remota: %s",
-"Request ID: %s" => "ID solicitado: %s",
-"Code: %s" => "Codigo: %s",
-"Message: %s" => "Mensaje: %s",
-"File: %s" => "Archivo: %s",
-"Line: %s" => "Linea: %s",
-"Trace" => "Trazas",
-"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.",
-"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>",
-"Password" => "Contraseña",
-"Storage & database" => "Almacenamiento y base de datos",
-"Data folder" => "Directorio de datos",
-"Configure the database" => "Configurar la base de datos",
-"Only %s is available." => "Solo %s está disponible.",
-"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",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Se usará SQLite como base de datos. Para instalaciones más grandes, es recomendable cambiar esto.",
-"Finish setup" => "Completar la instalación",
-"Finishing …" => "Finalizando...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "La aplicación requiere JavaScript para poder operar correctamente. Sírvase <a href=\"http://enable-javascript.com/\" target=\"_blank\">activar JavaScript</a> y volver a cargar la página.",
-"%s is available. Get more information on how to update." => "%s está disponible. Obtener más información de como actualizar.",
-"Log out" => "Salir",
-"Server side authentication failed!" => "La autenticación a fallado en el servidor.",
-"Please contact your administrator." => "Por favor, contacte con el administrador.",
-"Forgot your password? Reset it!" => "¿Olvidó su contraseña? ¡Reiniciala!",
-"remember" => "recordar",
-"Log in" => "Entrar",
-"Alternative Logins" => "Inicios de sesión alternativos",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hola:<br><br>Te comentamos que %s compartió <strong>%s</strong> contigo.<br><a href=\"%s\">¡Échale un vistazo!</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.",
-"You are accessing the server from an untrusted domain." => "Está accediendo al servidor desde un dominio inseguro.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Contacte a su administrador. Si usted es el administrador, configure \"trusted_domain\" en config/config.php. En config/config.sample.php se encuentra un ejemplo para la configuración.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Dependiendo de su configuración, como administrador, debería poder usar el botón de abajo para confiar en este dominio.",
-"Add \"%s\" as trusted domain" => "Agregar \"%s\" como un dominio de confianza",
-"%s will be updated to version %s." => "%s será actualizado a la versión %s.",
-"The following apps will be disabled:" => "Las siguientes aplicaciones serán desactivadas:",
-"The theme %s has been disabled." => "El tema %s ha sido desactivado.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Antes de proceder, asegúrese de que se haya hecho un respaldo de la base de datos, la carpeta de configuración y la carpeta de datos.",
-"Start update" => "Iniciar actualización",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Para evitar tiempos de espera en grandes instalaciones, en su lugar puede ejecutar el siguiente comando desde el directorio de instalación:",
-"This %s instance is currently being updated, which may take a while." => "Está instancia %s está siendo actualizada, lo que puede llevar un tiempo.",
-"This page will refresh itself when the %s instance is available again." => "La página se refrescará por sí misma cuando la instancia %s vuelva a estar disponible."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js
new file mode 100644
index 00000000000..f9b54cc8d81
--- /dev/null
+++ b/core/l10n/es_AR.js
@@ -0,0 +1,155 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "No se pudieron mandar correos a los siguientes usuarios: %s",
+    "Turned on maintenance mode" : "Modo de mantenimiento activado",
+    "Turned off maintenance mode" : "Modo de mantenimiento desactivado",
+    "Updated database" : "Base de datos actualizada",
+    "No image or file provided" : "No se ha proveído de una imágen o archivo.",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "No temporary profile picture available, try again" : "No hay una imágen temporal del perfil disponible, intente de nuevo",
+    "No crop data provided" : "No se proveyeron datos de 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" : "Configuración",
+    "File" : "Archivo",
+    "Folder" : "Carpeta",
+    "Image" : "Imagen",
+    "Saving..." : "Guardando...",
+    "Reset password" : "Restablecer contraseña",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Elegir",
+    "Error loading file picker template: {error}" : "Error cargando la plantilla del selector de archivo: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Error cargando la plantilla del mensaje: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["un archivo en conflicto","{count} archivos en conflicto"],
+    "One file conflict" : "Un archivo en conflicto",
+    "New Files" : "Nuevos archivos",
+    "Which files do you want to keep?" : "¿Qué archivos deseas retener?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si tu seleccionas ambas versiones, el archivo copiado tendrá un número agregado a su nombre.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos están seleccionados)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Error cargando la plantilla de archivo existente",
+    "Very weak password" : "Contraseña muy débil.",
+    "Weak password" : "Contraseña débil.",
+    "So-so password" : "Contraseña de nivel medio. ",
+    "Good password" : "Buena contraseña. ",
+    "Strong password" : "Contraseña fuerte.",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características.",
+    "Shared" : "Compartido",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Error al compartir",
+    "Error while unsharing" : "Error en al dejar de compartir",
+    "Error while changing permissions" : "Error al cambiar permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartido con vos y el grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido con vos por {owner}",
+    "Share with user or group …" : "Compartir con usuario o grupo ...",
+    "Share link" : "Compartir vínculo",
+    "Password protect" : "Proteger con contraseña ",
+    "Allow Public Upload" : "Permitir Subida Pública",
+    "Email link to person" : "Enviar el enlace por e-mail.",
+    "Send" : "Mandar",
+    "Set expiration date" : "Asignar fecha de vencimiento",
+    "Expiration date" : "Fecha de vencimiento",
+    "group" : "grupo",
+    "Resharing is not allowed" : "No se permite volver a compartir",
+    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
+    "Unshare" : "Dejar de compartir",
+    "notify by email" : "notificar por correo",
+    "can share" : "puede compartir",
+    "can edit" : "podés editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "delete" : "borrar",
+    "Password protected" : "Protegido por contraseña",
+    "Error unsetting expiration date" : "Error al remover la fecha de vencimiento",
+    "Error setting expiration date" : "Error al asignar fecha de vencimiento",
+    "Sending ..." : "Mandando...",
+    "Email sent" : "e-mail mandado",
+    "Warning" : "Atención",
+    "The object type is not specified." : "El tipo de objeto no está especificado. ",
+    "Enter new" : "Entrar nuevo",
+    "Delete" : "Borrar",
+    "Add" : "Agregar",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Error cargando la plantilla de dialogo: {error}",
+    "No tags selected for deletion." : "No se han seleccionado etiquetas para eliminar.",
+    "Please reload the page." : "Por favor, recargue la página.",
+    "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
+    "%s password reset" : "%s restablecer contraseña",
+    "Use the following link to reset your password: {link}" : "Usá este enlace para restablecer tu contraseña: {link}",
+    "You will receive a link to reset your password via Email." : "Vas a recibir un enlace por e-mail para restablecer tu 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?" : "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?",
+    "Yes, I really want to reset my password now" : "Sí, definitivamente quiero restablecer mi contraseña ahora",
+    "Reset" : "Resetear",
+    "New password" : "Nueva contraseña:",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Apps" : "Apps",
+    "Admin" : "Administración",
+    "Help" : "Ayuda",
+    "Error loading tags" : "Error cargando las etiquetas",
+    "Tag already exists" : "La etiqueta ya existe",
+    "Error deleting tag(s)" : "Error borrando etiquetas(s)",
+    "Error tagging" : "Error al etiquetar",
+    "Error untagging" : "Error al sacar la etiqueta",
+    "Error favoriting" : "Error al favorecer",
+    "Error unfavoriting" : "Error al desfavorecer",
+    "Access forbidden" : "Acceso prohibido",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "¡Hola!\n\nsólo te quería decir que %s acaba de compartir %s contigo.\nVerlo: %s\n\n",
+    "The share will expire on %s." : "El compartir expirará en %s.",
+    "Cheers!" : "¡Saludos!",
+    "Security Warning" : "Advertencia de seguridad",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Password" : "Contraseña",
+    "Data folder" : "Directorio de almacenamiento",
+    "Configure the database" : "Configurar la base de datos",
+    "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" : "Huésped de la base de datos",
+    "Finish setup" : "Completar la instalación",
+    "Finishing …" : "Finalizando...",
+    "%s is available. Get more information on how to update." : "%s está disponible. Obtené más información sobre cómo actualizar.",
+    "Log out" : "Cerrar la sesión",
+    "Server side authentication failed!" : "¡Falló la autenticación del servidor!",
+    "Please contact your administrator." : "Por favor, contacte a su administrador.",
+    "remember" : "recordame",
+    "Log in" : "Iniciar sesión",
+    "Alternative Logins" : "Nombre alternativos de usuarios",
+    "This ownCloud instance is currently in single user mode." : "Esta instancia de ownCloud está en modo de usuario único.",
+    "This means only administrators can use the instance." : "Esto significa que solo administradores pueden usar esta instancia.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte su administrador de sistema si este mensaje persiste o aparece inesperadamente.",
+    "Thank you for your patience." : "Gracias por su paciencia."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json
new file mode 100644
index 00000000000..621626a366b
--- /dev/null
+++ b/core/l10n/es_AR.json
@@ -0,0 +1,153 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "No se pudieron mandar correos a los siguientes usuarios: %s",
+    "Turned on maintenance mode" : "Modo de mantenimiento activado",
+    "Turned off maintenance mode" : "Modo de mantenimiento desactivado",
+    "Updated database" : "Base de datos actualizada",
+    "No image or file provided" : "No se ha proveído de una imágen o archivo.",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "No temporary profile picture available, try again" : "No hay una imágen temporal del perfil disponible, intente de nuevo",
+    "No crop data provided" : "No se proveyeron datos de 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" : "Configuración",
+    "File" : "Archivo",
+    "Folder" : "Carpeta",
+    "Image" : "Imagen",
+    "Saving..." : "Guardando...",
+    "Reset password" : "Restablecer contraseña",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Elegir",
+    "Error loading file picker template: {error}" : "Error cargando la plantilla del selector de archivo: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Error cargando la plantilla del mensaje: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["un archivo en conflicto","{count} archivos en conflicto"],
+    "One file conflict" : "Un archivo en conflicto",
+    "New Files" : "Nuevos archivos",
+    "Which files do you want to keep?" : "¿Qué archivos deseas retener?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si tu seleccionas ambas versiones, el archivo copiado tendrá un número agregado a su nombre.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos están seleccionados)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Error cargando la plantilla de archivo existente",
+    "Very weak password" : "Contraseña muy débil.",
+    "Weak password" : "Contraseña débil.",
+    "So-so password" : "Contraseña de nivel medio. ",
+    "Good password" : "Buena contraseña. ",
+    "Strong password" : "Contraseña fuerte.",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características.",
+    "Shared" : "Compartido",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Error al compartir",
+    "Error while unsharing" : "Error en al dejar de compartir",
+    "Error while changing permissions" : "Error al cambiar permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartido con vos y el grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido con vos por {owner}",
+    "Share with user or group …" : "Compartir con usuario o grupo ...",
+    "Share link" : "Compartir vínculo",
+    "Password protect" : "Proteger con contraseña ",
+    "Allow Public Upload" : "Permitir Subida Pública",
+    "Email link to person" : "Enviar el enlace por e-mail.",
+    "Send" : "Mandar",
+    "Set expiration date" : "Asignar fecha de vencimiento",
+    "Expiration date" : "Fecha de vencimiento",
+    "group" : "grupo",
+    "Resharing is not allowed" : "No se permite volver a compartir",
+    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
+    "Unshare" : "Dejar de compartir",
+    "notify by email" : "notificar por correo",
+    "can share" : "puede compartir",
+    "can edit" : "podés editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "delete" : "borrar",
+    "Password protected" : "Protegido por contraseña",
+    "Error unsetting expiration date" : "Error al remover la fecha de vencimiento",
+    "Error setting expiration date" : "Error al asignar fecha de vencimiento",
+    "Sending ..." : "Mandando...",
+    "Email sent" : "e-mail mandado",
+    "Warning" : "Atención",
+    "The object type is not specified." : "El tipo de objeto no está especificado. ",
+    "Enter new" : "Entrar nuevo",
+    "Delete" : "Borrar",
+    "Add" : "Agregar",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Error cargando la plantilla de dialogo: {error}",
+    "No tags selected for deletion." : "No se han seleccionado etiquetas para eliminar.",
+    "Please reload the page." : "Por favor, recargue la página.",
+    "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
+    "%s password reset" : "%s restablecer contraseña",
+    "Use the following link to reset your password: {link}" : "Usá este enlace para restablecer tu contraseña: {link}",
+    "You will receive a link to reset your password via Email." : "Vas a recibir un enlace por e-mail para restablecer tu 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?" : "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?",
+    "Yes, I really want to reset my password now" : "Sí, definitivamente quiero restablecer mi contraseña ahora",
+    "Reset" : "Resetear",
+    "New password" : "Nueva contraseña:",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Apps" : "Apps",
+    "Admin" : "Administración",
+    "Help" : "Ayuda",
+    "Error loading tags" : "Error cargando las etiquetas",
+    "Tag already exists" : "La etiqueta ya existe",
+    "Error deleting tag(s)" : "Error borrando etiquetas(s)",
+    "Error tagging" : "Error al etiquetar",
+    "Error untagging" : "Error al sacar la etiqueta",
+    "Error favoriting" : "Error al favorecer",
+    "Error unfavoriting" : "Error al desfavorecer",
+    "Access forbidden" : "Acceso prohibido",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "¡Hola!\n\nsólo te quería decir que %s acaba de compartir %s contigo.\nVerlo: %s\n\n",
+    "The share will expire on %s." : "El compartir expirará en %s.",
+    "Cheers!" : "¡Saludos!",
+    "Security Warning" : "Advertencia de seguridad",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Password" : "Contraseña",
+    "Data folder" : "Directorio de almacenamiento",
+    "Configure the database" : "Configurar la base de datos",
+    "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" : "Huésped de la base de datos",
+    "Finish setup" : "Completar la instalación",
+    "Finishing …" : "Finalizando...",
+    "%s is available. Get more information on how to update." : "%s está disponible. Obtené más información sobre cómo actualizar.",
+    "Log out" : "Cerrar la sesión",
+    "Server side authentication failed!" : "¡Falló la autenticación del servidor!",
+    "Please contact your administrator." : "Por favor, contacte a su administrador.",
+    "remember" : "recordame",
+    "Log in" : "Iniciar sesión",
+    "Alternative Logins" : "Nombre alternativos de usuarios",
+    "This ownCloud instance is currently in single user mode." : "Esta instancia de ownCloud está en modo de usuario único.",
+    "This means only administrators can use the instance." : "Esto significa que solo administradores pueden usar esta instancia.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte su administrador de sistema si este mensaje persiste o aparece inesperadamente.",
+    "Thank you for your patience." : "Gracias por su paciencia."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
deleted file mode 100644
index 89d7b721ce0..00000000000
--- a/core/l10n/es_AR.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "No se pudieron mandar correos a los siguientes usuarios: %s",
-"Turned on maintenance mode" => "Modo de mantenimiento activado",
-"Turned off maintenance mode" => "Modo de mantenimiento desactivado",
-"Updated database" => "Base de datos actualizada",
-"No image or file provided" => "No se ha proveído de una imágen o archivo.",
-"Unknown filetype" => "Tipo de archivo desconocido",
-"Invalid image" => "Imagen inválida",
-"No temporary profile picture available, try again" => "No hay una imágen temporal del perfil disponible, intente de nuevo",
-"No crop data provided" => "No se proveyeron datos de 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" => "Configuración",
-"File" => "Archivo",
-"Folder" => "Carpeta",
-"Image" => "Imagen",
-"Saving..." => "Guardando...",
-"Reset password" => "Restablecer contraseña",
-"No" => "No",
-"Yes" => "Sí",
-"Choose" => "Elegir",
-"Error loading file picker template: {error}" => "Error cargando la plantilla del selector de archivo: {error}",
-"Ok" => "Aceptar",
-"Error loading message template: {error}" => "Error cargando la plantilla del mensaje: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("un archivo en conflicto","{count} archivos en conflicto"),
-"One file conflict" => "Un archivo en conflicto",
-"New Files" => "Nuevos archivos",
-"Which files do you want to keep?" => "¿Qué archivos deseas retener?",
-"If you select both versions, the copied file will have a number added to its name." => "Si tu seleccionas ambas versiones, el archivo copiado tendrá un número agregado a su nombre.",
-"Cancel" => "Cancelar",
-"Continue" => "Continuar",
-"(all selected)" => "(todos están seleccionados)",
-"({count} selected)" => "({count} seleccionados)",
-"Error loading file exists template" => "Error cargando la plantilla de archivo existente",
-"Very weak password" => "Contraseña muy débil.",
-"Weak password" => "Contraseña débil.",
-"So-so password" => "Contraseña de nivel medio. ",
-"Good password" => "Buena contraseña. ",
-"Strong password" => "Contraseña fuerte.",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características.",
-"Shared" => "Compartido",
-"Share" => "Compartir",
-"Error" => "Error",
-"Error while sharing" => "Error al compartir",
-"Error while unsharing" => "Error en al dejar de compartir",
-"Error while changing permissions" => "Error al cambiar permisos",
-"Shared with you and the group {group} by {owner}" => "Compartido con vos y el grupo {group} por {owner}",
-"Shared with you by {owner}" => "Compartido con vos por {owner}",
-"Share with user or group …" => "Compartir con usuario o grupo ...",
-"Share link" => "Compartir vínculo",
-"Password protect" => "Proteger con contraseña ",
-"Allow Public Upload" => "Permitir Subida Pública",
-"Email link to person" => "Enviar el enlace por e-mail.",
-"Send" => "Mandar",
-"Set expiration date" => "Asignar fecha de vencimiento",
-"Expiration date" => "Fecha de vencimiento",
-"group" => "grupo",
-"Resharing is not allowed" => "No se permite volver a compartir",
-"Shared in {item} with {user}" => "Compartido en {item} con {user}",
-"Unshare" => "Dejar de compartir",
-"notify by email" => "notificar por correo",
-"can share" => "puede compartir",
-"can edit" => "podés editar",
-"access control" => "control de acceso",
-"create" => "crear",
-"update" => "actualizar",
-"delete" => "borrar",
-"Password protected" => "Protegido por contraseña",
-"Error unsetting expiration date" => "Error al remover la fecha de vencimiento",
-"Error setting expiration date" => "Error al asignar fecha de vencimiento",
-"Sending ..." => "Mandando...",
-"Email sent" => "e-mail mandado",
-"Warning" => "Atención",
-"The object type is not specified." => "El tipo de objeto no está especificado. ",
-"Enter new" => "Entrar nuevo",
-"Delete" => "Borrar",
-"Add" => "Agregar",
-"Edit tags" => "Editar etiquetas",
-"Error loading dialog template: {error}" => "Error cargando la plantilla de dialogo: {error}",
-"No tags selected for deletion." => "No se han seleccionado etiquetas para eliminar.",
-"Please reload the page." => "Por favor, recargue la página.",
-"The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
-"%s password reset" => "%s restablecer contraseña",
-"Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
-"You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu 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?" => "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?",
-"Yes, I really want to reset my password now" => "Sí, definitivamente quiero restablecer mi contraseña ahora",
-"Reset" => "Resetear",
-"New password" => "Nueva contraseña:",
-"Personal" => "Personal",
-"Users" => "Usuarios",
-"Apps" => "Apps",
-"Admin" => "Administración",
-"Help" => "Ayuda",
-"Error loading tags" => "Error cargando las etiquetas",
-"Tag already exists" => "La etiqueta ya existe",
-"Error deleting tag(s)" => "Error borrando etiquetas(s)",
-"Error tagging" => "Error al etiquetar",
-"Error untagging" => "Error al sacar la etiqueta",
-"Error favoriting" => "Error al favorecer",
-"Error unfavoriting" => "Error al desfavorecer",
-"Access forbidden" => "Acceso prohibido",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "¡Hola!\n\nsólo te quería decir que %s acaba de compartir %s contigo.\nVerlo: %s\n\n",
-"The share will expire on %s." => "El compartir expirará en %s.",
-"Cheers!" => "¡Saludos!",
-"Security Warning" => "Advertencia de seguridad",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
-"Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
-"Password" => "Contraseña",
-"Data folder" => "Directorio de almacenamiento",
-"Configure the database" => "Configurar la base de datos",
-"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" => "Huésped de la base de datos",
-"Finish setup" => "Completar la instalación",
-"Finishing …" => "Finalizando...",
-"%s is available. Get more information on how to update." => "%s está disponible. Obtené más información sobre cómo actualizar.",
-"Log out" => "Cerrar la sesión",
-"Server side authentication failed!" => "¡Falló la autenticación del servidor!",
-"Please contact your administrator." => "Por favor, contacte a su administrador.",
-"remember" => "recordame",
-"Log in" => "Iniciar sesión",
-"Alternative Logins" => "Nombre alternativos de usuarios",
-"This ownCloud instance is currently in single user mode." => "Esta instancia de ownCloud está en modo de usuario único.",
-"This means only administrators can use the instance." => "Esto significa que solo administradores pueden usar esta instancia.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte su administrador de sistema si este mensaje persiste o aparece inesperadamente.",
-"Thank you for your patience." => "Gracias por su paciencia."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_BO.js b/core/l10n/es_BO.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_BO.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_BO.json b/core/l10n/es_BO.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_BO.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_BO.php b/core/l10n/es_BO.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_BO.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_CL.js b/core/l10n/es_CL.js
new file mode 100644
index 00000000000..64a8ed0c706
--- /dev/null
+++ b/core/l10n/es_CL.js
@@ -0,0 +1,48 @@
+OC.L10N.register(
+    "core",
+    {
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen no válida",
+    "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" : "Configuración",
+    "No" : "No",
+    "Yes" : "Si",
+    "Choose" : "Choose",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Cancelar",
+    "Shared" : "Compartido",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Ocurrió un error mientras compartía",
+    "Error while unsharing" : "Ocurrió un error mientras dejaba de compartir",
+    "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
+    "The object type is not specified." : "El tipo de objeto no está especificado.",
+    "Username" : "Usuario",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "Help" : "Ayuda",
+    "Password" : "Clave",
+    "You are accessing the server from an untrusted domain." : "Usted está accediendo al servidor desde un dominio no confiable.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte con su administrador. Si usted es el administrador de esta instancia, configure la opción \"trusted_domain\" en \"config/config.php\". Un ejemplo de la configuración está disponible en config/config.sample.php"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_CL.json b/core/l10n/es_CL.json
new file mode 100644
index 00000000000..22bab061129
--- /dev/null
+++ b/core/l10n/es_CL.json
@@ -0,0 +1,46 @@
+{ "translations": {
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen no válida",
+    "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" : "Configuración",
+    "No" : "No",
+    "Yes" : "Si",
+    "Choose" : "Choose",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Cancelar",
+    "Shared" : "Compartido",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Ocurrió un error mientras compartía",
+    "Error while unsharing" : "Ocurrió un error mientras dejaba de compartir",
+    "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
+    "The object type is not specified." : "El tipo de objeto no está especificado.",
+    "Username" : "Usuario",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "Help" : "Ayuda",
+    "Password" : "Clave",
+    "You are accessing the server from an untrusted domain." : "Usted está accediendo al servidor desde un dominio no confiable.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte con su administrador. Si usted es el administrador de esta instancia, configure la opción \"trusted_domain\" en \"config/config.php\". Un ejemplo de la configuración está disponible en config/config.sample.php"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_CL.php b/core/l10n/es_CL.php
deleted file mode 100644
index 68d82086933..00000000000
--- a/core/l10n/es_CL.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown filetype" => "Tipo de archivo desconocido",
-"Invalid image" => "Imagen no válida",
-"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" => "Configuración",
-"No" => "No",
-"Yes" => "Si",
-"Choose" => "Choose",
-"Ok" => "Ok",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Cancelar",
-"Shared" => "Compartido",
-"Share" => "Compartir",
-"Error" => "Error",
-"Error while sharing" => "Ocurrió un error mientras compartía",
-"Error while unsharing" => "Ocurrió un error mientras dejaba de compartir",
-"Error while changing permissions" => "Ocurrió un error mientras se cambiaban los permisos",
-"The object type is not specified." => "El tipo de objeto no está especificado.",
-"Username" => "Usuario",
-"Personal" => "Personal",
-"Users" => "Usuarios",
-"Admin" => "Administración",
-"Help" => "Ayuda",
-"Password" => "Clave",
-"You are accessing the server from an untrusted domain." => "Usted está accediendo al servidor desde un dominio no confiable.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Por favor contacte con su administrador. Si usted es el administrador de esta instancia, configure la opción \"trusted_domain\" en \"config/config.php\". Un ejemplo de la configuración está disponible en config/config.sample.php"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_CO.js b/core/l10n/es_CO.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_CO.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_CO.json b/core/l10n/es_CO.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_CO.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_CO.php b/core/l10n/es_CO.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_CO.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_CR.js b/core/l10n/es_CR.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_CR.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_CR.json b/core/l10n/es_CR.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_CR.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_CR.php b/core/l10n/es_CR.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_CR.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_EC.js b/core/l10n/es_EC.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_EC.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_EC.json b/core/l10n/es_EC.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_EC.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_EC.php b/core/l10n/es_EC.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_EC.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js
new file mode 100644
index 00000000000..0134945fa45
--- /dev/null
+++ b/core/l10n/es_MX.js
@@ -0,0 +1,148 @@
+OC.L10N.register(
+    "core",
+    {
+    "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",
+    "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",
+    "File" : "Archivo",
+    "Folder" : "Carpeta",
+    "Saving..." : "Guardando...",
+    "Reset password" : "Restablecer contraseña",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Seleccionar",
+    "Error loading file picker template: {error}" : "Error cargando plantilla del seleccionador de archivos: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Error cargando plantilla del mensaje: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{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",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
+    "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",
+    "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",
+    "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 share" : "puede compartir",
+    "can edit" : "puede editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "delete" : "eliminar",
+    "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 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}",
+    "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",
+    "New password" : "Nueva 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",
+    "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.",
+    "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>",
+    "Password" : "Contraseña",
+    "Data folder" : "Directorio de datos",
+    "Configure the database" : "Configurar la base de datos",
+    "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 …",
+    "%s is available. Get more information on how to update." : "%s esta disponible. Obtener mas información de como actualizar.",
+    "Log out" : "Salir",
+    "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
+    "Please contact your administrator." : "Por favor, contacte con el administrador.",
+    "remember" : "recordar",
+    "Log in" : "Entrar",
+    "Alternative Logins" : "Accesos Alternativos",
+    "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."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json
new file mode 100644
index 00000000000..a620c6ca020
--- /dev/null
+++ b/core/l10n/es_MX.json
@@ -0,0 +1,146 @@
+{ "translations": {
+    "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",
+    "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",
+    "File" : "Archivo",
+    "Folder" : "Carpeta",
+    "Saving..." : "Guardando...",
+    "Reset password" : "Restablecer contraseña",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Seleccionar",
+    "Error loading file picker template: {error}" : "Error cargando plantilla del seleccionador de archivos: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Error cargando plantilla del mensaje: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{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",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
+    "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",
+    "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",
+    "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 share" : "puede compartir",
+    "can edit" : "puede editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "delete" : "eliminar",
+    "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 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}",
+    "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",
+    "New password" : "Nueva 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",
+    "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.",
+    "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>",
+    "Password" : "Contraseña",
+    "Data folder" : "Directorio de datos",
+    "Configure the database" : "Configurar la base de datos",
+    "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 …",
+    "%s is available. Get more information on how to update." : "%s esta disponible. Obtener mas información de como actualizar.",
+    "Log out" : "Salir",
+    "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
+    "Please contact your administrator." : "Por favor, contacte con el administrador.",
+    "remember" : "recordar",
+    "Log in" : "Entrar",
+    "Alternative Logins" : "Accesos Alternativos",
+    "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."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
deleted file mode 100644
index 1575822ee50..00000000000
--- a/core/l10n/es_MX.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"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",
-"File" => "Archivo",
-"Folder" => "Carpeta",
-"Saving..." => "Guardando...",
-"Reset password" => "Restablecer contraseña",
-"No" => "No",
-"Yes" => "Sí",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
-"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",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
-"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",
-"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",
-"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 share" => "puede compartir",
-"can edit" => "puede editar",
-"access control" => "control de acceso",
-"create" => "crear",
-"update" => "actualizar",
-"delete" => "eliminar",
-"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 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}",
-"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",
-"New password" => "Nueva 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",
-"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.",
-"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>",
-"Password" => "Contraseña",
-"Data folder" => "Directorio de datos",
-"Configure the database" => "Configurar la base de datos",
-"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 …",
-"%s is available. Get more information on how to update." => "%s esta disponible. Obtener mas información de como actualizar.",
-"Log out" => "Salir",
-"Server side authentication failed!" => "La autenticación a fallado en el servidor.",
-"Please contact your administrator." => "Por favor, contacte con el administrador.",
-"remember" => "recordar",
-"Log in" => "Entrar",
-"Alternative Logins" => "Accesos Alternativos",
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_PE.js b/core/l10n/es_PE.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_PE.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_PE.json b/core/l10n/es_PE.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_PE.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_PE.php b/core/l10n/es_PE.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_PE.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_PY.js b/core/l10n/es_PY.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_PY.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_PY.json b/core/l10n/es_PY.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_PY.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_PY.php b/core/l10n/es_PY.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_PY.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_US.js b/core/l10n/es_US.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_US.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_US.json b/core/l10n/es_US.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_US.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_US.php b/core/l10n/es_US.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_US.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_UY.js b/core/l10n/es_UY.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_UY.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_UY.json b/core/l10n/es_UY.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_UY.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_UY.php b/core/l10n/es_UY.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_UY.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
new file mode 100644
index 00000000000..5b2e2511005
--- /dev/null
+++ b/core/l10n/et_EE.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s ",
+    "Turned on maintenance mode" : "Haldusrežiimis sisse lülitatud",
+    "Turned off maintenance mode" : "Haldusrežiimis välja lülitatud",
+    "Updated database" : "Uuendatud andmebaas",
+    "Checked database schema update" : "Andmebaasi skeemi uuendus kontrollitud",
+    "Checked database schema update for apps" : "Andmebaasi skeemi uuendus rakendustele on kontrollitud",
+    "Updated \"%s\" to %s" : "Uuendatud \"%s\" -> %s",
+    "Disabled incompatible apps: %s" : "Keelatud mitteühilduvad rakendid: %s",
+    "No image or file provided" : "Ühtegi pilti või faili pole pakutud",
+    "Unknown filetype" : "Tundmatu failitüüp",
+    "Invalid image" : "Vigane pilt",
+    "No temporary profile picture available, try again" : "Ühtegi ajutist profiili pilti pole saadaval, proovi uuesti",
+    "No crop data provided" : "Lõikeandmeid ei leitud",
+    "Sunday" : "Pühapäev",
+    "Monday" : "Esmaspäev",
+    "Tuesday" : "Teisipäev",
+    "Wednesday" : "Kolmapäev",
+    "Thursday" : "Neljapäev",
+    "Friday" : "Reede",
+    "Saturday" : "Laupäev",
+    "January" : "Jaanuar",
+    "February" : "Veebruar",
+    "March" : "Märts",
+    "April" : "Aprill",
+    "May" : "Mai",
+    "June" : "Juuni",
+    "July" : "Juuli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktoober",
+    "November" : "November",
+    "December" : "Detsember",
+    "Settings" : "Seaded",
+    "File" : "Fail",
+    "Folder" : "Kaust",
+    "Image" : "Pilt",
+    "Audio" : "Helid",
+    "Saving..." : "Salvestamine...",
+    "Couldn't send reset email. Please contact your administrator." : "Ei suutnud lähtestada e-maili. Palun kontakteeru süsteemihalduriga.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge<br>.Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. <br />Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. <br />Oled sa kindel, et sa soovid jätkata?",
+    "I know what I'm doing" : "Ma tean mida teen",
+    "Reset password" : "Nulli parool",
+    "Password can not be changed. Please contact your administrator." : "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.",
+    "No" : "Ei",
+    "Yes" : "Jah",
+    "Choose" : "Vali",
+    "Error loading file picker template: {error}" : "Viga failivalija malli laadimisel:  {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Viga sõnumi malli laadimisel: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} failikonflikt","{count} failikonflikti"],
+    "One file conflict" : "Üks failikonflikt",
+    "New Files" : "Uued failid",
+    "Already existing files" : "Juba olemasolevad failid",
+    "Which files do you want to keep?" : "Milliseid faile sa soovid alles hoida?",
+    "If you select both versions, the copied file will have a number added to its name." : "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number.",
+    "Cancel" : "Loobu",
+    "Continue" : "Jätka",
+    "(all selected)" : "(kõik valitud)",
+    "({count} selected)" : "({count} valitud)",
+    "Error loading file exists template" : "Viga faili olemasolu malli laadimisel",
+    "Very weak password" : "Väga nõrk parool",
+    "Weak password" : "Nõrk parool",
+    "So-so password" : "Enam-vähem sobiv parool",
+    "Good password" : "Hea parool",
+    "Strong password" : "Väga hea parool",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
+    "Error occurred while checking server setup" : "Serveri seadete kontrolimisel tekkis viga",
+    "Shared" : "Jagatud",
+    "Shared with {recipients}" : "Jagatud {recipients}",
+    "Share" : "Jaga",
+    "Error" : "Viga",
+    "Error while sharing" : "Viga jagamisel",
+    "Error while unsharing" : "Viga jagamise lõpetamisel",
+    "Error while changing permissions" : "Viga õiguste muutmisel",
+    "Shared with you and the group {group} by {owner}" : "Jagatud sinu ja {group} grupiga {owner} poolt",
+    "Shared with you by {owner}" : "Sinuga jagas {owner}",
+    "Share with user or group …" : "Jaga kasutaja või grupiga ...",
+    "Share link" : "Jaga linki",
+    "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
+    "Password protect" : "Parooliga kaitstud",
+    "Choose a password for the public link" : "Vali avaliku lingi jaoks parool",
+    "Allow Public Upload" : "Luba avalik üleslaadimine",
+    "Email link to person" : "Saada link isikule e-postiga",
+    "Send" : "Saada",
+    "Set expiration date" : "Määra aegumise kuupäev",
+    "Expiration date" : "Aegumise kuupäev",
+    "Adding user..." : "Kasutaja lisamine...",
+    "group" : "grupp",
+    "Resharing is not allowed" : "Edasijagamine pole lubatud",
+    "Shared in {item} with {user}" : "Jagatud {item} kasutajaga {user}",
+    "Unshare" : "Lõpeta jagamine",
+    "notify by email" : "teavita e-postiga",
+    "can share" : "saab jagada",
+    "can edit" : "saab muuta",
+    "access control" : "ligipääsukontroll",
+    "create" : "loo",
+    "update" : "uuenda",
+    "delete" : "kustuta",
+    "Password protected" : "Parooliga kaitstud",
+    "Error unsetting expiration date" : "Viga aegumise kuupäeva eemaldamisel",
+    "Error setting expiration date" : "Viga aegumise kuupäeva määramisel",
+    "Sending ..." : "Saatmine ...",
+    "Email sent" : "E-kiri on saadetud",
+    "Warning" : "Hoiatus",
+    "The object type is not specified." : "Objekti tüüp pole määratletud.",
+    "Enter new" : "Sisesta uus",
+    "Delete" : "Kustuta",
+    "Add" : "Lisa",
+    "Edit tags" : "Muuda silte",
+    "Error loading dialog template: {error}" : "Viga dialoogi malli laadimisel: {error}",
+    "No tags selected for deletion." : "Kustutamiseks pole ühtegi silti valitud.",
+    "Updating {productName} to version {version}, this may take a while." : "Uuendan {productName} versioonile {version}, see võtab veidi aega.",
+    "Please reload the page." : "Palun laadi see uuesti.",
+    "The update was unsuccessful." : "Uuendus ebaõnnestus.",
+    "The update was successful. Redirecting you to ownCloud now." : "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
+    "Couldn't reset password because the token is invalid" : "Ei saanud parooli taastada, kuna märgend on vigane",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ei suutnud lähtestada e-maili. Palun veendu, et kasutajatunnus on õige.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga.",
+    "%s password reset" : "%s parooli lähtestus",
+    "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.",
+    "Username" : "Kasutajanimi",
+    "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?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
+    "Yes, I really want to reset my password now" : "Jah, ma tõesti soovin oma parooli praegu taastada",
+    "Reset" : "Algseaded",
+    "New password" : "Uus parool",
+    "New Password" : "Uus parool",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.",
+    "Personal" : "Isiklik",
+    "Users" : "Kasutajad",
+    "Apps" : "Rakendused",
+    "Admin" : "Admin",
+    "Help" : "Abiinfo",
+    "Error loading tags" : "Viga siltide laadimisel",
+    "Tag already exists" : "Silt on juba olemas",
+    "Error deleting tag(s)" : "Viga sildi (siltide) kustutamisel",
+    "Error tagging" : "Viga sildi lisamisel",
+    "Error untagging" : "Viga sildi eemaldamisel",
+    "Error favoriting" : "Viga lemmikuks lisamisel",
+    "Error unfavoriting" : "Viga lemmikutest eemaldamisel",
+    "Access forbidden" : "Ligipääs on keelatud",
+    "File not found" : "Faili ei leitud",
+    "The specified document has not been found on the server." : "Määratud dokumenti serverist ei leitud.",
+    "You can click here to return to %s." : "%s tagasi minemiseks võid sa siia klikkida.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Tere,\n\n%s jagas sulle välja %s.\nVaata siit: %s\n\n",
+    "The share will expire on %s." : "Jagamine aegub %s.",
+    "Cheers!" : "Terekest!",
+    "Internal Server Error" : "Serveri sisemine viga",
+    "The server encountered an internal error and was unable to complete your request." : "Serveris tekkis sisemine tõrge ja sinu päringu täitmine ebaõnnestus.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kui seda veateadet näidatakse mitu korda, siis palun võta ühendust serveri administraatoriga. Palun lisa alla aruandesse tehnilised üksikasjad.",
+    "More details can be found in the server log." : "Lisainfot võib leida serveri logist.",
+    "Technical details" : "Tehnilised andmed",
+    "Remote Address: %s" : "Kaugaadress: %s",
+    "Request ID: %s" : "Päringu ID: %s",
+    "Code: %s" : "Kood: %s",
+    "Message: %s" : "Sõnum: %s",
+    "File: %s" : "Fail: %s",
+    "Line: %s" : "Rida: %s",
+    "Trace" : "Jälita",
+    "Security Warning" : "Turvahoiatus",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rünnakuga.",
+    "Please update your PHP installation to use %s securely." : "Palun uuenda oma paigaldatud PHP-d tagamaks %s turvalisus.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
+    "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>",
+    "Password" : "Parool",
+    "Storage & database" : "Andmehoidla ja andmebaas",
+    "Data folder" : "Andmete kaust",
+    "Configure the database" : "Seadista andmebaasi",
+    "Only %s is available." : "Ainult %s on saadaval.",
+    "Database user" : "Andmebaasi kasutaja",
+    "Database password" : "Andmebaasi parool",
+    "Database name" : "Andmebasi nimi",
+    "Database tablespace" : "Andmebaasi tabeliruum",
+    "Database host" : "Andmebaasi host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta.",
+    "Finish setup" : "Lõpeta seadistamine",
+    "Finishing …" : "Lõpetamine ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "See rakendus vajab toimimiseks JavaScripti. Palun <a href=\"http://enable-javascript.com/\" target=\"_blank\">luba JavaScript</a> ning laadi see leht uuesti.",
+    "%s is available. Get more information on how to update." : "%s on saadaval. Vaata lähemalt kuidas uuendada.",
+    "Log out" : "Logi välja",
+    "Server side authentication failed!" : "Serveripoolne autentimine ebaõnnestus!",
+    "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.",
+    "Forgot your password? Reset it!" : "Unustasid parooli? Taasta see!",
+    "remember" : "pea meeles",
+    "Log in" : "Logi sisse",
+    "Alternative Logins" : "Alternatiivsed sisselogimisviisid",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "See ownCloud on momendil seadistatud ühe kasutaja jaoks.",
+    "This means only administrators can use the instance." : "See tähendab, et seda saavad kasutada ainult administraatorid.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakteeru oma süsteemihalduriga, kui see teade püsib või on tekkinud ootamatult.",
+    "Thank you for your patience." : "Täname kannatlikkuse eest.",
+    "You are accessing the server from an untrusted domain." : "Sa kasutad serverit usalduseta asukohast",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Sõltuvalt sinu seadetest võib ka administraator kasutada allolevat nuppu, et seda domeeni usaldusväärseks märkida.",
+    "Add \"%s\" as trusted domain" : "Lisa \"%s\" usaldusväärse domeenina",
+    "%s will be updated to version %s." : "%s uuendatakse versioonile %s.",
+    "The following apps will be disabled:" : "Järgnevad rakendid keelatakse:",
+    "The theme %s has been disabled." : "Teema %s on keelatud.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enne jätkamist veendu, et andmebaas, seadete ning andmete kataloog on varundatud.",
+    "Start update" : "Käivita uuendus",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Suurtel saitidel aegumise vältimiseks võid sa paigalduskaustas käivitada järgmise käsu:",
+    "This %s instance is currently being updated, which may take a while." : "Seda %s ownCloud instantsi hetkel uuendatakse, see võib võtta veidi aega.",
+    "This page will refresh itself when the %s instance is available again." : "Se leht laetakse uuesti, kui %s instantsi on uuesti saadaval."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
new file mode 100644
index 00000000000..ba3f3b8e8f2
--- /dev/null
+++ b/core/l10n/et_EE.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s ",
+    "Turned on maintenance mode" : "Haldusrežiimis sisse lülitatud",
+    "Turned off maintenance mode" : "Haldusrežiimis välja lülitatud",
+    "Updated database" : "Uuendatud andmebaas",
+    "Checked database schema update" : "Andmebaasi skeemi uuendus kontrollitud",
+    "Checked database schema update for apps" : "Andmebaasi skeemi uuendus rakendustele on kontrollitud",
+    "Updated \"%s\" to %s" : "Uuendatud \"%s\" -> %s",
+    "Disabled incompatible apps: %s" : "Keelatud mitteühilduvad rakendid: %s",
+    "No image or file provided" : "Ühtegi pilti või faili pole pakutud",
+    "Unknown filetype" : "Tundmatu failitüüp",
+    "Invalid image" : "Vigane pilt",
+    "No temporary profile picture available, try again" : "Ühtegi ajutist profiili pilti pole saadaval, proovi uuesti",
+    "No crop data provided" : "Lõikeandmeid ei leitud",
+    "Sunday" : "Pühapäev",
+    "Monday" : "Esmaspäev",
+    "Tuesday" : "Teisipäev",
+    "Wednesday" : "Kolmapäev",
+    "Thursday" : "Neljapäev",
+    "Friday" : "Reede",
+    "Saturday" : "Laupäev",
+    "January" : "Jaanuar",
+    "February" : "Veebruar",
+    "March" : "Märts",
+    "April" : "Aprill",
+    "May" : "Mai",
+    "June" : "Juuni",
+    "July" : "Juuli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktoober",
+    "November" : "November",
+    "December" : "Detsember",
+    "Settings" : "Seaded",
+    "File" : "Fail",
+    "Folder" : "Kaust",
+    "Image" : "Pilt",
+    "Audio" : "Helid",
+    "Saving..." : "Salvestamine...",
+    "Couldn't send reset email. Please contact your administrator." : "Ei suutnud lähtestada e-maili. Palun kontakteeru süsteemihalduriga.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge<br>.Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. <br />Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. <br />Oled sa kindel, et sa soovid jätkata?",
+    "I know what I'm doing" : "Ma tean mida teen",
+    "Reset password" : "Nulli parool",
+    "Password can not be changed. Please contact your administrator." : "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.",
+    "No" : "Ei",
+    "Yes" : "Jah",
+    "Choose" : "Vali",
+    "Error loading file picker template: {error}" : "Viga failivalija malli laadimisel:  {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Viga sõnumi malli laadimisel: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} failikonflikt","{count} failikonflikti"],
+    "One file conflict" : "Üks failikonflikt",
+    "New Files" : "Uued failid",
+    "Already existing files" : "Juba olemasolevad failid",
+    "Which files do you want to keep?" : "Milliseid faile sa soovid alles hoida?",
+    "If you select both versions, the copied file will have a number added to its name." : "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number.",
+    "Cancel" : "Loobu",
+    "Continue" : "Jätka",
+    "(all selected)" : "(kõik valitud)",
+    "({count} selected)" : "({count} valitud)",
+    "Error loading file exists template" : "Viga faili olemasolu malli laadimisel",
+    "Very weak password" : "Väga nõrk parool",
+    "Weak password" : "Nõrk parool",
+    "So-so password" : "Enam-vähem sobiv parool",
+    "Good password" : "Hea parool",
+    "Strong password" : "Väga hea parool",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
+    "Error occurred while checking server setup" : "Serveri seadete kontrolimisel tekkis viga",
+    "Shared" : "Jagatud",
+    "Shared with {recipients}" : "Jagatud {recipients}",
+    "Share" : "Jaga",
+    "Error" : "Viga",
+    "Error while sharing" : "Viga jagamisel",
+    "Error while unsharing" : "Viga jagamise lõpetamisel",
+    "Error while changing permissions" : "Viga õiguste muutmisel",
+    "Shared with you and the group {group} by {owner}" : "Jagatud sinu ja {group} grupiga {owner} poolt",
+    "Shared with you by {owner}" : "Sinuga jagas {owner}",
+    "Share with user or group …" : "Jaga kasutaja või grupiga ...",
+    "Share link" : "Jaga linki",
+    "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
+    "Password protect" : "Parooliga kaitstud",
+    "Choose a password for the public link" : "Vali avaliku lingi jaoks parool",
+    "Allow Public Upload" : "Luba avalik üleslaadimine",
+    "Email link to person" : "Saada link isikule e-postiga",
+    "Send" : "Saada",
+    "Set expiration date" : "Määra aegumise kuupäev",
+    "Expiration date" : "Aegumise kuupäev",
+    "Adding user..." : "Kasutaja lisamine...",
+    "group" : "grupp",
+    "Resharing is not allowed" : "Edasijagamine pole lubatud",
+    "Shared in {item} with {user}" : "Jagatud {item} kasutajaga {user}",
+    "Unshare" : "Lõpeta jagamine",
+    "notify by email" : "teavita e-postiga",
+    "can share" : "saab jagada",
+    "can edit" : "saab muuta",
+    "access control" : "ligipääsukontroll",
+    "create" : "loo",
+    "update" : "uuenda",
+    "delete" : "kustuta",
+    "Password protected" : "Parooliga kaitstud",
+    "Error unsetting expiration date" : "Viga aegumise kuupäeva eemaldamisel",
+    "Error setting expiration date" : "Viga aegumise kuupäeva määramisel",
+    "Sending ..." : "Saatmine ...",
+    "Email sent" : "E-kiri on saadetud",
+    "Warning" : "Hoiatus",
+    "The object type is not specified." : "Objekti tüüp pole määratletud.",
+    "Enter new" : "Sisesta uus",
+    "Delete" : "Kustuta",
+    "Add" : "Lisa",
+    "Edit tags" : "Muuda silte",
+    "Error loading dialog template: {error}" : "Viga dialoogi malli laadimisel: {error}",
+    "No tags selected for deletion." : "Kustutamiseks pole ühtegi silti valitud.",
+    "Updating {productName} to version {version}, this may take a while." : "Uuendan {productName} versioonile {version}, see võtab veidi aega.",
+    "Please reload the page." : "Palun laadi see uuesti.",
+    "The update was unsuccessful." : "Uuendus ebaõnnestus.",
+    "The update was successful. Redirecting you to ownCloud now." : "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
+    "Couldn't reset password because the token is invalid" : "Ei saanud parooli taastada, kuna märgend on vigane",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ei suutnud lähtestada e-maili. Palun veendu, et kasutajatunnus on õige.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga.",
+    "%s password reset" : "%s parooli lähtestus",
+    "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.",
+    "Username" : "Kasutajanimi",
+    "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?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
+    "Yes, I really want to reset my password now" : "Jah, ma tõesti soovin oma parooli praegu taastada",
+    "Reset" : "Algseaded",
+    "New password" : "Uus parool",
+    "New Password" : "Uus parool",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.",
+    "Personal" : "Isiklik",
+    "Users" : "Kasutajad",
+    "Apps" : "Rakendused",
+    "Admin" : "Admin",
+    "Help" : "Abiinfo",
+    "Error loading tags" : "Viga siltide laadimisel",
+    "Tag already exists" : "Silt on juba olemas",
+    "Error deleting tag(s)" : "Viga sildi (siltide) kustutamisel",
+    "Error tagging" : "Viga sildi lisamisel",
+    "Error untagging" : "Viga sildi eemaldamisel",
+    "Error favoriting" : "Viga lemmikuks lisamisel",
+    "Error unfavoriting" : "Viga lemmikutest eemaldamisel",
+    "Access forbidden" : "Ligipääs on keelatud",
+    "File not found" : "Faili ei leitud",
+    "The specified document has not been found on the server." : "Määratud dokumenti serverist ei leitud.",
+    "You can click here to return to %s." : "%s tagasi minemiseks võid sa siia klikkida.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Tere,\n\n%s jagas sulle välja %s.\nVaata siit: %s\n\n",
+    "The share will expire on %s." : "Jagamine aegub %s.",
+    "Cheers!" : "Terekest!",
+    "Internal Server Error" : "Serveri sisemine viga",
+    "The server encountered an internal error and was unable to complete your request." : "Serveris tekkis sisemine tõrge ja sinu päringu täitmine ebaõnnestus.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kui seda veateadet näidatakse mitu korda, siis palun võta ühendust serveri administraatoriga. Palun lisa alla aruandesse tehnilised üksikasjad.",
+    "More details can be found in the server log." : "Lisainfot võib leida serveri logist.",
+    "Technical details" : "Tehnilised andmed",
+    "Remote Address: %s" : "Kaugaadress: %s",
+    "Request ID: %s" : "Päringu ID: %s",
+    "Code: %s" : "Kood: %s",
+    "Message: %s" : "Sõnum: %s",
+    "File: %s" : "Fail: %s",
+    "Line: %s" : "Rida: %s",
+    "Trace" : "Jälita",
+    "Security Warning" : "Turvahoiatus",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rünnakuga.",
+    "Please update your PHP installation to use %s securely." : "Palun uuenda oma paigaldatud PHP-d tagamaks %s turvalisus.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
+    "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>",
+    "Password" : "Parool",
+    "Storage & database" : "Andmehoidla ja andmebaas",
+    "Data folder" : "Andmete kaust",
+    "Configure the database" : "Seadista andmebaasi",
+    "Only %s is available." : "Ainult %s on saadaval.",
+    "Database user" : "Andmebaasi kasutaja",
+    "Database password" : "Andmebaasi parool",
+    "Database name" : "Andmebasi nimi",
+    "Database tablespace" : "Andmebaasi tabeliruum",
+    "Database host" : "Andmebaasi host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta.",
+    "Finish setup" : "Lõpeta seadistamine",
+    "Finishing …" : "Lõpetamine ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "See rakendus vajab toimimiseks JavaScripti. Palun <a href=\"http://enable-javascript.com/\" target=\"_blank\">luba JavaScript</a> ning laadi see leht uuesti.",
+    "%s is available. Get more information on how to update." : "%s on saadaval. Vaata lähemalt kuidas uuendada.",
+    "Log out" : "Logi välja",
+    "Server side authentication failed!" : "Serveripoolne autentimine ebaõnnestus!",
+    "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.",
+    "Forgot your password? Reset it!" : "Unustasid parooli? Taasta see!",
+    "remember" : "pea meeles",
+    "Log in" : "Logi sisse",
+    "Alternative Logins" : "Alternatiivsed sisselogimisviisid",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "See ownCloud on momendil seadistatud ühe kasutaja jaoks.",
+    "This means only administrators can use the instance." : "See tähendab, et seda saavad kasutada ainult administraatorid.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakteeru oma süsteemihalduriga, kui see teade püsib või on tekkinud ootamatult.",
+    "Thank you for your patience." : "Täname kannatlikkuse eest.",
+    "You are accessing the server from an untrusted domain." : "Sa kasutad serverit usalduseta asukohast",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Sõltuvalt sinu seadetest võib ka administraator kasutada allolevat nuppu, et seda domeeni usaldusväärseks märkida.",
+    "Add \"%s\" as trusted domain" : "Lisa \"%s\" usaldusväärse domeenina",
+    "%s will be updated to version %s." : "%s uuendatakse versioonile %s.",
+    "The following apps will be disabled:" : "Järgnevad rakendid keelatakse:",
+    "The theme %s has been disabled." : "Teema %s on keelatud.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enne jätkamist veendu, et andmebaas, seadete ning andmete kataloog on varundatud.",
+    "Start update" : "Käivita uuendus",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Suurtel saitidel aegumise vältimiseks võid sa paigalduskaustas käivitada järgmise käsu:",
+    "This %s instance is currently being updated, which may take a while." : "Seda %s ownCloud instantsi hetkel uuendatakse, see võib võtta veidi aega.",
+    "This page will refresh itself when the %s instance is available again." : "Se leht laetakse uuesti, kui %s instantsi on uuesti saadaval."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
deleted file mode 100644
index 2aa5d95d18e..00000000000
--- a/core/l10n/et_EE.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s ",
-"Turned on maintenance mode" => "Haldusrežiimis sisse lülitatud",
-"Turned off maintenance mode" => "Haldusrežiimis välja lülitatud",
-"Updated database" => "Uuendatud andmebaas",
-"Checked database schema update" => "Andmebaasi skeemi uuendus kontrollitud",
-"Checked database schema update for apps" => "Andmebaasi skeemi uuendus rakendustele on kontrollitud",
-"Updated \"%s\" to %s" => "Uuendatud \"%s\" -> %s",
-"Disabled incompatible apps: %s" => "Keelatud mitteühilduvad rakendid: %s",
-"No image or file provided" => "Ühtegi pilti või faili pole pakutud",
-"Unknown filetype" => "Tundmatu failitüüp",
-"Invalid image" => "Vigane pilt",
-"No temporary profile picture available, try again" => "Ühtegi ajutist profiili pilti pole saadaval, proovi uuesti",
-"No crop data provided" => "Lõikeandmeid ei leitud",
-"Sunday" => "Pühapäev",
-"Monday" => "Esmaspäev",
-"Tuesday" => "Teisipäev",
-"Wednesday" => "Kolmapäev",
-"Thursday" => "Neljapäev",
-"Friday" => "Reede",
-"Saturday" => "Laupäev",
-"January" => "Jaanuar",
-"February" => "Veebruar",
-"March" => "Märts",
-"April" => "Aprill",
-"May" => "Mai",
-"June" => "Juuni",
-"July" => "Juuli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktoober",
-"November" => "November",
-"December" => "Detsember",
-"Settings" => "Seaded",
-"File" => "Fail",
-"Folder" => "Kaust",
-"Image" => "Pilt",
-"Audio" => "Helid",
-"Saving..." => "Salvestamine...",
-"Couldn't send reset email. Please contact your administrator." => "Ei suutnud lähtestada e-maili. Palun kontakteeru süsteemihalduriga.",
-"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge<br>.Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. <br />Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. <br />Oled sa kindel, et sa soovid jätkata?",
-"I know what I'm doing" => "Ma tean mida teen",
-"Reset password" => "Nulli parool",
-"Password can not be changed. Please contact your administrator." => "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.",
-"No" => "Ei",
-"Yes" => "Jah",
-"Choose" => "Vali",
-"Error loading file picker template: {error}" => "Viga failivalija malli laadimisel:  {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} failikonflikt","{count} failikonflikti"),
-"One file conflict" => "Üks failikonflikt",
-"New Files" => "Uued failid",
-"Already existing files" => "Juba olemasolevad failid",
-"Which files do you want to keep?" => "Milliseid faile sa soovid alles hoida?",
-"If you select both versions, the copied file will have a number added to its name." => "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number.",
-"Cancel" => "Loobu",
-"Continue" => "Jätka",
-"(all selected)" => "(kõik valitud)",
-"({count} selected)" => "({count} valitud)",
-"Error loading file exists template" => "Viga faili olemasolu malli laadimisel",
-"Very weak password" => "Väga nõrk parool",
-"Weak password" => "Nõrk parool",
-"So-so password" => "Enam-vähem sobiv parool",
-"Good password" => "Hea parool",
-"Strong password" => "Väga hea parool",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
-"Error occurred while checking server setup" => "Serveri seadete kontrolimisel tekkis viga",
-"Shared" => "Jagatud",
-"Shared with {recipients}" => "Jagatud {recipients}",
-"Share" => "Jaga",
-"Error" => "Viga",
-"Error while sharing" => "Viga jagamisel",
-"Error while unsharing" => "Viga jagamise lõpetamisel",
-"Error while changing permissions" => "Viga õiguste muutmisel",
-"Shared with you and the group {group} by {owner}" => "Jagatud sinu ja {group} grupiga {owner} poolt",
-"Shared with you by {owner}" => "Sinuga jagas {owner}",
-"Share with user or group …" => "Jaga kasutaja või grupiga ...",
-"Share link" => "Jaga linki",
-"The public link will expire no later than {days} days after it is created" => "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
-"Password protect" => "Parooliga kaitstud",
-"Choose a password for the public link" => "Vali avaliku lingi jaoks parool",
-"Allow Public Upload" => "Luba avalik üleslaadimine",
-"Email link to person" => "Saada link isikule e-postiga",
-"Send" => "Saada",
-"Set expiration date" => "Määra aegumise kuupäev",
-"Expiration date" => "Aegumise kuupäev",
-"Adding user..." => "Kasutaja lisamine...",
-"group" => "grupp",
-"Resharing is not allowed" => "Edasijagamine pole lubatud",
-"Shared in {item} with {user}" => "Jagatud {item} kasutajaga {user}",
-"Unshare" => "Lõpeta jagamine",
-"notify by email" => "teavita e-postiga",
-"can share" => "saab jagada",
-"can edit" => "saab muuta",
-"access control" => "ligipääsukontroll",
-"create" => "loo",
-"update" => "uuenda",
-"delete" => "kustuta",
-"Password protected" => "Parooliga kaitstud",
-"Error unsetting expiration date" => "Viga aegumise kuupäeva eemaldamisel",
-"Error setting expiration date" => "Viga aegumise kuupäeva määramisel",
-"Sending ..." => "Saatmine ...",
-"Email sent" => "E-kiri on saadetud",
-"Warning" => "Hoiatus",
-"The object type is not specified." => "Objekti tüüp pole määratletud.",
-"Enter new" => "Sisesta uus",
-"Delete" => "Kustuta",
-"Add" => "Lisa",
-"Edit tags" => "Muuda silte",
-"Error loading dialog template: {error}" => "Viga dialoogi malli laadimisel: {error}",
-"No tags selected for deletion." => "Kustutamiseks pole ühtegi silti valitud.",
-"Updating {productName} to version {version}, this may take a while." => "Uuendan {productName} versioonile {version}, see võtab veidi aega.",
-"Please reload the page." => "Palun laadi see uuesti.",
-"The update was unsuccessful." => "Uuendus ebaõnnestus.",
-"The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
-"Couldn't reset password because the token is invalid" => "Ei saanud parooli taastada, kuna märgend on vigane",
-"Couldn't send reset email. Please make sure your username is correct." => "Ei suutnud lähtestada e-maili. Palun veendu, et kasutajatunnus on õige.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga.",
-"%s password reset" => "%s parooli lähtestus",
-"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.",
-"Username" => "Kasutajanimi",
-"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?" => "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
-"Yes, I really want to reset my password now" => "Jah, ma tõesti soovin oma parooli praegu taastada",
-"Reset" => "Algseaded",
-"New password" => "Uus parool",
-"New Password" => "Uus parool",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!",
-"For the best results, please consider using a GNU/Linux server instead." => "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.",
-"Personal" => "Isiklik",
-"Users" => "Kasutajad",
-"Apps" => "Rakendused",
-"Admin" => "Admin",
-"Help" => "Abiinfo",
-"Error loading tags" => "Viga siltide laadimisel",
-"Tag already exists" => "Silt on juba olemas",
-"Error deleting tag(s)" => "Viga sildi (siltide) kustutamisel",
-"Error tagging" => "Viga sildi lisamisel",
-"Error untagging" => "Viga sildi eemaldamisel",
-"Error favoriting" => "Viga lemmikuks lisamisel",
-"Error unfavoriting" => "Viga lemmikutest eemaldamisel",
-"Access forbidden" => "Ligipääs on keelatud",
-"File not found" => "Faili ei leitud",
-"The specified document has not been found on the server." => "Määratud dokumenti serverist ei leitud.",
-"You can click here to return to %s." => "%s tagasi minemiseks võid sa siia klikkida.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Tere,\n\n%s jagas sulle välja %s.\nVaata siit: %s\n\n",
-"The share will expire on %s." => "Jagamine aegub %s.",
-"Cheers!" => "Terekest!",
-"Internal Server Error" => "Serveri sisemine viga",
-"The server encountered an internal error and was unable to complete your request." => "Serveris tekkis sisemine tõrge ja sinu päringu täitmine ebaõnnestus.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Kui seda veateadet näidatakse mitu korda, siis palun võta ühendust serveri administraatoriga. Palun lisa alla aruandesse tehnilised üksikasjad.",
-"More details can be found in the server log." => "Lisainfot võib leida serveri logist.",
-"Technical details" => "Tehnilised andmed",
-"Remote Address: %s" => "Kaugaadress: %s",
-"Request ID: %s" => "Päringu ID: %s",
-"Code: %s" => "Kood: %s",
-"Message: %s" => "Sõnum: %s",
-"File: %s" => "Fail: %s",
-"Line: %s" => "Rida: %s",
-"Trace" => "Jälita",
-"Security Warning" => "Turvahoiatus",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rünnakuga.",
-"Please update your PHP installation to use %s securely." => "Palun uuenda oma paigaldatud PHP-d tagamaks %s turvalisus.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
-"Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
-"Password" => "Parool",
-"Storage & database" => "Andmehoidla ja andmebaas",
-"Data folder" => "Andmete kaust",
-"Configure the database" => "Seadista andmebaasi",
-"Only %s is available." => "Ainult %s on saadaval.",
-"Database user" => "Andmebaasi kasutaja",
-"Database password" => "Andmebaasi parool",
-"Database name" => "Andmebasi nimi",
-"Database tablespace" => "Andmebaasi tabeliruum",
-"Database host" => "Andmebaasi host",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta.",
-"Finish setup" => "Lõpeta seadistamine",
-"Finishing …" => "Lõpetamine ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "See rakendus vajab toimimiseks JavaScripti. Palun <a href=\"http://enable-javascript.com/\" target=\"_blank\">luba JavaScript</a> ning laadi see leht uuesti.",
-"%s is available. Get more information on how to update." => "%s on saadaval. Vaata lähemalt kuidas uuendada.",
-"Log out" => "Logi välja",
-"Server side authentication failed!" => "Serveripoolne autentimine ebaõnnestus!",
-"Please contact your administrator." => "Palun kontakteeru oma süsteemihalduriga.",
-"Forgot your password? Reset it!" => "Unustasid parooli? Taasta see!",
-"remember" => "pea meeles",
-"Log in" => "Logi sisse",
-"Alternative Logins" => "Alternatiivsed sisselogimisviisid",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "See ownCloud on momendil seadistatud ühe kasutaja jaoks.",
-"This means only administrators can use the instance." => "See tähendab, et seda saavad kasutada ainult administraatorid.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakteeru oma süsteemihalduriga, kui see teade püsib või on tekkinud ootamatult.",
-"Thank you for your patience." => "Täname kannatlikkuse eest.",
-"You are accessing the server from an untrusted domain." => "Sa kasutad serverit usalduseta asukohast",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Sõltuvalt sinu seadetest võib ka administraator kasutada allolevat nuppu, et seda domeeni usaldusväärseks märkida.",
-"Add \"%s\" as trusted domain" => "Lisa \"%s\" usaldusväärse domeenina",
-"%s will be updated to version %s." => "%s uuendatakse versioonile %s.",
-"The following apps will be disabled:" => "Järgnevad rakendid keelatakse:",
-"The theme %s has been disabled." => "Teema %s on keelatud.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Enne jätkamist veendu, et andmebaas, seadete ning andmete kataloog on varundatud.",
-"Start update" => "Käivita uuendus",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Suurtel saitidel aegumise vältimiseks võid sa paigalduskaustas käivitada järgmise käsu:",
-"This %s instance is currently being updated, which may take a while." => "Seda %s ownCloud instantsi hetkel uuendatakse, see võib võtta veidi aega.",
-"This page will refresh itself when the %s instance is available again." => "Se leht laetakse uuesti, kui %s instantsi on uuesti saadaval."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
new file mode 100644
index 00000000000..7f03d568dc9
--- /dev/null
+++ b/core/l10n/eu.js
@@ -0,0 +1,192 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Ezin izan da posta bidali hurrengo erabiltzaileei: %s",
+    "Turned on maintenance mode" : "Mantenu modua gaitu da",
+    "Turned off maintenance mode" : "Mantenu modua desgaitu da",
+    "Updated database" : "Datu basea eguneratu da",
+    "Checked database schema update" : "Egiaztatuta datu-basearen zerbitzariaren eguneraketa",
+    "Checked database schema update for apps" : "Egiaztatuta aplikazioen datu-basearen zerbitzariaren eguneraketa",
+    "Updated \"%s\" to %s" : "\"%s\" %s-ra eguneratua",
+    "Disabled incompatible apps: %s" : "Bateragarriak ez diren desgaitutako aplikazioak: %s",
+    "No image or file provided" : "Ez da irudi edo fitxategirik zehaztu",
+    "Unknown filetype" : "Fitxategi mota ezezaguna",
+    "Invalid image" : "Baliogabeko irudia",
+    "No temporary profile picture available, try again" : "Ez dago behin-behineko profil irudirik, saiatu berriro",
+    "No crop data provided" : "Ez da ebaketarako daturik zehaztu",
+    "Sunday" : "Igandea",
+    "Monday" : "Astelehena",
+    "Tuesday" : "Asteartea",
+    "Wednesday" : "Asteazkena",
+    "Thursday" : "Osteguna",
+    "Friday" : "Ostirala",
+    "Saturday" : "Larunbata",
+    "January" : "Urtarrila",
+    "February" : "Otsaila",
+    "March" : "Martxoa",
+    "April" : "Apirila",
+    "May" : "Maiatza",
+    "June" : "Ekaina",
+    "July" : "Uztaila",
+    "August" : "Abuztua",
+    "September" : "Iraila",
+    "October" : "Urria",
+    "November" : "Azaroa",
+    "December" : "Abendua",
+    "Settings" : "Ezarpenak",
+    "File" : "Fitxategia",
+    "Folder" : "Karpeta",
+    "Image" : "Irudia",
+    "Audio" : "Audio",
+    "Saving..." : "Gordetzen...",
+    "Couldn't send reset email. Please contact your administrator." : "Ezin da berrezartzeko eposta bidali. Mesedez jarri harremetan zure administradorearekin.",
+    "The link to reset your password has been sent to your email. 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." : "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora epe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan jarri.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. <br />Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik.<br /> Ziur zaude aurrera jarraitu nahi duzula?",
+    "I know what I'm doing" : "Badakit zer ari naizen egiten",
+    "Reset password" : "Berrezarri pasahitza",
+    "Password can not be changed. Please contact your administrator." : "Ezin da pasahitza aldatu. Mesedez jarri harremetan zure administradorearekin.",
+    "No" : "Ez",
+    "Yes" : "Bai",
+    "Choose" : "Aukeratu",
+    "Error loading file picker template: {error}" : "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
+    "Ok" : "Ados",
+    "Error loading message template: {error}" : "Errorea mezu txantiloia kargatzean: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["fitxategi {count}ek konfliktua sortu du","{count} fitxategik konfliktua sortu dute"],
+    "One file conflict" : "Fitxategi batek konfliktua sortu du",
+    "New Files" : "Fitxategi Berriak",
+    "Already existing files" : "Dagoeneko existitzen diren fitxategiak",
+    "Which files do you want to keep?" : "Ze fitxategi mantendu nahi duzu?",
+    "If you select both versions, the copied file will have a number added to its name." : "Bi bertsioak hautatzen badituzu, kopiatutako fitxategiaren izenean zenbaki bat atxikituko zaio.",
+    "Cancel" : "Ezeztatu",
+    "Continue" : "Jarraitu",
+    "(all selected)" : "(denak hautatuta)",
+    "({count} selected)" : "({count} hautatuta)",
+    "Error loading file exists template" : "Errorea fitxategia existitzen da txantiloiak kargatzerakoan",
+    "Very weak password" : "Pasahitz oso ahula",
+    "Weak password" : "Pasahitz ahula",
+    "So-so password" : "Halamoduzko pasahitza",
+    "Good password" : "Pasahitz ona",
+    "Strong password" : "Pasahitz sendoa",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
+    "Shared" : "Elkarbanatuta",
+    "Shared with {recipients}" : "{recipients}-rekin partekatua.",
+    "Share" : "Elkarbanatu",
+    "Error" : "Errorea",
+    "Error while sharing" : "Errore bat egon da elkarbanatzean",
+    "Error while unsharing" : "Errore bat egon da elkarbanaketa desegitean",
+    "Error while changing permissions" : "Errore bat egon da baimenak aldatzean",
+    "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin elkarbanatuta",
+    "Shared with you by {owner}" : "{owner}-k zurekin elkarbanatuta",
+    "Share with user or group …" : "Elkarbanatu erabiltzaile edo taldearekin...",
+    "Share link" : "Elkarbanatu lotura",
+    "The public link will expire no later than {days} days after it is created" : "Esteka publikoak iraungi egingo du, askoz jota, sortu eta  {days} egunetara.",
+    "Password protect" : "Babestu pasahitzarekin",
+    "Choose a password for the public link" : "Aukeratu pasahitz bat esteka publikorako",
+    "Allow Public Upload" : "Gaitu igotze publikoa",
+    "Email link to person" : "Postaz bidali lotura ",
+    "Send" : "Bidali",
+    "Set expiration date" : "Ezarri muga data",
+    "Expiration date" : "Muga data",
+    "group" : "taldea",
+    "Resharing is not allowed" : "Berriz elkarbanatzea ez dago baimendua",
+    "Shared in {item} with {user}" : "{user}ekin {item}-n elkarbanatuta",
+    "Unshare" : "Ez elkarbanatu",
+    "notify by email" : "jakinarazi eposta bidez",
+    "can share" : "elkarbana dezake",
+    "can edit" : "editatu dezake",
+    "access control" : "sarrera kontrola",
+    "create" : "sortu",
+    "update" : "eguneratu",
+    "delete" : "ezabatu",
+    "Password protected" : "Pasahitzarekin babestuta",
+    "Error unsetting expiration date" : "Errorea izan da muga data kentzean",
+    "Error setting expiration date" : "Errore bat egon da muga data ezartzean",
+    "Sending ..." : "Bidaltzen ...",
+    "Email sent" : "Eposta bidalia",
+    "Warning" : "Abisua",
+    "The object type is not specified." : "Objetu mota ez dago zehaztuta.",
+    "Enter new" : "Sartu berria",
+    "Delete" : "Ezabatu",
+    "Add" : "Gehitu",
+    "Edit tags" : "Editatu etiketak",
+    "Error loading dialog template: {error}" : "Errorea elkarrizketa txantiloia kargatzean: {errorea}",
+    "No tags selected for deletion." : "Ez dira ezabatzeko etiketak hautatu.",
+    "Updating {productName} to version {version}, this may take a while." : "Eguneratu  {productName} {version} bertsiora, bere denbora behar du.",
+    "Please reload the page." : "Mesedez birkargatu orria.",
+    "The update was unsuccessful." : "Eguneraketak ez du arrakasta izan.",
+    "The update was successful. Redirecting you to ownCloud now." : "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
+    "Couldn't reset password because the token is invalid" : "Ezin izan da pasahitza berrezarri tokena baliogabea delako",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ezin izan da berrezartzeko eposta bidali. Ziurtatu zure erabiltzaile izena egokia dela.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ezin izan da berrezartzeko eposta bidali erabiltzaile izen honetarako eposta helbiderik ez dagoelako. Mesedez harremanetan jarri kudeatzailearekin.",
+    "%s password reset" : "%s 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.",
+    "Username" : "Erabiltzaile izena",
+    "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?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?",
+    "Yes, I really want to reset my password now" : "Bai, nire pasahitza orain berrabiarazi nahi dut",
+    "Reset" : "Berrezarri",
+    "New password" : "Pasahitz berria",
+    "New Password" : "Pasahitz Berria",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.",
+    "For the best results, please consider using a GNU/Linux server instead." : "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
+    "Personal" : "Pertsonala",
+    "Users" : "Erabiltzaileak",
+    "Apps" : "Aplikazioak",
+    "Admin" : "Admin",
+    "Help" : "Laguntza",
+    "Error loading tags" : "Errore bat izan da etiketak kargatzearkoan.",
+    "Tag already exists" : "Etiketa dagoeneko existitzen da",
+    "Error deleting tag(s)" : "Errore bat izan da etiketa(k) ezabatzerakoan",
+    "Error tagging" : "Errorea etiketa ezartzerakoan",
+    "Error untagging" : "Errorea etiketa kentzerakoan",
+    "Error favoriting" : "Errorea gogokoetara gehitzerakoan",
+    "Error unfavoriting" : "Errorea gogokoetatik kentzerakoan",
+    "Access forbidden" : "Sarrera debekatuta",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Kaixo\n\n%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s\n\n",
+    "The share will expire on %s." : "Elkarbanaketa %s-n iraungiko da.",
+    "Cheers!" : "Ongi izan!",
+    "Security Warning" : "Segurtasun abisua",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake.",
+    "Please update your PHP installation to use %s securely." : "Mesedez eguneratu zure PHP instalazioa %s seguru erabiltzeko",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
+    "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat",
+    "Password" : "Pasahitza",
+    "Storage & database" : "Biltegia & datubasea",
+    "Data folder" : "Datuen karpeta",
+    "Configure the database" : "Konfiguratu datu basea",
+    "Only %s is available." : "Soilik %s dago eskuragarri.",
+    "Database user" : "Datubasearen erabiltzailea",
+    "Database password" : "Datubasearen pasahitza",
+    "Database name" : "Datubasearen izena",
+    "Database tablespace" : "Datu basearen taula-lekua",
+    "Database host" : "Datubasearen hostalaria",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite erabiliko da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea.",
+    "Finish setup" : "Bukatu konfigurazioa",
+    "Finishing …" : "Bukatzen...",
+    "%s is available. Get more information on how to update." : "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
+    "Log out" : "Saioa bukatu",
+    "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!",
+    "Please contact your administrator." : "Mesedez jarri harremetan zure administradorearekin.",
+    "Forgot your password? Reset it!" : "Pasahitza ahaztu duzu? Berrezarri!",
+    "remember" : "gogoratu",
+    "Log in" : "Hasi saioa",
+    "Alternative Logins" : "Beste erabiltzaile izenak",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s",
+    "This ownCloud instance is currently in single user mode." : "ownCloud instantzia hau erabiltzaile bakar moduan dago.",
+    "This means only administrators can use the instance." : "Honek administradoreak bakarrik erabili dezakeela esan nahi du.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Jarri harremanetan zure sistema administratzailearekin mezu hau irauten badu edo bat-batean agertu bada.",
+    "Thank you for your patience." : "Milesker zure patzientziagatik.",
+    "You are accessing the server from an untrusted domain." : "Zerbitzaria domeinu ez fidagarri batetik eskuratzen ari zara.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Mesedez harremanetan jarri kudeatzailearekin. Zu kudeatzailea bazara, konfiguratu \"trusted_domain\" ezarpena config/config.php fitxategian. Adibidezko konfigurazko bat  config/config.sample.php fitxategian dago.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Zure ezarpenen gorabehera, administratzaile bezala posible duzu ere azpiko botoia erabiltzea fidatzeko domeinu horrekin.",
+    "Add \"%s\" as trusted domain" : "Gehitu \"%s\" domeinu fidagarri gisa",
+    "%s will be updated to version %s." : "%s %s bertsiora eguneratuko da.",
+    "The following apps will be disabled:" : "Ondorengo aplikazioak desgaituko dira:",
+    "The theme %s has been disabled." : "%s gaia desgaitu da.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ekin aurretik egiazta ezazu datu basearen, ezarpenen karpetaren eta datuen karpetaren babeskopia duzula.",
+    "Start update" : "Hasi eguneraketa",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Instalazio handien itxarote-denbora saihesteko, ondoko komandoa exekuta dezakezu instalazio direktoriotik:"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
new file mode 100644
index 00000000000..5bd339cd793
--- /dev/null
+++ b/core/l10n/eu.json
@@ -0,0 +1,190 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Ezin izan da posta bidali hurrengo erabiltzaileei: %s",
+    "Turned on maintenance mode" : "Mantenu modua gaitu da",
+    "Turned off maintenance mode" : "Mantenu modua desgaitu da",
+    "Updated database" : "Datu basea eguneratu da",
+    "Checked database schema update" : "Egiaztatuta datu-basearen zerbitzariaren eguneraketa",
+    "Checked database schema update for apps" : "Egiaztatuta aplikazioen datu-basearen zerbitzariaren eguneraketa",
+    "Updated \"%s\" to %s" : "\"%s\" %s-ra eguneratua",
+    "Disabled incompatible apps: %s" : "Bateragarriak ez diren desgaitutako aplikazioak: %s",
+    "No image or file provided" : "Ez da irudi edo fitxategirik zehaztu",
+    "Unknown filetype" : "Fitxategi mota ezezaguna",
+    "Invalid image" : "Baliogabeko irudia",
+    "No temporary profile picture available, try again" : "Ez dago behin-behineko profil irudirik, saiatu berriro",
+    "No crop data provided" : "Ez da ebaketarako daturik zehaztu",
+    "Sunday" : "Igandea",
+    "Monday" : "Astelehena",
+    "Tuesday" : "Asteartea",
+    "Wednesday" : "Asteazkena",
+    "Thursday" : "Osteguna",
+    "Friday" : "Ostirala",
+    "Saturday" : "Larunbata",
+    "January" : "Urtarrila",
+    "February" : "Otsaila",
+    "March" : "Martxoa",
+    "April" : "Apirila",
+    "May" : "Maiatza",
+    "June" : "Ekaina",
+    "July" : "Uztaila",
+    "August" : "Abuztua",
+    "September" : "Iraila",
+    "October" : "Urria",
+    "November" : "Azaroa",
+    "December" : "Abendua",
+    "Settings" : "Ezarpenak",
+    "File" : "Fitxategia",
+    "Folder" : "Karpeta",
+    "Image" : "Irudia",
+    "Audio" : "Audio",
+    "Saving..." : "Gordetzen...",
+    "Couldn't send reset email. Please contact your administrator." : "Ezin da berrezartzeko eposta bidali. Mesedez jarri harremetan zure administradorearekin.",
+    "The link to reset your password has been sent to your email. 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." : "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora epe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan jarri.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. <br />Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik.<br /> Ziur zaude aurrera jarraitu nahi duzula?",
+    "I know what I'm doing" : "Badakit zer ari naizen egiten",
+    "Reset password" : "Berrezarri pasahitza",
+    "Password can not be changed. Please contact your administrator." : "Ezin da pasahitza aldatu. Mesedez jarri harremetan zure administradorearekin.",
+    "No" : "Ez",
+    "Yes" : "Bai",
+    "Choose" : "Aukeratu",
+    "Error loading file picker template: {error}" : "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
+    "Ok" : "Ados",
+    "Error loading message template: {error}" : "Errorea mezu txantiloia kargatzean: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["fitxategi {count}ek konfliktua sortu du","{count} fitxategik konfliktua sortu dute"],
+    "One file conflict" : "Fitxategi batek konfliktua sortu du",
+    "New Files" : "Fitxategi Berriak",
+    "Already existing files" : "Dagoeneko existitzen diren fitxategiak",
+    "Which files do you want to keep?" : "Ze fitxategi mantendu nahi duzu?",
+    "If you select both versions, the copied file will have a number added to its name." : "Bi bertsioak hautatzen badituzu, kopiatutako fitxategiaren izenean zenbaki bat atxikituko zaio.",
+    "Cancel" : "Ezeztatu",
+    "Continue" : "Jarraitu",
+    "(all selected)" : "(denak hautatuta)",
+    "({count} selected)" : "({count} hautatuta)",
+    "Error loading file exists template" : "Errorea fitxategia existitzen da txantiloiak kargatzerakoan",
+    "Very weak password" : "Pasahitz oso ahula",
+    "Weak password" : "Pasahitz ahula",
+    "So-so password" : "Halamoduzko pasahitza",
+    "Good password" : "Pasahitz ona",
+    "Strong password" : "Pasahitz sendoa",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
+    "Shared" : "Elkarbanatuta",
+    "Shared with {recipients}" : "{recipients}-rekin partekatua.",
+    "Share" : "Elkarbanatu",
+    "Error" : "Errorea",
+    "Error while sharing" : "Errore bat egon da elkarbanatzean",
+    "Error while unsharing" : "Errore bat egon da elkarbanaketa desegitean",
+    "Error while changing permissions" : "Errore bat egon da baimenak aldatzean",
+    "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin elkarbanatuta",
+    "Shared with you by {owner}" : "{owner}-k zurekin elkarbanatuta",
+    "Share with user or group …" : "Elkarbanatu erabiltzaile edo taldearekin...",
+    "Share link" : "Elkarbanatu lotura",
+    "The public link will expire no later than {days} days after it is created" : "Esteka publikoak iraungi egingo du, askoz jota, sortu eta  {days} egunetara.",
+    "Password protect" : "Babestu pasahitzarekin",
+    "Choose a password for the public link" : "Aukeratu pasahitz bat esteka publikorako",
+    "Allow Public Upload" : "Gaitu igotze publikoa",
+    "Email link to person" : "Postaz bidali lotura ",
+    "Send" : "Bidali",
+    "Set expiration date" : "Ezarri muga data",
+    "Expiration date" : "Muga data",
+    "group" : "taldea",
+    "Resharing is not allowed" : "Berriz elkarbanatzea ez dago baimendua",
+    "Shared in {item} with {user}" : "{user}ekin {item}-n elkarbanatuta",
+    "Unshare" : "Ez elkarbanatu",
+    "notify by email" : "jakinarazi eposta bidez",
+    "can share" : "elkarbana dezake",
+    "can edit" : "editatu dezake",
+    "access control" : "sarrera kontrola",
+    "create" : "sortu",
+    "update" : "eguneratu",
+    "delete" : "ezabatu",
+    "Password protected" : "Pasahitzarekin babestuta",
+    "Error unsetting expiration date" : "Errorea izan da muga data kentzean",
+    "Error setting expiration date" : "Errore bat egon da muga data ezartzean",
+    "Sending ..." : "Bidaltzen ...",
+    "Email sent" : "Eposta bidalia",
+    "Warning" : "Abisua",
+    "The object type is not specified." : "Objetu mota ez dago zehaztuta.",
+    "Enter new" : "Sartu berria",
+    "Delete" : "Ezabatu",
+    "Add" : "Gehitu",
+    "Edit tags" : "Editatu etiketak",
+    "Error loading dialog template: {error}" : "Errorea elkarrizketa txantiloia kargatzean: {errorea}",
+    "No tags selected for deletion." : "Ez dira ezabatzeko etiketak hautatu.",
+    "Updating {productName} to version {version}, this may take a while." : "Eguneratu  {productName} {version} bertsiora, bere denbora behar du.",
+    "Please reload the page." : "Mesedez birkargatu orria.",
+    "The update was unsuccessful." : "Eguneraketak ez du arrakasta izan.",
+    "The update was successful. Redirecting you to ownCloud now." : "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
+    "Couldn't reset password because the token is invalid" : "Ezin izan da pasahitza berrezarri tokena baliogabea delako",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ezin izan da berrezartzeko eposta bidali. Ziurtatu zure erabiltzaile izena egokia dela.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ezin izan da berrezartzeko eposta bidali erabiltzaile izen honetarako eposta helbiderik ez dagoelako. Mesedez harremanetan jarri kudeatzailearekin.",
+    "%s password reset" : "%s 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.",
+    "Username" : "Erabiltzaile izena",
+    "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?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?",
+    "Yes, I really want to reset my password now" : "Bai, nire pasahitza orain berrabiarazi nahi dut",
+    "Reset" : "Berrezarri",
+    "New password" : "Pasahitz berria",
+    "New Password" : "Pasahitz Berria",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.",
+    "For the best results, please consider using a GNU/Linux server instead." : "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
+    "Personal" : "Pertsonala",
+    "Users" : "Erabiltzaileak",
+    "Apps" : "Aplikazioak",
+    "Admin" : "Admin",
+    "Help" : "Laguntza",
+    "Error loading tags" : "Errore bat izan da etiketak kargatzearkoan.",
+    "Tag already exists" : "Etiketa dagoeneko existitzen da",
+    "Error deleting tag(s)" : "Errore bat izan da etiketa(k) ezabatzerakoan",
+    "Error tagging" : "Errorea etiketa ezartzerakoan",
+    "Error untagging" : "Errorea etiketa kentzerakoan",
+    "Error favoriting" : "Errorea gogokoetara gehitzerakoan",
+    "Error unfavoriting" : "Errorea gogokoetatik kentzerakoan",
+    "Access forbidden" : "Sarrera debekatuta",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Kaixo\n\n%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s\n\n",
+    "The share will expire on %s." : "Elkarbanaketa %s-n iraungiko da.",
+    "Cheers!" : "Ongi izan!",
+    "Security Warning" : "Segurtasun abisua",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake.",
+    "Please update your PHP installation to use %s securely." : "Mesedez eguneratu zure PHP instalazioa %s seguru erabiltzeko",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
+    "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat",
+    "Password" : "Pasahitza",
+    "Storage & database" : "Biltegia & datubasea",
+    "Data folder" : "Datuen karpeta",
+    "Configure the database" : "Konfiguratu datu basea",
+    "Only %s is available." : "Soilik %s dago eskuragarri.",
+    "Database user" : "Datubasearen erabiltzailea",
+    "Database password" : "Datubasearen pasahitza",
+    "Database name" : "Datubasearen izena",
+    "Database tablespace" : "Datu basearen taula-lekua",
+    "Database host" : "Datubasearen hostalaria",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite erabiliko da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea.",
+    "Finish setup" : "Bukatu konfigurazioa",
+    "Finishing …" : "Bukatzen...",
+    "%s is available. Get more information on how to update." : "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
+    "Log out" : "Saioa bukatu",
+    "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!",
+    "Please contact your administrator." : "Mesedez jarri harremetan zure administradorearekin.",
+    "Forgot your password? Reset it!" : "Pasahitza ahaztu duzu? Berrezarri!",
+    "remember" : "gogoratu",
+    "Log in" : "Hasi saioa",
+    "Alternative Logins" : "Beste erabiltzaile izenak",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s",
+    "This ownCloud instance is currently in single user mode." : "ownCloud instantzia hau erabiltzaile bakar moduan dago.",
+    "This means only administrators can use the instance." : "Honek administradoreak bakarrik erabili dezakeela esan nahi du.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Jarri harremanetan zure sistema administratzailearekin mezu hau irauten badu edo bat-batean agertu bada.",
+    "Thank you for your patience." : "Milesker zure patzientziagatik.",
+    "You are accessing the server from an untrusted domain." : "Zerbitzaria domeinu ez fidagarri batetik eskuratzen ari zara.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Mesedez harremanetan jarri kudeatzailearekin. Zu kudeatzailea bazara, konfiguratu \"trusted_domain\" ezarpena config/config.php fitxategian. Adibidezko konfigurazko bat  config/config.sample.php fitxategian dago.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Zure ezarpenen gorabehera, administratzaile bezala posible duzu ere azpiko botoia erabiltzea fidatzeko domeinu horrekin.",
+    "Add \"%s\" as trusted domain" : "Gehitu \"%s\" domeinu fidagarri gisa",
+    "%s will be updated to version %s." : "%s %s bertsiora eguneratuko da.",
+    "The following apps will be disabled:" : "Ondorengo aplikazioak desgaituko dira:",
+    "The theme %s has been disabled." : "%s gaia desgaitu da.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ekin aurretik egiazta ezazu datu basearen, ezarpenen karpetaren eta datuen karpetaren babeskopia duzula.",
+    "Start update" : "Hasi eguneraketa",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Instalazio handien itxarote-denbora saihesteko, ondoko komandoa exekuta dezakezu instalazio direktoriotik:"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
deleted file mode 100644
index e2fef47647f..00000000000
--- a/core/l10n/eu.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Ezin izan da posta bidali hurrengo erabiltzaileei: %s",
-"Turned on maintenance mode" => "Mantenu modua gaitu da",
-"Turned off maintenance mode" => "Mantenu modua desgaitu da",
-"Updated database" => "Datu basea eguneratu da",
-"Checked database schema update" => "Egiaztatuta datu-basearen zerbitzariaren eguneraketa",
-"Checked database schema update for apps" => "Egiaztatuta aplikazioen datu-basearen zerbitzariaren eguneraketa",
-"Updated \"%s\" to %s" => "\"%s\" %s-ra eguneratua",
-"Disabled incompatible apps: %s" => "Bateragarriak ez diren desgaitutako aplikazioak: %s",
-"No image or file provided" => "Ez da irudi edo fitxategirik zehaztu",
-"Unknown filetype" => "Fitxategi mota ezezaguna",
-"Invalid image" => "Baliogabeko irudia",
-"No temporary profile picture available, try again" => "Ez dago behin-behineko profil irudirik, saiatu berriro",
-"No crop data provided" => "Ez da ebaketarako daturik zehaztu",
-"Sunday" => "Igandea",
-"Monday" => "Astelehena",
-"Tuesday" => "Asteartea",
-"Wednesday" => "Asteazkena",
-"Thursday" => "Osteguna",
-"Friday" => "Ostirala",
-"Saturday" => "Larunbata",
-"January" => "Urtarrila",
-"February" => "Otsaila",
-"March" => "Martxoa",
-"April" => "Apirila",
-"May" => "Maiatza",
-"June" => "Ekaina",
-"July" => "Uztaila",
-"August" => "Abuztua",
-"September" => "Iraila",
-"October" => "Urria",
-"November" => "Azaroa",
-"December" => "Abendua",
-"Settings" => "Ezarpenak",
-"File" => "Fitxategia",
-"Folder" => "Karpeta",
-"Image" => "Irudia",
-"Audio" => "Audio",
-"Saving..." => "Gordetzen...",
-"Couldn't send reset email. Please contact your administrator." => "Ezin da berrezartzeko eposta bidali. Mesedez jarri harremetan zure administradorearekin.",
-"The link to reset your password has been sent to your email. 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." => "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora epe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan jarri.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. <br />Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik.<br /> Ziur zaude aurrera jarraitu nahi duzula?",
-"I know what I'm doing" => "Badakit zer ari naizen egiten",
-"Reset password" => "Berrezarri pasahitza",
-"Password can not be changed. Please contact your administrator." => "Ezin da pasahitza aldatu. Mesedez jarri harremetan zure administradorearekin.",
-"No" => "Ez",
-"Yes" => "Bai",
-"Choose" => "Aukeratu",
-"Error loading file picker template: {error}" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
-"Ok" => "Ados",
-"Error loading message template: {error}" => "Errorea mezu txantiloia kargatzean: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("fitxategi {count}ek konfliktua sortu du","{count} fitxategik konfliktua sortu dute"),
-"One file conflict" => "Fitxategi batek konfliktua sortu du",
-"New Files" => "Fitxategi Berriak",
-"Already existing files" => "Dagoeneko existitzen diren fitxategiak",
-"Which files do you want to keep?" => "Ze fitxategi mantendu nahi duzu?",
-"If you select both versions, the copied file will have a number added to its name." => "Bi bertsioak hautatzen badituzu, kopiatutako fitxategiaren izenean zenbaki bat atxikituko zaio.",
-"Cancel" => "Ezeztatu",
-"Continue" => "Jarraitu",
-"(all selected)" => "(denak hautatuta)",
-"({count} selected)" => "({count} hautatuta)",
-"Error loading file exists template" => "Errorea fitxategia existitzen da txantiloiak kargatzerakoan",
-"Very weak password" => "Pasahitz oso ahula",
-"Weak password" => "Pasahitz ahula",
-"So-so password" => "Halamoduzko pasahitza",
-"Good password" => "Pasahitz ona",
-"Strong password" => "Pasahitz sendoa",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
-"Error occurred while checking server setup" => "Errore bat gertatu da zerbitzariaren konfigurazioa egiaztatzerakoan.",
-"Shared" => "Elkarbanatuta",
-"Shared with {recipients}" => "{recipients}-rekin partekatua.",
-"Share" => "Elkarbanatu",
-"Error" => "Errorea",
-"Error while sharing" => "Errore bat egon da elkarbanatzean",
-"Error while unsharing" => "Errore bat egon da elkarbanaketa desegitean",
-"Error while changing permissions" => "Errore bat egon da baimenak aldatzean",
-"Shared with you and the group {group} by {owner}" => "{owner}-k zu eta {group} taldearekin elkarbanatuta",
-"Shared with you by {owner}" => "{owner}-k zurekin elkarbanatuta",
-"Share with user or group …" => "Elkarbanatu erabiltzaile edo taldearekin...",
-"Share link" => "Elkarbanatu lotura",
-"The public link will expire no later than {days} days after it is created" => "Esteka publikoak iraungi egingo du, askoz jota, sortu eta  {days} egunetara.",
-"Password protect" => "Babestu pasahitzarekin",
-"Choose a password for the public link" => "Aukeratu pasahitz bat esteka publikorako",
-"Allow Public Upload" => "Gaitu igotze publikoa",
-"Email link to person" => "Postaz bidali lotura ",
-"Send" => "Bidali",
-"Set expiration date" => "Ezarri muga data",
-"Expiration date" => "Muga data",
-"Adding user..." => "Erabiltzailea gehitzen...",
-"group" => "taldea",
-"Resharing is not allowed" => "Berriz elkarbanatzea ez dago baimendua",
-"Shared in {item} with {user}" => "{user}ekin {item}-n elkarbanatuta",
-"Unshare" => "Ez elkarbanatu",
-"notify by email" => "jakinarazi eposta bidez",
-"can share" => "elkarbana dezake",
-"can edit" => "editatu dezake",
-"access control" => "sarrera kontrola",
-"create" => "sortu",
-"update" => "eguneratu",
-"delete" => "ezabatu",
-"Password protected" => "Pasahitzarekin babestuta",
-"Error unsetting expiration date" => "Errorea izan da muga data kentzean",
-"Error setting expiration date" => "Errore bat egon da muga data ezartzean",
-"Sending ..." => "Bidaltzen ...",
-"Email sent" => "Eposta bidalia",
-"Warning" => "Abisua",
-"The object type is not specified." => "Objetu mota ez dago zehaztuta.",
-"Enter new" => "Sartu berria",
-"Delete" => "Ezabatu",
-"Add" => "Gehitu",
-"Edit tags" => "Editatu etiketak",
-"Error loading dialog template: {error}" => "Errorea elkarrizketa txantiloia kargatzean: {errorea}",
-"No tags selected for deletion." => "Ez dira ezabatzeko etiketak hautatu.",
-"Updating {productName} to version {version}, this may take a while." => "Eguneratu  {productName} {version} bertsiora, bere denbora behar du.",
-"Please reload the page." => "Mesedez birkargatu orria.",
-"The update was unsuccessful." => "Eguneraketak ez du arrakasta izan.",
-"The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
-"Couldn't reset password because the token is invalid" => "Ezin izan da pasahitza berrezarri tokena baliogabea delako",
-"Couldn't send reset email. Please make sure your username is correct." => "Ezin izan da berrezartzeko eposta bidali. Ziurtatu zure erabiltzaile izena egokia dela.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Ezin izan da berrezartzeko eposta bidali erabiltzaile izen honetarako eposta helbiderik ez dagoelako. Mesedez harremanetan jarri kudeatzailearekin.",
-"%s password reset" => "%s 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.",
-"Username" => "Erabiltzaile izena",
-"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?" => "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?",
-"Yes, I really want to reset my password now" => "Bai, nire pasahitza orain berrabiarazi nahi dut",
-"Reset" => "Berrezarri",
-"New password" => "Pasahitz berria",
-"New Password" => "Pasahitz Berria",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.",
-"For the best results, please consider using a GNU/Linux server instead." => "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
-"Personal" => "Pertsonala",
-"Users" => "Erabiltzaileak",
-"Apps" => "Aplikazioak",
-"Admin" => "Admin",
-"Help" => "Laguntza",
-"Error loading tags" => "Errore bat izan da etiketak kargatzearkoan.",
-"Tag already exists" => "Etiketa dagoeneko existitzen da",
-"Error deleting tag(s)" => "Errore bat izan da etiketa(k) ezabatzerakoan",
-"Error tagging" => "Errorea etiketa ezartzerakoan",
-"Error untagging" => "Errorea etiketa kentzerakoan",
-"Error favoriting" => "Errorea gogokoetara gehitzerakoan",
-"Error unfavoriting" => "Errorea gogokoetatik kentzerakoan",
-"Access forbidden" => "Sarrera debekatuta",
-"File not found" => "Ez da fitxategia aurkitu",
-"The specified document has not been found on the server." => "Zehaztutako dokumentua ez da zerbitzarian aurkitu.",
-"You can click here to return to %s." => "Hemen klika dezakezu %sra itzultzeko.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Kaixo\n\n%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s\n\n",
-"The share will expire on %s." => "Elkarbanaketa %s-n iraungiko da.",
-"Cheers!" => "Ongi izan!",
-"Internal Server Error" => "Zerbitzariaren Barne Errorea",
-"The server encountered an internal error and was unable to complete your request." => "Zerbitzariak barne errore bat izan du eta ez da gai izan zure eskaria osatzeko.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Mesedez harremanetan jarri zerbitzariaren kudeatzailearekin errore hau aldi askotan agertzekotan, mesedez gehitu beheko zehaztapen teknikoak zure txostenean.",
-"More details can be found in the server log." => "Zehaztapen gehiago zerbitzariaren egunerokoan aurki daitezke.",
-"Technical details" => "Arazo teknikoak",
-"Remote Address: %s" => "Urruneko Helbidea: %s",
-"Request ID: %s" => "Eskariaren IDa: %s",
-"Code: %s" => "Kodea: %s",
-"Message: %s" => "Mezua: %s",
-"File: %s" => "Fitxategia: %s",
-"Line: %s" => "Lerroa: %s",
-"Trace" => "Arrastoa",
-"Security Warning" => "Segurtasun abisua",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake.",
-"Please update your PHP installation to use %s securely." => "Mesedez eguneratu zure PHP instalazioa %s seguru erabiltzeko",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
-"Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat",
-"Password" => "Pasahitza",
-"Storage & database" => "Biltegia & datubasea",
-"Data folder" => "Datuen karpeta",
-"Configure the database" => "Konfiguratu datu basea",
-"Only %s is available." => "Soilik %s dago eskuragarri.",
-"Database user" => "Datubasearen erabiltzailea",
-"Database password" => "Datubasearen pasahitza",
-"Database name" => "Datubasearen izena",
-"Database tablespace" => "Datu basearen taula-lekua",
-"Database host" => "Datubasearen hostalaria",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite erabiliko da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea.",
-"Finish setup" => "Bukatu konfigurazioa",
-"Finishing …" => "Bukatzen...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Aplikazio honek ongi funtzionatzeko JavaScript behar du. Mesedez  <a href=\"http://enable-javascript.com/\" target=\"_blank\">gaitu JavaScript</a> eta birkargatu orri hau.",
-"%s is available. Get more information on how to update." => "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
-"Log out" => "Saioa bukatu",
-"Server side authentication failed!" => "Zerbitzari aldeko autentifikazioak huts egin du!",
-"Please contact your administrator." => "Mesedez jarri harremetan zure administradorearekin.",
-"Forgot your password? Reset it!" => "Pasahitza ahaztu duzu? Berrezarri!",
-"remember" => "gogoratu",
-"Log in" => "Hasi saioa",
-"Alternative Logins" => "Beste erabiltzaile izenak",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s",
-"This ownCloud instance is currently in single user mode." => "ownCloud instantzia hau erabiltzaile bakar moduan dago.",
-"This means only administrators can use the instance." => "Honek administradoreak bakarrik erabili dezakeela esan nahi du.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Jarri harremanetan zure sistema administratzailearekin mezu hau irauten badu edo bat-batean agertu bada.",
-"Thank you for your patience." => "Milesker zure patzientziagatik.",
-"You are accessing the server from an untrusted domain." => "Zerbitzaria domeinu ez fidagarri batetik eskuratzen ari zara.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Mesedez harremanetan jarri kudeatzailearekin. Zu kudeatzailea bazara, konfiguratu \"trusted_domain\" ezarpena config/config.php fitxategian. Adibidezko konfigurazko bat  config/config.sample.php fitxategian dago.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Zure ezarpenen gorabehera, administratzaile bezala posible duzu ere azpiko botoia erabiltzea fidatzeko domeinu horrekin.",
-"Add \"%s\" as trusted domain" => "Gehitu \"%s\" domeinu fidagarri gisa",
-"%s will be updated to version %s." => "%s %s bertsiora eguneratuko da.",
-"The following apps will be disabled:" => "Ondorengo aplikazioak desgaituko dira:",
-"The theme %s has been disabled." => "%s gaia desgaitu da.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Ekin aurretik egiazta ezazu datu basearen, ezarpenen karpetaren eta datuen karpetaren babeskopia duzula.",
-"Start update" => "Hasi eguneraketa",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Instalazio handien itxarote-denbora saihesteko, ondoko komandoa exekuta dezakezu instalazio direktoriotik:",
-"This %s instance is currently being updated, which may take a while." => "%s instantzia hau eguneratzen ari da, honek denbora har dezake.",
-"This page will refresh itself when the %s instance is available again." => "Orri honek bere burua eguneratuko du %s instantzia berriz prest dagoenean."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eu_ES.js b/core/l10n/eu_ES.js
new file mode 100644
index 00000000000..5f64fb906bd
--- /dev/null
+++ b/core/l10n/eu_ES.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Ezeztatu",
+    "Delete" : "Ezabatu",
+    "Personal" : "Pertsonala"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/eu_ES.json b/core/l10n/eu_ES.json
new file mode 100644
index 00000000000..083ff038d8d
--- /dev/null
+++ b/core/l10n/eu_ES.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Ezeztatu",
+    "Delete" : "Ezabatu",
+    "Personal" : "Pertsonala"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/eu_ES.php b/core/l10n/eu_ES.php
deleted file mode 100644
index 92e64924b61..00000000000
--- a/core/l10n/eu_ES.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Ezeztatu",
-"Delete" => "Ezabatu",
-"Personal" => "Pertsonala"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
new file mode 100644
index 00000000000..e6951221983
--- /dev/null
+++ b/core/l10n/fa.js
@@ -0,0 +1,152 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "ارسال ایمیل برای کاربران روبرو با شکست مواجه شد : %s",
+    "Turned on maintenance mode" : "حالت \" در دست تعمیر \" فعال شد .",
+    "Turned off maintenance mode" : "حالت \" در دست تعمیر \" غیرفعال شد .",
+    "Updated database" : "بروز رسانی پایگاه داده انجام شد .",
+    "Disabled incompatible apps: %s" : "اپ های ناسازگار غیرفعال شدند : %s",
+    "No image or file provided" : "هیچ فایل یا تصویری وارد نشده است",
+    "Unknown filetype" : "نوع فایل ناشناخته",
+    "Invalid image" : "عکس نامعتبر",
+    "No temporary profile picture available, try again" : "تصویر پروفایل موقت در حال حاضر در دسترس نیست ، دوباره تلاش کنید ",
+    "Sunday" : "یکشنبه",
+    "Monday" : "دوشنبه",
+    "Tuesday" : "سه شنبه",
+    "Wednesday" : "چهارشنبه",
+    "Thursday" : "پنجشنبه",
+    "Friday" : "جمعه",
+    "Saturday" : "شنبه",
+    "January" : "ژانویه",
+    "February" : "فبریه",
+    "March" : "مارس",
+    "April" : "آوریل",
+    "May" : "می",
+    "June" : "ژوئن",
+    "July" : "جولای",
+    "August" : "آگوست",
+    "September" : "سپتامبر",
+    "October" : "اکتبر",
+    "November" : "نوامبر",
+    "December" : "دسامبر",
+    "Settings" : "تنظیمات",
+    "File" : "فایل",
+    "Folder" : "پوشه",
+    "Image" : "تصویر",
+    "Audio" : "صدا",
+    "Saving..." : "در حال ذخیره سازی...",
+    "Couldn't send reset email. Please contact your administrator." : "ارسال ایمیل مجدد با مشکل مواجه شد . لطفا با مدیر سیستم تماس بگیرید .",
+    "The link to reset your password has been sent to your email. 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>در صورت نبودن از مدیر خود بپرسید.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
+    "I know what I'm doing" : "اطلاع از انجام این کار دارم",
+    "Reset password" : "تنظیم مجدد رمز عبور",
+    "Password can not be changed. Please contact your administrator." : "رمز عبور نمی تواند تغییر بکند . لطفا با مدیر سیستم تماس بگیرید .",
+    "No" : "نه",
+    "Yes" : "بله",
+    "Choose" : "انتخاب کردن",
+    "Error loading file picker template: {error}" : "خطا در بارگذاری قالب انتخاب فایل : {error}",
+    "Ok" : "قبول",
+    "Error loading message template: {error}" : "خطا در بارگذاری قالب پیام : {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "One file conflict" : "یک فایل متضاد",
+    "New Files" : "فایل های جدید",
+    "Already existing files" : "فایل های موجود در حال حاضر ",
+    "Which files do you want to keep?" : "کدام فایل ها را می خواهید نگه دارید ؟",
+    "Cancel" : "منصرف شدن",
+    "Continue" : "ادامه",
+    "(all selected)" : "(همه انتخاب شده اند)",
+    "({count} selected)" : "({count} انتخاب شده)",
+    "Very weak password" : "رمز عبور بسیار ضعیف",
+    "Weak password" : "رمز عبور ضعیف",
+    "So-so password" : "رمز عبور متوسط",
+    "Good password" : "رمز عبور خوب",
+    "Strong password" : "رمز عبور قوی",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "این سرور ارتباط اینترنتی ندارد. این بدین معناست که بعضی از امکانات نظیر مرتبط سازی یک منبع ذخیره‌ی خارجی، اطلاعات رسانی در مورد بروزرسانی‌ها یا نصب برنامه های جانبی کار نمی‌کنند. دسترسی به فایل ها از راه دور و ارسال اطلاع رسانی توسط ایمیل ممکن است همچنان کار نکند. ما پیشنهاد می‌کنیم که ارتباط اینترنتی مربوط به این سرور را فعال کنید تا تمامی امکانات را در اختیار داشته باشید.",
+    "Shared" : "اشتراک گذاشته شده",
+    "Shared with {recipients}" : "به اشتراک گذاشته شده با {recipients}",
+    "Share" : "اشتراک‌گذاری",
+    "Error" : "خطا",
+    "Error while sharing" : "خطا درحال به اشتراک گذاشتن",
+    "Error while unsharing" : "خطا درحال لغو اشتراک",
+    "Error while changing permissions" : "خطا در حال تغییر مجوز",
+    "Shared with you and the group {group} by {owner}" : "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
+    "Shared with you by {owner}" : "به اشتراک گذاشته شده با شما توسط { دارنده}",
+    "Share with user or group …" : "به اشتراک گذاری با کاربر یا گروه",
+    "Share link" : "اشتراک گذاشتن لینک",
+    "Password protect" : "نگهداری کردن رمز عبور",
+    "Allow Public Upload" : "اجازه آپلود عمومی",
+    "Email link to person" : "پیوند ایمیل برای شخص.",
+    "Send" : "ارسال",
+    "Set expiration date" : "تنظیم تاریخ انقضا",
+    "Expiration date" : "تاریخ انقضا",
+    "group" : "گروه",
+    "Resharing is not allowed" : "اشتراک گذاری مجدد مجاز نمی باشد",
+    "Shared in {item} with {user}" : "به اشتراک گذاشته شده در {بخش} با {کاربر}",
+    "Unshare" : "لغو اشتراک",
+    "notify by email" : "دریافت هشدار از طریق ایمیل",
+    "can share" : "قابل به اشتراک گذاری",
+    "can edit" : "می توان ویرایش کرد",
+    "access control" : "کنترل دسترسی",
+    "create" : "ایجاد",
+    "update" : "به روز",
+    "delete" : "پاک کردن",
+    "Password protected" : "نگهداری از رمز عبور",
+    "Error unsetting expiration date" : "خطا در تنظیم نکردن تاریخ انقضا ",
+    "Error setting expiration date" : "خطا در تنظیم تاریخ انقضا",
+    "Sending ..." : "درحال ارسال ...",
+    "Email sent" : "ایمیل ارسال شد",
+    "Warning" : "اخطار",
+    "The object type is not specified." : "نوع شی تعیین نشده است.",
+    "Enter new" : "مورد جدید را وارد کنید",
+    "Delete" : "حذف",
+    "Add" : "افزودن",
+    "Edit tags" : "ویرایش تگ ها",
+    "The update was unsuccessful." : "بروزرسانی موفقیت آمیز نبود.",
+    "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
+    "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
+    "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" : "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.",
+    "Reset" : "تنظیم مجدد",
+    "New password" : "گذرواژه جدید",
+    "Personal" : "شخصی",
+    "Users" : "کاربران",
+    "Apps" : "  برنامه ها",
+    "Admin" : "مدیر",
+    "Help" : "راه‌نما",
+    "Error loading tags" : "خطا در هنگام بارگزاری تگ ها",
+    "Tag already exists" : "تگ از قبل وجود دارد",
+    "Error deleting tag(s)" : "خطا در هنگام حذف تگ (ها)",
+    "Error tagging" : "خطا در هنگام تگ گذاری",
+    "Error untagging" : "خطا در هنگام حذف تگ",
+    "Error favoriting" : "خطا هنگام افزودن به موارد محبوب",
+    "Error unfavoriting" : "خطا هنگام حذف از موارد محبوب",
+    "Access forbidden" : "اجازه دسترسی به مناطق ممنوعه را ندارید",
+    "Cheers!" : "سلامتی!",
+    "Security Warning" : "اخطار امنیتی",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
+    "Create an <strong>admin account</strong>" : "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
+    "Password" : "گذرواژه",
+    "Storage & database" : "انبارش و پایگاه داده",
+    "Data folder" : "پوشه اطلاعاتی",
+    "Configure the database" : "پایگاه داده برنامه ریزی شدند",
+    "Only %s is available." : "تنها %s موجود است.",
+    "Database user" : "شناسه پایگاه داده",
+    "Database password" : "پسورد پایگاه داده",
+    "Database name" : "نام پایگاه داده",
+    "Database tablespace" : "جدول پایگاه داده",
+    "Database host" : "هاست پایگاه داده",
+    "Finish setup" : "اتمام نصب",
+    "Finishing …" : "در حال اتمام ...",
+    "%s is available. Get more information on how to update." : "%s در دسترس است. برای چگونگی به روز رسانی اطلاعات بیشتر را دریافت نمایید.",
+    "Log out" : "خروج",
+    "remember" : "بیاد آوری",
+    "Log in" : "ورود",
+    "Alternative Logins" : "ورود متناوب",
+    "Thank you for your patience." : "از صبر شما متشکریم",
+    "Start update" : "اغاز به روز رسانی"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
new file mode 100644
index 00000000000..80b130bdcde
--- /dev/null
+++ b/core/l10n/fa.json
@@ -0,0 +1,150 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "ارسال ایمیل برای کاربران روبرو با شکست مواجه شد : %s",
+    "Turned on maintenance mode" : "حالت \" در دست تعمیر \" فعال شد .",
+    "Turned off maintenance mode" : "حالت \" در دست تعمیر \" غیرفعال شد .",
+    "Updated database" : "بروز رسانی پایگاه داده انجام شد .",
+    "Disabled incompatible apps: %s" : "اپ های ناسازگار غیرفعال شدند : %s",
+    "No image or file provided" : "هیچ فایل یا تصویری وارد نشده است",
+    "Unknown filetype" : "نوع فایل ناشناخته",
+    "Invalid image" : "عکس نامعتبر",
+    "No temporary profile picture available, try again" : "تصویر پروفایل موقت در حال حاضر در دسترس نیست ، دوباره تلاش کنید ",
+    "Sunday" : "یکشنبه",
+    "Monday" : "دوشنبه",
+    "Tuesday" : "سه شنبه",
+    "Wednesday" : "چهارشنبه",
+    "Thursday" : "پنجشنبه",
+    "Friday" : "جمعه",
+    "Saturday" : "شنبه",
+    "January" : "ژانویه",
+    "February" : "فبریه",
+    "March" : "مارس",
+    "April" : "آوریل",
+    "May" : "می",
+    "June" : "ژوئن",
+    "July" : "جولای",
+    "August" : "آگوست",
+    "September" : "سپتامبر",
+    "October" : "اکتبر",
+    "November" : "نوامبر",
+    "December" : "دسامبر",
+    "Settings" : "تنظیمات",
+    "File" : "فایل",
+    "Folder" : "پوشه",
+    "Image" : "تصویر",
+    "Audio" : "صدا",
+    "Saving..." : "در حال ذخیره سازی...",
+    "Couldn't send reset email. Please contact your administrator." : "ارسال ایمیل مجدد با مشکل مواجه شد . لطفا با مدیر سیستم تماس بگیرید .",
+    "The link to reset your password has been sent to your email. 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>در صورت نبودن از مدیر خود بپرسید.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
+    "I know what I'm doing" : "اطلاع از انجام این کار دارم",
+    "Reset password" : "تنظیم مجدد رمز عبور",
+    "Password can not be changed. Please contact your administrator." : "رمز عبور نمی تواند تغییر بکند . لطفا با مدیر سیستم تماس بگیرید .",
+    "No" : "نه",
+    "Yes" : "بله",
+    "Choose" : "انتخاب کردن",
+    "Error loading file picker template: {error}" : "خطا در بارگذاری قالب انتخاب فایل : {error}",
+    "Ok" : "قبول",
+    "Error loading message template: {error}" : "خطا در بارگذاری قالب پیام : {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "One file conflict" : "یک فایل متضاد",
+    "New Files" : "فایل های جدید",
+    "Already existing files" : "فایل های موجود در حال حاضر ",
+    "Which files do you want to keep?" : "کدام فایل ها را می خواهید نگه دارید ؟",
+    "Cancel" : "منصرف شدن",
+    "Continue" : "ادامه",
+    "(all selected)" : "(همه انتخاب شده اند)",
+    "({count} selected)" : "({count} انتخاب شده)",
+    "Very weak password" : "رمز عبور بسیار ضعیف",
+    "Weak password" : "رمز عبور ضعیف",
+    "So-so password" : "رمز عبور متوسط",
+    "Good password" : "رمز عبور خوب",
+    "Strong password" : "رمز عبور قوی",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "این سرور ارتباط اینترنتی ندارد. این بدین معناست که بعضی از امکانات نظیر مرتبط سازی یک منبع ذخیره‌ی خارجی، اطلاعات رسانی در مورد بروزرسانی‌ها یا نصب برنامه های جانبی کار نمی‌کنند. دسترسی به فایل ها از راه دور و ارسال اطلاع رسانی توسط ایمیل ممکن است همچنان کار نکند. ما پیشنهاد می‌کنیم که ارتباط اینترنتی مربوط به این سرور را فعال کنید تا تمامی امکانات را در اختیار داشته باشید.",
+    "Shared" : "اشتراک گذاشته شده",
+    "Shared with {recipients}" : "به اشتراک گذاشته شده با {recipients}",
+    "Share" : "اشتراک‌گذاری",
+    "Error" : "خطا",
+    "Error while sharing" : "خطا درحال به اشتراک گذاشتن",
+    "Error while unsharing" : "خطا درحال لغو اشتراک",
+    "Error while changing permissions" : "خطا در حال تغییر مجوز",
+    "Shared with you and the group {group} by {owner}" : "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
+    "Shared with you by {owner}" : "به اشتراک گذاشته شده با شما توسط { دارنده}",
+    "Share with user or group …" : "به اشتراک گذاری با کاربر یا گروه",
+    "Share link" : "اشتراک گذاشتن لینک",
+    "Password protect" : "نگهداری کردن رمز عبور",
+    "Allow Public Upload" : "اجازه آپلود عمومی",
+    "Email link to person" : "پیوند ایمیل برای شخص.",
+    "Send" : "ارسال",
+    "Set expiration date" : "تنظیم تاریخ انقضا",
+    "Expiration date" : "تاریخ انقضا",
+    "group" : "گروه",
+    "Resharing is not allowed" : "اشتراک گذاری مجدد مجاز نمی باشد",
+    "Shared in {item} with {user}" : "به اشتراک گذاشته شده در {بخش} با {کاربر}",
+    "Unshare" : "لغو اشتراک",
+    "notify by email" : "دریافت هشدار از طریق ایمیل",
+    "can share" : "قابل به اشتراک گذاری",
+    "can edit" : "می توان ویرایش کرد",
+    "access control" : "کنترل دسترسی",
+    "create" : "ایجاد",
+    "update" : "به روز",
+    "delete" : "پاک کردن",
+    "Password protected" : "نگهداری از رمز عبور",
+    "Error unsetting expiration date" : "خطا در تنظیم نکردن تاریخ انقضا ",
+    "Error setting expiration date" : "خطا در تنظیم تاریخ انقضا",
+    "Sending ..." : "درحال ارسال ...",
+    "Email sent" : "ایمیل ارسال شد",
+    "Warning" : "اخطار",
+    "The object type is not specified." : "نوع شی تعیین نشده است.",
+    "Enter new" : "مورد جدید را وارد کنید",
+    "Delete" : "حذف",
+    "Add" : "افزودن",
+    "Edit tags" : "ویرایش تگ ها",
+    "The update was unsuccessful." : "بروزرسانی موفقیت آمیز نبود.",
+    "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
+    "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
+    "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" : "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.",
+    "Reset" : "تنظیم مجدد",
+    "New password" : "گذرواژه جدید",
+    "Personal" : "شخصی",
+    "Users" : "کاربران",
+    "Apps" : "  برنامه ها",
+    "Admin" : "مدیر",
+    "Help" : "راه‌نما",
+    "Error loading tags" : "خطا در هنگام بارگزاری تگ ها",
+    "Tag already exists" : "تگ از قبل وجود دارد",
+    "Error deleting tag(s)" : "خطا در هنگام حذف تگ (ها)",
+    "Error tagging" : "خطا در هنگام تگ گذاری",
+    "Error untagging" : "خطا در هنگام حذف تگ",
+    "Error favoriting" : "خطا هنگام افزودن به موارد محبوب",
+    "Error unfavoriting" : "خطا هنگام حذف از موارد محبوب",
+    "Access forbidden" : "اجازه دسترسی به مناطق ممنوعه را ندارید",
+    "Cheers!" : "سلامتی!",
+    "Security Warning" : "اخطار امنیتی",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
+    "Create an <strong>admin account</strong>" : "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
+    "Password" : "گذرواژه",
+    "Storage & database" : "انبارش و پایگاه داده",
+    "Data folder" : "پوشه اطلاعاتی",
+    "Configure the database" : "پایگاه داده برنامه ریزی شدند",
+    "Only %s is available." : "تنها %s موجود است.",
+    "Database user" : "شناسه پایگاه داده",
+    "Database password" : "پسورد پایگاه داده",
+    "Database name" : "نام پایگاه داده",
+    "Database tablespace" : "جدول پایگاه داده",
+    "Database host" : "هاست پایگاه داده",
+    "Finish setup" : "اتمام نصب",
+    "Finishing …" : "در حال اتمام ...",
+    "%s is available. Get more information on how to update." : "%s در دسترس است. برای چگونگی به روز رسانی اطلاعات بیشتر را دریافت نمایید.",
+    "Log out" : "خروج",
+    "remember" : "بیاد آوری",
+    "Log in" : "ورود",
+    "Alternative Logins" : "ورود متناوب",
+    "Thank you for your patience." : "از صبر شما متشکریم",
+    "Start update" : "اغاز به روز رسانی"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
deleted file mode 100644
index 6506102e360..00000000000
--- a/core/l10n/fa.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "ارسال ایمیل برای کاربران روبرو با شکست مواجه شد : %s",
-"Turned on maintenance mode" => "حالت \" در دست تعمیر \" فعال شد .",
-"Turned off maintenance mode" => "حالت \" در دست تعمیر \" غیرفعال شد .",
-"Updated database" => "بروز رسانی پایگاه داده انجام شد .",
-"Disabled incompatible apps: %s" => "اپ های ناسازگار غیرفعال شدند : %s",
-"No image or file provided" => "هیچ فایل یا تصویری وارد نشده است",
-"Unknown filetype" => "نوع فایل ناشناخته",
-"Invalid image" => "عکس نامعتبر",
-"No temporary profile picture available, try again" => "تصویر پروفایل موقت در حال حاضر در دسترس نیست ، دوباره تلاش کنید ",
-"Sunday" => "یکشنبه",
-"Monday" => "دوشنبه",
-"Tuesday" => "سه شنبه",
-"Wednesday" => "چهارشنبه",
-"Thursday" => "پنجشنبه",
-"Friday" => "جمعه",
-"Saturday" => "شنبه",
-"January" => "ژانویه",
-"February" => "فبریه",
-"March" => "مارس",
-"April" => "آوریل",
-"May" => "می",
-"June" => "ژوئن",
-"July" => "جولای",
-"August" => "آگوست",
-"September" => "سپتامبر",
-"October" => "اکتبر",
-"November" => "نوامبر",
-"December" => "دسامبر",
-"Settings" => "تنظیمات",
-"File" => "فایل",
-"Folder" => "پوشه",
-"Image" => "تصویر",
-"Audio" => "صدا",
-"Saving..." => "در حال ذخیره سازی...",
-"Couldn't send reset email. Please contact your administrator." => "ارسال ایمیل مجدد با مشکل مواجه شد . لطفا با مدیر سیستم تماس بگیرید .",
-"The link to reset your password has been sent to your email. 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>در صورت نبودن از مدیر خود بپرسید.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
-"I know what I'm doing" => "اطلاع از انجام این کار دارم",
-"Reset password" => "تنظیم مجدد رمز عبور",
-"Password can not be changed. Please contact your administrator." => "رمز عبور نمی تواند تغییر بکند . لطفا با مدیر سیستم تماس بگیرید .",
-"No" => "نه",
-"Yes" => "بله",
-"Choose" => "انتخاب کردن",
-"Error loading file picker template: {error}" => "خطا در بارگذاری قالب انتخاب فایل : {error}",
-"Ok" => "قبول",
-"Error loading message template: {error}" => "خطا در بارگذاری قالب پیام : {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"One file conflict" => "یک فایل متضاد",
-"New Files" => "فایل های جدید",
-"Already existing files" => "فایل های موجود در حال حاضر ",
-"Which files do you want to keep?" => "کدام فایل ها را می خواهید نگه دارید ؟",
-"Cancel" => "منصرف شدن",
-"Continue" => "ادامه",
-"(all selected)" => "(همه انتخاب شده اند)",
-"({count} selected)" => "({count} انتخاب شده)",
-"Very weak password" => "رمز عبور بسیار ضعیف",
-"Weak password" => "رمز عبور ضعیف",
-"So-so password" => "رمز عبور متوسط",
-"Good password" => "رمز عبور خوب",
-"Strong password" => "رمز عبور قوی",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "این سرور ارتباط اینترنتی ندارد. این بدین معناست که بعضی از امکانات نظیر مرتبط سازی یک منبع ذخیره‌ی خارجی، اطلاعات رسانی در مورد بروزرسانی‌ها یا نصب برنامه های جانبی کار نمی‌کنند. دسترسی به فایل ها از راه دور و ارسال اطلاع رسانی توسط ایمیل ممکن است همچنان کار نکند. ما پیشنهاد می‌کنیم که ارتباط اینترنتی مربوط به این سرور را فعال کنید تا تمامی امکانات را در اختیار داشته باشید.",
-"Shared" => "اشتراک گذاشته شده",
-"Shared with {recipients}" => "به اشتراک گذاشته شده با {recipients}",
-"Share" => "اشتراک‌گذاری",
-"Error" => "خطا",
-"Error while sharing" => "خطا درحال به اشتراک گذاشتن",
-"Error while unsharing" => "خطا درحال لغو اشتراک",
-"Error while changing permissions" => "خطا در حال تغییر مجوز",
-"Shared with you and the group {group} by {owner}" => "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
-"Shared with you by {owner}" => "به اشتراک گذاشته شده با شما توسط { دارنده}",
-"Share with user or group …" => "به اشتراک گذاری با کاربر یا گروه",
-"Share link" => "اشتراک گذاشتن لینک",
-"Password protect" => "نگهداری کردن رمز عبور",
-"Allow Public Upload" => "اجازه آپلود عمومی",
-"Email link to person" => "پیوند ایمیل برای شخص.",
-"Send" => "ارسال",
-"Set expiration date" => "تنظیم تاریخ انقضا",
-"Expiration date" => "تاریخ انقضا",
-"group" => "گروه",
-"Resharing is not allowed" => "اشتراک گذاری مجدد مجاز نمی باشد",
-"Shared in {item} with {user}" => "به اشتراک گذاشته شده در {بخش} با {کاربر}",
-"Unshare" => "لغو اشتراک",
-"notify by email" => "دریافت هشدار از طریق ایمیل",
-"can share" => "قابل به اشتراک گذاری",
-"can edit" => "می توان ویرایش کرد",
-"access control" => "کنترل دسترسی",
-"create" => "ایجاد",
-"update" => "به روز",
-"delete" => "پاک کردن",
-"Password protected" => "نگهداری از رمز عبور",
-"Error unsetting expiration date" => "خطا در تنظیم نکردن تاریخ انقضا ",
-"Error setting expiration date" => "خطا در تنظیم تاریخ انقضا",
-"Sending ..." => "درحال ارسال ...",
-"Email sent" => "ایمیل ارسال شد",
-"Warning" => "اخطار",
-"The object type is not specified." => "نوع شی تعیین نشده است.",
-"Enter new" => "مورد جدید را وارد کنید",
-"Delete" => "حذف",
-"Add" => "افزودن",
-"Edit tags" => "ویرایش تگ ها",
-"The update was unsuccessful." => "بروزرسانی موفقیت آمیز نبود.",
-"The update was successful. Redirecting you to ownCloud now." => "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
-"Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
-"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" => "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.",
-"Reset" => "تنظیم مجدد",
-"New password" => "گذرواژه جدید",
-"Personal" => "شخصی",
-"Users" => "کاربران",
-"Apps" => "  برنامه ها",
-"Admin" => "مدیر",
-"Help" => "راه‌نما",
-"Error loading tags" => "خطا در هنگام بارگزاری تگ ها",
-"Tag already exists" => "تگ از قبل وجود دارد",
-"Error deleting tag(s)" => "خطا در هنگام حذف تگ (ها)",
-"Error tagging" => "خطا در هنگام تگ گذاری",
-"Error untagging" => "خطا در هنگام حذف تگ",
-"Error favoriting" => "خطا هنگام افزودن به موارد محبوب",
-"Error unfavoriting" => "خطا هنگام حذف از موارد محبوب",
-"Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
-"Cheers!" => "سلامتی!",
-"Security Warning" => "اخطار امنیتی",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
-"Create an <strong>admin account</strong>" => "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
-"Password" => "گذرواژه",
-"Storage & database" => "انبارش و پایگاه داده",
-"Data folder" => "پوشه اطلاعاتی",
-"Configure the database" => "پایگاه داده برنامه ریزی شدند",
-"Only %s is available." => "تنها %s موجود است.",
-"Database user" => "شناسه پایگاه داده",
-"Database password" => "پسورد پایگاه داده",
-"Database name" => "نام پایگاه داده",
-"Database tablespace" => "جدول پایگاه داده",
-"Database host" => "هاست پایگاه داده",
-"Finish setup" => "اتمام نصب",
-"Finishing …" => "در حال اتمام ...",
-"%s is available. Get more information on how to update." => "%s در دسترس است. برای چگونگی به روز رسانی اطلاعات بیشتر را دریافت نمایید.",
-"Log out" => "خروج",
-"remember" => "بیاد آوری",
-"Log in" => "ورود",
-"Alternative Logins" => "ورود متناوب",
-"Thank you for your patience." => "از صبر شما متشکریم",
-"Start update" => "اغاز به روز رسانی"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
new file mode 100644
index 00000000000..b7924c1710c
--- /dev/null
+++ b/core/l10n/fi_FI.js
@@ -0,0 +1,211 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
+    "Turned on maintenance mode" : "Siirrytty ylläpitotilaan",
+    "Turned off maintenance mode" : "Ylläpitotila laitettu pois päältä",
+    "Updated database" : "Tietokanta ajan tasalla",
+    "Checked database schema update" : "Tarkistettu tietokannan skeemapäivitys",
+    "Updated \"%s\" to %s" : "Päivitetty \"%s\" versioon %s",
+    "Disabled incompatible apps: %s" : "Yhteensopimattomat sovellukset poistettiin käytöstä: %s",
+    "No image or file provided" : "Kuvaa tai tiedostoa ei määritelty",
+    "Unknown filetype" : "Tuntematon tiedostotyyppi",
+    "Invalid image" : "Virhellinen kuva",
+    "No temporary profile picture available, try again" : "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen",
+    "No crop data provided" : "Puutteellinen tieto",
+    "Sunday" : "sunnuntai",
+    "Monday" : "maanantai",
+    "Tuesday" : "tiistai",
+    "Wednesday" : "keskiviikko",
+    "Thursday" : "torstai",
+    "Friday" : "perjantai",
+    "Saturday" : "lauantai",
+    "January" : "tammikuu",
+    "February" : "helmikuu",
+    "March" : "maaliskuu",
+    "April" : "huhtikuu",
+    "May" : "toukokuu",
+    "June" : "kesäkuu",
+    "July" : "heinäkuu",
+    "August" : "elokuu",
+    "September" : "syyskuu",
+    "October" : "lokakuu",
+    "November" : "marraskuu",
+    "December" : "joulukuu",
+    "Settings" : "Asetukset",
+    "File" : "Tiedosto",
+    "Folder" : "Kansio",
+    "Image" : "Kuva",
+    "Audio" : "Ääni",
+    "Saving..." : "Tallennetaan...",
+    "Couldn't send reset email. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
+    "The link to reset your password has been sent to your email. 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." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
+    "I know what I'm doing" : "Tiedän mitä teen",
+    "Reset password" : "Palauta salasana",
+    "Password can not be changed. Please contact your administrator." : "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.",
+    "No" : "Ei",
+    "Yes" : "Kyllä",
+    "Choose" : "Valitse",
+    "Error loading file picker template: {error}" : "Virhe ladatessa tiedostopohjia: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Virhe ladatessa viestipohjaa: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} tiedoston ristiriita","{count} tiedoston ristiriita"],
+    "One file conflict" : "Yhden tiedoston ristiriita",
+    "New Files" : "Uudet tiedostot",
+    "Already existing files" : "Jo olemassa olevat tiedostot",
+    "Which files do you want to keep?" : "Mitkä tiedostot haluat säilyttää?",
+    "If you select both versions, the copied file will have a number added to its name." : "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero.",
+    "Cancel" : "Peru",
+    "Continue" : "Jatka",
+    "(all selected)" : "(kaikki valittu)",
+    "({count} selected)" : "({count} valittu)",
+    "Error loading file exists template" : "Virhe ladatessa mallipohjaa",
+    "Very weak password" : "Erittäin heikko salasana",
+    "Weak password" : "Heikko salasana",
+    "So-so password" : "Kohtalainen salasana",
+    "Good password" : "Hyvä salasana",
+    "Strong password" : "Vahva salasana",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web-palvelimen asetukset eivät ole kelvolliset tiedostojen synkronointia varten, koska WebDAV-liitäntä vaikuttaa olevan rikki.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Tällä palvelimella ei ole toimivaa internetyhteyttä. Sen seurauksena jotkin ominaisuudet, kuten erillisten tallennustilojen liittäminen, ilmoitukset päivityksistä tai kolmansien osapuolten sovellusten asentaminen eivät toimi. Tiedostojen käyttäminen etäältä ja ilmoitusten lähettäminen sähköpostitse eivät myöskään välttämättä toimi. Jos haluat käyttää kaikkia palvelimen ominaisuuksia, kytke palvelin internetiin.",
+    "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa",
+    "Shared" : "Jaettu",
+    "Shared with {recipients}" : "Jaettu henkilöiden {recipients} kanssa",
+    "Share" : "Jaa",
+    "Error" : "Virhe",
+    "Error while sharing" : "Virhe jaettaessa",
+    "Error while unsharing" : "Virhe jakoa peruttaessa",
+    "Error while changing permissions" : "Virhe oikeuksia muuttaessa",
+    "Shared with you and the group {group} by {owner}" : "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
+    "Shared with you by {owner}" : "Jaettu kanssasi käyttäjän {owner} toimesta",
+    "Share with user or group …" : "Jaa käyttäjän tai ryhmän kanssa…",
+    "Share link" : "Jaa linkki",
+    "The public link will expire no later than {days} days after it is created" : "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
+    "Password protect" : "Suojaa salasanalla",
+    "Choose a password for the public link" : "Valitse salasana julkiselle linkille",
+    "Allow Public Upload" : "Salli julkinen lähetys",
+    "Email link to person" : "Lähetä linkki sähköpostitse",
+    "Send" : "Lähetä",
+    "Set expiration date" : "Aseta päättymispäivä",
+    "Expiration date" : "Päättymispäivä",
+    "Adding user..." : "Lisätään käyttäjä...",
+    "group" : "ryhmä",
+    "Resharing is not allowed" : "Jakaminen uudelleen ei ole salittu",
+    "Shared in {item} with {user}" : "{item} on jaettu {user} kanssa",
+    "Unshare" : "Peru jakaminen",
+    "notify by email" : "ilmoita sähköpostitse",
+    "can share" : "jaa",
+    "can edit" : "voi muokata",
+    "access control" : "Pääsyn hallinta",
+    "create" : "luo",
+    "update" : "päivitä",
+    "delete" : "poista",
+    "Password protected" : "Salasanasuojattu",
+    "Error unsetting expiration date" : "Virhe purettaessa eräpäivää",
+    "Error setting expiration date" : "Virhe päättymispäivää asettaessa",
+    "Sending ..." : "Lähetetään...",
+    "Email sent" : "Sähköposti lähetetty",
+    "Warning" : "Varoitus",
+    "The object type is not specified." : "The object type is not specified.",
+    "Enter new" : "Kirjoita uusi",
+    "Delete" : "Poista",
+    "Add" : "Lisää",
+    "Edit tags" : "Muokkaa tunnisteita",
+    "Error loading dialog template: {error}" : "Virhe ladatessa keskustelupohja: {error}",
+    "No tags selected for deletion." : "Tunnisteita ei valittu poistettavaksi.",
+    "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.",
+    "Please reload the page." : "Päivitä sivu.",
+    "The update was unsuccessful." : "Päivitys epäonnistui.",
+    "The update was successful. Redirecting you to ownCloud now." : "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
+    "Couldn't reset password because the token is invalid" : "Salasanaa ei voitu palauttaa koska valtuutus on virheellinen",
+    "Couldn't send reset email. Please make sure your username is correct." : "Palautussähköpostin lähettäminen ei onnistunut. Varmista, että käyttäjätunnuksesi on oikein.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
+    "%s password reset" : "%s salasanan palautus",
+    "Use the following link to reset your password: {link}" : "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
+    "You will receive a link to reset your password via Email." : "Saat sähköpostitse linkin palauttaaksesi salasanan.",
+    "Username" : "Käyttäjätunnus",
+    "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?" : "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?",
+    "Yes, I really want to reset my password now" : "Kyllä, haluan palauttaa salasanani nyt",
+    "Reset" : "Palauta salasana",
+    "New password" : "Uusi salasana",
+    "New Password" : "Uusi salasana",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.",
+    "Personal" : "Henkilökohtainen",
+    "Users" : "Käyttäjät",
+    "Apps" : "Sovellukset",
+    "Admin" : "Ylläpito",
+    "Help" : "Ohje",
+    "Error loading tags" : "Virhe tunnisteita ladattaessa",
+    "Tag already exists" : "Tunniste on jo olemassa",
+    "Error deleting tag(s)" : "Virhe tunnisteita poistaessa",
+    "Error tagging" : "Tunnisteiden kirjoitusvirhe",
+    "Error untagging" : "Tunisteiden poisto virhe",
+    "Error favoriting" : "Suosituksen kirjoitusvirhe",
+    "Error unfavoriting" : "Suosituksen poisto virhe",
+    "Access forbidden" : "Pääsy estetty",
+    "File not found" : "Tiedostoa ei löytynyt",
+    "The specified document has not been found on the server." : "Määritettyä asiakirjaa ei löytynyt palvelimelta.",
+    "You can click here to return to %s." : "Napsauta tästä palataksesi %siin.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hei sinä!\n\n%s jakoi kohteen %s kanssasi.\nTutustu siihen: %s\n\n",
+    "The share will expire on %s." : "Jakaminen päättyy %s.",
+    "Cheers!" : "Kippis!",
+    "Internal Server Error" : "Sisäinen palvelinvirhe",
+    "The server encountered an internal error and was unable to complete your request." : "Palvelin kohtasi sisäisen virheen, eikä pystynyt viimeistelmään pyyntöäsi.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Ota yhteys palvelimen ylläpitäjään, jos tämä virhe ilmenee useita kertoja. Lisää yhteydenottoosi alla olevat tekniset tiedot.",
+    "More details can be found in the server log." : "Lisätietoja on palvelimen lokitiedostossa.",
+    "Technical details" : "Tekniset tiedot",
+    "Remote Address: %s" : "Etäosoite: %s",
+    "Request ID: %s" : "Pyynnön tunniste: %s",
+    "Code: %s" : "Koodi: %s",
+    "Message: %s" : "Viesti: %s",
+    "File: %s" : "Tiedosto: %s",
+    "Line: %s" : "Rivi: %s",
+    "Trace" : "Jälki",
+    "Security Warning" : "Turvallisuusvaroitus",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Päivitä PHP-asennus varmistaaksesi, että %s on turvallinen käyttää.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
+    "Create an <strong>admin account</strong>" : "Luo <strong>ylläpitäjän tunnus</strong>",
+    "Password" : "Salasana",
+    "Storage & database" : "Tallennus ja tietokanta",
+    "Data folder" : "Datakansio",
+    "Configure the database" : "Muokkaa tietokantaa",
+    "Only %s is available." : "Vain %s on käytettävissä.",
+    "Database user" : "Tietokannan käyttäjä",
+    "Database password" : "Tietokannan salasana",
+    "Database name" : "Tietokannan nimi",
+    "Database tablespace" : "Tietokannan taulukkotila",
+    "Database host" : "Tietokantapalvelin",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. ",
+    "Finish setup" : "Viimeistele asennus",
+    "Finishing …" : "Valmistellaan…",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Tämä sovellus vaatii JavaScript-tuen toimiakseen. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Ota JavaScript käyttöön</a> ja päivitä sivu.",
+    "%s is available. Get more information on how to update." : "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
+    "Log out" : "Kirjaudu ulos",
+    "Server side authentication failed!" : "Palvelimen puoleinen tunnistautuminen epäonnistui!",
+    "Please contact your administrator." : "Ota yhteys ylläpitäjään.",
+    "Forgot your password? Reset it!" : "Unohditko salasanasi? Palauta se!",
+    "remember" : "muista",
+    "Log in" : "Kirjaudu sisään",
+    "Alternative Logins" : "Vaihtoehtoiset kirjautumiset",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei!<br><br>%s jakoi kanssasi kohteen <strong>%s</strong>.<br><a href=\"%s\">Tutustu siihen!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Tämä ownCloud-asennus on parhaillaan single user -tilassa.",
+    "This means only administrators can use the instance." : "Se tarkoittaa, että vain ylläpitäjät voivat nyt käyttää tätä ownCloudia.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Ota yhteys järjestelmän ylläpitäjään, jos tämä viesti ilmenee uudelleen tai odottamatta.",
+    "Thank you for your patience." : "Kiitos kärsivällisyydestäsi.",
+    "You are accessing the server from an untrusted domain." : "Olet yhteydessä palvelimeen epäluotettavasta verkko-osoitteesta.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Ota yhteys ylläpitäjään. Jos olet tämän ownCloudin ylläpitäjä, määritä \"trusted_domain\"-asetus tiedostossa config/config.php. Esimerkkimääritys on nähtävillä tiedostossa config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Riippuen määrityksistä, ylläpitäjänä saatat kyetä käyttämään alla olevaa painiketta luodaksesi luottamussuhteen tähän toimialueeseen.",
+    "Add \"%s\" as trusted domain" : "Lisää \"%s\" luotetuksi toimialueeksi",
+    "%s will be updated to version %s." : "%s päivitetään versioon %s.",
+    "The following apps will be disabled:" : "Seuraavat sovellukset poistetaan käytöstä:",
+    "The theme %s has been disabled." : "Teema %s on poistettu käytöstä.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.",
+    "Start update" : "Käynnistä päivitys",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Välttääksesi aikakatkaisuja suurikokoisten asennusten kanssa, voit suorittaa vaihtoehtoisesti seuraavan komennon asennushakemistossa:",
+    "This %s instance is currently being updated, which may take a while." : "Tätä %s-asennusta päivitetään parhaillaan, päivityksessä saattaa kestää hetki.",
+    "This page will refresh itself when the %s instance is available again." : "Tämä sivu päivittää itsensä, kun %s on jälleen käytettävissä."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
new file mode 100644
index 00000000000..0b5c5dcb4fc
--- /dev/null
+++ b/core/l10n/fi_FI.json
@@ -0,0 +1,209 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
+    "Turned on maintenance mode" : "Siirrytty ylläpitotilaan",
+    "Turned off maintenance mode" : "Ylläpitotila laitettu pois päältä",
+    "Updated database" : "Tietokanta ajan tasalla",
+    "Checked database schema update" : "Tarkistettu tietokannan skeemapäivitys",
+    "Updated \"%s\" to %s" : "Päivitetty \"%s\" versioon %s",
+    "Disabled incompatible apps: %s" : "Yhteensopimattomat sovellukset poistettiin käytöstä: %s",
+    "No image or file provided" : "Kuvaa tai tiedostoa ei määritelty",
+    "Unknown filetype" : "Tuntematon tiedostotyyppi",
+    "Invalid image" : "Virhellinen kuva",
+    "No temporary profile picture available, try again" : "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen",
+    "No crop data provided" : "Puutteellinen tieto",
+    "Sunday" : "sunnuntai",
+    "Monday" : "maanantai",
+    "Tuesday" : "tiistai",
+    "Wednesday" : "keskiviikko",
+    "Thursday" : "torstai",
+    "Friday" : "perjantai",
+    "Saturday" : "lauantai",
+    "January" : "tammikuu",
+    "February" : "helmikuu",
+    "March" : "maaliskuu",
+    "April" : "huhtikuu",
+    "May" : "toukokuu",
+    "June" : "kesäkuu",
+    "July" : "heinäkuu",
+    "August" : "elokuu",
+    "September" : "syyskuu",
+    "October" : "lokakuu",
+    "November" : "marraskuu",
+    "December" : "joulukuu",
+    "Settings" : "Asetukset",
+    "File" : "Tiedosto",
+    "Folder" : "Kansio",
+    "Image" : "Kuva",
+    "Audio" : "Ääni",
+    "Saving..." : "Tallennetaan...",
+    "Couldn't send reset email. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
+    "The link to reset your password has been sent to your email. 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." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
+    "I know what I'm doing" : "Tiedän mitä teen",
+    "Reset password" : "Palauta salasana",
+    "Password can not be changed. Please contact your administrator." : "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.",
+    "No" : "Ei",
+    "Yes" : "Kyllä",
+    "Choose" : "Valitse",
+    "Error loading file picker template: {error}" : "Virhe ladatessa tiedostopohjia: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Virhe ladatessa viestipohjaa: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} tiedoston ristiriita","{count} tiedoston ristiriita"],
+    "One file conflict" : "Yhden tiedoston ristiriita",
+    "New Files" : "Uudet tiedostot",
+    "Already existing files" : "Jo olemassa olevat tiedostot",
+    "Which files do you want to keep?" : "Mitkä tiedostot haluat säilyttää?",
+    "If you select both versions, the copied file will have a number added to its name." : "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero.",
+    "Cancel" : "Peru",
+    "Continue" : "Jatka",
+    "(all selected)" : "(kaikki valittu)",
+    "({count} selected)" : "({count} valittu)",
+    "Error loading file exists template" : "Virhe ladatessa mallipohjaa",
+    "Very weak password" : "Erittäin heikko salasana",
+    "Weak password" : "Heikko salasana",
+    "So-so password" : "Kohtalainen salasana",
+    "Good password" : "Hyvä salasana",
+    "Strong password" : "Vahva salasana",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web-palvelimen asetukset eivät ole kelvolliset tiedostojen synkronointia varten, koska WebDAV-liitäntä vaikuttaa olevan rikki.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Tällä palvelimella ei ole toimivaa internetyhteyttä. Sen seurauksena jotkin ominaisuudet, kuten erillisten tallennustilojen liittäminen, ilmoitukset päivityksistä tai kolmansien osapuolten sovellusten asentaminen eivät toimi. Tiedostojen käyttäminen etäältä ja ilmoitusten lähettäminen sähköpostitse eivät myöskään välttämättä toimi. Jos haluat käyttää kaikkia palvelimen ominaisuuksia, kytke palvelin internetiin.",
+    "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa",
+    "Shared" : "Jaettu",
+    "Shared with {recipients}" : "Jaettu henkilöiden {recipients} kanssa",
+    "Share" : "Jaa",
+    "Error" : "Virhe",
+    "Error while sharing" : "Virhe jaettaessa",
+    "Error while unsharing" : "Virhe jakoa peruttaessa",
+    "Error while changing permissions" : "Virhe oikeuksia muuttaessa",
+    "Shared with you and the group {group} by {owner}" : "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
+    "Shared with you by {owner}" : "Jaettu kanssasi käyttäjän {owner} toimesta",
+    "Share with user or group …" : "Jaa käyttäjän tai ryhmän kanssa…",
+    "Share link" : "Jaa linkki",
+    "The public link will expire no later than {days} days after it is created" : "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
+    "Password protect" : "Suojaa salasanalla",
+    "Choose a password for the public link" : "Valitse salasana julkiselle linkille",
+    "Allow Public Upload" : "Salli julkinen lähetys",
+    "Email link to person" : "Lähetä linkki sähköpostitse",
+    "Send" : "Lähetä",
+    "Set expiration date" : "Aseta päättymispäivä",
+    "Expiration date" : "Päättymispäivä",
+    "Adding user..." : "Lisätään käyttäjä...",
+    "group" : "ryhmä",
+    "Resharing is not allowed" : "Jakaminen uudelleen ei ole salittu",
+    "Shared in {item} with {user}" : "{item} on jaettu {user} kanssa",
+    "Unshare" : "Peru jakaminen",
+    "notify by email" : "ilmoita sähköpostitse",
+    "can share" : "jaa",
+    "can edit" : "voi muokata",
+    "access control" : "Pääsyn hallinta",
+    "create" : "luo",
+    "update" : "päivitä",
+    "delete" : "poista",
+    "Password protected" : "Salasanasuojattu",
+    "Error unsetting expiration date" : "Virhe purettaessa eräpäivää",
+    "Error setting expiration date" : "Virhe päättymispäivää asettaessa",
+    "Sending ..." : "Lähetetään...",
+    "Email sent" : "Sähköposti lähetetty",
+    "Warning" : "Varoitus",
+    "The object type is not specified." : "The object type is not specified.",
+    "Enter new" : "Kirjoita uusi",
+    "Delete" : "Poista",
+    "Add" : "Lisää",
+    "Edit tags" : "Muokkaa tunnisteita",
+    "Error loading dialog template: {error}" : "Virhe ladatessa keskustelupohja: {error}",
+    "No tags selected for deletion." : "Tunnisteita ei valittu poistettavaksi.",
+    "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.",
+    "Please reload the page." : "Päivitä sivu.",
+    "The update was unsuccessful." : "Päivitys epäonnistui.",
+    "The update was successful. Redirecting you to ownCloud now." : "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
+    "Couldn't reset password because the token is invalid" : "Salasanaa ei voitu palauttaa koska valtuutus on virheellinen",
+    "Couldn't send reset email. Please make sure your username is correct." : "Palautussähköpostin lähettäminen ei onnistunut. Varmista, että käyttäjätunnuksesi on oikein.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
+    "%s password reset" : "%s salasanan palautus",
+    "Use the following link to reset your password: {link}" : "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
+    "You will receive a link to reset your password via Email." : "Saat sähköpostitse linkin palauttaaksesi salasanan.",
+    "Username" : "Käyttäjätunnus",
+    "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?" : "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?",
+    "Yes, I really want to reset my password now" : "Kyllä, haluan palauttaa salasanani nyt",
+    "Reset" : "Palauta salasana",
+    "New password" : "Uusi salasana",
+    "New Password" : "Uusi salasana",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.",
+    "Personal" : "Henkilökohtainen",
+    "Users" : "Käyttäjät",
+    "Apps" : "Sovellukset",
+    "Admin" : "Ylläpito",
+    "Help" : "Ohje",
+    "Error loading tags" : "Virhe tunnisteita ladattaessa",
+    "Tag already exists" : "Tunniste on jo olemassa",
+    "Error deleting tag(s)" : "Virhe tunnisteita poistaessa",
+    "Error tagging" : "Tunnisteiden kirjoitusvirhe",
+    "Error untagging" : "Tunisteiden poisto virhe",
+    "Error favoriting" : "Suosituksen kirjoitusvirhe",
+    "Error unfavoriting" : "Suosituksen poisto virhe",
+    "Access forbidden" : "Pääsy estetty",
+    "File not found" : "Tiedostoa ei löytynyt",
+    "The specified document has not been found on the server." : "Määritettyä asiakirjaa ei löytynyt palvelimelta.",
+    "You can click here to return to %s." : "Napsauta tästä palataksesi %siin.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hei sinä!\n\n%s jakoi kohteen %s kanssasi.\nTutustu siihen: %s\n\n",
+    "The share will expire on %s." : "Jakaminen päättyy %s.",
+    "Cheers!" : "Kippis!",
+    "Internal Server Error" : "Sisäinen palvelinvirhe",
+    "The server encountered an internal error and was unable to complete your request." : "Palvelin kohtasi sisäisen virheen, eikä pystynyt viimeistelmään pyyntöäsi.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Ota yhteys palvelimen ylläpitäjään, jos tämä virhe ilmenee useita kertoja. Lisää yhteydenottoosi alla olevat tekniset tiedot.",
+    "More details can be found in the server log." : "Lisätietoja on palvelimen lokitiedostossa.",
+    "Technical details" : "Tekniset tiedot",
+    "Remote Address: %s" : "Etäosoite: %s",
+    "Request ID: %s" : "Pyynnön tunniste: %s",
+    "Code: %s" : "Koodi: %s",
+    "Message: %s" : "Viesti: %s",
+    "File: %s" : "Tiedosto: %s",
+    "Line: %s" : "Rivi: %s",
+    "Trace" : "Jälki",
+    "Security Warning" : "Turvallisuusvaroitus",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Päivitä PHP-asennus varmistaaksesi, että %s on turvallinen käyttää.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
+    "Create an <strong>admin account</strong>" : "Luo <strong>ylläpitäjän tunnus</strong>",
+    "Password" : "Salasana",
+    "Storage & database" : "Tallennus ja tietokanta",
+    "Data folder" : "Datakansio",
+    "Configure the database" : "Muokkaa tietokantaa",
+    "Only %s is available." : "Vain %s on käytettävissä.",
+    "Database user" : "Tietokannan käyttäjä",
+    "Database password" : "Tietokannan salasana",
+    "Database name" : "Tietokannan nimi",
+    "Database tablespace" : "Tietokannan taulukkotila",
+    "Database host" : "Tietokantapalvelin",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. ",
+    "Finish setup" : "Viimeistele asennus",
+    "Finishing …" : "Valmistellaan…",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Tämä sovellus vaatii JavaScript-tuen toimiakseen. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Ota JavaScript käyttöön</a> ja päivitä sivu.",
+    "%s is available. Get more information on how to update." : "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
+    "Log out" : "Kirjaudu ulos",
+    "Server side authentication failed!" : "Palvelimen puoleinen tunnistautuminen epäonnistui!",
+    "Please contact your administrator." : "Ota yhteys ylläpitäjään.",
+    "Forgot your password? Reset it!" : "Unohditko salasanasi? Palauta se!",
+    "remember" : "muista",
+    "Log in" : "Kirjaudu sisään",
+    "Alternative Logins" : "Vaihtoehtoiset kirjautumiset",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei!<br><br>%s jakoi kanssasi kohteen <strong>%s</strong>.<br><a href=\"%s\">Tutustu siihen!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Tämä ownCloud-asennus on parhaillaan single user -tilassa.",
+    "This means only administrators can use the instance." : "Se tarkoittaa, että vain ylläpitäjät voivat nyt käyttää tätä ownCloudia.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Ota yhteys järjestelmän ylläpitäjään, jos tämä viesti ilmenee uudelleen tai odottamatta.",
+    "Thank you for your patience." : "Kiitos kärsivällisyydestäsi.",
+    "You are accessing the server from an untrusted domain." : "Olet yhteydessä palvelimeen epäluotettavasta verkko-osoitteesta.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Ota yhteys ylläpitäjään. Jos olet tämän ownCloudin ylläpitäjä, määritä \"trusted_domain\"-asetus tiedostossa config/config.php. Esimerkkimääritys on nähtävillä tiedostossa config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Riippuen määrityksistä, ylläpitäjänä saatat kyetä käyttämään alla olevaa painiketta luodaksesi luottamussuhteen tähän toimialueeseen.",
+    "Add \"%s\" as trusted domain" : "Lisää \"%s\" luotetuksi toimialueeksi",
+    "%s will be updated to version %s." : "%s päivitetään versioon %s.",
+    "The following apps will be disabled:" : "Seuraavat sovellukset poistetaan käytöstä:",
+    "The theme %s has been disabled." : "Teema %s on poistettu käytöstä.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.",
+    "Start update" : "Käynnistä päivitys",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Välttääksesi aikakatkaisuja suurikokoisten asennusten kanssa, voit suorittaa vaihtoehtoisesti seuraavan komennon asennushakemistossa:",
+    "This %s instance is currently being updated, which may take a while." : "Tätä %s-asennusta päivitetään parhaillaan, päivityksessä saattaa kestää hetki.",
+    "This page will refresh itself when the %s instance is available again." : "Tämä sivu päivittää itsensä, kun %s on jälleen käytettävissä."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
deleted file mode 100644
index e72bc5b8e7d..00000000000
--- a/core/l10n/fi_FI.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
-"Turned on maintenance mode" => "Siirrytty ylläpitotilaan",
-"Turned off maintenance mode" => "Ylläpitotila laitettu pois päältä",
-"Updated database" => "Tietokanta ajan tasalla",
-"Checked database schema update" => "Tarkistettu tietokannan skeemapäivitys",
-"Updated \"%s\" to %s" => "Päivitetty \"%s\" versioon %s",
-"Disabled incompatible apps: %s" => "Yhteensopimattomat sovellukset poistettiin käytöstä: %s",
-"No image or file provided" => "Kuvaa tai tiedostoa ei määritelty",
-"Unknown filetype" => "Tuntematon tiedostotyyppi",
-"Invalid image" => "Virhellinen kuva",
-"No temporary profile picture available, try again" => "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen",
-"No crop data provided" => "Puutteellinen tieto",
-"Sunday" => "sunnuntai",
-"Monday" => "maanantai",
-"Tuesday" => "tiistai",
-"Wednesday" => "keskiviikko",
-"Thursday" => "torstai",
-"Friday" => "perjantai",
-"Saturday" => "lauantai",
-"January" => "tammikuu",
-"February" => "helmikuu",
-"March" => "maaliskuu",
-"April" => "huhtikuu",
-"May" => "toukokuu",
-"June" => "kesäkuu",
-"July" => "heinäkuu",
-"August" => "elokuu",
-"September" => "syyskuu",
-"October" => "lokakuu",
-"November" => "marraskuu",
-"December" => "joulukuu",
-"Settings" => "Asetukset",
-"File" => "Tiedosto",
-"Folder" => "Kansio",
-"Image" => "Kuva",
-"Audio" => "Ääni",
-"Saving..." => "Tallennetaan...",
-"Couldn't send reset email. Please contact your administrator." => "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
-"The link to reset your password has been sent to your email. 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." => "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
-"I know what I'm doing" => "Tiedän mitä teen",
-"Reset password" => "Palauta salasana",
-"Password can not be changed. Please contact your administrator." => "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.",
-"No" => "Ei",
-"Yes" => "Kyllä",
-"Choose" => "Valitse",
-"Error loading file picker template: {error}" => "Virhe ladatessa tiedostopohjia: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Virhe ladatessa viestipohjaa: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} tiedoston ristiriita","{count} tiedoston ristiriita"),
-"One file conflict" => "Yhden tiedoston ristiriita",
-"New Files" => "Uudet tiedostot",
-"Already existing files" => "Jo olemassa olevat tiedostot",
-"Which files do you want to keep?" => "Mitkä tiedostot haluat säilyttää?",
-"If you select both versions, the copied file will have a number added to its name." => "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero.",
-"Cancel" => "Peru",
-"Continue" => "Jatka",
-"(all selected)" => "(kaikki valittu)",
-"({count} selected)" => "({count} valittu)",
-"Error loading file exists template" => "Virhe ladatessa mallipohjaa",
-"Very weak password" => "Erittäin heikko salasana",
-"Weak password" => "Heikko salasana",
-"So-so password" => "Kohtalainen salasana",
-"Good password" => "Hyvä salasana",
-"Strong password" => "Vahva salasana",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web-palvelimen asetukset eivät ole kelvolliset tiedostojen synkronointia varten, koska WebDAV-liitäntä vaikuttaa olevan rikki.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Tällä palvelimella ei ole toimivaa internetyhteyttä. Sen seurauksena jotkin ominaisuudet, kuten erillisten tallennustilojen liittäminen, ilmoitukset päivityksistä tai kolmansien osapuolten sovellusten asentaminen eivät toimi. Tiedostojen käyttäminen etäältä ja ilmoitusten lähettäminen sähköpostitse eivät myöskään välttämättä toimi. Jos haluat käyttää kaikkia palvelimen ominaisuuksia, kytke palvelin internetiin.",
-"Error occurred while checking server setup" => "Virhe palvelimen määrityksiä tarkistaessa",
-"Shared" => "Jaettu",
-"Shared with {recipients}" => "Jaettu henkilöiden {recipients} kanssa",
-"Share" => "Jaa",
-"Error" => "Virhe",
-"Error while sharing" => "Virhe jaettaessa",
-"Error while unsharing" => "Virhe jakoa peruttaessa",
-"Error while changing permissions" => "Virhe oikeuksia muuttaessa",
-"Shared with you and the group {group} by {owner}" => "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
-"Shared with you by {owner}" => "Jaettu kanssasi käyttäjän {owner} toimesta",
-"Share with user or group …" => "Jaa käyttäjän tai ryhmän kanssa…",
-"Share link" => "Jaa linkki",
-"The public link will expire no later than {days} days after it is created" => "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
-"Password protect" => "Suojaa salasanalla",
-"Choose a password for the public link" => "Valitse salasana julkiselle linkille",
-"Allow Public Upload" => "Salli julkinen lähetys",
-"Email link to person" => "Lähetä linkki sähköpostitse",
-"Send" => "Lähetä",
-"Set expiration date" => "Aseta päättymispäivä",
-"Expiration date" => "Päättymispäivä",
-"Adding user..." => "Lisätään käyttäjä...",
-"group" => "ryhmä",
-"Resharing is not allowed" => "Jakaminen uudelleen ei ole salittu",
-"Shared in {item} with {user}" => "{item} on jaettu {user} kanssa",
-"Unshare" => "Peru jakaminen",
-"notify by email" => "ilmoita sähköpostitse",
-"can share" => "jaa",
-"can edit" => "voi muokata",
-"access control" => "Pääsyn hallinta",
-"create" => "luo",
-"update" => "päivitä",
-"delete" => "poista",
-"Password protected" => "Salasanasuojattu",
-"Error unsetting expiration date" => "Virhe purettaessa eräpäivää",
-"Error setting expiration date" => "Virhe päättymispäivää asettaessa",
-"Sending ..." => "Lähetetään...",
-"Email sent" => "Sähköposti lähetetty",
-"Warning" => "Varoitus",
-"The object type is not specified." => "The object type is not specified.",
-"Enter new" => "Kirjoita uusi",
-"Delete" => "Poista",
-"Add" => "Lisää",
-"Edit tags" => "Muokkaa tunnisteita",
-"Error loading dialog template: {error}" => "Virhe ladatessa keskustelupohja: {error}",
-"No tags selected for deletion." => "Tunnisteita ei valittu poistettavaksi.",
-"Updating {productName} to version {version}, this may take a while." => "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.",
-"Please reload the page." => "Päivitä sivu.",
-"The update was unsuccessful." => "Päivitys epäonnistui.",
-"The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
-"Couldn't reset password because the token is invalid" => "Salasanaa ei voitu palauttaa koska valtuutus on virheellinen",
-"Couldn't send reset email. Please make sure your username is correct." => "Palautussähköpostin lähettäminen ei onnistunut. Varmista, että käyttäjätunnuksesi on oikein.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
-"%s password reset" => "%s salasanan palautus",
-"Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
-"You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin palauttaaksesi salasanan.",
-"Username" => "Käyttäjätunnus",
-"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?" => "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?",
-"Yes, I really want to reset my password now" => "Kyllä, haluan palauttaa salasanani nyt",
-"Reset" => "Palauta salasana",
-"New password" => "Uusi salasana",
-"New Password" => "Uusi salasana",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!",
-"For the best results, please consider using a GNU/Linux server instead." => "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.",
-"Personal" => "Henkilökohtainen",
-"Users" => "Käyttäjät",
-"Apps" => "Sovellukset",
-"Admin" => "Ylläpito",
-"Help" => "Ohje",
-"Error loading tags" => "Virhe tunnisteita ladattaessa",
-"Tag already exists" => "Tunniste on jo olemassa",
-"Error deleting tag(s)" => "Virhe tunnisteita poistaessa",
-"Error tagging" => "Tunnisteiden kirjoitusvirhe",
-"Error untagging" => "Tunisteiden poisto virhe",
-"Error favoriting" => "Suosituksen kirjoitusvirhe",
-"Error unfavoriting" => "Suosituksen poisto virhe",
-"Access forbidden" => "Pääsy estetty",
-"File not found" => "Tiedostoa ei löytynyt",
-"The specified document has not been found on the server." => "Määritettyä asiakirjaa ei löytynyt palvelimelta.",
-"You can click here to return to %s." => "Napsauta tästä palataksesi %siin.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei sinä!\n\n%s jakoi kohteen %s kanssasi.\nTutustu siihen: %s\n\n",
-"The share will expire on %s." => "Jakaminen päättyy %s.",
-"Cheers!" => "Kippis!",
-"Internal Server Error" => "Sisäinen palvelinvirhe",
-"The server encountered an internal error and was unable to complete your request." => "Palvelin kohtasi sisäisen virheen, eikä pystynyt viimeistelmään pyyntöäsi.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Ota yhteys palvelimen ylläpitäjään, jos tämä virhe ilmenee useita kertoja. Lisää yhteydenottoosi alla olevat tekniset tiedot.",
-"More details can be found in the server log." => "Lisätietoja on palvelimen lokitiedostossa.",
-"Technical details" => "Tekniset tiedot",
-"Remote Address: %s" => "Etäosoite: %s",
-"Request ID: %s" => "Pyynnön tunniste: %s",
-"Code: %s" => "Koodi: %s",
-"Message: %s" => "Viesti: %s",
-"File: %s" => "Tiedosto: %s",
-"Line: %s" => "Rivi: %s",
-"Trace" => "Jälki",
-"Security Warning" => "Turvallisuusvaroitus",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Päivitä PHP-asennus varmistaaksesi, että %s on turvallinen käyttää.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
-"Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
-"Password" => "Salasana",
-"Storage & database" => "Tallennus ja tietokanta",
-"Data folder" => "Datakansio",
-"Configure the database" => "Muokkaa tietokantaa",
-"Only %s is available." => "Vain %s on käytettävissä.",
-"Database user" => "Tietokannan käyttäjä",
-"Database password" => "Tietokannan salasana",
-"Database name" => "Tietokannan nimi",
-"Database tablespace" => "Tietokannan taulukkotila",
-"Database host" => "Tietokantapalvelin",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. ",
-"Finish setup" => "Viimeistele asennus",
-"Finishing …" => "Valmistellaan…",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Tämä sovellus vaatii JavaScript-tuen toimiakseen. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Ota JavaScript käyttöön</a> ja päivitä sivu.",
-"%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
-"Log out" => "Kirjaudu ulos",
-"Server side authentication failed!" => "Palvelimen puoleinen tunnistautuminen epäonnistui!",
-"Please contact your administrator." => "Ota yhteys ylläpitäjään.",
-"Forgot your password? Reset it!" => "Unohditko salasanasi? Palauta se!",
-"remember" => "muista",
-"Log in" => "Kirjaudu sisään",
-"Alternative Logins" => "Vaihtoehtoiset kirjautumiset",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hei!<br><br>%s jakoi kanssasi kohteen <strong>%s</strong>.<br><a href=\"%s\">Tutustu siihen!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Tämä ownCloud-asennus on parhaillaan single user -tilassa.",
-"This means only administrators can use the instance." => "Se tarkoittaa, että vain ylläpitäjät voivat nyt käyttää tätä ownCloudia.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Ota yhteys järjestelmän ylläpitäjään, jos tämä viesti ilmenee uudelleen tai odottamatta.",
-"Thank you for your patience." => "Kiitos kärsivällisyydestäsi.",
-"You are accessing the server from an untrusted domain." => "Olet yhteydessä palvelimeen epäluotettavasta verkko-osoitteesta.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Ota yhteys ylläpitäjään. Jos olet tämän ownCloudin ylläpitäjä, määritä \"trusted_domain\"-asetus tiedostossa config/config.php. Esimerkkimääritys on nähtävillä tiedostossa config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Riippuen määrityksistä, ylläpitäjänä saatat kyetä käyttämään alla olevaa painiketta luodaksesi luottamussuhteen tähän toimialueeseen.",
-"Add \"%s\" as trusted domain" => "Lisää \"%s\" luotetuksi toimialueeksi",
-"%s will be updated to version %s." => "%s päivitetään versioon %s.",
-"The following apps will be disabled:" => "Seuraavat sovellukset poistetaan käytöstä:",
-"The theme %s has been disabled." => "Teema %s on poistettu käytöstä.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.",
-"Start update" => "Käynnistä päivitys",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Välttääksesi aikakatkaisuja suurikokoisten asennusten kanssa, voit suorittaa vaihtoehtoisesti seuraavan komennon asennushakemistossa:",
-"This %s instance is currently being updated, which may take a while." => "Tätä %s-asennusta päivitetään parhaillaan, päivityksessä saattaa kestää hetki.",
-"This page will refresh itself when the %s instance is available again." => "Tämä sivu päivittää itsensä, kun %s on jälleen käytettävissä."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fil.js b/core/l10n/fil.js
new file mode 100644
index 00000000000..bc4e6c6bc64
--- /dev/null
+++ b/core/l10n/fil.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/fil.json b/core/l10n/fil.json
new file mode 100644
index 00000000000..4ebc0d2d45d
--- /dev/null
+++ b/core/l10n/fil.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/fil.php b/core/l10n/fil.php
deleted file mode 100644
index e012fb1656e..00000000000
--- a/core/l10n/fil.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
new file mode 100644
index 00000000000..ba430852edc
--- /dev/null
+++ b/core/l10n/fr.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
+    "Turned on maintenance mode" : "Mode de maintenance activé",
+    "Turned off maintenance mode" : "Mode de maintenance désactivé",
+    "Updated database" : "Base de données mise à jour",
+    "Checked database schema update" : "Mise à jour du schéma de la base de données vérifiée",
+    "Checked database schema update for apps" : "La mise à jour du schéma de la base de données pour les applications a été vérifiée",
+    "Updated \"%s\" to %s" : "Mise à jour de « %s » vers %s",
+    "Disabled incompatible apps: %s" : "Applications incompatibles désactivées : %s",
+    "No image or file provided" : "Aucun fichier fourni",
+    "Unknown filetype" : "Type de fichier inconnu",
+    "Invalid image" : "Image non valable",
+    "No temporary profile picture available, try again" : "Aucune image temporaire disponible pour le profil. Essayez à nouveau.",
+    "No crop data provided" : "Aucune donnée de recadrage fournie",
+    "Sunday" : "Dimanche",
+    "Monday" : "Lundi",
+    "Tuesday" : "Mardi",
+    "Wednesday" : "Mercredi",
+    "Thursday" : "Jeudi",
+    "Friday" : "Vendredi",
+    "Saturday" : "Samedi",
+    "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",
+    "Settings" : "Paramètres",
+    "File" : "Fichier",
+    "Folder" : "Dossier",
+    "Image" : "Image",
+    "Audio" : "Audio",
+    "Saving..." : "Enregistrement…",
+    "Couldn't send reset email. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez contacter votre administrateur.",
+    "The link to reset your password has been sent to your email. 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." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
+    "I know what I'm doing" : "Je sais ce que je fais",
+    "Reset password" : "Réinitialiser le mot de passe",
+    "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
+    "No" : "Non",
+    "Yes" : "Oui",
+    "Choose" : "Choisir",
+    "Error loading file picker template: {error}" : "Erreur lors du chargement du modèle du sélecteur de fichiers : {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Erreur de chargement du modèle de message : {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} fichier en conflit","{count} fichiers en conflit"],
+    "One file conflict" : "Un conflit de fichier",
+    "New Files" : "Nouveaux fichiers",
+    "Already existing files" : "Fichiers déjà existants",
+    "Which files do you want to keep?" : "Quels fichiers désirez-vous garder ?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié.",
+    "Cancel" : "Annuler",
+    "Continue" : "Continuer",
+    "(all selected)" : "(tous sélectionnés)",
+    "({count} selected)" : "({count} sélectionné(s))",
+    "Error loading file exists template" : "Erreur de chargement du modèle de fichier existant",
+    "Very weak password" : "Mot de passe très faible",
+    "Weak password" : "Mot de passe faible",
+    "So-so password" : "Mot de passe tout juste acceptable",
+    "Good password" : "Mot de passe de sécurité suffisante",
+    "Strong password" : "Mot de passe fort",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav semble ne pas fonctionner.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par courriel ne fonctionneront pas non plus. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
+    "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
+    "Shared" : "Partagé",
+    "Shared with {recipients}" : "Partagé avec {recipients}",
+    "Share" : "Partager",
+    "Error" : "Erreur",
+    "Error while sharing" : "Erreur lors de la mise en partage",
+    "Error while unsharing" : "Erreur lors de l'annulation du partage",
+    "Error while changing permissions" : "Erreur lors du changement des permissions",
+    "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}",
+    "Shared with you by {owner}" : "Partagé avec vous par {owner}",
+    "Share with user or group …" : "Partager avec un utilisateur ou un groupe...",
+    "Share link" : "Partager par lien public",
+    "The public link will expire no later than {days} days after it is created" : "Ce lien public expirera au plus tard {days} jours après sa création.",
+    "Password protect" : "Protéger par un mot de passe",
+    "Choose a password for the public link" : "Choisissez un mot de passe pour le lien public",
+    "Allow Public Upload" : "Autoriser l'ajout de fichiers par des utilisateurs non enregistrés",
+    "Email link to person" : "Envoyer le lien par courriel",
+    "Send" : "Envoyer",
+    "Set expiration date" : "Spécifier une date d'expiration",
+    "Expiration date" : "Date d'expiration",
+    "Adding user..." : "Utilisateur en cours d'ajout...",
+    "group" : "groupe",
+    "Resharing is not allowed" : "Le repartage n'est pas autorisé",
+    "Shared in {item} with {user}" : "Partagé dans {item} avec {user}",
+    "Unshare" : "Ne plus partager",
+    "notify by email" : "notifier par courriel",
+    "can share" : "peut partager",
+    "can edit" : "peut modifier",
+    "access control" : "contrôle d'accès",
+    "create" : "créer",
+    "update" : "mettre à jour",
+    "delete" : "supprimer",
+    "Password protected" : "Protégé par mot de passe",
+    "Error unsetting expiration date" : "Erreur lors de la suppression de la date d'expiration",
+    "Error setting expiration date" : "Erreur lors de la spécification de la date d'expiration",
+    "Sending ..." : "Envoi …",
+    "Email sent" : "Courriel envoyé",
+    "Warning" : "Attention",
+    "The object type is not specified." : "Le type d'objet n'est pas spécifié.",
+    "Enter new" : "Saisir un nouveau",
+    "Delete" : "Supprimer",
+    "Add" : "Ajouter",
+    "Edit tags" : "Modifier les marqueurs",
+    "Error loading dialog template: {error}" : "Erreur lors du chargement du modèle de dialogue : {error}",
+    "No tags selected for deletion." : "Aucun marqueur sélectionné pour la suppression.",
+    "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
+    "Please reload the page." : "Veuillez recharger la page.",
+    "The update was unsuccessful." : "La mise à jour a échoué.",
+    "The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé(e) vers ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Impossible de réinitialiser le mot de passe car le jeton n'est pas valable.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez vérifier que votre nom d'utilisateur est correct.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation car il n'y a aucune adresse de courriel pour cet utilisateur. Veuillez contacter votre administrateur.",
+    "%s password reset" : "Réinitialisation de votre mot de passe %s",
+    "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 courriel contenant un lien pour réinitialiser votre mot de passe.",
+    "Username" : "Nom d'utilisateur",
+    "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?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de poursuivre. Voulez-vous vraiment continuer ?",
+    "Yes, I really want to reset my password now" : "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
+    "Reset" : "Réinitialiser",
+    "New password" : "Nouveau mot de passe",
+    "New Password" : "Nouveau mot de passe",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pour obtenir les meilleurs résultats, vous devriez utiliser un serveur GNU/Linux.",
+    "Personal" : "Personnel",
+    "Users" : "Utilisateurs",
+    "Apps" : "Applications",
+    "Admin" : "Administration",
+    "Help" : "Aide",
+    "Error loading tags" : "Erreur de chargement des marqueurs.",
+    "Tag already exists" : "Le marqueur existe déjà.",
+    "Error deleting tag(s)" : "Erreur de suppression de(s) marqueur(s)",
+    "Error tagging" : "Erreur lors de la mise en place du marqueur",
+    "Error untagging" : "Erreur lors de la suppression du marqueur",
+    "Error favoriting" : "Erreur lors de la mise en favori",
+    "Error unfavoriting" : "Erreur lors de la suppression des favoris",
+    "Access forbidden" : "Accès interdit",
+    "File not found" : "Fichier non trouvé",
+    "The specified document has not been found on the server." : "Impossible de trouver le document spécifié sur le serveur.",
+    "You can click here to return to %s." : "Vous pouvez cliquer ici pour retourner à %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Bonjour,\n\nNous vous informons que %s a partagé %s avec vous.\nConsultez-le : %s\n",
+    "The share will expire on %s." : "Le partage expirera le %s.",
+    "Cheers!" : "À bientôt !",
+    "Internal Server Error" : "Erreur interne du serveur",
+    "The server encountered an internal error and was unable to complete your request." : "Le serveur a rencontré une erreur interne et est incapable d'exécuter votre requête.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Veuillez contacter l'administrateur du serveur si cette erreur apparaît plusieurs fois. Veuillez joindre les détails techniques à votre rapport.",
+    "More details can be found in the server log." : "Le fichier journal du serveur peut fournir plus de renseignements.",
+    "Technical details" : "Renseignements techniques",
+    "Remote Address: %s" : "Adresse distante : %s",
+    "Request ID: %s" : "ID de la demande : %s",
+    "Code: %s" : "Code : %s",
+    "Message: %s" : "Message : %s",
+    "File: %s" : "Fichier : %s",
+    "Line: %s" : "Ligne : %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Avertissement de sécurité",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
+    "Create an <strong>admin account</strong>" : "Créer un <strong>compte administrateur</strong>",
+    "Password" : "Mot de passe",
+    "Storage & database" : "Stockage & base de données",
+    "Data folder" : "Répertoire des données",
+    "Configure the database" : "Configurer la base de données",
+    "Only %s is available." : "%s seulement est disponible.",
+    "Database user" : "Utilisateur de 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" : "Tablespace de la base de données",
+    "Database host" : "Hôte de la base de données",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite va être utilisée comme base de données. Pour des installations plus volumineuses, nous vous conseillons de changer ce réglage.",
+    "Finish setup" : "Terminer l'installation",
+    "Finishing …" : "Finalisation …",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Cette application nécessite JavaScript pour fonctionner correctement.  Veuillez <a href=\"http://www.enable-javascript.com/fr/\" target=\"_blank\">activer JavaScript</a> puis charger à nouveau cette page.",
+    "%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",
+    "Server side authentication failed!" : "L'authentification sur le serveur a échoué !",
+    "Please contact your administrator." : "Veuillez contacter votre administrateur.",
+    "Forgot your password? Reset it!" : "Mot de passe oublié ? Réinitialisez-le !",
+    "remember" : "se souvenir de moi",
+    "Log in" : "Connexion",
+    "Alternative Logins" : "Identifiants alternatifs",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Bonjour,<br><br>Nous vous informons que %s a partagé <strong>%s</strong> avec vous.<br><a href=\"%s\">Consultez-le !</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Cette instance de ownCloud est actuellement en mode utilisateur unique.",
+    "This means only administrators can use the instance." : "Cela signifie que seuls les administrateurs peuvent utiliser l'instance.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Veuillez contacter votre administrateur système si ce message persiste ou apparaît de façon inattendue.",
+    "Thank you for your patience." : "Merci de votre patience.",
+    "You are accessing the server from an untrusted domain." : "Vous accédez au serveur à partir d'un domaine non approuvé.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Veuillez contacter votre administrateur. Si vous êtes administrateur de cette instance, configurez le paramètre « trusted_domain » dans le fichier config/config.php. Un exemple de configuration est fourni dans le fichier config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En fonction de votre configuration, en tant qu'administrateur vous pouvez également utiliser le bouton ci-dessous pour approuver ce domaine.",
+    "Add \"%s\" as trusted domain" : "Ajouter \"%s\" à la liste des domaines approuvés",
+    "%s will be updated to version %s." : "%s sera mis à jour vers la version %s.",
+    "The following apps will be disabled:" : "Les applications suivantes seront désactivées :",
+    "The theme %s has been disabled." : "Le thème %s a été désactivé.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Veuillez vous assurer qu'une copie de sauvegarde de la base de données, du dossier de configuration (config) et du dossier de données (data) a été réalisée avant de commencer.",
+    "Start update" : "Démarrer la mise à jour",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Afin d'éviter les dépassements de délai (timeouts) avec les installations de plus grande ampleur, vous pouvez exécuter la commande suivante depuis le répertoire d'installation :",
+    "This %s instance is currently being updated, which may take a while." : "Cette instance de %s est en cours de mise à jour, cela peut prendre du temps.",
+    "This page will refresh itself when the %s instance is available again." : "Cette page se rafraîchira d'elle-même lorsque l'instance %s sera à nouveau disponible."
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
new file mode 100644
index 00000000000..b123afbb0d8
--- /dev/null
+++ b/core/l10n/fr.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
+    "Turned on maintenance mode" : "Mode de maintenance activé",
+    "Turned off maintenance mode" : "Mode de maintenance désactivé",
+    "Updated database" : "Base de données mise à jour",
+    "Checked database schema update" : "Mise à jour du schéma de la base de données vérifiée",
+    "Checked database schema update for apps" : "La mise à jour du schéma de la base de données pour les applications a été vérifiée",
+    "Updated \"%s\" to %s" : "Mise à jour de « %s » vers %s",
+    "Disabled incompatible apps: %s" : "Applications incompatibles désactivées : %s",
+    "No image or file provided" : "Aucun fichier fourni",
+    "Unknown filetype" : "Type de fichier inconnu",
+    "Invalid image" : "Image non valable",
+    "No temporary profile picture available, try again" : "Aucune image temporaire disponible pour le profil. Essayez à nouveau.",
+    "No crop data provided" : "Aucune donnée de recadrage fournie",
+    "Sunday" : "Dimanche",
+    "Monday" : "Lundi",
+    "Tuesday" : "Mardi",
+    "Wednesday" : "Mercredi",
+    "Thursday" : "Jeudi",
+    "Friday" : "Vendredi",
+    "Saturday" : "Samedi",
+    "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",
+    "Settings" : "Paramètres",
+    "File" : "Fichier",
+    "Folder" : "Dossier",
+    "Image" : "Image",
+    "Audio" : "Audio",
+    "Saving..." : "Enregistrement…",
+    "Couldn't send reset email. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez contacter votre administrateur.",
+    "The link to reset your password has been sent to your email. 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." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
+    "I know what I'm doing" : "Je sais ce que je fais",
+    "Reset password" : "Réinitialiser le mot de passe",
+    "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
+    "No" : "Non",
+    "Yes" : "Oui",
+    "Choose" : "Choisir",
+    "Error loading file picker template: {error}" : "Erreur lors du chargement du modèle du sélecteur de fichiers : {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Erreur de chargement du modèle de message : {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} fichier en conflit","{count} fichiers en conflit"],
+    "One file conflict" : "Un conflit de fichier",
+    "New Files" : "Nouveaux fichiers",
+    "Already existing files" : "Fichiers déjà existants",
+    "Which files do you want to keep?" : "Quels fichiers désirez-vous garder ?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié.",
+    "Cancel" : "Annuler",
+    "Continue" : "Continuer",
+    "(all selected)" : "(tous sélectionnés)",
+    "({count} selected)" : "({count} sélectionné(s))",
+    "Error loading file exists template" : "Erreur de chargement du modèle de fichier existant",
+    "Very weak password" : "Mot de passe très faible",
+    "Weak password" : "Mot de passe faible",
+    "So-so password" : "Mot de passe tout juste acceptable",
+    "Good password" : "Mot de passe de sécurité suffisante",
+    "Strong password" : "Mot de passe fort",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav semble ne pas fonctionner.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par courriel ne fonctionneront pas non plus. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
+    "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
+    "Shared" : "Partagé",
+    "Shared with {recipients}" : "Partagé avec {recipients}",
+    "Share" : "Partager",
+    "Error" : "Erreur",
+    "Error while sharing" : "Erreur lors de la mise en partage",
+    "Error while unsharing" : "Erreur lors de l'annulation du partage",
+    "Error while changing permissions" : "Erreur lors du changement des permissions",
+    "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}",
+    "Shared with you by {owner}" : "Partagé avec vous par {owner}",
+    "Share with user or group …" : "Partager avec un utilisateur ou un groupe...",
+    "Share link" : "Partager par lien public",
+    "The public link will expire no later than {days} days after it is created" : "Ce lien public expirera au plus tard {days} jours après sa création.",
+    "Password protect" : "Protéger par un mot de passe",
+    "Choose a password for the public link" : "Choisissez un mot de passe pour le lien public",
+    "Allow Public Upload" : "Autoriser l'ajout de fichiers par des utilisateurs non enregistrés",
+    "Email link to person" : "Envoyer le lien par courriel",
+    "Send" : "Envoyer",
+    "Set expiration date" : "Spécifier une date d'expiration",
+    "Expiration date" : "Date d'expiration",
+    "Adding user..." : "Utilisateur en cours d'ajout...",
+    "group" : "groupe",
+    "Resharing is not allowed" : "Le repartage n'est pas autorisé",
+    "Shared in {item} with {user}" : "Partagé dans {item} avec {user}",
+    "Unshare" : "Ne plus partager",
+    "notify by email" : "notifier par courriel",
+    "can share" : "peut partager",
+    "can edit" : "peut modifier",
+    "access control" : "contrôle d'accès",
+    "create" : "créer",
+    "update" : "mettre à jour",
+    "delete" : "supprimer",
+    "Password protected" : "Protégé par mot de passe",
+    "Error unsetting expiration date" : "Erreur lors de la suppression de la date d'expiration",
+    "Error setting expiration date" : "Erreur lors de la spécification de la date d'expiration",
+    "Sending ..." : "Envoi …",
+    "Email sent" : "Courriel envoyé",
+    "Warning" : "Attention",
+    "The object type is not specified." : "Le type d'objet n'est pas spécifié.",
+    "Enter new" : "Saisir un nouveau",
+    "Delete" : "Supprimer",
+    "Add" : "Ajouter",
+    "Edit tags" : "Modifier les marqueurs",
+    "Error loading dialog template: {error}" : "Erreur lors du chargement du modèle de dialogue : {error}",
+    "No tags selected for deletion." : "Aucun marqueur sélectionné pour la suppression.",
+    "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
+    "Please reload the page." : "Veuillez recharger la page.",
+    "The update was unsuccessful." : "La mise à jour a échoué.",
+    "The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé(e) vers ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Impossible de réinitialiser le mot de passe car le jeton n'est pas valable.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez vérifier que votre nom d'utilisateur est correct.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation car il n'y a aucune adresse de courriel pour cet utilisateur. Veuillez contacter votre administrateur.",
+    "%s password reset" : "Réinitialisation de votre mot de passe %s",
+    "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 courriel contenant un lien pour réinitialiser votre mot de passe.",
+    "Username" : "Nom d'utilisateur",
+    "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?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de poursuivre. Voulez-vous vraiment continuer ?",
+    "Yes, I really want to reset my password now" : "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
+    "Reset" : "Réinitialiser",
+    "New password" : "Nouveau mot de passe",
+    "New Password" : "Nouveau mot de passe",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pour obtenir les meilleurs résultats, vous devriez utiliser un serveur GNU/Linux.",
+    "Personal" : "Personnel",
+    "Users" : "Utilisateurs",
+    "Apps" : "Applications",
+    "Admin" : "Administration",
+    "Help" : "Aide",
+    "Error loading tags" : "Erreur de chargement des marqueurs.",
+    "Tag already exists" : "Le marqueur existe déjà.",
+    "Error deleting tag(s)" : "Erreur de suppression de(s) marqueur(s)",
+    "Error tagging" : "Erreur lors de la mise en place du marqueur",
+    "Error untagging" : "Erreur lors de la suppression du marqueur",
+    "Error favoriting" : "Erreur lors de la mise en favori",
+    "Error unfavoriting" : "Erreur lors de la suppression des favoris",
+    "Access forbidden" : "Accès interdit",
+    "File not found" : "Fichier non trouvé",
+    "The specified document has not been found on the server." : "Impossible de trouver le document spécifié sur le serveur.",
+    "You can click here to return to %s." : "Vous pouvez cliquer ici pour retourner à %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Bonjour,\n\nNous vous informons que %s a partagé %s avec vous.\nConsultez-le : %s\n",
+    "The share will expire on %s." : "Le partage expirera le %s.",
+    "Cheers!" : "À bientôt !",
+    "Internal Server Error" : "Erreur interne du serveur",
+    "The server encountered an internal error and was unable to complete your request." : "Le serveur a rencontré une erreur interne et est incapable d'exécuter votre requête.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Veuillez contacter l'administrateur du serveur si cette erreur apparaît plusieurs fois. Veuillez joindre les détails techniques à votre rapport.",
+    "More details can be found in the server log." : "Le fichier journal du serveur peut fournir plus de renseignements.",
+    "Technical details" : "Renseignements techniques",
+    "Remote Address: %s" : "Adresse distante : %s",
+    "Request ID: %s" : "ID de la demande : %s",
+    "Code: %s" : "Code : %s",
+    "Message: %s" : "Message : %s",
+    "File: %s" : "Fichier : %s",
+    "Line: %s" : "Ligne : %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Avertissement de sécurité",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
+    "Create an <strong>admin account</strong>" : "Créer un <strong>compte administrateur</strong>",
+    "Password" : "Mot de passe",
+    "Storage & database" : "Stockage & base de données",
+    "Data folder" : "Répertoire des données",
+    "Configure the database" : "Configurer la base de données",
+    "Only %s is available." : "%s seulement est disponible.",
+    "Database user" : "Utilisateur de 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" : "Tablespace de la base de données",
+    "Database host" : "Hôte de la base de données",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite va être utilisée comme base de données. Pour des installations plus volumineuses, nous vous conseillons de changer ce réglage.",
+    "Finish setup" : "Terminer l'installation",
+    "Finishing …" : "Finalisation …",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Cette application nécessite JavaScript pour fonctionner correctement.  Veuillez <a href=\"http://www.enable-javascript.com/fr/\" target=\"_blank\">activer JavaScript</a> puis charger à nouveau cette page.",
+    "%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",
+    "Server side authentication failed!" : "L'authentification sur le serveur a échoué !",
+    "Please contact your administrator." : "Veuillez contacter votre administrateur.",
+    "Forgot your password? Reset it!" : "Mot de passe oublié ? Réinitialisez-le !",
+    "remember" : "se souvenir de moi",
+    "Log in" : "Connexion",
+    "Alternative Logins" : "Identifiants alternatifs",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Bonjour,<br><br>Nous vous informons que %s a partagé <strong>%s</strong> avec vous.<br><a href=\"%s\">Consultez-le !</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Cette instance de ownCloud est actuellement en mode utilisateur unique.",
+    "This means only administrators can use the instance." : "Cela signifie que seuls les administrateurs peuvent utiliser l'instance.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Veuillez contacter votre administrateur système si ce message persiste ou apparaît de façon inattendue.",
+    "Thank you for your patience." : "Merci de votre patience.",
+    "You are accessing the server from an untrusted domain." : "Vous accédez au serveur à partir d'un domaine non approuvé.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Veuillez contacter votre administrateur. Si vous êtes administrateur de cette instance, configurez le paramètre « trusted_domain » dans le fichier config/config.php. Un exemple de configuration est fourni dans le fichier config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En fonction de votre configuration, en tant qu'administrateur vous pouvez également utiliser le bouton ci-dessous pour approuver ce domaine.",
+    "Add \"%s\" as trusted domain" : "Ajouter \"%s\" à la liste des domaines approuvés",
+    "%s will be updated to version %s." : "%s sera mis à jour vers la version %s.",
+    "The following apps will be disabled:" : "Les applications suivantes seront désactivées :",
+    "The theme %s has been disabled." : "Le thème %s a été désactivé.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Veuillez vous assurer qu'une copie de sauvegarde de la base de données, du dossier de configuration (config) et du dossier de données (data) a été réalisée avant de commencer.",
+    "Start update" : "Démarrer la mise à jour",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Afin d'éviter les dépassements de délai (timeouts) avec les installations de plus grande ampleur, vous pouvez exécuter la commande suivante depuis le répertoire d'installation :",
+    "This %s instance is currently being updated, which may take a while." : "Cette instance de %s est en cours de mise à jour, cela peut prendre du temps.",
+    "This page will refresh itself when the %s instance is available again." : "Cette page se rafraîchira d'elle-même lorsque l'instance %s sera à nouveau disponible."
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
deleted file mode 100644
index ea6736a1648..00000000000
--- a/core/l10n/fr.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
-"Turned on maintenance mode" => "Mode de maintenance activé",
-"Turned off maintenance mode" => "Mode de maintenance désactivé",
-"Updated database" => "Base de données mise à jour",
-"Checked database schema update" => "Mise à jour du schéma de la base de données vérifiée",
-"Checked database schema update for apps" => "La mise à jour du schéma de la base de données pour les applications a été vérifiée",
-"Updated \"%s\" to %s" => "Mise à jour de « %s » vers %s",
-"Disabled incompatible apps: %s" => "Applications incompatibles désactivées : %s",
-"No image or file provided" => "Aucun fichier fourni",
-"Unknown filetype" => "Type de fichier inconnu",
-"Invalid image" => "Image non valable",
-"No temporary profile picture available, try again" => "Aucune image temporaire disponible pour le profil. Essayez à nouveau.",
-"No crop data provided" => "Aucune donnée de recadrage fournie",
-"Sunday" => "Dimanche",
-"Monday" => "Lundi",
-"Tuesday" => "Mardi",
-"Wednesday" => "Mercredi",
-"Thursday" => "Jeudi",
-"Friday" => "Vendredi",
-"Saturday" => "Samedi",
-"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",
-"Settings" => "Paramètres",
-"File" => "Fichier",
-"Folder" => "Dossier",
-"Image" => "Image",
-"Audio" => "Audio",
-"Saving..." => "Enregistrement…",
-"Couldn't send reset email. Please contact your administrator." => "Impossible d'envoyer le courriel de réinitialisation. Veuillez contacter votre administrateur.",
-"The link to reset your password has been sent to your email. 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." => "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
-"I know what I'm doing" => "Je sais ce que je fais",
-"Reset password" => "Réinitialiser le mot de passe",
-"Password can not be changed. Please contact your administrator." => "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
-"No" => "Non",
-"Yes" => "Oui",
-"Choose" => "Choisir",
-"Error loading file picker template: {error}" => "Erreur lors du chargement du modèle du sélecteur de fichiers : {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Erreur de chargement du modèle de message : {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} fichier en conflit","{count} fichiers en conflit"),
-"One file conflict" => "Un conflit de fichier",
-"New Files" => "Nouveaux fichiers",
-"Already existing files" => "Fichiers déjà existants",
-"Which files do you want to keep?" => "Quels fichiers désirez-vous garder ?",
-"If you select both versions, the copied file will have a number added to its name." => "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié.",
-"Cancel" => "Annuler",
-"Continue" => "Continuer",
-"(all selected)" => "(tous sélectionnés)",
-"({count} selected)" => "({count} sélectionné(s))",
-"Error loading file exists template" => "Erreur de chargement du modèle de fichier existant",
-"Very weak password" => "Mot de passe très faible",
-"Weak password" => "Mot de passe faible",
-"So-so password" => "Mot de passe tout juste acceptable",
-"Good password" => "Mot de passe de sécurité suffisante",
-"Strong password" => "Mot de passe fort",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav semble ne pas fonctionner.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par courriel ne fonctionneront pas non plus. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
-"Error occurred while checking server setup" => "Une erreur s'est produite lors de la vérification de la configuration du serveur",
-"Shared" => "Partagé",
-"Shared with {recipients}" => "Partagé avec {recipients}",
-"Share" => "Partager",
-"Error" => "Erreur",
-"Error while sharing" => "Erreur lors de la mise en partage",
-"Error while unsharing" => "Erreur lors de l'annulation du partage",
-"Error while changing permissions" => "Erreur lors du changement des permissions",
-"Shared with you and the group {group} by {owner}" => "Partagé avec vous et le groupe {group} par {owner}",
-"Shared with you by {owner}" => "Partagé avec vous par {owner}",
-"Share with user or group …" => "Partager avec un utilisateur ou un groupe...",
-"Share link" => "Partager par lien public",
-"The public link will expire no later than {days} days after it is created" => "Ce lien public expirera au plus tard {days} jours après sa création.",
-"Password protect" => "Protéger par un mot de passe",
-"Choose a password for the public link" => "Choisissez un mot de passe pour le lien public",
-"Allow Public Upload" => "Autoriser l'ajout de fichiers par des utilisateurs non enregistrés",
-"Email link to person" => "Envoyer le lien par courriel",
-"Send" => "Envoyer",
-"Set expiration date" => "Spécifier une date d'expiration",
-"Expiration date" => "Date d'expiration",
-"Adding user..." => "Utilisateur en cours d'ajout...",
-"group" => "groupe",
-"Resharing is not allowed" => "Le repartage n'est pas autorisé",
-"Shared in {item} with {user}" => "Partagé dans {item} avec {user}",
-"Unshare" => "Ne plus partager",
-"notify by email" => "notifier par courriel",
-"can share" => "peut partager",
-"can edit" => "peut modifier",
-"access control" => "contrôle d'accès",
-"create" => "créer",
-"update" => "mettre à jour",
-"delete" => "supprimer",
-"Password protected" => "Protégé par mot de passe",
-"Error unsetting expiration date" => "Erreur lors de la suppression de la date d'expiration",
-"Error setting expiration date" => "Erreur lors de la spécification de la date d'expiration",
-"Sending ..." => "Envoi …",
-"Email sent" => "Courriel envoyé",
-"Warning" => "Attention",
-"The object type is not specified." => "Le type d'objet n'est pas spécifié.",
-"Enter new" => "Saisir un nouveau",
-"Delete" => "Supprimer",
-"Add" => "Ajouter",
-"Edit tags" => "Modifier les marqueurs",
-"Error loading dialog template: {error}" => "Erreur lors du chargement du modèle de dialogue : {error}",
-"No tags selected for deletion." => "Aucun marqueur sélectionné pour la suppression.",
-"Updating {productName} to version {version}, this may take a while." => "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
-"Please reload the page." => "Veuillez recharger la page.",
-"The update was unsuccessful." => "La mise à jour a échoué.",
-"The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes maintenant redirigé(e) vers ownCloud.",
-"Couldn't reset password because the token is invalid" => "Impossible de réinitialiser le mot de passe car le jeton n'est pas valable.",
-"Couldn't send reset email. Please make sure your username is correct." => "Impossible d'envoyer le courriel de réinitialisation. Veuillez vérifier que votre nom d'utilisateur est correct.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Impossible d'envoyer le courriel de réinitialisation car il n'y a aucune adresse de courriel pour cet utilisateur. Veuillez contacter votre administrateur.",
-"%s password reset" => "Réinitialisation de votre mot de passe %s",
-"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 courriel contenant un lien pour réinitialiser votre mot de passe.",
-"Username" => "Nom d'utilisateur",
-"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?" => "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de poursuivre. Voulez-vous vraiment continuer ?",
-"Yes, I really want to reset my password now" => "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
-"Reset" => "Réinitialiser",
-"New password" => "Nouveau mot de passe",
-"New Password" => "Nouveau mot de passe",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !",
-"For the best results, please consider using a GNU/Linux server instead." => "Pour obtenir les meilleurs résultats, vous devriez utiliser un serveur GNU/Linux.",
-"Personal" => "Personnel",
-"Users" => "Utilisateurs",
-"Apps" => "Applications",
-"Admin" => "Administration",
-"Help" => "Aide",
-"Error loading tags" => "Erreur de chargement des marqueurs.",
-"Tag already exists" => "Le marqueur existe déjà.",
-"Error deleting tag(s)" => "Erreur de suppression de(s) marqueur(s)",
-"Error tagging" => "Erreur lors de la mise en place du marqueur",
-"Error untagging" => "Erreur lors de la suppression du marqueur",
-"Error favoriting" => "Erreur lors de la mise en favori",
-"Error unfavoriting" => "Erreur lors de la suppression des favoris",
-"Access forbidden" => "Accès interdit",
-"File not found" => "Fichier non trouvé",
-"The specified document has not been found on the server." => "Impossible de trouver le document spécifié sur le serveur.",
-"You can click here to return to %s." => "Vous pouvez cliquer ici pour retourner à %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Bonjour,\n\nNous vous informons que %s a partagé %s avec vous.\nConsultez-le : %s\n",
-"The share will expire on %s." => "Le partage expirera le %s.",
-"Cheers!" => "À bientôt !",
-"Internal Server Error" => "Erreur interne du serveur",
-"The server encountered an internal error and was unable to complete your request." => "Le serveur a rencontré une erreur interne et est incapable d'exécuter votre requête.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Veuillez contacter l'administrateur du serveur si cette erreur apparaît plusieurs fois. Veuillez joindre les détails techniques à votre rapport.",
-"More details can be found in the server log." => "Le fichier journal du serveur peut fournir plus de renseignements.",
-"Technical details" => "Renseignements techniques",
-"Remote Address: %s" => "Adresse distante : %s",
-"Request ID: %s" => "ID de la demande : %s",
-"Code: %s" => "Code : %s",
-"Message: %s" => "Message : %s",
-"File: %s" => "Fichier : %s",
-"Line: %s" => "Ligne : %s",
-"Trace" => "Trace",
-"Security Warning" => "Avertissement de sécurité",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
-"Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
-"Password" => "Mot de passe",
-"Storage & database" => "Stockage & base de données",
-"Data folder" => "Répertoire des données",
-"Configure the database" => "Configurer la base de données",
-"Only %s is available." => "%s seulement est disponible.",
-"Database user" => "Utilisateur de 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" => "Tablespace de la base de données",
-"Database host" => "Hôte de la base de données",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite va être utilisée comme base de données. Pour des installations plus volumineuses, nous vous conseillons de changer ce réglage.",
-"Finish setup" => "Terminer l'installation",
-"Finishing …" => "Finalisation …",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Cette application nécessite JavaScript pour fonctionner correctement.  Veuillez <a href=\"http://www.enable-javascript.com/fr/\" target=\"_blank\">activer JavaScript</a> puis charger à nouveau cette page.",
-"%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",
-"Server side authentication failed!" => "L'authentification sur le serveur a échoué !",
-"Please contact your administrator." => "Veuillez contacter votre administrateur.",
-"Forgot your password? Reset it!" => "Mot de passe oublié ? Réinitialisez-le !",
-"remember" => "se souvenir de moi",
-"Log in" => "Connexion",
-"Alternative Logins" => "Identifiants alternatifs",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Bonjour,<br><br>Nous vous informons que %s a partagé <strong>%s</strong> avec vous.<br><a href=\"%s\">Consultez-le !</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Cette instance de ownCloud est actuellement en mode utilisateur unique.",
-"This means only administrators can use the instance." => "Cela signifie que seuls les administrateurs peuvent utiliser l'instance.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Veuillez contacter votre administrateur système si ce message persiste ou apparaît de façon inattendue.",
-"Thank you for your patience." => "Merci de votre patience.",
-"You are accessing the server from an untrusted domain." => "Vous accédez au serveur à partir d'un domaine non approuvé.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Veuillez contacter votre administrateur. Si vous êtes administrateur de cette instance, configurez le paramètre « trusted_domain » dans le fichier config/config.php. Un exemple de configuration est fourni dans le fichier config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "En fonction de votre configuration, en tant qu'administrateur vous pouvez également utiliser le bouton ci-dessous pour approuver ce domaine.",
-"Add \"%s\" as trusted domain" => "Ajouter \"%s\" à la liste des domaines approuvés",
-"%s will be updated to version %s." => "%s sera mis à jour vers la version %s.",
-"The following apps will be disabled:" => "Les applications suivantes seront désactivées :",
-"The theme %s has been disabled." => "Le thème %s a été désactivé.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Veuillez vous assurer qu'une copie de sauvegarde de la base de données, du dossier de configuration (config) et du dossier de données (data) a été réalisée avant de commencer.",
-"Start update" => "Démarrer la mise à jour",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Afin d'éviter les dépassements de délai (timeouts) avec les installations de plus grande ampleur, vous pouvez exécuter la commande suivante depuis le répertoire d'installation :",
-"This %s instance is currently being updated, which may take a while." => "Cette instance de %s est en cours de mise à jour, cela peut prendre du temps.",
-"This page will refresh itself when the %s instance is available again." => "Cette page se rafraîchira d'elle-même lorsque l'instance %s sera à nouveau disponible."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/fr_CA.js b/core/l10n/fr_CA.js
new file mode 100644
index 00000000000..bc4e6c6bc64
--- /dev/null
+++ b/core/l10n/fr_CA.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/fr_CA.json b/core/l10n/fr_CA.json
new file mode 100644
index 00000000000..4ebc0d2d45d
--- /dev/null
+++ b/core/l10n/fr_CA.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/fr_CA.php b/core/l10n/fr_CA.php
deleted file mode 100644
index e012fb1656e..00000000000
--- a/core/l10n/fr_CA.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/fy_NL.js b/core/l10n/fy_NL.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/fy_NL.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/fy_NL.json b/core/l10n/fy_NL.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/fy_NL.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/fy_NL.php b/core/l10n/fy_NL.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/fy_NL.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
new file mode 100644
index 00000000000..21092fce15b
--- /dev/null
+++ b/core/l10n/gl.js
@@ -0,0 +1,188 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Non é posíbel enviar correo aos usuarios seguintes: %s",
+    "Turned on maintenance mode" : "Modo de mantemento activado",
+    "Turned off maintenance mode" : "Modo de mantemento desactivado",
+    "Updated database" : "Base de datos actualizada",
+    "Checked database schema update" : "Comprobada a actualización do esquema da base de datos",
+    "Disabled incompatible apps: %s" : "Aplicacións incompatíbeis desactivadas: %s",
+    "No image or file provided" : "Non forneceu ningunha imaxe ou ficheiro",
+    "Unknown filetype" : "Tipo de ficheiro descoñecido",
+    "Invalid image" : "Imaxe incorrecta",
+    "No temporary profile picture available, try again" : "Non hai unha imaxe temporal de perfil dispoñíbel, volva tentalo",
+    "No crop data provided" : "Non indicou como recortar",
+    "Sunday" : "domingo",
+    "Monday" : "luns",
+    "Tuesday" : "martes",
+    "Wednesday" : "mércores",
+    "Thursday" : "xoves",
+    "Friday" : "venres",
+    "Saturday" : "sábado",
+    "January" : "xaneiro",
+    "February" : "febreiro",
+    "March" : "marzo",
+    "April" : "abril",
+    "May" : "maio",
+    "June" : "xuño",
+    "July" : "xullo",
+    "August" : "agosto",
+    "September" : "setembro",
+    "October" : "outubro",
+    "November" : "novembro",
+    "December" : "decembro",
+    "Settings" : "Axustes",
+    "File" : "Ficheiro",
+    "Folder" : "Cartafol",
+    "Image" : "Imaxe",
+    "Audio" : "Son",
+    "Saving..." : "Gardando...",
+    "Couldn't send reset email. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. Póñase en contacto co administrador.",
+    "The link to reset your password has been sent to your email. 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." : "A ligazón para restabelecer o seu contrasinal foi enviada ao seu correo. Se non a recibe nun prazo razoábel de tempo, vexa o seu cartafol de correo lixo. <br> Se non está ali pregúntelle ao administrador local.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros están cifrados. Se non activou a chave de recuperación, non haberá maneira de recuperar os datos após o restabelecemento do contrasinal. <br />Se non está seguro de que facer, póñase en contacto co administrador antes de continuar. <br /> Confirma que quere?",
+    "I know what I'm doing" : "Sei o estou a facer",
+    "Reset password" : "Restabelecer o contrasinal",
+    "Password can not be changed. Please contact your administrator." : "Non é posíbel cambiar o contrasinal. Póñase en contacto co administrador.",
+    "No" : "Non",
+    "Yes" : "Si",
+    "Choose" : "Escoller",
+    "Error loading file picker template: {error}" : "Produciuse un erro ao cargar o modelo do selector: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Produciuse un erro ao cargar o modelo da mensaxe: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflito de ficheiro","{count} conflitos de ficheiros"],
+    "One file conflict" : "Un conflito de ficheiro",
+    "New Files" : "Ficheiros novos",
+    "Already existing files" : "Ficheiros xa existentes",
+    "Which files do you want to keep?" : "Que ficheiros quere conservar?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todo o seleccionado)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Produciuse un erro ao cargar o modelo de ficheiro existente",
+    "Very weak password" : "Contrasinal moi feble",
+    "Weak password" : "Contrasinal feble",
+    "So-so password" : "Contrasinal non moi aló",
+    "Good password" : "Bo contrasinal",
+    "Strong password" : "Contrasinal forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "O seu servidor web aínda non está configurado axeidamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Este servidor non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicacións de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades.",
+    "Shared" : "Compartido",
+    "Shared with {recipients}" : "Compartido con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Erro",
+    "Error while sharing" : "Produciuse un erro ao compartir",
+    "Error while unsharing" : "Produciuse un erro ao deixar de compartir",
+    "Error while changing permissions" : "Produciuse un erro ao cambiar os permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartido con vostede e co grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido con vostede por {owner}",
+    "Share with user or group …" : "Compartir cun usuario ou grupo ...",
+    "Share link" : "Ligazón para compartir",
+    "The public link will expire no later than {days} days after it is created" : "A ligazón pública caducará, a máis tardar, {days} días após a súa creación",
+    "Password protect" : "Protexido con contrasinal",
+    "Choose a password for the public link" : "Escolla un contrasinal para a ligazón pública",
+    "Allow Public Upload" : "Permitir o envío público",
+    "Email link to person" : "Enviar ligazón por correo",
+    "Send" : "Enviar",
+    "Set expiration date" : "Definir a data de caducidade",
+    "Expiration date" : "Data de caducidade",
+    "group" : "grupo",
+    "Resharing is not allowed" : "Non se permite volver compartir",
+    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
+    "Unshare" : "Deixar de compartir",
+    "notify by email" : "notificar por correo",
+    "can share" : "pode compartir",
+    "can edit" : "pode editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "delete" : "eliminar",
+    "Password protected" : "Protexido con contrasinal",
+    "Error unsetting expiration date" : "Produciuse un erro ao retirar a data de caducidade",
+    "Error setting expiration date" : "Produciuse un erro ao definir a data de caducidade",
+    "Sending ..." : "Enviando...",
+    "Email sent" : "Correo enviado",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "Non se especificou o tipo de obxecto.",
+    "Enter new" : "Introduza o novo",
+    "Delete" : "Eliminar",
+    "Add" : "Engadir",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Produciuse un erro ao cargar o modelo do dialogo: {error}",
+    "No tags selected for deletion." : "Non se seleccionaron etiquetas para borrado.",
+    "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
+    "Please reload the page." : "Volva cargar a páxina.",
+    "The update was unsuccessful." : "A actualización foi satisfactoria.",
+    "The update was successful. Redirecting you to ownCloud now." : "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
+    "Couldn't reset password because the token is invalid" : "No, foi posíbel restabelecer o contrasinal, a marca non é correcta",
+    "Couldn't send reset email. Please make sure your username is correct." : "Non foi posíbel enviar o coreo do restablecemento. Asegúrese de que o nome de usuario é o correcto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. Semella que este correo non corresponde con este nome de usuario. Póñase en contacto co administrador.",
+    "%s password reset" : "Restabelecer o contrasinal %s",
+    "Use the following link to reset your password: {link}" : "Usa a seguinte ligazón para restabelecer o contrasinal: {link}",
+    "You will receive a link to reset your password via Email." : "Recibirá unha ligazón por correo para restabelecer o contrasinal",
+    "Username" : "Nome 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?" : "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
+    "Yes, I really want to reset my password now" : "Si, confirmo que quero restabelecer agora o meu contrasinal",
+    "Reset" : "Restabelecer",
+    "New password" : "Novo contrasinal",
+    "New Password" : "Novo contrasinal",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.",
+    "Personal" : "Persoal",
+    "Users" : "Usuarios",
+    "Apps" : "Aplicacións",
+    "Admin" : "Administración",
+    "Help" : "Axuda",
+    "Error loading tags" : "Produciuse un erro ao cargar as etiquetas",
+    "Tag already exists" : "Xa existe a etiqueta",
+    "Error deleting tag(s)" : "Produciuse un erro ao eliminar a(s) etiqueta(s)",
+    "Error tagging" : "Produciuse un erro ao etiquetar",
+    "Error untagging" : "Produciuse un erro ao eliminar a etiqueta",
+    "Error favoriting" : "Produciuse un erro ao marcar como favorito",
+    "Error unfavoriting" : "Produciuse un erro ao desmarcar como favorito",
+    "Access forbidden" : "Acceso denegado",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\n",
+    "The share will expire on %s." : "Esta compartición caduca o %s.",
+    "Cheers!" : "Saúdos!",
+    "Security Warning" : "Aviso de seguranza",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Actualice a instalación de PHP para empregar %s de xeito seguro.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crear unha <strong>contra de administrador</strong>",
+    "Password" : "Contrasinal",
+    "Storage & database" : "Almacenamento e base de datos",
+    "Data folder" : "Cartafol de datos",
+    "Configure the database" : "Configurar a base de datos",
+    "Only %s is available." : "Só está dispoñíbel %s.",
+    "Database user" : "Usuario da base de datos",
+    "Database password" : "Contrasinal da base de datos",
+    "Database name" : "Nome da base de datos",
+    "Database tablespace" : "Táboa de espazos da base de datos",
+    "Database host" : "Servidor da base de datos",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto.",
+    "Finish setup" : "Rematar a configuración",
+    "Finishing …" : "Rematando ...",
+    "%s is available. Get more information on how to update." : "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
+    "Log out" : "Desconectar",
+    "Server side authentication failed!" : "A autenticación fracasou do lado do servidor!",
+    "Please contact your administrator." : "Contacte co administrador.",
+    "Forgot your password? Reset it!" : "Esqueceu o contrasinal? Restabelézao!",
+    "remember" : "lembrar",
+    "Log in" : "Conectar",
+    "Alternative Logins" : "Accesos alternativos",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ola,<br><br>só facerlle saber que %s compartiu <strong>%s</strong> con vostede.<br><a href=\"%s\">Véxao!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Esta instancia do ownCloud está actualmente en modo de usuario único.",
+    "This means only administrators can use the instance." : "Isto significa que só os administradores poden utilizar a instancia.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Póñase en contacto co administrador do sistema se persiste esta mensaxe ou se aparece de forma inesperada.",
+    "Thank you for your patience." : "Grazas pola súa paciencia.",
+    "You are accessing the server from an untrusted domain." : "Esta accedendo desde un dominio non fiábel.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.",
+    "%s will be updated to version %s." : "%s actualizarase á versión %s.",
+    "The following apps will be disabled:" : "Van desactivarse as seguintes aplicacións:",
+    "The theme %s has been disabled." : "O tema %s foi desactivado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Asegúrese de ter feito unha copia de seguranza da base de datos, do cartafol de configuración e do cartafol de datos, antes de proceder.",
+    "Start update" : "Iniciar a actualización",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera nas instalacións grandes, no seu lugar pode executar a seguinte orde desde o directorio de instalación:"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
new file mode 100644
index 00000000000..5817851838c
--- /dev/null
+++ b/core/l10n/gl.json
@@ -0,0 +1,186 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Non é posíbel enviar correo aos usuarios seguintes: %s",
+    "Turned on maintenance mode" : "Modo de mantemento activado",
+    "Turned off maintenance mode" : "Modo de mantemento desactivado",
+    "Updated database" : "Base de datos actualizada",
+    "Checked database schema update" : "Comprobada a actualización do esquema da base de datos",
+    "Disabled incompatible apps: %s" : "Aplicacións incompatíbeis desactivadas: %s",
+    "No image or file provided" : "Non forneceu ningunha imaxe ou ficheiro",
+    "Unknown filetype" : "Tipo de ficheiro descoñecido",
+    "Invalid image" : "Imaxe incorrecta",
+    "No temporary profile picture available, try again" : "Non hai unha imaxe temporal de perfil dispoñíbel, volva tentalo",
+    "No crop data provided" : "Non indicou como recortar",
+    "Sunday" : "domingo",
+    "Monday" : "luns",
+    "Tuesday" : "martes",
+    "Wednesday" : "mércores",
+    "Thursday" : "xoves",
+    "Friday" : "venres",
+    "Saturday" : "sábado",
+    "January" : "xaneiro",
+    "February" : "febreiro",
+    "March" : "marzo",
+    "April" : "abril",
+    "May" : "maio",
+    "June" : "xuño",
+    "July" : "xullo",
+    "August" : "agosto",
+    "September" : "setembro",
+    "October" : "outubro",
+    "November" : "novembro",
+    "December" : "decembro",
+    "Settings" : "Axustes",
+    "File" : "Ficheiro",
+    "Folder" : "Cartafol",
+    "Image" : "Imaxe",
+    "Audio" : "Son",
+    "Saving..." : "Gardando...",
+    "Couldn't send reset email. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. Póñase en contacto co administrador.",
+    "The link to reset your password has been sent to your email. 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." : "A ligazón para restabelecer o seu contrasinal foi enviada ao seu correo. Se non a recibe nun prazo razoábel de tempo, vexa o seu cartafol de correo lixo. <br> Se non está ali pregúntelle ao administrador local.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros están cifrados. Se non activou a chave de recuperación, non haberá maneira de recuperar os datos após o restabelecemento do contrasinal. <br />Se non está seguro de que facer, póñase en contacto co administrador antes de continuar. <br /> Confirma que quere?",
+    "I know what I'm doing" : "Sei o estou a facer",
+    "Reset password" : "Restabelecer o contrasinal",
+    "Password can not be changed. Please contact your administrator." : "Non é posíbel cambiar o contrasinal. Póñase en contacto co administrador.",
+    "No" : "Non",
+    "Yes" : "Si",
+    "Choose" : "Escoller",
+    "Error loading file picker template: {error}" : "Produciuse un erro ao cargar o modelo do selector: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Produciuse un erro ao cargar o modelo da mensaxe: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflito de ficheiro","{count} conflitos de ficheiros"],
+    "One file conflict" : "Un conflito de ficheiro",
+    "New Files" : "Ficheiros novos",
+    "Already existing files" : "Ficheiros xa existentes",
+    "Which files do you want to keep?" : "Que ficheiros quere conservar?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todo o seleccionado)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Produciuse un erro ao cargar o modelo de ficheiro existente",
+    "Very weak password" : "Contrasinal moi feble",
+    "Weak password" : "Contrasinal feble",
+    "So-so password" : "Contrasinal non moi aló",
+    "Good password" : "Bo contrasinal",
+    "Strong password" : "Contrasinal forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "O seu servidor web aínda non está configurado axeidamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Este servidor non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicacións de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades.",
+    "Shared" : "Compartido",
+    "Shared with {recipients}" : "Compartido con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Erro",
+    "Error while sharing" : "Produciuse un erro ao compartir",
+    "Error while unsharing" : "Produciuse un erro ao deixar de compartir",
+    "Error while changing permissions" : "Produciuse un erro ao cambiar os permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartido con vostede e co grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido con vostede por {owner}",
+    "Share with user or group …" : "Compartir cun usuario ou grupo ...",
+    "Share link" : "Ligazón para compartir",
+    "The public link will expire no later than {days} days after it is created" : "A ligazón pública caducará, a máis tardar, {days} días após a súa creación",
+    "Password protect" : "Protexido con contrasinal",
+    "Choose a password for the public link" : "Escolla un contrasinal para a ligazón pública",
+    "Allow Public Upload" : "Permitir o envío público",
+    "Email link to person" : "Enviar ligazón por correo",
+    "Send" : "Enviar",
+    "Set expiration date" : "Definir a data de caducidade",
+    "Expiration date" : "Data de caducidade",
+    "group" : "grupo",
+    "Resharing is not allowed" : "Non se permite volver compartir",
+    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
+    "Unshare" : "Deixar de compartir",
+    "notify by email" : "notificar por correo",
+    "can share" : "pode compartir",
+    "can edit" : "pode editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "delete" : "eliminar",
+    "Password protected" : "Protexido con contrasinal",
+    "Error unsetting expiration date" : "Produciuse un erro ao retirar a data de caducidade",
+    "Error setting expiration date" : "Produciuse un erro ao definir a data de caducidade",
+    "Sending ..." : "Enviando...",
+    "Email sent" : "Correo enviado",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "Non se especificou o tipo de obxecto.",
+    "Enter new" : "Introduza o novo",
+    "Delete" : "Eliminar",
+    "Add" : "Engadir",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Produciuse un erro ao cargar o modelo do dialogo: {error}",
+    "No tags selected for deletion." : "Non se seleccionaron etiquetas para borrado.",
+    "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
+    "Please reload the page." : "Volva cargar a páxina.",
+    "The update was unsuccessful." : "A actualización foi satisfactoria.",
+    "The update was successful. Redirecting you to ownCloud now." : "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
+    "Couldn't reset password because the token is invalid" : "No, foi posíbel restabelecer o contrasinal, a marca non é correcta",
+    "Couldn't send reset email. Please make sure your username is correct." : "Non foi posíbel enviar o coreo do restablecemento. Asegúrese de que o nome de usuario é o correcto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. Semella que este correo non corresponde con este nome de usuario. Póñase en contacto co administrador.",
+    "%s password reset" : "Restabelecer o contrasinal %s",
+    "Use the following link to reset your password: {link}" : "Usa a seguinte ligazón para restabelecer o contrasinal: {link}",
+    "You will receive a link to reset your password via Email." : "Recibirá unha ligazón por correo para restabelecer o contrasinal",
+    "Username" : "Nome 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?" : "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
+    "Yes, I really want to reset my password now" : "Si, confirmo que quero restabelecer agora o meu contrasinal",
+    "Reset" : "Restabelecer",
+    "New password" : "Novo contrasinal",
+    "New Password" : "Novo contrasinal",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.",
+    "Personal" : "Persoal",
+    "Users" : "Usuarios",
+    "Apps" : "Aplicacións",
+    "Admin" : "Administración",
+    "Help" : "Axuda",
+    "Error loading tags" : "Produciuse un erro ao cargar as etiquetas",
+    "Tag already exists" : "Xa existe a etiqueta",
+    "Error deleting tag(s)" : "Produciuse un erro ao eliminar a(s) etiqueta(s)",
+    "Error tagging" : "Produciuse un erro ao etiquetar",
+    "Error untagging" : "Produciuse un erro ao eliminar a etiqueta",
+    "Error favoriting" : "Produciuse un erro ao marcar como favorito",
+    "Error unfavoriting" : "Produciuse un erro ao desmarcar como favorito",
+    "Access forbidden" : "Acceso denegado",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\n",
+    "The share will expire on %s." : "Esta compartición caduca o %s.",
+    "Cheers!" : "Saúdos!",
+    "Security Warning" : "Aviso de seguranza",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Actualice a instalación de PHP para empregar %s de xeito seguro.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crear unha <strong>contra de administrador</strong>",
+    "Password" : "Contrasinal",
+    "Storage & database" : "Almacenamento e base de datos",
+    "Data folder" : "Cartafol de datos",
+    "Configure the database" : "Configurar a base de datos",
+    "Only %s is available." : "Só está dispoñíbel %s.",
+    "Database user" : "Usuario da base de datos",
+    "Database password" : "Contrasinal da base de datos",
+    "Database name" : "Nome da base de datos",
+    "Database tablespace" : "Táboa de espazos da base de datos",
+    "Database host" : "Servidor da base de datos",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto.",
+    "Finish setup" : "Rematar a configuración",
+    "Finishing …" : "Rematando ...",
+    "%s is available. Get more information on how to update." : "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
+    "Log out" : "Desconectar",
+    "Server side authentication failed!" : "A autenticación fracasou do lado do servidor!",
+    "Please contact your administrator." : "Contacte co administrador.",
+    "Forgot your password? Reset it!" : "Esqueceu o contrasinal? Restabelézao!",
+    "remember" : "lembrar",
+    "Log in" : "Conectar",
+    "Alternative Logins" : "Accesos alternativos",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ola,<br><br>só facerlle saber que %s compartiu <strong>%s</strong> con vostede.<br><a href=\"%s\">Véxao!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Esta instancia do ownCloud está actualmente en modo de usuario único.",
+    "This means only administrators can use the instance." : "Isto significa que só os administradores poden utilizar a instancia.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Póñase en contacto co administrador do sistema se persiste esta mensaxe ou se aparece de forma inesperada.",
+    "Thank you for your patience." : "Grazas pola súa paciencia.",
+    "You are accessing the server from an untrusted domain." : "Esta accedendo desde un dominio non fiábel.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.",
+    "%s will be updated to version %s." : "%s actualizarase á versión %s.",
+    "The following apps will be disabled:" : "Van desactivarse as seguintes aplicacións:",
+    "The theme %s has been disabled." : "O tema %s foi desactivado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Asegúrese de ter feito unha copia de seguranza da base de datos, do cartafol de configuración e do cartafol de datos, antes de proceder.",
+    "Start update" : "Iniciar a actualización",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera nas instalacións grandes, no seu lugar pode executar a seguinte orde desde o directorio de instalación:"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
deleted file mode 100644
index 9f9b3a8e34c..00000000000
--- a/core/l10n/gl.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Non é posíbel enviar correo aos usuarios seguintes: %s",
-"Turned on maintenance mode" => "Modo de mantemento activado",
-"Turned off maintenance mode" => "Modo de mantemento desactivado",
-"Updated database" => "Base de datos actualizada",
-"Checked database schema update" => "Comprobada a actualización do esquema da base de datos",
-"Disabled incompatible apps: %s" => "Aplicacións incompatíbeis desactivadas: %s",
-"No image or file provided" => "Non forneceu ningunha imaxe ou ficheiro",
-"Unknown filetype" => "Tipo de ficheiro descoñecido",
-"Invalid image" => "Imaxe incorrecta",
-"No temporary profile picture available, try again" => "Non hai unha imaxe temporal de perfil dispoñíbel, volva tentalo",
-"No crop data provided" => "Non indicou como recortar",
-"Sunday" => "domingo",
-"Monday" => "luns",
-"Tuesday" => "martes",
-"Wednesday" => "mércores",
-"Thursday" => "xoves",
-"Friday" => "venres",
-"Saturday" => "sábado",
-"January" => "xaneiro",
-"February" => "febreiro",
-"March" => "marzo",
-"April" => "abril",
-"May" => "maio",
-"June" => "xuño",
-"July" => "xullo",
-"August" => "agosto",
-"September" => "setembro",
-"October" => "outubro",
-"November" => "novembro",
-"December" => "decembro",
-"Settings" => "Axustes",
-"File" => "Ficheiro",
-"Folder" => "Cartafol",
-"Image" => "Imaxe",
-"Audio" => "Son",
-"Saving..." => "Gardando...",
-"Couldn't send reset email. Please contact your administrator." => "Non foi posíbel enviar o coreo do restablecemento. Póñase en contacto co administrador.",
-"The link to reset your password has been sent to your email. 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." => "A ligazón para restabelecer o seu contrasinal foi enviada ao seu correo. Se non a recibe nun prazo razoábel de tempo, vexa o seu cartafol de correo lixo. <br> Se non está ali pregúntelle ao administrador local.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Os seus ficheiros están cifrados. Se non activou a chave de recuperación, non haberá maneira de recuperar os datos após o restabelecemento do contrasinal. <br />Se non está seguro de que facer, póñase en contacto co administrador antes de continuar. <br /> Confirma que quere?",
-"I know what I'm doing" => "Sei o estou a facer",
-"Reset password" => "Restabelecer o contrasinal",
-"Password can not be changed. Please contact your administrator." => "Non é posíbel cambiar o contrasinal. Póñase en contacto co administrador.",
-"No" => "Non",
-"Yes" => "Si",
-"Choose" => "Escoller",
-"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}",
-"Ok" => "Aceptar",
-"Error loading message template: {error}" => "Produciuse un erro ao cargar o modelo da mensaxe: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de ficheiro","{count} conflitos de ficheiros"),
-"One file conflict" => "Un conflito de ficheiro",
-"New Files" => "Ficheiros novos",
-"Already existing files" => "Ficheiros xa existentes",
-"Which files do you want to keep?" => "Que ficheiros quere conservar?",
-"If you select both versions, the copied file will have a number added to its name." => "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome.",
-"Cancel" => "Cancelar",
-"Continue" => "Continuar",
-"(all selected)" => "(todo o seleccionado)",
-"({count} selected)" => "({count} seleccionados)",
-"Error loading file exists template" => "Produciuse un erro ao cargar o modelo de ficheiro existente",
-"Very weak password" => "Contrasinal moi feble",
-"Weak password" => "Contrasinal feble",
-"So-so password" => "Contrasinal non moi aló",
-"Good password" => "Bo contrasinal",
-"Strong password" => "Contrasinal forte",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web aínda non está configurado axeidamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicacións de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades.",
-"Shared" => "Compartido",
-"Shared with {recipients}" => "Compartido con {recipients}",
-"Share" => "Compartir",
-"Error" => "Erro",
-"Error while sharing" => "Produciuse un erro ao compartir",
-"Error while unsharing" => "Produciuse un erro ao deixar de compartir",
-"Error while changing permissions" => "Produciuse un erro ao cambiar os permisos",
-"Shared with you and the group {group} by {owner}" => "Compartido con vostede e co grupo {group} por {owner}",
-"Shared with you by {owner}" => "Compartido con vostede por {owner}",
-"Share with user or group …" => "Compartir cun usuario ou grupo ...",
-"Share link" => "Ligazón para compartir",
-"The public link will expire no later than {days} days after it is created" => "A ligazón pública caducará, a máis tardar, {days} días após a súa creación",
-"Password protect" => "Protexido con contrasinal",
-"Choose a password for the public link" => "Escolla un contrasinal para a ligazón pública",
-"Allow Public Upload" => "Permitir o envío público",
-"Email link to person" => "Enviar ligazón por correo",
-"Send" => "Enviar",
-"Set expiration date" => "Definir a data de caducidade",
-"Expiration date" => "Data de caducidade",
-"group" => "grupo",
-"Resharing is not allowed" => "Non se permite volver compartir",
-"Shared in {item} with {user}" => "Compartido en {item} con {user}",
-"Unshare" => "Deixar de compartir",
-"notify by email" => "notificar por correo",
-"can share" => "pode compartir",
-"can edit" => "pode editar",
-"access control" => "control de acceso",
-"create" => "crear",
-"update" => "actualizar",
-"delete" => "eliminar",
-"Password protected" => "Protexido con contrasinal",
-"Error unsetting expiration date" => "Produciuse un erro ao retirar a data de caducidade",
-"Error setting expiration date" => "Produciuse un erro ao definir a data de caducidade",
-"Sending ..." => "Enviando...",
-"Email sent" => "Correo enviado",
-"Warning" => "Aviso",
-"The object type is not specified." => "Non se especificou o tipo de obxecto.",
-"Enter new" => "Introduza o novo",
-"Delete" => "Eliminar",
-"Add" => "Engadir",
-"Edit tags" => "Editar etiquetas",
-"Error loading dialog template: {error}" => "Produciuse un erro ao cargar o modelo do dialogo: {error}",
-"No tags selected for deletion." => "Non se seleccionaron etiquetas para borrado.",
-"Updating {productName} to version {version}, this may take a while." => "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
-"Please reload the page." => "Volva cargar a páxina.",
-"The update was unsuccessful." => "A actualización foi satisfactoria.",
-"The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
-"Couldn't reset password because the token is invalid" => "No, foi posíbel restabelecer o contrasinal, a marca non é correcta",
-"Couldn't send reset email. Please make sure your username is correct." => "Non foi posíbel enviar o coreo do restablecemento. Asegúrese de que o nome de usuario é o correcto.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Non foi posíbel enviar o coreo do restablecemento. Semella que este correo non corresponde con este nome de usuario. Póñase en contacto co administrador.",
-"%s password reset" => "Restabelecer o contrasinal %s",
-"Use the following link to reset your password: {link}" => "Usa a seguinte ligazón para restabelecer o contrasinal: {link}",
-"You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo para restabelecer o contrasinal",
-"Username" => "Nome 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?" => "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
-"Yes, I really want to reset my password now" => "Si, confirmo que quero restabelecer agora o meu contrasinal",
-"Reset" => "Restabelecer",
-"New password" => "Novo contrasinal",
-"New Password" => "Novo contrasinal",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!",
-"For the best results, please consider using a GNU/Linux server instead." => "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.",
-"Personal" => "Persoal",
-"Users" => "Usuarios",
-"Apps" => "Aplicacións",
-"Admin" => "Administración",
-"Help" => "Axuda",
-"Error loading tags" => "Produciuse un erro ao cargar as etiquetas",
-"Tag already exists" => "Xa existe a etiqueta",
-"Error deleting tag(s)" => "Produciuse un erro ao eliminar a(s) etiqueta(s)",
-"Error tagging" => "Produciuse un erro ao etiquetar",
-"Error untagging" => "Produciuse un erro ao eliminar a etiqueta",
-"Error favoriting" => "Produciuse un erro ao marcar como favorito",
-"Error unfavoriting" => "Produciuse un erro ao desmarcar como favorito",
-"Access forbidden" => "Acceso denegado",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\n",
-"The share will expire on %s." => "Esta compartición caduca o %s.",
-"Cheers!" => "Saúdos!",
-"Security Warning" => "Aviso de seguranza",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Actualice a instalación de PHP para empregar %s de xeito seguro.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
-"Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
-"Password" => "Contrasinal",
-"Storage & database" => "Almacenamento e base de datos",
-"Data folder" => "Cartafol de datos",
-"Configure the database" => "Configurar a base de datos",
-"Only %s is available." => "Só está dispoñíbel %s.",
-"Database user" => "Usuario da base de datos",
-"Database password" => "Contrasinal da base de datos",
-"Database name" => "Nome da base de datos",
-"Database tablespace" => "Táboa de espazos da base de datos",
-"Database host" => "Servidor da base de datos",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto.",
-"Finish setup" => "Rematar a configuración",
-"Finishing …" => "Rematando ...",
-"%s is available. Get more information on how to update." => "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
-"Log out" => "Desconectar",
-"Server side authentication failed!" => "A autenticación fracasou do lado do servidor!",
-"Please contact your administrator." => "Contacte co administrador.",
-"Forgot your password? Reset it!" => "Esqueceu o contrasinal? Restabelézao!",
-"remember" => "lembrar",
-"Log in" => "Conectar",
-"Alternative Logins" => "Accesos alternativos",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ola,<br><br>só facerlle saber que %s compartiu <strong>%s</strong> con vostede.<br><a href=\"%s\">Véxao!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Esta instancia do ownCloud está actualmente en modo de usuario único.",
-"This means only administrators can use the instance." => "Isto significa que só os administradores poden utilizar a instancia.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Póñase en contacto co administrador do sistema se persiste esta mensaxe ou se aparece de forma inesperada.",
-"Thank you for your patience." => "Grazas pola súa paciencia.",
-"You are accessing the server from an untrusted domain." => "Esta accedendo desde un dominio non fiábel.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.",
-"%s will be updated to version %s." => "%s actualizarase á versión %s.",
-"The following apps will be disabled:" => "Van desactivarse as seguintes aplicacións:",
-"The theme %s has been disabled." => "O tema %s foi desactivado.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Asegúrese de ter feito unha copia de seguranza da base de datos, do cartafol de configuración e do cartafol de datos, antes de proceder.",
-"Start update" => "Iniciar a actualización",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Para evitar tempos de espera nas instalacións grandes, no seu lugar pode executar a seguinte orde desde o directorio de instalación:"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/gu.js b/core/l10n/gu.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/gu.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/gu.json b/core/l10n/gu.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/gu.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/gu.php b/core/l10n/gu.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/gu.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/he.js b/core/l10n/he.js
new file mode 100644
index 00000000000..fc09eb2b03b
--- /dev/null
+++ b/core/l10n/he.js
@@ -0,0 +1,100 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "יום ראשון",
+    "Monday" : "יום שני",
+    "Tuesday" : "יום שלישי",
+    "Wednesday" : "יום רביעי",
+    "Thursday" : "יום חמישי",
+    "Friday" : "יום שישי",
+    "Saturday" : "שבת",
+    "January" : "ינואר",
+    "February" : "פברואר",
+    "March" : "מרץ",
+    "April" : "אפריל",
+    "May" : "מאי",
+    "June" : "יוני",
+    "July" : "יולי",
+    "August" : "אוגוסט",
+    "September" : "ספטמבר",
+    "October" : "אוקטובר",
+    "November" : "נובמבר",
+    "December" : "דצמבר",
+    "Settings" : "הגדרות",
+    "Folder" : "תיקייה",
+    "Saving..." : "שמירה…",
+    "Reset password" : "איפוס ססמה",
+    "No" : "לא",
+    "Yes" : "כן",
+    "Choose" : "בחירה",
+    "Ok" : "בסדר",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "New Files" : "קבצים חדשים",
+    "Cancel" : "ביטול",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין.",
+    "Shared" : "שותף",
+    "Share" : "שתף",
+    "Error" : "שגיאה",
+    "Error while sharing" : "שגיאה במהלך השיתוף",
+    "Error while unsharing" : "שגיאה במהלך ביטול השיתוף",
+    "Error while changing permissions" : "שגיאה במהלך שינוי ההגדרות",
+    "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
+    "Shared with you by {owner}" : "שותף אתך על ידי {owner}",
+    "Share link" : "קישור לשיתוף",
+    "Password protect" : "הגנה בססמה",
+    "Email link to person" : "שליחת קישור בדוא״ל למשתמש",
+    "Send" : "שליחה",
+    "Set expiration date" : "הגדרת תאריך תפוגה",
+    "Expiration date" : "תאריך התפוגה",
+    "group" : "קבוצה",
+    "Resharing is not allowed" : "אסור לעשות שיתוף מחדש",
+    "Shared in {item} with {user}" : "שותף תחת {item} עם {user}",
+    "Unshare" : "הסר שיתוף",
+    "can share" : "ניתן לשתף",
+    "can edit" : "ניתן לערוך",
+    "access control" : "בקרת גישה",
+    "create" : "יצירה",
+    "update" : "עדכון",
+    "delete" : "מחיקה",
+    "Password protected" : "מוגן בססמה",
+    "Error unsetting expiration date" : "אירעה שגיאה בביטול תאריך התפוגה",
+    "Error setting expiration date" : "אירעה שגיאה בעת הגדרת תאריך התפוגה",
+    "Sending ..." : "מתבצעת שליחה ...",
+    "Email sent" : "הודעת הדוא״ל נשלחה",
+    "Warning" : "אזהרה",
+    "The object type is not specified." : "סוג הפריט לא צוין.",
+    "Delete" : "מחיקה",
+    "Add" : "הוספה",
+    "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
+    "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
+    "You will receive a link to reset your password via Email." : "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
+    "Username" : "שם משתמש",
+    "Yes, I really want to reset my password now" : "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.",
+    "New password" : "ססמה חדשה",
+    "Personal" : "אישי",
+    "Users" : "משתמשים",
+    "Apps" : "יישומים",
+    "Admin" : "מנהל",
+    "Help" : "עזרה",
+    "Access forbidden" : "הגישה נחסמה",
+    "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." : "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
+    "Create an <strong>admin account</strong>" : "יצירת <strong>חשבון מנהל</strong>",
+    "Password" : "סיסמא",
+    "Data folder" : "תיקיית נתונים",
+    "Configure the database" : "הגדרת מסד הנתונים",
+    "Database user" : "שם משתמש במסד הנתונים",
+    "Database password" : "ססמת מסד הנתונים",
+    "Database name" : "שם מסד הנתונים",
+    "Database tablespace" : "מרחב הכתובות של מסד הנתונים",
+    "Database host" : "שרת בסיס נתונים",
+    "Finish setup" : "סיום התקנה",
+    "%s is available. Get more information on how to update." : "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן.",
+    "Log out" : "התנתקות",
+    "remember" : "שמירת הססמה",
+    "Log in" : "כניסה",
+    "Alternative Logins" : "כניסות אלטרנטיביות"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/he.json b/core/l10n/he.json
new file mode 100644
index 00000000000..ea7f1e5e058
--- /dev/null
+++ b/core/l10n/he.json
@@ -0,0 +1,98 @@
+{ "translations": {
+    "Sunday" : "יום ראשון",
+    "Monday" : "יום שני",
+    "Tuesday" : "יום שלישי",
+    "Wednesday" : "יום רביעי",
+    "Thursday" : "יום חמישי",
+    "Friday" : "יום שישי",
+    "Saturday" : "שבת",
+    "January" : "ינואר",
+    "February" : "פברואר",
+    "March" : "מרץ",
+    "April" : "אפריל",
+    "May" : "מאי",
+    "June" : "יוני",
+    "July" : "יולי",
+    "August" : "אוגוסט",
+    "September" : "ספטמבר",
+    "October" : "אוקטובר",
+    "November" : "נובמבר",
+    "December" : "דצמבר",
+    "Settings" : "הגדרות",
+    "Folder" : "תיקייה",
+    "Saving..." : "שמירה…",
+    "Reset password" : "איפוס ססמה",
+    "No" : "לא",
+    "Yes" : "כן",
+    "Choose" : "בחירה",
+    "Ok" : "בסדר",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "New Files" : "קבצים חדשים",
+    "Cancel" : "ביטול",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין.",
+    "Shared" : "שותף",
+    "Share" : "שתף",
+    "Error" : "שגיאה",
+    "Error while sharing" : "שגיאה במהלך השיתוף",
+    "Error while unsharing" : "שגיאה במהלך ביטול השיתוף",
+    "Error while changing permissions" : "שגיאה במהלך שינוי ההגדרות",
+    "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
+    "Shared with you by {owner}" : "שותף אתך על ידי {owner}",
+    "Share link" : "קישור לשיתוף",
+    "Password protect" : "הגנה בססמה",
+    "Email link to person" : "שליחת קישור בדוא״ל למשתמש",
+    "Send" : "שליחה",
+    "Set expiration date" : "הגדרת תאריך תפוגה",
+    "Expiration date" : "תאריך התפוגה",
+    "group" : "קבוצה",
+    "Resharing is not allowed" : "אסור לעשות שיתוף מחדש",
+    "Shared in {item} with {user}" : "שותף תחת {item} עם {user}",
+    "Unshare" : "הסר שיתוף",
+    "can share" : "ניתן לשתף",
+    "can edit" : "ניתן לערוך",
+    "access control" : "בקרת גישה",
+    "create" : "יצירה",
+    "update" : "עדכון",
+    "delete" : "מחיקה",
+    "Password protected" : "מוגן בססמה",
+    "Error unsetting expiration date" : "אירעה שגיאה בביטול תאריך התפוגה",
+    "Error setting expiration date" : "אירעה שגיאה בעת הגדרת תאריך התפוגה",
+    "Sending ..." : "מתבצעת שליחה ...",
+    "Email sent" : "הודעת הדוא״ל נשלחה",
+    "Warning" : "אזהרה",
+    "The object type is not specified." : "סוג הפריט לא צוין.",
+    "Delete" : "מחיקה",
+    "Add" : "הוספה",
+    "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
+    "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
+    "You will receive a link to reset your password via Email." : "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
+    "Username" : "שם משתמש",
+    "Yes, I really want to reset my password now" : "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.",
+    "New password" : "ססמה חדשה",
+    "Personal" : "אישי",
+    "Users" : "משתמשים",
+    "Apps" : "יישומים",
+    "Admin" : "מנהל",
+    "Help" : "עזרה",
+    "Access forbidden" : "הגישה נחסמה",
+    "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." : "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
+    "Create an <strong>admin account</strong>" : "יצירת <strong>חשבון מנהל</strong>",
+    "Password" : "סיסמא",
+    "Data folder" : "תיקיית נתונים",
+    "Configure the database" : "הגדרת מסד הנתונים",
+    "Database user" : "שם משתמש במסד הנתונים",
+    "Database password" : "ססמת מסד הנתונים",
+    "Database name" : "שם מסד הנתונים",
+    "Database tablespace" : "מרחב הכתובות של מסד הנתונים",
+    "Database host" : "שרת בסיס נתונים",
+    "Finish setup" : "סיום התקנה",
+    "%s is available. Get more information on how to update." : "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן.",
+    "Log out" : "התנתקות",
+    "remember" : "שמירת הססמה",
+    "Log in" : "כניסה",
+    "Alternative Logins" : "כניסות אלטרנטיביות"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/he.php b/core/l10n/he.php
deleted file mode 100644
index 39ce0956dd7..00000000000
--- a/core/l10n/he.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "יום ראשון",
-"Monday" => "יום שני",
-"Tuesday" => "יום שלישי",
-"Wednesday" => "יום רביעי",
-"Thursday" => "יום חמישי",
-"Friday" => "יום שישי",
-"Saturday" => "שבת",
-"January" => "ינואר",
-"February" => "פברואר",
-"March" => "מרץ",
-"April" => "אפריל",
-"May" => "מאי",
-"June" => "יוני",
-"July" => "יולי",
-"August" => "אוגוסט",
-"September" => "ספטמבר",
-"October" => "אוקטובר",
-"November" => "נובמבר",
-"December" => "דצמבר",
-"Settings" => "הגדרות",
-"Folder" => "תיקייה",
-"Saving..." => "שמירה…",
-"Reset password" => "איפוס ססמה",
-"No" => "לא",
-"Yes" => "כן",
-"Choose" => "בחירה",
-"Ok" => "בסדר",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"New Files" => "קבצים חדשים",
-"Cancel" => "ביטול",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין.",
-"Shared" => "שותף",
-"Share" => "שתף",
-"Error" => "שגיאה",
-"Error while sharing" => "שגיאה במהלך השיתוף",
-"Error while unsharing" => "שגיאה במהלך ביטול השיתוף",
-"Error while changing permissions" => "שגיאה במהלך שינוי ההגדרות",
-"Shared with you and the group {group} by {owner}" => "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
-"Shared with you by {owner}" => "שותף אתך על ידי {owner}",
-"Share link" => "קישור לשיתוף",
-"Password protect" => "הגנה בססמה",
-"Email link to person" => "שליחת קישור בדוא״ל למשתמש",
-"Send" => "שליחה",
-"Set expiration date" => "הגדרת תאריך תפוגה",
-"Expiration date" => "תאריך התפוגה",
-"group" => "קבוצה",
-"Resharing is not allowed" => "אסור לעשות שיתוף מחדש",
-"Shared in {item} with {user}" => "שותף תחת {item} עם {user}",
-"Unshare" => "הסר שיתוף",
-"can share" => "ניתן לשתף",
-"can edit" => "ניתן לערוך",
-"access control" => "בקרת גישה",
-"create" => "יצירה",
-"update" => "עדכון",
-"delete" => "מחיקה",
-"Password protected" => "מוגן בססמה",
-"Error unsetting expiration date" => "אירעה שגיאה בביטול תאריך התפוגה",
-"Error setting expiration date" => "אירעה שגיאה בעת הגדרת תאריך התפוגה",
-"Sending ..." => "מתבצעת שליחה ...",
-"Email sent" => "הודעת הדוא״ל נשלחה",
-"Warning" => "אזהרה",
-"The object type is not specified." => "סוג הפריט לא צוין.",
-"Delete" => "מחיקה",
-"Add" => "הוספה",
-"The update was successful. Redirecting you to ownCloud now." => "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
-"Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
-"You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
-"Username" => "שם משתמש",
-"Yes, I really want to reset my password now" => "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.",
-"New password" => "ססמה חדשה",
-"Personal" => "אישי",
-"Users" => "משתמשים",
-"Apps" => "יישומים",
-"Admin" => "מנהל",
-"Help" => "עזרה",
-"Access forbidden" => "הגישה נחסמה",
-"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." => "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
-"Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>",
-"Password" => "סיסמא",
-"Data folder" => "תיקיית נתונים",
-"Configure the database" => "הגדרת מסד הנתונים",
-"Database user" => "שם משתמש במסד הנתונים",
-"Database password" => "ססמת מסד הנתונים",
-"Database name" => "שם מסד הנתונים",
-"Database tablespace" => "מרחב הכתובות של מסד הנתונים",
-"Database host" => "שרת בסיס נתונים",
-"Finish setup" => "סיום התקנה",
-"%s is available. Get more information on how to update." => "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן.",
-"Log out" => "התנתקות",
-"remember" => "שמירת הססמה",
-"Log in" => "כניסה",
-"Alternative Logins" => "כניסות אלטרנטיביות"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hi.js b/core/l10n/hi.js
new file mode 100644
index 00000000000..a58e175149a
--- /dev/null
+++ b/core/l10n/hi.js
@@ -0,0 +1,53 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "रविवार",
+    "Monday" : "सोमवार",
+    "Tuesday" : "मंगलवार",
+    "Wednesday" : "बुधवार",
+    "Thursday" : "बृहस्पतिवार",
+    "Friday" : "शुक्रवार",
+    "Saturday" : "शनिवार",
+    "January" : "जनवरी",
+    "February" : "फरवरी",
+    "March" : "मार्च",
+    "April" : "अप्रैल",
+    "May" : "मई",
+    "June" : "जून",
+    "July" : "जुलाई",
+    "August" : "अगस्त",
+    "September" : "सितम्बर",
+    "October" : "अक्टूबर",
+    "November" : "नवंबर",
+    "December" : "दिसम्बर",
+    "Settings" : "सेटिंग्स",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "रद्द करें ",
+    "Share" : "साझा करें",
+    "Error" : "त्रुटि",
+    "Send" : "भेजें",
+    "Sending ..." : "भेजा जा रहा है",
+    "Email sent" : "ईमेल भेज दिया गया है ",
+    "Warning" : "चेतावनी ",
+    "Add" : "डाले",
+    "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
+    "You will receive a link to reset your password via Email." : "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
+    "Username" : "प्रयोक्ता का नाम",
+    "New password" : "नया पासवर्ड",
+    "Personal" : "यक्तिगत",
+    "Users" : "उपयोगकर्ता",
+    "Apps" : "Apps",
+    "Help" : "सहयोग",
+    "Security Warning" : "सुरक्षा चेतावनी ",
+    "Create an <strong>admin account</strong>" : "व्यवस्थापक खाता बनाएँ",
+    "Password" : "पासवर्ड",
+    "Data folder" : "डाटा फोल्डर",
+    "Configure the database" : "डेटाबेस कॉन्फ़िगर करें ",
+    "Database user" : "डेटाबेस उपयोगकर्ता",
+    "Database password" : "डेटाबेस पासवर्ड",
+    "Database name" : "डेटाबेस का नाम",
+    "Finish setup" : "सेटअप समाप्त करे",
+    "Log out" : "लोग  आउट",
+    "remember" : "याद रखें"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/hi.json b/core/l10n/hi.json
new file mode 100644
index 00000000000..c1041efafb9
--- /dev/null
+++ b/core/l10n/hi.json
@@ -0,0 +1,51 @@
+{ "translations": {
+    "Sunday" : "रविवार",
+    "Monday" : "सोमवार",
+    "Tuesday" : "मंगलवार",
+    "Wednesday" : "बुधवार",
+    "Thursday" : "बृहस्पतिवार",
+    "Friday" : "शुक्रवार",
+    "Saturday" : "शनिवार",
+    "January" : "जनवरी",
+    "February" : "फरवरी",
+    "March" : "मार्च",
+    "April" : "अप्रैल",
+    "May" : "मई",
+    "June" : "जून",
+    "July" : "जुलाई",
+    "August" : "अगस्त",
+    "September" : "सितम्बर",
+    "October" : "अक्टूबर",
+    "November" : "नवंबर",
+    "December" : "दिसम्बर",
+    "Settings" : "सेटिंग्स",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "रद्द करें ",
+    "Share" : "साझा करें",
+    "Error" : "त्रुटि",
+    "Send" : "भेजें",
+    "Sending ..." : "भेजा जा रहा है",
+    "Email sent" : "ईमेल भेज दिया गया है ",
+    "Warning" : "चेतावनी ",
+    "Add" : "डाले",
+    "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
+    "You will receive a link to reset your password via Email." : "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
+    "Username" : "प्रयोक्ता का नाम",
+    "New password" : "नया पासवर्ड",
+    "Personal" : "यक्तिगत",
+    "Users" : "उपयोगकर्ता",
+    "Apps" : "Apps",
+    "Help" : "सहयोग",
+    "Security Warning" : "सुरक्षा चेतावनी ",
+    "Create an <strong>admin account</strong>" : "व्यवस्थापक खाता बनाएँ",
+    "Password" : "पासवर्ड",
+    "Data folder" : "डाटा फोल्डर",
+    "Configure the database" : "डेटाबेस कॉन्फ़िगर करें ",
+    "Database user" : "डेटाबेस उपयोगकर्ता",
+    "Database password" : "डेटाबेस पासवर्ड",
+    "Database name" : "डेटाबेस का नाम",
+    "Finish setup" : "सेटअप समाप्त करे",
+    "Log out" : "लोग  आउट",
+    "remember" : "याद रखें"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
deleted file mode 100644
index ef81f978aa3..00000000000
--- a/core/l10n/hi.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "रविवार",
-"Monday" => "सोमवार",
-"Tuesday" => "मंगलवार",
-"Wednesday" => "बुधवार",
-"Thursday" => "बृहस्पतिवार",
-"Friday" => "शुक्रवार",
-"Saturday" => "शनिवार",
-"January" => "जनवरी",
-"February" => "फरवरी",
-"March" => "मार्च",
-"April" => "अप्रैल",
-"May" => "मई",
-"June" => "जून",
-"July" => "जुलाई",
-"August" => "अगस्त",
-"September" => "सितम्बर",
-"October" => "अक्टूबर",
-"November" => "नवंबर",
-"December" => "दिसम्बर",
-"Settings" => "सेटिंग्स",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "रद्द करें ",
-"Share" => "साझा करें",
-"Error" => "त्रुटि",
-"Send" => "भेजें",
-"Sending ..." => "भेजा जा रहा है",
-"Email sent" => "ईमेल भेज दिया गया है ",
-"Warning" => "चेतावनी ",
-"Add" => "डाले",
-"Use the following link to reset your password: {link}" => "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
-"You will receive a link to reset your password via Email." => "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
-"Username" => "प्रयोक्ता का नाम",
-"New password" => "नया पासवर्ड",
-"Personal" => "यक्तिगत",
-"Users" => "उपयोगकर्ता",
-"Apps" => "Apps",
-"Help" => "सहयोग",
-"Security Warning" => "सुरक्षा चेतावनी ",
-"Create an <strong>admin account</strong>" => "व्यवस्थापक खाता बनाएँ",
-"Password" => "पासवर्ड",
-"Data folder" => "डाटा फोल्डर",
-"Configure the database" => "डेटाबेस कॉन्फ़िगर करें ",
-"Database user" => "डेटाबेस उपयोगकर्ता",
-"Database password" => "डेटाबेस पासवर्ड",
-"Database name" => "डेटाबेस का नाम",
-"Finish setup" => "सेटअप समाप्त करे",
-"Log out" => "लोग  आउट",
-"remember" => "याद रखें"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hr.js b/core/l10n/hr.js
new file mode 100644
index 00000000000..019b5a5f6a4
--- /dev/null
+++ b/core/l10n/hr.js
@@ -0,0 +1,193 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nije moguće slanje pošte sljedećim korisnicima: %s",
+    "Turned on maintenance mode" : "Način rada za održavanje uključen",
+    "Turned off maintenance mode" : "Način rada za održavanje isključen",
+    "Updated database" : " Baza podataka ažurirana",
+    "Checked database schema update" : "Provjereno ažuriranje sheme  baze podataka",
+    "Checked database schema update for apps" : "Provjereno ažuriranje sheme baze podataka za aplikacije",
+    "Updated \"%s\" to %s" : "Ažurirano \"%s\" u %s",
+    "Disabled incompatible apps: %s" : "Onemogućene inkompatibilne applikacije: %s",
+    "No image or file provided" : "Nijedna slika ili datoteka nije dobavljena",
+    "Unknown filetype" : "Vrsta datoteke nepoznata",
+    "Invalid image" : "Slika neispravna",
+    "No temporary profile picture available, try again" : "Slike privremenih profila nisu dostupne, pokušajte ponovno",
+    "No crop data provided" : "Nema podataka o obrezivanju",
+    "Sunday" : "Nedjelja",
+    "Monday" : "Ponedjeljak",
+    "Tuesday" : "Utorak",
+    "Wednesday" : "Srijeda",
+    "Thursday" : "Četvrtak",
+    "Friday" : "Petak",
+    "Saturday" : "Subota",
+    "January" : "Siječanj",
+    "February" : "Veljača",
+    "March" : "Ožujak",
+    "April" : "Travanj",
+    "May" : "Svibanj",
+    "June" : "Lipanj",
+    "July" : "Srpanj",
+    "August" : "Kolovoz",
+    "September" : "Rujan",
+    "October" : "Listopad",
+    "November" : "Studeni",
+    "December" : "Prosinac",
+    "Settings" : "Postavke",
+    "File" : "Datoteka",
+    "Folder" : "Mapa",
+    "Image" : "Slika",
+    "Audio" : "Audio",
+    "Saving..." : "Spremanje...",
+    "Couldn't send reset email. Please contact your administrator." : "Nije mogće poslati resetiranu poštu. MOlimo kontaktirajte svog administratora.",
+    "The link to reset your password has been sent to your email. 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." : "Veza za resetiranje vaše lozinke poslana je na vašu adresu e-pošte. Ako je ne primite unekom razumnom vremenskom roku, provjerite svoje spam/junk mape. <br> Ako nije tamo, kontaktirajtesvoga lokalnog administratora.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka,svoje podatke nećete moći dohvatitinakon što vaša lozinka bude resetirana.<br />Ako ne znate što učiniti, prije nego linastavite, molimo kontaktirajte svog administratora. <br />Želite li doista nastaviti?",
+    "I know what I'm doing" : "Znam što radim",
+    "Reset password" : "Resetirajte lozinku",
+    "Password can not be changed. Please contact your administrator." : "Lozinku nije moguće promijeniti. Molimo kontaktirajte svog administratora.",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Odaberite",
+    "Error loading file picker template: {error}" : "Pogrešno učitavanje predloška za pronalazača datoteke: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Pogrešno učitavanje predloška za poruke: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["neželjeno podudaranje u {count} datoteci","neželjeno podudaranje u {count} datoteke","neželjeno podudaranje u {count} datoteke"],
+    "One file conflict" : "Konflikt u jednoj datoteci",
+    "New Files" : "Nove datoteke",
+    "Already existing files" : "Postojeće datoteke",
+    "Which files do you want to keep?" : "Koje datoteke želite zadržati?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ako odaberete obje verzije, kopirana će datoteka uz svoje ime imati i broj.",
+    "Cancel" : "Odustani",
+    "Continue" : "Nastavi",
+    "(all selected)" : "(sve odabrano)",
+    "({count} selected)" : "({count} odabran)",
+    "Error loading file exists template" : "Pogrešno učitavanje predloška DATOTEKA POSTOJI",
+    "Very weak password" : "Lozinka vrlo slaba",
+    "Weak password" : "Lozinka Slaba",
+    "So-so password" : "Lozinka tako-tako",
+    "Good password" : "Lozinka dobra",
+    "Strong password" : "Lozinka snažna",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Vaš web poslužitelj još nije propisno postavljen da bi omogućio sinkronizaciju datoteka jer izgleda da jesučelje WebDAV neispravno.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Ovaj poslužitelj nema nikakvu radnu vezu s internetom. To znači da ne rade neke od njegovihfunkcija kao što su spajanje na vanjsku memoriju, notifikacije o ažuriranju ili instalacijiaplikacija treće strane. Također, možda je onemogućen daljinski pristup datotekama i slanjenotifikacijske e-pošte. Savjetujemo vam da, ako želite da sve njegove funkcije rade,omogućite vezuovog poslužitelja s internetom.",
+    "Shared" : "Resurs podijeljen",
+    "Shared with {recipients}" : "Resurs podijeljen s {recipients}",
+    "Share" : "Podijelite",
+    "Error" : "Pogreška",
+    "Error while sharing" : "Pogreška pri dijeljenju",
+    "Error while unsharing" : "Pogreška pri prestanku dijeljenja",
+    "Error while changing permissions" : "POgreška pri mijenjanju dozvola",
+    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
+    "Shared with you by {owner}" : "S vama podijelio {owner}",
+    "Share with user or group …" : "Podijelite s korisnikom ili grupom ...",
+    "Share link" : "Podijelite vezu",
+    "The public link will expire no later than {days} days after it is created" : " Javna veza ističe najkasnije {days} dana nakon što je kreirana",
+    "Password protect" : "Zaštititi lozinkom",
+    "Choose a password for the public link" : "Odaberite lozinku za javnu vezu",
+    "Allow Public Upload" : "Omogućite javno učitavanje",
+    "Email link to person" : "Pošaljite osobi vezu e-poštom",
+    "Send" : "Pošaljite",
+    "Set expiration date" : "Odredite datum isteka",
+    "Expiration date" : "Datum isteka",
+    "group" : "Grupa",
+    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
+    "Shared in {item} with {user}" : "Podijeljeno u {item} s {user}",
+    "Unshare" : "Prestanite dijeliti",
+    "notify by email" : "Obavijestite e-poštom",
+    "can share" : "Dijeljenje moguće",
+    "can edit" : "Uređivanje moguće",
+    "access control" : "Kontrola pristupa",
+    "create" : "Kreirajte",
+    "update" : "Ažurirajte",
+    "delete" : "Izbrišite",
+    "Password protected" : "Lozinka zaštićena",
+    "Error unsetting expiration date" : "Pogrešno uklanjanje postavke datuma isteka",
+    "Error setting expiration date" : "Pogrešno učitavanje postavke datuma isteka",
+    "Sending ..." : "Slanje...",
+    "Email sent" : "E-pošta poslana",
+    "Warning" : "Upozorenje",
+    "The object type is not specified." : "Vrsta objekta nije specificirana.",
+    "Enter new" : "Unesite novi",
+    "Delete" : "Izbrišite",
+    "Add" : "Dodajte",
+    "Edit tags" : "Uredite oznake",
+    "Error loading dialog template: {error}" : "Pogrešno učitavanje predloška dijaloga: {error}",
+    "No tags selected for deletion." : "Nijedna oznaka nije odabrana za brisanje.",
+    "Updating {productName} to version {version}, this may take a while." : "Uređivanje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
+    "Please reload the page." : "Molimo, ponovno učitajte stranicu",
+    "The update was unsuccessful." : "Ažuriranje nije uspjelo",
+    "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Upravo ste preusmjeravani na ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Resetiranje lozinke nije moguće jer je token neispravan.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Resetiranu e-poštu nije moguće poslati.Molimo provjerite ispravnost svoga korisničkog imena.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Resetiranu e-poštu nije moguće poslati jer za ovo korisničko ime ne postoji adresa.Molimo, kontaktirajte svog administratora.",
+    "%s password reset" : "%s lozinka resetirana",
+    "Use the following link to reset your password: {link}" : "Za resetiranje svoje lozinke koristite sljedeću vezu: {link}",
+    "You will receive a link to reset your password via Email." : "Vezu za resetiranje svoje lozinke primit ćete e-poštom.",
+    "Username" : "Korisničko ime",
+    "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?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka, svoje podatke nećetemoći dohvatiti nakon što vaša lozinka bude resetirana. Ako niste sigurni što učiniti, molimokontaktirajte svog administratora prije nego li nastavite. Želite li doista nastaviti?",
+    "Yes, I really want to reset my password now" : "Da, ja doista želim sada resetirati svojju lozinku.",
+    "Reset" : "Resetirajte",
+    "New password" : "Nova lozinka",
+    "New Password" : "Nova lozinka",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nije podržan i %s na ovoj platformi neće raditi kako treba.",
+    "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate, molimo razmotrite mogućnost korištenje poslužitelja GNU/Linux.",
+    "Personal" : "Osobno",
+    "Users" : "Korisnici",
+    "Apps" : "Aplikacije",
+    "Admin" : "Admin",
+    "Help" : "Pomoć",
+    "Error loading tags" : "Pogrešno učitavanje oznaka",
+    "Tag already exists" : "Oznaka već postoji",
+    "Error deleting tag(s)" : "Pogrešno brisanje oznake (oznaka)",
+    "Error tagging" : "Pogrešno označavanje",
+    "Error untagging" : "Pogrešno uklanjanje oznaka",
+    "Error favoriting" : "Pogrešno dodavanje u favorite",
+    "Error unfavoriting" : "Pogrešno uklanjanje iz favorita",
+    "Access forbidden" : "Pristup zabranjen",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej, \n\nsamo vam javljamo da je %s podijelio %s s vama.\nPogledajte ga: %s\n\n",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
+    "Security Warning" : "Sigurnosno upozorenje",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je podložna napadu NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Molimo ažurirajte svoju PHP instalaciju da biste mogli sigurno koristiti %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
+    "Create an <strong>admin account</strong>" : "Kreirajte <strong>admin račun</strong>",
+    "Password" : "Lozinka",
+    "Storage & database" : "Pohrana & baza podataka",
+    "Data folder" : "Mapa za podatke",
+    "Configure the database" : "Konfigurirajte bazu podataka",
+    "Only %s is available." : "Jedino je %s dostupan.",
+    "Database user" : "Korisnik baze podataka",
+    "Database password" : "Lozinka baze podataka",
+    "Database name" : "Naziv baze podataka",
+    "Database tablespace" : "Tablespace (?) baze podataka",
+    "Database host" : "Glavno računalo baze podataka",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.",
+    "Finish setup" : "Završite postavljanje",
+    "Finishing …" : "Završavanje...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ova aplikacija zahtjeva JavaScript za ispravan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> uključite JavaScript</a> i ponovno učitajte stranicu.",
+    "%s is available. Get more information on how to update." : "%s je dostupan. Saznajte više informacija o tome kako ažurirati.",
+    "Log out" : "Odjavite se",
+    "Server side authentication failed!" : "Autentikacija na strani poslužitelja nije uspjela!",
+    "Please contact your administrator." : "Molimo kontaktirajte svog administratora.",
+    "Forgot your password? Reset it!" : "Zaboravili ste svoju lozinku? Resetirajte ju!",
+    "remember" : "Sjetite se",
+    "Log in" : "Prijavite se",
+    "Alternative Logins" : "Alternativne prijave",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> vam upravo javlja da je %s podijelio <strong>%s</strong>s vama.<br><a href=\"%s\">POgledajte!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Ova ownCloud instanca je trenutno u načinu rada za jednog korisnika.",
+    "This means only administrators can use the instance." : "To znači da tu instancu mogu koristiti samo administratori.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktirajte svog administratora sustava ako se ova poruka ponavlja ili sepojavila neočekivano.",
+    "Thank you for your patience." : "Hvala vam na strpljenju",
+    "You are accessing the server from an untrusted domain." : "Poslužitelju pristupate iz nepouzdane domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Molimo kontaktirajte svog administratora. Ako ste vi administrator ove instance,konfigurirajte postavku \"trusted_domain\" config/config.php.Primjer konfiguracije ponuđen je u config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ovisno o vašoj konfiguraciji, kao administrator vi biste također mogli koristitigumb dolje za pristup toj domeni.",
+    "Add \"%s\" as trusted domain" : "Dodajte \"%s\" kao pouzdanu domenu.",
+    "%s will be updated to version %s." : "%s će biti ažuriran u verziju %s",
+    "The following apps will be disabled:" : "Sljedeće aplikacije bit će onemogućene",
+    "The theme %s has been disabled." : "Tema %s je onemogućena",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Prije nego li nastavite, molimo osigurajte da su baza podataka, mapa konfiguracije i mapaza podatke sigurnosno kopirani.",
+    "Start update" : "Započnite ažuriranje",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Da biste izbjegli vremensko prekoračenje s većim instalacijama, možete pokrenutisljedeću naredbu iz svoga instalacijskog direktorija:"
+},
+"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/core/l10n/hr.json b/core/l10n/hr.json
new file mode 100644
index 00000000000..17985b11abc
--- /dev/null
+++ b/core/l10n/hr.json
@@ -0,0 +1,191 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nije moguće slanje pošte sljedećim korisnicima: %s",
+    "Turned on maintenance mode" : "Način rada za održavanje uključen",
+    "Turned off maintenance mode" : "Način rada za održavanje isključen",
+    "Updated database" : " Baza podataka ažurirana",
+    "Checked database schema update" : "Provjereno ažuriranje sheme  baze podataka",
+    "Checked database schema update for apps" : "Provjereno ažuriranje sheme baze podataka za aplikacije",
+    "Updated \"%s\" to %s" : "Ažurirano \"%s\" u %s",
+    "Disabled incompatible apps: %s" : "Onemogućene inkompatibilne applikacije: %s",
+    "No image or file provided" : "Nijedna slika ili datoteka nije dobavljena",
+    "Unknown filetype" : "Vrsta datoteke nepoznata",
+    "Invalid image" : "Slika neispravna",
+    "No temporary profile picture available, try again" : "Slike privremenih profila nisu dostupne, pokušajte ponovno",
+    "No crop data provided" : "Nema podataka o obrezivanju",
+    "Sunday" : "Nedjelja",
+    "Monday" : "Ponedjeljak",
+    "Tuesday" : "Utorak",
+    "Wednesday" : "Srijeda",
+    "Thursday" : "Četvrtak",
+    "Friday" : "Petak",
+    "Saturday" : "Subota",
+    "January" : "Siječanj",
+    "February" : "Veljača",
+    "March" : "Ožujak",
+    "April" : "Travanj",
+    "May" : "Svibanj",
+    "June" : "Lipanj",
+    "July" : "Srpanj",
+    "August" : "Kolovoz",
+    "September" : "Rujan",
+    "October" : "Listopad",
+    "November" : "Studeni",
+    "December" : "Prosinac",
+    "Settings" : "Postavke",
+    "File" : "Datoteka",
+    "Folder" : "Mapa",
+    "Image" : "Slika",
+    "Audio" : "Audio",
+    "Saving..." : "Spremanje...",
+    "Couldn't send reset email. Please contact your administrator." : "Nije mogće poslati resetiranu poštu. MOlimo kontaktirajte svog administratora.",
+    "The link to reset your password has been sent to your email. 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." : "Veza za resetiranje vaše lozinke poslana je na vašu adresu e-pošte. Ako je ne primite unekom razumnom vremenskom roku, provjerite svoje spam/junk mape. <br> Ako nije tamo, kontaktirajtesvoga lokalnog administratora.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka,svoje podatke nećete moći dohvatitinakon što vaša lozinka bude resetirana.<br />Ako ne znate što učiniti, prije nego linastavite, molimo kontaktirajte svog administratora. <br />Želite li doista nastaviti?",
+    "I know what I'm doing" : "Znam što radim",
+    "Reset password" : "Resetirajte lozinku",
+    "Password can not be changed. Please contact your administrator." : "Lozinku nije moguće promijeniti. Molimo kontaktirajte svog administratora.",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Odaberite",
+    "Error loading file picker template: {error}" : "Pogrešno učitavanje predloška za pronalazača datoteke: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Pogrešno učitavanje predloška za poruke: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["neželjeno podudaranje u {count} datoteci","neželjeno podudaranje u {count} datoteke","neželjeno podudaranje u {count} datoteke"],
+    "One file conflict" : "Konflikt u jednoj datoteci",
+    "New Files" : "Nove datoteke",
+    "Already existing files" : "Postojeće datoteke",
+    "Which files do you want to keep?" : "Koje datoteke želite zadržati?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ako odaberete obje verzije, kopirana će datoteka uz svoje ime imati i broj.",
+    "Cancel" : "Odustani",
+    "Continue" : "Nastavi",
+    "(all selected)" : "(sve odabrano)",
+    "({count} selected)" : "({count} odabran)",
+    "Error loading file exists template" : "Pogrešno učitavanje predloška DATOTEKA POSTOJI",
+    "Very weak password" : "Lozinka vrlo slaba",
+    "Weak password" : "Lozinka Slaba",
+    "So-so password" : "Lozinka tako-tako",
+    "Good password" : "Lozinka dobra",
+    "Strong password" : "Lozinka snažna",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Vaš web poslužitelj još nije propisno postavljen da bi omogućio sinkronizaciju datoteka jer izgleda da jesučelje WebDAV neispravno.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Ovaj poslužitelj nema nikakvu radnu vezu s internetom. To znači da ne rade neke od njegovihfunkcija kao što su spajanje na vanjsku memoriju, notifikacije o ažuriranju ili instalacijiaplikacija treće strane. Također, možda je onemogućen daljinski pristup datotekama i slanjenotifikacijske e-pošte. Savjetujemo vam da, ako želite da sve njegove funkcije rade,omogućite vezuovog poslužitelja s internetom.",
+    "Shared" : "Resurs podijeljen",
+    "Shared with {recipients}" : "Resurs podijeljen s {recipients}",
+    "Share" : "Podijelite",
+    "Error" : "Pogreška",
+    "Error while sharing" : "Pogreška pri dijeljenju",
+    "Error while unsharing" : "Pogreška pri prestanku dijeljenja",
+    "Error while changing permissions" : "POgreška pri mijenjanju dozvola",
+    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
+    "Shared with you by {owner}" : "S vama podijelio {owner}",
+    "Share with user or group …" : "Podijelite s korisnikom ili grupom ...",
+    "Share link" : "Podijelite vezu",
+    "The public link will expire no later than {days} days after it is created" : " Javna veza ističe najkasnije {days} dana nakon što je kreirana",
+    "Password protect" : "Zaštititi lozinkom",
+    "Choose a password for the public link" : "Odaberite lozinku za javnu vezu",
+    "Allow Public Upload" : "Omogućite javno učitavanje",
+    "Email link to person" : "Pošaljite osobi vezu e-poštom",
+    "Send" : "Pošaljite",
+    "Set expiration date" : "Odredite datum isteka",
+    "Expiration date" : "Datum isteka",
+    "group" : "Grupa",
+    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
+    "Shared in {item} with {user}" : "Podijeljeno u {item} s {user}",
+    "Unshare" : "Prestanite dijeliti",
+    "notify by email" : "Obavijestite e-poštom",
+    "can share" : "Dijeljenje moguće",
+    "can edit" : "Uređivanje moguće",
+    "access control" : "Kontrola pristupa",
+    "create" : "Kreirajte",
+    "update" : "Ažurirajte",
+    "delete" : "Izbrišite",
+    "Password protected" : "Lozinka zaštićena",
+    "Error unsetting expiration date" : "Pogrešno uklanjanje postavke datuma isteka",
+    "Error setting expiration date" : "Pogrešno učitavanje postavke datuma isteka",
+    "Sending ..." : "Slanje...",
+    "Email sent" : "E-pošta poslana",
+    "Warning" : "Upozorenje",
+    "The object type is not specified." : "Vrsta objekta nije specificirana.",
+    "Enter new" : "Unesite novi",
+    "Delete" : "Izbrišite",
+    "Add" : "Dodajte",
+    "Edit tags" : "Uredite oznake",
+    "Error loading dialog template: {error}" : "Pogrešno učitavanje predloška dijaloga: {error}",
+    "No tags selected for deletion." : "Nijedna oznaka nije odabrana za brisanje.",
+    "Updating {productName} to version {version}, this may take a while." : "Uređivanje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
+    "Please reload the page." : "Molimo, ponovno učitajte stranicu",
+    "The update was unsuccessful." : "Ažuriranje nije uspjelo",
+    "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Upravo ste preusmjeravani na ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Resetiranje lozinke nije moguće jer je token neispravan.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Resetiranu e-poštu nije moguće poslati.Molimo provjerite ispravnost svoga korisničkog imena.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Resetiranu e-poštu nije moguće poslati jer za ovo korisničko ime ne postoji adresa.Molimo, kontaktirajte svog administratora.",
+    "%s password reset" : "%s lozinka resetirana",
+    "Use the following link to reset your password: {link}" : "Za resetiranje svoje lozinke koristite sljedeću vezu: {link}",
+    "You will receive a link to reset your password via Email." : "Vezu za resetiranje svoje lozinke primit ćete e-poštom.",
+    "Username" : "Korisničko ime",
+    "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?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka, svoje podatke nećetemoći dohvatiti nakon što vaša lozinka bude resetirana. Ako niste sigurni što učiniti, molimokontaktirajte svog administratora prije nego li nastavite. Želite li doista nastaviti?",
+    "Yes, I really want to reset my password now" : "Da, ja doista želim sada resetirati svojju lozinku.",
+    "Reset" : "Resetirajte",
+    "New password" : "Nova lozinka",
+    "New Password" : "Nova lozinka",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nije podržan i %s na ovoj platformi neće raditi kako treba.",
+    "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate, molimo razmotrite mogućnost korištenje poslužitelja GNU/Linux.",
+    "Personal" : "Osobno",
+    "Users" : "Korisnici",
+    "Apps" : "Aplikacije",
+    "Admin" : "Admin",
+    "Help" : "Pomoć",
+    "Error loading tags" : "Pogrešno učitavanje oznaka",
+    "Tag already exists" : "Oznaka već postoji",
+    "Error deleting tag(s)" : "Pogrešno brisanje oznake (oznaka)",
+    "Error tagging" : "Pogrešno označavanje",
+    "Error untagging" : "Pogrešno uklanjanje oznaka",
+    "Error favoriting" : "Pogrešno dodavanje u favorite",
+    "Error unfavoriting" : "Pogrešno uklanjanje iz favorita",
+    "Access forbidden" : "Pristup zabranjen",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej, \n\nsamo vam javljamo da je %s podijelio %s s vama.\nPogledajte ga: %s\n\n",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
+    "Security Warning" : "Sigurnosno upozorenje",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je podložna napadu NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Molimo ažurirajte svoju PHP instalaciju da biste mogli sigurno koristiti %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
+    "Create an <strong>admin account</strong>" : "Kreirajte <strong>admin račun</strong>",
+    "Password" : "Lozinka",
+    "Storage & database" : "Pohrana & baza podataka",
+    "Data folder" : "Mapa za podatke",
+    "Configure the database" : "Konfigurirajte bazu podataka",
+    "Only %s is available." : "Jedino je %s dostupan.",
+    "Database user" : "Korisnik baze podataka",
+    "Database password" : "Lozinka baze podataka",
+    "Database name" : "Naziv baze podataka",
+    "Database tablespace" : "Tablespace (?) baze podataka",
+    "Database host" : "Glavno računalo baze podataka",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.",
+    "Finish setup" : "Završite postavljanje",
+    "Finishing …" : "Završavanje...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ova aplikacija zahtjeva JavaScript za ispravan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> uključite JavaScript</a> i ponovno učitajte stranicu.",
+    "%s is available. Get more information on how to update." : "%s je dostupan. Saznajte više informacija o tome kako ažurirati.",
+    "Log out" : "Odjavite se",
+    "Server side authentication failed!" : "Autentikacija na strani poslužitelja nije uspjela!",
+    "Please contact your administrator." : "Molimo kontaktirajte svog administratora.",
+    "Forgot your password? Reset it!" : "Zaboravili ste svoju lozinku? Resetirajte ju!",
+    "remember" : "Sjetite se",
+    "Log in" : "Prijavite se",
+    "Alternative Logins" : "Alternativne prijave",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> vam upravo javlja da je %s podijelio <strong>%s</strong>s vama.<br><a href=\"%s\">POgledajte!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Ova ownCloud instanca je trenutno u načinu rada za jednog korisnika.",
+    "This means only administrators can use the instance." : "To znači da tu instancu mogu koristiti samo administratori.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktirajte svog administratora sustava ako se ova poruka ponavlja ili sepojavila neočekivano.",
+    "Thank you for your patience." : "Hvala vam na strpljenju",
+    "You are accessing the server from an untrusted domain." : "Poslužitelju pristupate iz nepouzdane domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Molimo kontaktirajte svog administratora. Ako ste vi administrator ove instance,konfigurirajte postavku \"trusted_domain\" config/config.php.Primjer konfiguracije ponuđen je u config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ovisno o vašoj konfiguraciji, kao administrator vi biste također mogli koristitigumb dolje za pristup toj domeni.",
+    "Add \"%s\" as trusted domain" : "Dodajte \"%s\" kao pouzdanu domenu.",
+    "%s will be updated to version %s." : "%s će biti ažuriran u verziju %s",
+    "The following apps will be disabled:" : "Sljedeće aplikacije bit će onemogućene",
+    "The theme %s has been disabled." : "Tema %s je onemogućena",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Prije nego li nastavite, molimo osigurajte da su baza podataka, mapa konfiguracije i mapaza podatke sigurnosno kopirani.",
+    "Start update" : "Započnite ažuriranje",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Da biste izbjegli vremensko prekoračenje s većim instalacijama, možete pokrenutisljedeću naredbu iz svoga instalacijskog direktorija:"
+},"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
deleted file mode 100644
index ae71027dd74..00000000000
--- a/core/l10n/hr.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nije moguće slanje pošte sljedećim korisnicima: %s",
-"Turned on maintenance mode" => "Način rada za održavanje uključen",
-"Turned off maintenance mode" => "Način rada za održavanje isključen",
-"Updated database" => " Baza podataka ažurirana",
-"Checked database schema update" => "Provjereno ažuriranje sheme  baze podataka",
-"Checked database schema update for apps" => "Provjereno ažuriranje sheme baze podataka za aplikacije",
-"Updated \"%s\" to %s" => "Ažurirano \"%s\" u %s",
-"Disabled incompatible apps: %s" => "Onemogućene inkompatibilne applikacije: %s",
-"No image or file provided" => "Nijedna slika ili datoteka nije dobavljena",
-"Unknown filetype" => "Vrsta datoteke nepoznata",
-"Invalid image" => "Slika neispravna",
-"No temporary profile picture available, try again" => "Slike privremenih profila nisu dostupne, pokušajte ponovno",
-"No crop data provided" => "Nema podataka o obrezivanju",
-"Sunday" => "Nedjelja",
-"Monday" => "Ponedjeljak",
-"Tuesday" => "Utorak",
-"Wednesday" => "Srijeda",
-"Thursday" => "Četvrtak",
-"Friday" => "Petak",
-"Saturday" => "Subota",
-"January" => "Siječanj",
-"February" => "Veljača",
-"March" => "Ožujak",
-"April" => "Travanj",
-"May" => "Svibanj",
-"June" => "Lipanj",
-"July" => "Srpanj",
-"August" => "Kolovoz",
-"September" => "Rujan",
-"October" => "Listopad",
-"November" => "Studeni",
-"December" => "Prosinac",
-"Settings" => "Postavke",
-"File" => "Datoteka",
-"Folder" => "Mapa",
-"Image" => "Slika",
-"Audio" => "Audio",
-"Saving..." => "Spremanje...",
-"Couldn't send reset email. Please contact your administrator." => "Nije mogće poslati resetiranu poštu. MOlimo kontaktirajte svog administratora.",
-"The link to reset your password has been sent to your email. 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." => "Veza za resetiranje vaše lozinke poslana je na vašu adresu e-pošte. Ako je ne primite unekom razumnom vremenskom roku, provjerite svoje spam/junk mape. <br> Ako nije tamo, kontaktirajtesvoga lokalnog administratora.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka,svoje podatke nećete moći dohvatitinakon što vaša lozinka bude resetirana.<br />Ako ne znate što učiniti, prije nego linastavite, molimo kontaktirajte svog administratora. <br />Želite li doista nastaviti?",
-"I know what I'm doing" => "Znam što radim",
-"Reset password" => "Resetirajte lozinku",
-"Password can not be changed. Please contact your administrator." => "Lozinku nije moguće promijeniti. Molimo kontaktirajte svog administratora.",
-"No" => "Ne",
-"Yes" => "Da",
-"Choose" => "Odaberite",
-"Error loading file picker template: {error}" => "Pogrešno učitavanje predloška za pronalazača datoteke: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Pogrešno učitavanje predloška za poruke: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("neželjeno podudaranje u {count} datoteci","neželjeno podudaranje u {count} datoteke","neželjeno podudaranje u {count} datoteke"),
-"One file conflict" => "Konflikt u jednoj datoteci",
-"New Files" => "Nove datoteke",
-"Already existing files" => "Postojeće datoteke",
-"Which files do you want to keep?" => "Koje datoteke želite zadržati?",
-"If you select both versions, the copied file will have a number added to its name." => "Ako odaberete obje verzije, kopirana će datoteka uz svoje ime imati i broj.",
-"Cancel" => "Odustani",
-"Continue" => "Nastavi",
-"(all selected)" => "(sve odabrano)",
-"({count} selected)" => "({count} odabran)",
-"Error loading file exists template" => "Pogrešno učitavanje predloška DATOTEKA POSTOJI",
-"Very weak password" => "Lozinka vrlo slaba",
-"Weak password" => "Lozinka Slaba",
-"So-so password" => "Lozinka tako-tako",
-"Good password" => "Lozinka dobra",
-"Strong password" => "Lozinka snažna",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Vaš web poslužitelj još nije propisno postavljen da bi omogućio sinkronizaciju datoteka jer izgleda da jesučelje WebDAV neispravno.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Ovaj poslužitelj nema nikakvu radnu vezu s internetom. To znači da ne rade neke od njegovihfunkcija kao što su spajanje na vanjsku memoriju, notifikacije o ažuriranju ili instalacijiaplikacija treće strane. Također, možda je onemogućen daljinski pristup datotekama i slanjenotifikacijske e-pošte. Savjetujemo vam da, ako želite da sve njegove funkcije rade,omogućite vezuovog poslužitelja s internetom.",
-"Shared" => "Resurs podijeljen",
-"Shared with {recipients}" => "Resurs podijeljen s {recipients}",
-"Share" => "Podijelite",
-"Error" => "Pogreška",
-"Error while sharing" => "Pogreška pri dijeljenju",
-"Error while unsharing" => "Pogreška pri prestanku dijeljenja",
-"Error while changing permissions" => "POgreška pri mijenjanju dozvola",
-"Shared with you and the group {group} by {owner}" => "Dijeljeno s vama i grupom {group} vlasnika {owner}",
-"Shared with you by {owner}" => "S vama podijelio {owner}",
-"Share with user or group …" => "Podijelite s korisnikom ili grupom ...",
-"Share link" => "Podijelite vezu",
-"The public link will expire no later than {days} days after it is created" => " Javna veza ističe najkasnije {days} dana nakon što je kreirana",
-"Password protect" => "Zaštititi lozinkom",
-"Choose a password for the public link" => "Odaberite lozinku za javnu vezu",
-"Allow Public Upload" => "Omogućite javno učitavanje",
-"Email link to person" => "Pošaljite osobi vezu e-poštom",
-"Send" => "Pošaljite",
-"Set expiration date" => "Odredite datum isteka",
-"Expiration date" => "Datum isteka",
-"group" => "Grupa",
-"Resharing is not allowed" => "Ponovno dijeljenje nije dopušteno",
-"Shared in {item} with {user}" => "Podijeljeno u {item} s {user}",
-"Unshare" => "Prestanite dijeliti",
-"notify by email" => "Obavijestite e-poštom",
-"can share" => "Dijeljenje moguće",
-"can edit" => "Uređivanje moguće",
-"access control" => "Kontrola pristupa",
-"create" => "Kreirajte",
-"update" => "Ažurirajte",
-"delete" => "Izbrišite",
-"Password protected" => "Lozinka zaštićena",
-"Error unsetting expiration date" => "Pogrešno uklanjanje postavke datuma isteka",
-"Error setting expiration date" => "Pogrešno učitavanje postavke datuma isteka",
-"Sending ..." => "Slanje...",
-"Email sent" => "E-pošta poslana",
-"Warning" => "Upozorenje",
-"The object type is not specified." => "Vrsta objekta nije specificirana.",
-"Enter new" => "Unesite novi",
-"Delete" => "Izbrišite",
-"Add" => "Dodajte",
-"Edit tags" => "Uredite oznake",
-"Error loading dialog template: {error}" => "Pogrešno učitavanje predloška dijaloga: {error}",
-"No tags selected for deletion." => "Nijedna oznaka nije odabrana za brisanje.",
-"Updating {productName} to version {version}, this may take a while." => "Uređivanje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
-"Please reload the page." => "Molimo, ponovno učitajte stranicu",
-"The update was unsuccessful." => "Ažuriranje nije uspjelo",
-"The update was successful. Redirecting you to ownCloud now." => "Ažuriranje je uspjelo. Upravo ste preusmjeravani na ownCloud.",
-"Couldn't reset password because the token is invalid" => "Resetiranje lozinke nije moguće jer je token neispravan.",
-"Couldn't send reset email. Please make sure your username is correct." => "Resetiranu e-poštu nije moguće poslati.Molimo provjerite ispravnost svoga korisničkog imena.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Resetiranu e-poštu nije moguće poslati jer za ovo korisničko ime ne postoji adresa.Molimo, kontaktirajte svog administratora.",
-"%s password reset" => "%s lozinka resetirana",
-"Use the following link to reset your password: {link}" => "Za resetiranje svoje lozinke koristite sljedeću vezu: {link}",
-"You will receive a link to reset your password via Email." => "Vezu za resetiranje svoje lozinke primit ćete e-poštom.",
-"Username" => "Korisničko ime",
-"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?" => "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka, svoje podatke nećetemoći dohvatiti nakon što vaša lozinka bude resetirana. Ako niste sigurni što učiniti, molimokontaktirajte svog administratora prije nego li nastavite. Želite li doista nastaviti?",
-"Yes, I really want to reset my password now" => "Da, ja doista želim sada resetirati svojju lozinku.",
-"Reset" => "Resetirajte",
-"New password" => "Nova lozinka",
-"New Password" => "Nova lozinka",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nije podržan i %s na ovoj platformi neće raditi kako treba.",
-"For the best results, please consider using a GNU/Linux server instead." => "Za najbolje rezultate, molimo razmotrite mogućnost korištenje poslužitelja GNU/Linux.",
-"Personal" => "Osobno",
-"Users" => "Korisnici",
-"Apps" => "Aplikacije",
-"Admin" => "Admin",
-"Help" => "Pomoć",
-"Error loading tags" => "Pogrešno učitavanje oznaka",
-"Tag already exists" => "Oznaka već postoji",
-"Error deleting tag(s)" => "Pogrešno brisanje oznake (oznaka)",
-"Error tagging" => "Pogrešno označavanje",
-"Error untagging" => "Pogrešno uklanjanje oznaka",
-"Error favoriting" => "Pogrešno dodavanje u favorite",
-"Error unfavoriting" => "Pogrešno uklanjanje iz favorita",
-"Access forbidden" => "Pristup zabranjen",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej, \n\nsamo vam javljamo da je %s podijelio %s s vama.\nPogledajte ga: %s\n\n",
-"The share will expire on %s." => "Podijeljeni resurs će isteći na %s.",
-"Cheers!" => "Cheers!",
-"Security Warning" => "Sigurnosno upozorenje",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Vaša PHP verzija je podložna napadu NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Molimo ažurirajte svoju PHP instalaciju da biste mogli sigurno koristiti %s.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
-"Create an <strong>admin account</strong>" => "Kreirajte <strong>admin račun</strong>",
-"Password" => "Lozinka",
-"Storage & database" => "Pohrana & baza podataka",
-"Data folder" => "Mapa za podatke",
-"Configure the database" => "Konfigurirajte bazu podataka",
-"Only %s is available." => "Jedino je %s dostupan.",
-"Database user" => "Korisnik baze podataka",
-"Database password" => "Lozinka baze podataka",
-"Database name" => "Naziv baze podataka",
-"Database tablespace" => "Tablespace (?) baze podataka",
-"Database host" => "Glavno računalo baze podataka",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.",
-"Finish setup" => "Završite postavljanje",
-"Finishing …" => "Završavanje...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Ova aplikacija zahtjeva JavaScript za ispravan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> uključite JavaScript</a> i ponovno učitajte stranicu.",
-"%s is available. Get more information on how to update." => "%s je dostupan. Saznajte više informacija o tome kako ažurirati.",
-"Log out" => "Odjavite se",
-"Server side authentication failed!" => "Autentikacija na strani poslužitelja nije uspjela!",
-"Please contact your administrator." => "Molimo kontaktirajte svog administratora.",
-"Forgot your password? Reset it!" => "Zaboravili ste svoju lozinku? Resetirajte ju!",
-"remember" => "Sjetite se",
-"Log in" => "Prijavite se",
-"Alternative Logins" => "Alternativne prijave",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej, <br><br> vam upravo javlja da je %s podijelio <strong>%s</strong>s vama.<br><a href=\"%s\">POgledajte!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Ova ownCloud instanca je trenutno u načinu rada za jednog korisnika.",
-"This means only administrators can use the instance." => "To znači da tu instancu mogu koristiti samo administratori.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktirajte svog administratora sustava ako se ova poruka ponavlja ili sepojavila neočekivano.",
-"Thank you for your patience." => "Hvala vam na strpljenju",
-"You are accessing the server from an untrusted domain." => "Poslužitelju pristupate iz nepouzdane domene.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Molimo kontaktirajte svog administratora. Ako ste vi administrator ove instance,konfigurirajte postavku \"trusted_domain\" config/config.php.Primjer konfiguracije ponuđen je u config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Ovisno o vašoj konfiguraciji, kao administrator vi biste također mogli koristitigumb dolje za pristup toj domeni.",
-"Add \"%s\" as trusted domain" => "Dodajte \"%s\" kao pouzdanu domenu.",
-"%s will be updated to version %s." => "%s će biti ažuriran u verziju %s",
-"The following apps will be disabled:" => "Sljedeće aplikacije bit će onemogućene",
-"The theme %s has been disabled." => "Tema %s je onemogućena",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Prije nego li nastavite, molimo osigurajte da su baza podataka, mapa konfiguracije i mapaza podatke sigurnosno kopirani.",
-"Start update" => "Započnite ažuriranje",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Da biste izbjegli vremensko prekoračenje s većim instalacijama, možete pokrenutisljedeću naredbu iz svoga instalacijskog direktorija:"
-);
-$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
new file mode 100644
index 00000000000..1220cf05713
--- /dev/null
+++ b/core/l10n/hu_HU.js
@@ -0,0 +1,205 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
+    "Turned on maintenance mode" : "A karbantartási mód bekapcsolva",
+    "Turned off maintenance mode" : "A karbantartási mód kikapcsolva",
+    "Updated database" : "Az adatbázis frissítése megtörtént",
+    "Checked database schema update" : "Az adatbázis séma frissítését ellenőriztük",
+    "Checked database schema update for apps" : "Az adatbázis séma frissítését ellenőriztük az alkalmazásokra vontakozóan",
+    "Updated \"%s\" to %s" : "Frissítettük  \"%s\"-t erre: %s",
+    "Disabled incompatible apps: %s" : "Letiltásra került inkompatibilis alkalmazások: %s",
+    "No image or file provided" : "Nincs kép vagy fájl megadva",
+    "Unknown filetype" : "Ismeretlen fájltípus",
+    "Invalid image" : "Hibás kép",
+    "No temporary profile picture available, try again" : "Az átmeneti profilkép nem elérhető, próbálja újra",
+    "No crop data provided" : "Vágáshoz nincs adat megadva",
+    "Sunday" : "vasárnap",
+    "Monday" : "hétfő",
+    "Tuesday" : "kedd",
+    "Wednesday" : "szerda",
+    "Thursday" : "csütörtök",
+    "Friday" : "péntek",
+    "Saturday" : "szombat",
+    "January" : "január",
+    "February" : "február",
+    "March" : "március",
+    "April" : "április",
+    "May" : "május",
+    "June" : "június",
+    "July" : "július",
+    "August" : "augusztus",
+    "September" : "szeptember",
+    "October" : "október",
+    "November" : "november",
+    "December" : "december",
+    "Settings" : "Beállítások",
+    "File" : "Fájl",
+    "Folder" : "Mappa",
+    "Image" : "Kép",
+    "Audio" : "Hang",
+    "Saving..." : "Mentés...",
+    "Couldn't send reset email. Please contact your administrator." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával.",
+    "The link to reset your password has been sent to your email. 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." : "A jelszó felülírásához a linket e-mailben elküldtük. Ha a levél elfogadható időn belül nem érkezik meg, ellenőrizze a spam/levélszemét mappát.<br>Ha nincs ott, kérdezze meg a helyi rendszergazdát.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
+    "I know what I'm doing" : "Tudom mit csinálok.",
+    "Reset password" : "Jelszó-visszaállítás",
+    "Password can not be changed. Please contact your administrator." : "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.",
+    "No" : "Nem",
+    "Yes" : "Igen",
+    "Choose" : "Válasszon",
+    "Error loading file picker template: {error}" : "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Nem sikerült betölteni az üzenet sablont: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} fájl ütközik","{count} fájl ütközik"],
+    "One file conflict" : "Egy fájl ütközik",
+    "New Files" : "Új fájlok",
+    "Already existing files" : "A fájlok már léteznek",
+    "Which files do you want to keep?" : "Melyik fájlokat akarja megtartani?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ha mindkét verziót kiválasztja, a másolt fájlok neve sorszámozva lesz.",
+    "Cancel" : "Mégsem",
+    "Continue" : "Folytatás",
+    "(all selected)" : "(az összes ki lett választva)",
+    "({count} selected)" : "({count} lett kiválasztva)",
+    "Error loading file exists template" : "Hiba a létezőfájl-sablon betöltésekor",
+    "Very weak password" : "Nagyon gyenge jelszó",
+    "Weak password" : "Gyenge jelszó",
+    "So-so password" : "Nem túl jó jelszó",
+    "Good password" : "Jó jelszó",
+    "Strong password" : "Erős jelszó",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "A kiszolgálónak nem működik az internetkapcsolata. Ez azt jelenti, hogy bizonyos funkciók nem fognak működni, mint pl. külső tárolók becsatolása, automatikus frissítési értesítések vagy más fejlesztők /3rd party/ által írt alkalmazások telepítése. Az állományok távolról történő elérése valamint e-mail értesítések küldése szintén lehet, hogy nem fog működni. Javasoljuk, hogy engedélyezze a kiszolgáló internetelérését, ha az összes funkciót szeretné használni.",
+    "Error occurred while checking server setup" : "Hiba történt a szerver beállítások ellenőrzése közben",
+    "Shared" : "Megosztott",
+    "Shared with {recipients}" : "Megosztva ővelük: {recipients}",
+    "Share" : "Megosztás",
+    "Error" : "Hiba",
+    "Error while sharing" : "Nem sikerült létrehozni a megosztást",
+    "Error while unsharing" : "Nem sikerült visszavonni a megosztást",
+    "Error while changing permissions" : "Nem sikerült módosítani a jogosultságokat",
+    "Shared with you and the group {group} by {owner}" : "Megosztotta Önnel és a(z) {group} csoporttal: {owner}",
+    "Shared with you by {owner}" : "Megosztotta Önnel: {owner}",
+    "Share with user or group …" : "Megosztani egy felhasználóval vagy csoporttal ...",
+    "Share link" : "Megosztás hivatkozással",
+    "The public link will expire no later than {days} days after it is created" : "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
+    "Password protect" : "Jelszóval is védem",
+    "Choose a password for the public link" : "Válasszon egy jelszót a nyilvános linkhez",
+    "Allow Public Upload" : "Feltöltést is engedélyezek",
+    "Email link to person" : "Email címre küldjük el",
+    "Send" : "Küldjük el",
+    "Set expiration date" : "Legyen lejárati idő",
+    "Expiration date" : "A lejárati idő",
+    "Adding user..." : "Felhasználó hozzáadása...",
+    "group" : "csoport",
+    "Resharing is not allowed" : "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal",
+    "Shared in {item} with {user}" : "Megosztva {item}-ben {user}-rel",
+    "Unshare" : "A megosztás visszavonása",
+    "notify by email" : "e-mail értesítés",
+    "can share" : "megosztható",
+    "can edit" : "módosíthat",
+    "access control" : "jogosultság",
+    "create" : "létrehoz",
+    "update" : "szerkeszt",
+    "delete" : "töröl",
+    "Password protected" : "Jelszóval van védve",
+    "Error unsetting expiration date" : "Nem sikerült a lejárati időt törölni",
+    "Error setting expiration date" : "Nem sikerült a lejárati időt beállítani",
+    "Sending ..." : "Küldés ...",
+    "Email sent" : "Az e-mailt elküldtük",
+    "Warning" : "Figyelmeztetés",
+    "The object type is not specified." : "Az objektum típusa nincs megadva.",
+    "Enter new" : "Új beírása",
+    "Delete" : "Törlés",
+    "Add" : "Hozzáadás",
+    "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.",
+    "Updating {productName} to version {version}, this may take a while." : " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig.",
+    "Please reload the page." : "Kérjük frissítse az oldalt!",
+    "The update was unsuccessful." : "A frissítés nem sikerült.",
+    "The update was successful. Redirecting you to ownCloud now." : "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
+    "Couldn't reset password because the token is invalid" : "Nem lehet a jelszót törölni, mert a token érvénytelen.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával. ",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.",
+    "%s password reset" : "%s jelszó visszaállítás",
+    "Use the following link to reset your password: {link}" : "Használja ezt a linket a jelszó ismételt beállításához: {link}",
+    "You will receive a link to reset your password via Email." : "Egy e-mailben fog értesítést kapni a jelszóbeállítás módjáról.",
+    "Username" : "Felhasználónév",
+    "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?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
+    "Yes, I really want to reset my password now" : "Igen, tényleg meg akarom változtatni a jelszavam",
+    "Reset" : "Visszaállítás",
+    "New password" : "Az új jelszó",
+    "New Password" : "Új jelszó",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!",
+    "For the best results, please consider using a GNU/Linux server instead." : "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.",
+    "Personal" : "Személyes",
+    "Users" : "Felhasználók",
+    "Apps" : "Alkalmazások",
+    "Admin" : "Adminsztráció",
+    "Help" : "Súgó",
+    "Error loading tags" : "Hiba a címkék betöltésekor",
+    "Tag already exists" : "A címke már létezik",
+    "Error deleting tag(s)" : "Hiba a címkék törlésekor",
+    "Error tagging" : "Hiba a címkézéskor",
+    "Error untagging" : "Hiba a címkék eltávolításakor",
+    "Error favoriting" : "Hiba a kedvencekhez adáskor",
+    "Error unfavoriting" : "Hiba a kedvencekből törléskor",
+    "Access forbidden" : "A hozzáférés nem engedélyezett",
+    "File not found" : "Fájl nem található",
+    "The specified document has not been found on the server." : "A meghatározott dokumentum nem található a szerveren.",
+    "You can click here to return to %s." : "Ide kattintva visszatérhetsz ide: %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Üdv!\\n\n\\n\nÉrtesítjük, hogy %s megosztotta Önnel a következőt: %s.\\n\nItt lehet megnézni: %s\\n\n\\n",
+    "The share will expire on %s." : "A megosztás lejár ekkor %s",
+    "Cheers!" : "Üdv.",
+    "Internal Server Error" : "Belső szerver hiba",
+    "Technical details" : "Technikai adatok",
+    "Remote Address: %s" : "Távoli cím: %s",
+    "Request ID: %s" : "Kérelem azonosító: %s",
+    "Code: %s" : "Kód: %s",
+    "Message: %s" : "Üzenet: %s",
+    "File: %s" : "Fájl: %s",
+    "Line: %s" : "Sor: %s",
+    "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)",
+    "Please update your PHP installation to use %s securely." : "Kérjük frissítse a telepített PHP csomagjait, hogy biztonságos legyen az %s szolgáltatása.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
+    "Create an <strong>admin account</strong>" : "<strong>Rendszergazdai belépés</strong> létrehozása",
+    "Password" : "Jelszó",
+    "Storage & database" : "Tárolás és adatbázis",
+    "Data folder" : "Adatkönyvtár",
+    "Configure the database" : "Adatbázis konfigurálása",
+    "Only %s is available." : "Csak %s érhető el.",
+    "Database user" : "Adatbázis felhasználónév",
+    "Database password" : "Adatbázis jelszó",
+    "Database name" : "Az adatbázis neve",
+    "Database tablespace" : "Az adatbázis táblázattér (tablespace)",
+    "Database host" : "Adatbázis szerver",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy változtassa meg ezt a beállítást.",
+    "Finish setup" : "A beállítások befejezése",
+    "Finishing …" : "Befejezés ...",
+    "%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",
+    "Server side authentication failed!" : "A szerveroldali hitelesítés sikertelen!",
+    "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.",
+    "Forgot your password? Reset it!" : "Elfelejtette a jelszavát? Állítsa vissza!",
+    "remember" : "emlékezzen",
+    "Log in" : "Bejelentkezés",
+    "Alternative Logins" : "Alternatív bejelentkezés",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Üdvözöljük!<br><br>\n\nÉrtesítjük, hogy %s megosztotta Önnel ezt az állományt: <strong>%s</strong><br>\n<a href=\"%s\">Itt lehet megnézni!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik.",
+    "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 ez az üzenet ismételten vagy indokolatlanul megjelenik, akkor keresse a rendszergazda segítségét!",
+    "Thank you for your patience." : "Köszönjük a türelmét.",
+    "You are accessing the server from an untrusted domain." : "A kiszolgálót nem megbízható tartományból éri el.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kérjük keresse fel a rendszergazdát! Ha ennek a telepítésnek Ön a rendszergazdája, akkor állítsa be a config/config.php állományban a \"trusted_domain\" paramétert! A config/config.sample.php állományban talál példát a beállításra.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "A beállításoktól függően, rendszergazdaként lehetséges, hogy az alábbi gombot is használhatja a tartomány megbízhatóvá tételéhez.",
+    "Add \"%s\" as trusted domain" : "Adjuk hozzá \"%s\"-t a megbízható tartományokhoz!",
+    "%s will be updated to version %s." : "%s frissítődni fog erre a verzióra: %s.",
+    "The following apps will be disabled:" : "A következő alkalmazások lesznek letiltva:",
+    "The theme %s has been disabled." : "Ez a smink: %s letiltásra került.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Kérjük gondoskodjon róla, hogy elmentse az adatbázist, a konfigurációs mappa és az adatamappa tartalmát, mielőtt folytatja.",
+    "Start update" : "A frissítés megkezdése",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Nagyobb telepítések esetén úgy kerülhetők el az időtúllépések, ha inkább a következő parancsot adja ki a telepítési alkönyvtárban:"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
new file mode 100644
index 00000000000..28b3ecb3c45
--- /dev/null
+++ b/core/l10n/hu_HU.json
@@ -0,0 +1,203 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
+    "Turned on maintenance mode" : "A karbantartási mód bekapcsolva",
+    "Turned off maintenance mode" : "A karbantartási mód kikapcsolva",
+    "Updated database" : "Az adatbázis frissítése megtörtént",
+    "Checked database schema update" : "Az adatbázis séma frissítését ellenőriztük",
+    "Checked database schema update for apps" : "Az adatbázis séma frissítését ellenőriztük az alkalmazásokra vontakozóan",
+    "Updated \"%s\" to %s" : "Frissítettük  \"%s\"-t erre: %s",
+    "Disabled incompatible apps: %s" : "Letiltásra került inkompatibilis alkalmazások: %s",
+    "No image or file provided" : "Nincs kép vagy fájl megadva",
+    "Unknown filetype" : "Ismeretlen fájltípus",
+    "Invalid image" : "Hibás kép",
+    "No temporary profile picture available, try again" : "Az átmeneti profilkép nem elérhető, próbálja újra",
+    "No crop data provided" : "Vágáshoz nincs adat megadva",
+    "Sunday" : "vasárnap",
+    "Monday" : "hétfő",
+    "Tuesday" : "kedd",
+    "Wednesday" : "szerda",
+    "Thursday" : "csütörtök",
+    "Friday" : "péntek",
+    "Saturday" : "szombat",
+    "January" : "január",
+    "February" : "február",
+    "March" : "március",
+    "April" : "április",
+    "May" : "május",
+    "June" : "június",
+    "July" : "július",
+    "August" : "augusztus",
+    "September" : "szeptember",
+    "October" : "október",
+    "November" : "november",
+    "December" : "december",
+    "Settings" : "Beállítások",
+    "File" : "Fájl",
+    "Folder" : "Mappa",
+    "Image" : "Kép",
+    "Audio" : "Hang",
+    "Saving..." : "Mentés...",
+    "Couldn't send reset email. Please contact your administrator." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával.",
+    "The link to reset your password has been sent to your email. 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." : "A jelszó felülírásához a linket e-mailben elküldtük. Ha a levél elfogadható időn belül nem érkezik meg, ellenőrizze a spam/levélszemét mappát.<br>Ha nincs ott, kérdezze meg a helyi rendszergazdát.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
+    "I know what I'm doing" : "Tudom mit csinálok.",
+    "Reset password" : "Jelszó-visszaállítás",
+    "Password can not be changed. Please contact your administrator." : "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.",
+    "No" : "Nem",
+    "Yes" : "Igen",
+    "Choose" : "Válasszon",
+    "Error loading file picker template: {error}" : "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Nem sikerült betölteni az üzenet sablont: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} fájl ütközik","{count} fájl ütközik"],
+    "One file conflict" : "Egy fájl ütközik",
+    "New Files" : "Új fájlok",
+    "Already existing files" : "A fájlok már léteznek",
+    "Which files do you want to keep?" : "Melyik fájlokat akarja megtartani?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ha mindkét verziót kiválasztja, a másolt fájlok neve sorszámozva lesz.",
+    "Cancel" : "Mégsem",
+    "Continue" : "Folytatás",
+    "(all selected)" : "(az összes ki lett választva)",
+    "({count} selected)" : "({count} lett kiválasztva)",
+    "Error loading file exists template" : "Hiba a létezőfájl-sablon betöltésekor",
+    "Very weak password" : "Nagyon gyenge jelszó",
+    "Weak password" : "Gyenge jelszó",
+    "So-so password" : "Nem túl jó jelszó",
+    "Good password" : "Jó jelszó",
+    "Strong password" : "Erős jelszó",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "A kiszolgálónak nem működik az internetkapcsolata. Ez azt jelenti, hogy bizonyos funkciók nem fognak működni, mint pl. külső tárolók becsatolása, automatikus frissítési értesítések vagy más fejlesztők /3rd party/ által írt alkalmazások telepítése. Az állományok távolról történő elérése valamint e-mail értesítések küldése szintén lehet, hogy nem fog működni. Javasoljuk, hogy engedélyezze a kiszolgáló internetelérését, ha az összes funkciót szeretné használni.",
+    "Error occurred while checking server setup" : "Hiba történt a szerver beállítások ellenőrzése közben",
+    "Shared" : "Megosztott",
+    "Shared with {recipients}" : "Megosztva ővelük: {recipients}",
+    "Share" : "Megosztás",
+    "Error" : "Hiba",
+    "Error while sharing" : "Nem sikerült létrehozni a megosztást",
+    "Error while unsharing" : "Nem sikerült visszavonni a megosztást",
+    "Error while changing permissions" : "Nem sikerült módosítani a jogosultságokat",
+    "Shared with you and the group {group} by {owner}" : "Megosztotta Önnel és a(z) {group} csoporttal: {owner}",
+    "Shared with you by {owner}" : "Megosztotta Önnel: {owner}",
+    "Share with user or group …" : "Megosztani egy felhasználóval vagy csoporttal ...",
+    "Share link" : "Megosztás hivatkozással",
+    "The public link will expire no later than {days} days after it is created" : "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
+    "Password protect" : "Jelszóval is védem",
+    "Choose a password for the public link" : "Válasszon egy jelszót a nyilvános linkhez",
+    "Allow Public Upload" : "Feltöltést is engedélyezek",
+    "Email link to person" : "Email címre küldjük el",
+    "Send" : "Küldjük el",
+    "Set expiration date" : "Legyen lejárati idő",
+    "Expiration date" : "A lejárati idő",
+    "Adding user..." : "Felhasználó hozzáadása...",
+    "group" : "csoport",
+    "Resharing is not allowed" : "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal",
+    "Shared in {item} with {user}" : "Megosztva {item}-ben {user}-rel",
+    "Unshare" : "A megosztás visszavonása",
+    "notify by email" : "e-mail értesítés",
+    "can share" : "megosztható",
+    "can edit" : "módosíthat",
+    "access control" : "jogosultság",
+    "create" : "létrehoz",
+    "update" : "szerkeszt",
+    "delete" : "töröl",
+    "Password protected" : "Jelszóval van védve",
+    "Error unsetting expiration date" : "Nem sikerült a lejárati időt törölni",
+    "Error setting expiration date" : "Nem sikerült a lejárati időt beállítani",
+    "Sending ..." : "Küldés ...",
+    "Email sent" : "Az e-mailt elküldtük",
+    "Warning" : "Figyelmeztetés",
+    "The object type is not specified." : "Az objektum típusa nincs megadva.",
+    "Enter new" : "Új beírása",
+    "Delete" : "Törlés",
+    "Add" : "Hozzáadás",
+    "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.",
+    "Updating {productName} to version {version}, this may take a while." : " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig.",
+    "Please reload the page." : "Kérjük frissítse az oldalt!",
+    "The update was unsuccessful." : "A frissítés nem sikerült.",
+    "The update was successful. Redirecting you to ownCloud now." : "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
+    "Couldn't reset password because the token is invalid" : "Nem lehet a jelszót törölni, mert a token érvénytelen.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával. ",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.",
+    "%s password reset" : "%s jelszó visszaállítás",
+    "Use the following link to reset your password: {link}" : "Használja ezt a linket a jelszó ismételt beállításához: {link}",
+    "You will receive a link to reset your password via Email." : "Egy e-mailben fog értesítést kapni a jelszóbeállítás módjáról.",
+    "Username" : "Felhasználónév",
+    "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?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
+    "Yes, I really want to reset my password now" : "Igen, tényleg meg akarom változtatni a jelszavam",
+    "Reset" : "Visszaállítás",
+    "New password" : "Az új jelszó",
+    "New Password" : "Új jelszó",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!",
+    "For the best results, please consider using a GNU/Linux server instead." : "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.",
+    "Personal" : "Személyes",
+    "Users" : "Felhasználók",
+    "Apps" : "Alkalmazások",
+    "Admin" : "Adminsztráció",
+    "Help" : "Súgó",
+    "Error loading tags" : "Hiba a címkék betöltésekor",
+    "Tag already exists" : "A címke már létezik",
+    "Error deleting tag(s)" : "Hiba a címkék törlésekor",
+    "Error tagging" : "Hiba a címkézéskor",
+    "Error untagging" : "Hiba a címkék eltávolításakor",
+    "Error favoriting" : "Hiba a kedvencekhez adáskor",
+    "Error unfavoriting" : "Hiba a kedvencekből törléskor",
+    "Access forbidden" : "A hozzáférés nem engedélyezett",
+    "File not found" : "Fájl nem található",
+    "The specified document has not been found on the server." : "A meghatározott dokumentum nem található a szerveren.",
+    "You can click here to return to %s." : "Ide kattintva visszatérhetsz ide: %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Üdv!\\n\n\\n\nÉrtesítjük, hogy %s megosztotta Önnel a következőt: %s.\\n\nItt lehet megnézni: %s\\n\n\\n",
+    "The share will expire on %s." : "A megosztás lejár ekkor %s",
+    "Cheers!" : "Üdv.",
+    "Internal Server Error" : "Belső szerver hiba",
+    "Technical details" : "Technikai adatok",
+    "Remote Address: %s" : "Távoli cím: %s",
+    "Request ID: %s" : "Kérelem azonosító: %s",
+    "Code: %s" : "Kód: %s",
+    "Message: %s" : "Üzenet: %s",
+    "File: %s" : "Fájl: %s",
+    "Line: %s" : "Sor: %s",
+    "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)",
+    "Please update your PHP installation to use %s securely." : "Kérjük frissítse a telepített PHP csomagjait, hogy biztonságos legyen az %s szolgáltatása.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
+    "Create an <strong>admin account</strong>" : "<strong>Rendszergazdai belépés</strong> létrehozása",
+    "Password" : "Jelszó",
+    "Storage & database" : "Tárolás és adatbázis",
+    "Data folder" : "Adatkönyvtár",
+    "Configure the database" : "Adatbázis konfigurálása",
+    "Only %s is available." : "Csak %s érhető el.",
+    "Database user" : "Adatbázis felhasználónév",
+    "Database password" : "Adatbázis jelszó",
+    "Database name" : "Az adatbázis neve",
+    "Database tablespace" : "Az adatbázis táblázattér (tablespace)",
+    "Database host" : "Adatbázis szerver",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy változtassa meg ezt a beállítást.",
+    "Finish setup" : "A beállítások befejezése",
+    "Finishing …" : "Befejezés ...",
+    "%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",
+    "Server side authentication failed!" : "A szerveroldali hitelesítés sikertelen!",
+    "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.",
+    "Forgot your password? Reset it!" : "Elfelejtette a jelszavát? Állítsa vissza!",
+    "remember" : "emlékezzen",
+    "Log in" : "Bejelentkezés",
+    "Alternative Logins" : "Alternatív bejelentkezés",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Üdvözöljük!<br><br>\n\nÉrtesítjük, hogy %s megosztotta Önnel ezt az állományt: <strong>%s</strong><br>\n<a href=\"%s\">Itt lehet megnézni!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik.",
+    "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 ez az üzenet ismételten vagy indokolatlanul megjelenik, akkor keresse a rendszergazda segítségét!",
+    "Thank you for your patience." : "Köszönjük a türelmét.",
+    "You are accessing the server from an untrusted domain." : "A kiszolgálót nem megbízható tartományból éri el.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kérjük keresse fel a rendszergazdát! Ha ennek a telepítésnek Ön a rendszergazdája, akkor állítsa be a config/config.php állományban a \"trusted_domain\" paramétert! A config/config.sample.php állományban talál példát a beállításra.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "A beállításoktól függően, rendszergazdaként lehetséges, hogy az alábbi gombot is használhatja a tartomány megbízhatóvá tételéhez.",
+    "Add \"%s\" as trusted domain" : "Adjuk hozzá \"%s\"-t a megbízható tartományokhoz!",
+    "%s will be updated to version %s." : "%s frissítődni fog erre a verzióra: %s.",
+    "The following apps will be disabled:" : "A következő alkalmazások lesznek letiltva:",
+    "The theme %s has been disabled." : "Ez a smink: %s letiltásra került.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Kérjük gondoskodjon róla, hogy elmentse az adatbázist, a konfigurációs mappa és az adatamappa tartalmát, mielőtt folytatja.",
+    "Start update" : "A frissítés megkezdése",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Nagyobb telepítések esetén úgy kerülhetők el az időtúllépések, ha inkább a következő parancsot adja ki a telepítési alkönyvtárban:"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
deleted file mode 100644
index b5e28333cc9..00000000000
--- a/core/l10n/hu_HU.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
-"Turned on maintenance mode" => "A karbantartási mód bekapcsolva",
-"Turned off maintenance mode" => "A karbantartási mód kikapcsolva",
-"Updated database" => "Az adatbázis frissítése megtörtént",
-"Checked database schema update" => "Az adatbázis séma frissítését ellenőriztük",
-"Checked database schema update for apps" => "Az adatbázis séma frissítését ellenőriztük az alkalmazásokra vontakozóan",
-"Updated \"%s\" to %s" => "Frissítettük  \"%s\"-t erre: %s",
-"Disabled incompatible apps: %s" => "Letiltásra került inkompatibilis alkalmazások: %s",
-"No image or file provided" => "Nincs kép vagy fájl megadva",
-"Unknown filetype" => "Ismeretlen fájltípus",
-"Invalid image" => "Hibás kép",
-"No temporary profile picture available, try again" => "Az átmeneti profilkép nem elérhető, próbálja újra",
-"No crop data provided" => "Vágáshoz nincs adat megadva",
-"Sunday" => "vasárnap",
-"Monday" => "hétfő",
-"Tuesday" => "kedd",
-"Wednesday" => "szerda",
-"Thursday" => "csütörtök",
-"Friday" => "péntek",
-"Saturday" => "szombat",
-"January" => "január",
-"February" => "február",
-"March" => "március",
-"April" => "április",
-"May" => "május",
-"June" => "június",
-"July" => "július",
-"August" => "augusztus",
-"September" => "szeptember",
-"October" => "október",
-"November" => "november",
-"December" => "december",
-"Settings" => "Beállítások",
-"File" => "Fájl",
-"Folder" => "Mappa",
-"Image" => "Kép",
-"Audio" => "Hang",
-"Saving..." => "Mentés...",
-"Couldn't send reset email. Please contact your administrator." => "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával.",
-"The link to reset your password has been sent to your email. 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." => "A jelszó felülírásához a linket e-mailben elküldtük. Ha a levél elfogadható időn belül nem érkezik meg, ellenőrizze a spam/levélszemét mappát.<br>Ha nincs ott, kérdezze meg a helyi rendszergazdát.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
-"I know what I'm doing" => "Tudom mit csinálok.",
-"Reset password" => "Jelszó-visszaállítás",
-"Password can not be changed. Please contact your administrator." => "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.",
-"No" => "Nem",
-"Yes" => "Igen",
-"Choose" => "Válasszon",
-"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Nem sikerült betölteni az üzenet sablont: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} fájl ütközik","{count} fájl ütközik"),
-"One file conflict" => "Egy fájl ütközik",
-"New Files" => "Új fájlok",
-"Already existing files" => "A fájlok már léteznek",
-"Which files do you want to keep?" => "Melyik fájlokat akarja megtartani?",
-"If you select both versions, the copied file will have a number added to its name." => "Ha mindkét verziót kiválasztja, a másolt fájlok neve sorszámozva lesz.",
-"Cancel" => "Mégsem",
-"Continue" => "Folytatás",
-"(all selected)" => "(az összes ki lett választva)",
-"({count} selected)" => "({count} lett kiválasztva)",
-"Error loading file exists template" => "Hiba a létezőfájl-sablon betöltésekor",
-"Very weak password" => "Nagyon gyenge jelszó",
-"Weak password" => "Gyenge jelszó",
-"So-so password" => "Nem túl jó jelszó",
-"Good password" => "Jó jelszó",
-"Strong password" => "Erős jelszó",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "A kiszolgálónak nem működik az internetkapcsolata. Ez azt jelenti, hogy bizonyos funkciók nem fognak működni, mint pl. külső tárolók becsatolása, automatikus frissítési értesítések vagy más fejlesztők /3rd party/ által írt alkalmazások telepítése. Az állományok távolról történő elérése valamint e-mail értesítések küldése szintén lehet, hogy nem fog működni. Javasoljuk, hogy engedélyezze a kiszolgáló internetelérését, ha az összes funkciót szeretné használni.",
-"Error occurred while checking server setup" => "Hiba történt a szerver beállítások ellenőrzése közben",
-"Shared" => "Megosztott",
-"Shared with {recipients}" => "Megosztva ővelük: {recipients}",
-"Share" => "Megosztás",
-"Error" => "Hiba",
-"Error while sharing" => "Nem sikerült létrehozni a megosztást",
-"Error while unsharing" => "Nem sikerült visszavonni a megosztást",
-"Error while changing permissions" => "Nem sikerült módosítani a jogosultságokat",
-"Shared with you and the group {group} by {owner}" => "Megosztotta Önnel és a(z) {group} csoporttal: {owner}",
-"Shared with you by {owner}" => "Megosztotta Önnel: {owner}",
-"Share with user or group …" => "Megosztani egy felhasználóval vagy csoporttal ...",
-"Share link" => "Megosztás hivatkozással",
-"The public link will expire no later than {days} days after it is created" => "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
-"Password protect" => "Jelszóval is védem",
-"Choose a password for the public link" => "Válasszon egy jelszót a nyilvános linkhez",
-"Allow Public Upload" => "Feltöltést is engedélyezek",
-"Email link to person" => "Email címre küldjük el",
-"Send" => "Küldjük el",
-"Set expiration date" => "Legyen lejárati idő",
-"Expiration date" => "A lejárati idő",
-"Adding user..." => "Felhasználó hozzáadása...",
-"group" => "csoport",
-"Resharing is not allowed" => "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal",
-"Shared in {item} with {user}" => "Megosztva {item}-ben {user}-rel",
-"Unshare" => "A megosztás visszavonása",
-"notify by email" => "e-mail értesítés",
-"can share" => "megosztható",
-"can edit" => "módosíthat",
-"access control" => "jogosultság",
-"create" => "létrehoz",
-"update" => "szerkeszt",
-"delete" => "töröl",
-"Password protected" => "Jelszóval van védve",
-"Error unsetting expiration date" => "Nem sikerült a lejárati időt törölni",
-"Error setting expiration date" => "Nem sikerült a lejárati időt beállítani",
-"Sending ..." => "Küldés ...",
-"Email sent" => "Az e-mailt elküldtük",
-"Warning" => "Figyelmeztetés",
-"The object type is not specified." => "Az objektum típusa nincs megadva.",
-"Enter new" => "Új beírása",
-"Delete" => "Törlés",
-"Add" => "Hozzáadás",
-"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.",
-"Updating {productName} to version {version}, this may take a while." => " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig.",
-"Please reload the page." => "Kérjük frissítse az oldalt!",
-"The update was unsuccessful." => "A frissítés nem sikerült.",
-"The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
-"Couldn't reset password because the token is invalid" => "Nem lehet a jelszót törölni, mert a token érvénytelen.",
-"Couldn't send reset email. Please make sure your username is correct." => "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával. ",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.",
-"%s password reset" => "%s jelszó visszaállítás",
-"Use the following link to reset your password: {link}" => "Használja ezt a linket a jelszó ismételt beállításához: {link}",
-"You will receive a link to reset your password via Email." => "Egy e-mailben fog értesítést kapni a jelszóbeállítás módjáról.",
-"Username" => "Felhasználónév",
-"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?" => "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
-"Yes, I really want to reset my password now" => "Igen, tényleg meg akarom változtatni a jelszavam",
-"Reset" => "Visszaállítás",
-"New password" => "Az új jelszó",
-"New Password" => "Új jelszó",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!",
-"For the best results, please consider using a GNU/Linux server instead." => "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.",
-"Personal" => "Személyes",
-"Users" => "Felhasználók",
-"Apps" => "Alkalmazások",
-"Admin" => "Adminsztráció",
-"Help" => "Súgó",
-"Error loading tags" => "Hiba a címkék betöltésekor",
-"Tag already exists" => "A címke már létezik",
-"Error deleting tag(s)" => "Hiba a címkék törlésekor",
-"Error tagging" => "Hiba a címkézéskor",
-"Error untagging" => "Hiba a címkék eltávolításakor",
-"Error favoriting" => "Hiba a kedvencekhez adáskor",
-"Error unfavoriting" => "Hiba a kedvencekből törléskor",
-"Access forbidden" => "A hozzáférés nem engedélyezett",
-"File not found" => "Fájl nem található",
-"The specified document has not been found on the server." => "A meghatározott dokumentum nem található a szerveren.",
-"You can click here to return to %s." => "Ide kattintva visszatérhetsz ide: %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Üdv!\\n\n\\n\nÉrtesítjük, hogy %s megosztotta Önnel a következőt: %s.\\n\nItt lehet megnézni: %s\\n\n\\n",
-"The share will expire on %s." => "A megosztás lejár ekkor %s",
-"Cheers!" => "Üdv.",
-"Internal Server Error" => "Belső szerver hiba",
-"Technical details" => "Technikai adatok",
-"Remote Address: %s" => "Távoli cím: %s",
-"Request ID: %s" => "Kérelem azonosító: %s",
-"Code: %s" => "Kód: %s",
-"Message: %s" => "Üzenet: %s",
-"File: %s" => "Fájl: %s",
-"Line: %s" => "Sor: %s",
-"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)",
-"Please update your PHP installation to use %s securely." => "Kérjük frissítse a telepített PHP csomagjait, hogy biztonságos legyen az %s szolgáltatása.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
-"Create an <strong>admin account</strong>" => "<strong>Rendszergazdai belépés</strong> létrehozása",
-"Password" => "Jelszó",
-"Storage & database" => "Tárolás és adatbázis",
-"Data folder" => "Adatkönyvtár",
-"Configure the database" => "Adatbázis konfigurálása",
-"Only %s is available." => "Csak %s érhető el.",
-"Database user" => "Adatbázis felhasználónév",
-"Database password" => "Adatbázis jelszó",
-"Database name" => "Az adatbázis neve",
-"Database tablespace" => "Az adatbázis táblázattér (tablespace)",
-"Database host" => "Adatbázis szerver",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy változtassa meg ezt a beállítást.",
-"Finish setup" => "A beállítások befejezése",
-"Finishing …" => "Befejezés ...",
-"%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",
-"Server side authentication failed!" => "A szerveroldali hitelesítés sikertelen!",
-"Please contact your administrator." => "Kérjük, lépjen kapcsolatba a rendszergazdával.",
-"Forgot your password? Reset it!" => "Elfelejtette a jelszavát? Állítsa vissza!",
-"remember" => "emlékezzen",
-"Log in" => "Bejelentkezés",
-"Alternative Logins" => "Alternatív bejelentkezés",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Üdvözöljük!<br><br>\n\nÉrtesítjük, hogy %s megosztotta Önnel ezt az állományt: <strong>%s</strong><br>\n<a href=\"%s\">Itt lehet megnézni!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik.",
-"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 ez az üzenet ismételten vagy indokolatlanul megjelenik, akkor keresse a rendszergazda segítségét!",
-"Thank you for your patience." => "Köszönjük a türelmét.",
-"You are accessing the server from an untrusted domain." => "A kiszolgálót nem megbízható tartományból éri el.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Kérjük keresse fel a rendszergazdát! Ha ennek a telepítésnek Ön a rendszergazdája, akkor állítsa be a config/config.php állományban a \"trusted_domain\" paramétert! A config/config.sample.php állományban talál példát a beállításra.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "A beállításoktól függően, rendszergazdaként lehetséges, hogy az alábbi gombot is használhatja a tartomány megbízhatóvá tételéhez.",
-"Add \"%s\" as trusted domain" => "Adjuk hozzá \"%s\"-t a megbízható tartományokhoz!",
-"%s will be updated to version %s." => "%s frissítődni fog erre a verzióra: %s.",
-"The following apps will be disabled:" => "A következő alkalmazások lesznek letiltva:",
-"The theme %s has been disabled." => "Ez a smink: %s letiltásra került.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Kérjük gondoskodjon róla, hogy elmentse az adatbázist, a konfigurációs mappa és az adatamappa tartalmát, mielőtt folytatja.",
-"Start update" => "A frissítés megkezdése",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Nagyobb telepítések esetén úgy kerülhetők el az időtúllépések, ha inkább a következő parancsot adja ki a telepítési alkönyvtárban:"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hy.js b/core/l10n/hy.js
new file mode 100644
index 00000000000..7f69d32fa34
--- /dev/null
+++ b/core/l10n/hy.js
@@ -0,0 +1,26 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Կիրակի",
+    "Monday" : "Երկուշաբթի",
+    "Tuesday" : "Երեքշաբթի",
+    "Wednesday" : "Չորեքշաբթի",
+    "Thursday" : "Հինգշաբթի",
+    "Friday" : "Ուրբաթ",
+    "Saturday" : "Շաբաթ",
+    "January" : "Հունվար",
+    "February" : "Փետրվար",
+    "March" : "Մարտ",
+    "April" : "Ապրիլ",
+    "May" : "Մայիս",
+    "June" : "Հունիս",
+    "July" : "Հուլիս",
+    "August" : "Օգոստոս",
+    "September" : "Սեպտեմբեր",
+    "October" : "Հոկտեմբեր",
+    "November" : "Նոյեմբեր",
+    "December" : "Դեկտեմբեր",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Delete" : "Ջնջել"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/hy.json b/core/l10n/hy.json
new file mode 100644
index 00000000000..d650d6ee92b
--- /dev/null
+++ b/core/l10n/hy.json
@@ -0,0 +1,24 @@
+{ "translations": {
+    "Sunday" : "Կիրակի",
+    "Monday" : "Երկուշաբթի",
+    "Tuesday" : "Երեքշաբթի",
+    "Wednesday" : "Չորեքշաբթի",
+    "Thursday" : "Հինգշաբթի",
+    "Friday" : "Ուրբաթ",
+    "Saturday" : "Շաբաթ",
+    "January" : "Հունվար",
+    "February" : "Փետրվար",
+    "March" : "Մարտ",
+    "April" : "Ապրիլ",
+    "May" : "Մայիս",
+    "June" : "Հունիս",
+    "July" : "Հուլիս",
+    "August" : "Օգոստոս",
+    "September" : "Սեպտեմբեր",
+    "October" : "Հոկտեմբեր",
+    "November" : "Նոյեմբեր",
+    "December" : "Դեկտեմբեր",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Delete" : "Ջնջել"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/hy.php b/core/l10n/hy.php
deleted file mode 100644
index 956fe561b5a..00000000000
--- a/core/l10n/hy.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Կիրակի",
-"Monday" => "Երկուշաբթի",
-"Tuesday" => "Երեքշաբթի",
-"Wednesday" => "Չորեքշաբթի",
-"Thursday" => "Հինգշաբթի",
-"Friday" => "Ուրբաթ",
-"Saturday" => "Շաբաթ",
-"January" => "Հունվար",
-"February" => "Փետրվար",
-"March" => "Մարտ",
-"April" => "Ապրիլ",
-"May" => "Մայիս",
-"June" => "Հունիս",
-"July" => "Հուլիս",
-"August" => "Օգոստոս",
-"September" => "Սեպտեմբեր",
-"October" => "Հոկտեմբեր",
-"November" => "Նոյեմբեր",
-"December" => "Դեկտեմբեր",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Delete" => "Ջնջել"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ia.js b/core/l10n/ia.js
new file mode 100644
index 00000000000..515d612244d
--- /dev/null
+++ b/core/l10n/ia.js
@@ -0,0 +1,161 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "On non pote inviar message de e-posta a le usatores sequente: %s",
+    "Turned on maintenance mode" : "Activate modo de mantenentia",
+    "Turned off maintenance mode" : "De-activar modo de mantenentia",
+    "Updated database" : "Base de datos actualisate",
+    "Checked database schema update" : "Il ha verificate actualisation de schema de base de datos",
+    "Checked database schema update for apps" : "Il ha verificate actualisation de schema de base de datos pro apps",
+    "Updated \"%s\" to %s" : "Actualisava \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Apps non compatibile ha essite dishabilitate: %s",
+    "No image or file provided" : "Il forniva necun imagine o file",
+    "Unknown filetype" : "Typo de file incognite",
+    "Invalid image" : "Imagine invalide",
+    "No temporary profile picture available, try again" : "Necun photo de profilo temporanee disponibile, essaya novemente",
+    "Sunday" : "Dominica",
+    "Monday" : "Lunedi",
+    "Tuesday" : "Martedi",
+    "Wednesday" : "Mercuridi",
+    "Thursday" : "Jovedi",
+    "Friday" : "Venerdi",
+    "Saturday" : "Sabbato",
+    "January" : "januario",
+    "February" : "Februario",
+    "March" : "Martio",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Augusto",
+    "September" : "Septembre",
+    "October" : "Octobre",
+    "November" : "Novembre",
+    "December" : "Decembre",
+    "Settings" : "Configurationes",
+    "File" : "File",
+    "Folder" : "Dossier",
+    "Image" : "Imagine",
+    "Audio" : "Audio",
+    "Saving..." : "Salveguardante...",
+    "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
+    "I know what I'm doing" : "Io sape lo que io es facente",
+    "Reset password" : "Reinitialisar contrasigno",
+    "Password can not be changed. Please contact your administrator." : "Contrasigno non pote esser modificate. Pro favor continge tu administrator.",
+    "No" : "No",
+    "Yes" : "Si",
+    "Choose" : "Seliger",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de file","{count} conflictos de file"],
+    "One file conflict" : "Un conflicto de file",
+    "New Files" : "Nove files",
+    "Already existing files" : "Files jam existente",
+    "Which files do you want to keep?" : "Qual files tu vole mantener?",
+    "Cancel" : "Cancellar",
+    "Continue" : "Continuar",
+    "Error loading file exists template" : "Error quando on incargava patrono de file existente",
+    "Very weak password" : "Contrasigno multo debile",
+    "Weak password" : "Contrasigno debile",
+    "So-so password" : "Contrasigno passabile",
+    "Good password" : "Contrasigno bon",
+    "Strong password" : "Contrasigno forte",
+    "Error occurred while checking server setup" : "Un error occurreva quando on verificava le configuration de le servitor.",
+    "Shared" : "Compartite",
+    "Shared with {recipients}" : "Compatite con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Error quando on compartiva",
+    "Error while unsharing" : "Error quando on levava le compartir",
+    "Error while changing permissions" : "Error quando on modificava permissiones",
+    "Shared with you and the group {group} by {owner}" : "Compartite con te e le gruppo {group} per {owner}",
+    "Shared with you by {owner}" : "Compartite con te per {owner} ",
+    "Share with user or group …" : "Compartir con usator o gruppo ...",
+    "Share link" : "Compartir ligamine",
+    "Password protect" : "Protegite per contrasigno",
+    "Choose a password for the public link" : "Selige un contrasigno pro le ligamine public",
+    "Allow Public Upload" : "Permitter incargamento public",
+    "Email link to person" : "Ligamine de e-posta a persona",
+    "Send" : "Invia",
+    "Set expiration date" : "Fixa data de expiration",
+    "Expiration date" : "Data de expiration",
+    "Adding user..." : "Addente usator...",
+    "group" : "gruppo",
+    "Resharing is not allowed" : "Il non es permittite compartir plus que un vice",
+    "Shared in {item} with {user}" : "Compartite in  {item} con {user}",
+    "Unshare" : "Leva compartir",
+    "notify by email" : "notificar per message de e-posta",
+    "can share" : "pote compartir",
+    "can edit" : "pote modificar",
+    "access control" : "controlo de accesso",
+    "create" : "crear",
+    "update" : "actualisar",
+    "delete" : "deler",
+    "Password protected" : "Proteger con contrasigno",
+    "Error unsetting expiration date" : "Error quando on levava le data de expiration",
+    "Error setting expiration date" : "Error quando on fixava le data de expiration",
+    "Sending ..." : "Inviante ...",
+    "Email sent" : "Message de e-posta inviate",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "Le typo de objecto non es specificate",
+    "Enter new" : "Inserta nove",
+    "Delete" : "Deler",
+    "Add" : "Adder",
+    "Edit tags" : "Modifica etiquettas",
+    "Please reload the page." : "Pro favor recarga le pagina.",
+    "The update was unsuccessful." : "Le actualisation esseva successose.",
+    "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
+    "%s password reset" : "%s contrasigno re-fixate",
+    "Use the following link to reset your password: {link}" : "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}",
+    "You will receive a link to reset your password via Email." : "Tu recipera un ligamine pro re-configurar tu contrasigno via e-posta.",
+    "Username" : "Nomine de usator",
+    "Yes, I really want to reset my password now" : "Si, io vermente vole re-configurar mi contrasigno nunc",
+    "Reset" : "Re-fixar",
+    "New password" : "Nove contrasigno",
+    "New Password" : "Nove contrasigno",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pro le exitos melior, pro favor tu considera usar in loco un servitor GNU/Linux.",
+    "Personal" : "Personal",
+    "Users" : "Usatores",
+    "Apps" : "Applicationes",
+    "Admin" : "Administration",
+    "Help" : "Adjuta",
+    "Error loading tags" : "Error quando on cargava etiquettas",
+    "Tag already exists" : "Etiquetta ja existe",
+    "Access forbidden" : "Accesso prohibite",
+    "File not found" : "File non trovate",
+    "The specified document has not been found on the server." : "Le documento specificate non ha essite trovate sur le servitor.",
+    "The share will expire on %s." : "Le compartir expirara le %s.",
+    "Cheers!" : "Acclamationes!",
+    "Technical details" : "Detalios technic",
+    "Remote Address: %s" : "Adresse remote: %s",
+    "Request ID: %s" : "ID de requesta: %s",
+    "Code: %s" : "Codice: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Rango: %s",
+    "Trace" : "Tracia",
+    "Security Warning" : "Aviso de securitate",
+    "Please update your PHP installation to use %s securely." : "Pro favor actualisa tu installation de PHP pro usar %s con securitate.",
+    "Create an <strong>admin account</strong>" : "Crear un <strong>conto de administration</strong>",
+    "Password" : "Contrasigno",
+    "Storage & database" : "Immagazinage & base de datos",
+    "Data folder" : "Dossier de datos",
+    "Configure the database" : "Configurar le base de datos",
+    "Only %s is available." : "Solmente %s es disponibile",
+    "Database user" : "Usator de base de datos",
+    "Database password" : "Contrasigno de base de datos",
+    "Database name" : "Nomine de base de datos",
+    "Database tablespace" : "Spatio de tabella de base de datos",
+    "Database host" : "Hospite de base de datos",
+    "Finish setup" : "Terminar configuration",
+    "Finishing …" : "Terminante ...",
+    "Log out" : "Clauder le session",
+    "Server side authentication failed!" : "Il falleva authentication de latere servitor!",
+    "Please contact your administrator." : "Pro favor continge tu administrator.",
+    "Forgot your password? Reset it!" : "Tu oblidava tu contrasigno? Re-configura lo!",
+    "remember" : "memora",
+    "Log in" : "Aperir session",
+    "Alternative Logins" : "Accessos de autorisation alternative",
+    "Thank you for your patience." : "Gratias pro tu patientia.",
+    "Start update" : "Initia actualisation"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ia.json b/core/l10n/ia.json
new file mode 100644
index 00000000000..9814ab98abe
--- /dev/null
+++ b/core/l10n/ia.json
@@ -0,0 +1,159 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "On non pote inviar message de e-posta a le usatores sequente: %s",
+    "Turned on maintenance mode" : "Activate modo de mantenentia",
+    "Turned off maintenance mode" : "De-activar modo de mantenentia",
+    "Updated database" : "Base de datos actualisate",
+    "Checked database schema update" : "Il ha verificate actualisation de schema de base de datos",
+    "Checked database schema update for apps" : "Il ha verificate actualisation de schema de base de datos pro apps",
+    "Updated \"%s\" to %s" : "Actualisava \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Apps non compatibile ha essite dishabilitate: %s",
+    "No image or file provided" : "Il forniva necun imagine o file",
+    "Unknown filetype" : "Typo de file incognite",
+    "Invalid image" : "Imagine invalide",
+    "No temporary profile picture available, try again" : "Necun photo de profilo temporanee disponibile, essaya novemente",
+    "Sunday" : "Dominica",
+    "Monday" : "Lunedi",
+    "Tuesday" : "Martedi",
+    "Wednesday" : "Mercuridi",
+    "Thursday" : "Jovedi",
+    "Friday" : "Venerdi",
+    "Saturday" : "Sabbato",
+    "January" : "januario",
+    "February" : "Februario",
+    "March" : "Martio",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Augusto",
+    "September" : "Septembre",
+    "October" : "Octobre",
+    "November" : "Novembre",
+    "December" : "Decembre",
+    "Settings" : "Configurationes",
+    "File" : "File",
+    "Folder" : "Dossier",
+    "Image" : "Imagine",
+    "Audio" : "Audio",
+    "Saving..." : "Salveguardante...",
+    "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
+    "I know what I'm doing" : "Io sape lo que io es facente",
+    "Reset password" : "Reinitialisar contrasigno",
+    "Password can not be changed. Please contact your administrator." : "Contrasigno non pote esser modificate. Pro favor continge tu administrator.",
+    "No" : "No",
+    "Yes" : "Si",
+    "Choose" : "Seliger",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de file","{count} conflictos de file"],
+    "One file conflict" : "Un conflicto de file",
+    "New Files" : "Nove files",
+    "Already existing files" : "Files jam existente",
+    "Which files do you want to keep?" : "Qual files tu vole mantener?",
+    "Cancel" : "Cancellar",
+    "Continue" : "Continuar",
+    "Error loading file exists template" : "Error quando on incargava patrono de file existente",
+    "Very weak password" : "Contrasigno multo debile",
+    "Weak password" : "Contrasigno debile",
+    "So-so password" : "Contrasigno passabile",
+    "Good password" : "Contrasigno bon",
+    "Strong password" : "Contrasigno forte",
+    "Error occurred while checking server setup" : "Un error occurreva quando on verificava le configuration de le servitor.",
+    "Shared" : "Compartite",
+    "Shared with {recipients}" : "Compatite con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Error quando on compartiva",
+    "Error while unsharing" : "Error quando on levava le compartir",
+    "Error while changing permissions" : "Error quando on modificava permissiones",
+    "Shared with you and the group {group} by {owner}" : "Compartite con te e le gruppo {group} per {owner}",
+    "Shared with you by {owner}" : "Compartite con te per {owner} ",
+    "Share with user or group …" : "Compartir con usator o gruppo ...",
+    "Share link" : "Compartir ligamine",
+    "Password protect" : "Protegite per contrasigno",
+    "Choose a password for the public link" : "Selige un contrasigno pro le ligamine public",
+    "Allow Public Upload" : "Permitter incargamento public",
+    "Email link to person" : "Ligamine de e-posta a persona",
+    "Send" : "Invia",
+    "Set expiration date" : "Fixa data de expiration",
+    "Expiration date" : "Data de expiration",
+    "Adding user..." : "Addente usator...",
+    "group" : "gruppo",
+    "Resharing is not allowed" : "Il non es permittite compartir plus que un vice",
+    "Shared in {item} with {user}" : "Compartite in  {item} con {user}",
+    "Unshare" : "Leva compartir",
+    "notify by email" : "notificar per message de e-posta",
+    "can share" : "pote compartir",
+    "can edit" : "pote modificar",
+    "access control" : "controlo de accesso",
+    "create" : "crear",
+    "update" : "actualisar",
+    "delete" : "deler",
+    "Password protected" : "Proteger con contrasigno",
+    "Error unsetting expiration date" : "Error quando on levava le data de expiration",
+    "Error setting expiration date" : "Error quando on fixava le data de expiration",
+    "Sending ..." : "Inviante ...",
+    "Email sent" : "Message de e-posta inviate",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "Le typo de objecto non es specificate",
+    "Enter new" : "Inserta nove",
+    "Delete" : "Deler",
+    "Add" : "Adder",
+    "Edit tags" : "Modifica etiquettas",
+    "Please reload the page." : "Pro favor recarga le pagina.",
+    "The update was unsuccessful." : "Le actualisation esseva successose.",
+    "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
+    "%s password reset" : "%s contrasigno re-fixate",
+    "Use the following link to reset your password: {link}" : "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}",
+    "You will receive a link to reset your password via Email." : "Tu recipera un ligamine pro re-configurar tu contrasigno via e-posta.",
+    "Username" : "Nomine de usator",
+    "Yes, I really want to reset my password now" : "Si, io vermente vole re-configurar mi contrasigno nunc",
+    "Reset" : "Re-fixar",
+    "New password" : "Nove contrasigno",
+    "New Password" : "Nove contrasigno",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pro le exitos melior, pro favor tu considera usar in loco un servitor GNU/Linux.",
+    "Personal" : "Personal",
+    "Users" : "Usatores",
+    "Apps" : "Applicationes",
+    "Admin" : "Administration",
+    "Help" : "Adjuta",
+    "Error loading tags" : "Error quando on cargava etiquettas",
+    "Tag already exists" : "Etiquetta ja existe",
+    "Access forbidden" : "Accesso prohibite",
+    "File not found" : "File non trovate",
+    "The specified document has not been found on the server." : "Le documento specificate non ha essite trovate sur le servitor.",
+    "The share will expire on %s." : "Le compartir expirara le %s.",
+    "Cheers!" : "Acclamationes!",
+    "Technical details" : "Detalios technic",
+    "Remote Address: %s" : "Adresse remote: %s",
+    "Request ID: %s" : "ID de requesta: %s",
+    "Code: %s" : "Codice: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Rango: %s",
+    "Trace" : "Tracia",
+    "Security Warning" : "Aviso de securitate",
+    "Please update your PHP installation to use %s securely." : "Pro favor actualisa tu installation de PHP pro usar %s con securitate.",
+    "Create an <strong>admin account</strong>" : "Crear un <strong>conto de administration</strong>",
+    "Password" : "Contrasigno",
+    "Storage & database" : "Immagazinage & base de datos",
+    "Data folder" : "Dossier de datos",
+    "Configure the database" : "Configurar le base de datos",
+    "Only %s is available." : "Solmente %s es disponibile",
+    "Database user" : "Usator de base de datos",
+    "Database password" : "Contrasigno de base de datos",
+    "Database name" : "Nomine de base de datos",
+    "Database tablespace" : "Spatio de tabella de base de datos",
+    "Database host" : "Hospite de base de datos",
+    "Finish setup" : "Terminar configuration",
+    "Finishing …" : "Terminante ...",
+    "Log out" : "Clauder le session",
+    "Server side authentication failed!" : "Il falleva authentication de latere servitor!",
+    "Please contact your administrator." : "Pro favor continge tu administrator.",
+    "Forgot your password? Reset it!" : "Tu oblidava tu contrasigno? Re-configura lo!",
+    "remember" : "memora",
+    "Log in" : "Aperir session",
+    "Alternative Logins" : "Accessos de autorisation alternative",
+    "Thank you for your patience." : "Gratias pro tu patientia.",
+    "Start update" : "Initia actualisation"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
deleted file mode 100644
index 941f831c01c..00000000000
--- a/core/l10n/ia.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "On non pote inviar message de e-posta a le usatores sequente: %s",
-"Turned on maintenance mode" => "Activate modo de mantenentia",
-"Turned off maintenance mode" => "De-activar modo de mantenentia",
-"Updated database" => "Base de datos actualisate",
-"Checked database schema update" => "Il ha verificate actualisation de schema de base de datos",
-"Checked database schema update for apps" => "Il ha verificate actualisation de schema de base de datos pro apps",
-"Updated \"%s\" to %s" => "Actualisava \"%s\" a %s",
-"Disabled incompatible apps: %s" => "Apps non compatibile ha essite dishabilitate: %s",
-"No image or file provided" => "Il forniva necun imagine o file",
-"Unknown filetype" => "Typo de file incognite",
-"Invalid image" => "Imagine invalide",
-"No temporary profile picture available, try again" => "Necun photo de profilo temporanee disponibile, essaya novemente",
-"Sunday" => "Dominica",
-"Monday" => "Lunedi",
-"Tuesday" => "Martedi",
-"Wednesday" => "Mercuridi",
-"Thursday" => "Jovedi",
-"Friday" => "Venerdi",
-"Saturday" => "Sabbato",
-"January" => "januario",
-"February" => "Februario",
-"March" => "Martio",
-"April" => "April",
-"May" => "Mai",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Augusto",
-"September" => "Septembre",
-"October" => "Octobre",
-"November" => "Novembre",
-"December" => "Decembre",
-"Settings" => "Configurationes",
-"File" => "File",
-"Folder" => "Dossier",
-"Image" => "Imagine",
-"Audio" => "Audio",
-"Saving..." => "Salveguardante...",
-"Couldn't send reset email. Please contact your administrator." => "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
-"I know what I'm doing" => "Io sape lo que io es facente",
-"Reset password" => "Reinitialisar contrasigno",
-"Password can not be changed. Please contact your administrator." => "Contrasigno non pote esser modificate. Pro favor continge tu administrator.",
-"No" => "No",
-"Yes" => "Si",
-"Choose" => "Seliger",
-"Ok" => "Ok",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de file","{count} conflictos de file"),
-"One file conflict" => "Un conflicto de file",
-"New Files" => "Nove files",
-"Already existing files" => "Files jam existente",
-"Which files do you want to keep?" => "Qual files tu vole mantener?",
-"Cancel" => "Cancellar",
-"Continue" => "Continuar",
-"Error loading file exists template" => "Error quando on incargava patrono de file existente",
-"Very weak password" => "Contrasigno multo debile",
-"Weak password" => "Contrasigno debile",
-"So-so password" => "Contrasigno passabile",
-"Good password" => "Contrasigno bon",
-"Strong password" => "Contrasigno forte",
-"Error occurred while checking server setup" => "Un error occurreva quando on verificava le configuration de le servitor.",
-"Shared" => "Compartite",
-"Shared with {recipients}" => "Compatite con {recipients}",
-"Share" => "Compartir",
-"Error" => "Error",
-"Error while sharing" => "Error quando on compartiva",
-"Error while unsharing" => "Error quando on levava le compartir",
-"Error while changing permissions" => "Error quando on modificava permissiones",
-"Shared with you and the group {group} by {owner}" => "Compartite con te e le gruppo {group} per {owner}",
-"Shared with you by {owner}" => "Compartite con te per {owner} ",
-"Share with user or group …" => "Compartir con usator o gruppo ...",
-"Share link" => "Compartir ligamine",
-"Password protect" => "Protegite per contrasigno",
-"Choose a password for the public link" => "Selige un contrasigno pro le ligamine public",
-"Allow Public Upload" => "Permitter incargamento public",
-"Email link to person" => "Ligamine de e-posta a persona",
-"Send" => "Invia",
-"Set expiration date" => "Fixa data de expiration",
-"Expiration date" => "Data de expiration",
-"Adding user..." => "Addente usator...",
-"group" => "gruppo",
-"Resharing is not allowed" => "Il non es permittite compartir plus que un vice",
-"Shared in {item} with {user}" => "Compartite in  {item} con {user}",
-"Unshare" => "Leva compartir",
-"notify by email" => "notificar per message de e-posta",
-"can share" => "pote compartir",
-"can edit" => "pote modificar",
-"access control" => "controlo de accesso",
-"create" => "crear",
-"update" => "actualisar",
-"delete" => "deler",
-"Password protected" => "Proteger con contrasigno",
-"Error unsetting expiration date" => "Error quando on levava le data de expiration",
-"Error setting expiration date" => "Error quando on fixava le data de expiration",
-"Sending ..." => "Inviante ...",
-"Email sent" => "Message de e-posta inviate",
-"Warning" => "Aviso",
-"The object type is not specified." => "Le typo de objecto non es specificate",
-"Enter new" => "Inserta nove",
-"Delete" => "Deler",
-"Add" => "Adder",
-"Edit tags" => "Modifica etiquettas",
-"Please reload the page." => "Pro favor recarga le pagina.",
-"The update was unsuccessful." => "Le actualisation esseva successose.",
-"The update was successful. Redirecting you to ownCloud now." => "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
-"%s password reset" => "%s contrasigno re-fixate",
-"Use the following link to reset your password: {link}" => "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}",
-"You will receive a link to reset your password via Email." => "Tu recipera un ligamine pro re-configurar tu contrasigno via e-posta.",
-"Username" => "Nomine de usator",
-"Yes, I really want to reset my password now" => "Si, io vermente vole re-configurar mi contrasigno nunc",
-"Reset" => "Re-fixar",
-"New password" => "Nove contrasigno",
-"New Password" => "Nove contrasigno",
-"For the best results, please consider using a GNU/Linux server instead." => "Pro le exitos melior, pro favor tu considera usar in loco un servitor GNU/Linux.",
-"Personal" => "Personal",
-"Users" => "Usatores",
-"Apps" => "Applicationes",
-"Admin" => "Administration",
-"Help" => "Adjuta",
-"Error loading tags" => "Error quando on cargava etiquettas",
-"Tag already exists" => "Etiquetta ja existe",
-"Access forbidden" => "Accesso prohibite",
-"File not found" => "File non trovate",
-"The specified document has not been found on the server." => "Le documento specificate non ha essite trovate sur le servitor.",
-"The share will expire on %s." => "Le compartir expirara le %s.",
-"Cheers!" => "Acclamationes!",
-"Technical details" => "Detalios technic",
-"Remote Address: %s" => "Adresse remote: %s",
-"Request ID: %s" => "ID de requesta: %s",
-"Code: %s" => "Codice: %s",
-"Message: %s" => "Message: %s",
-"File: %s" => "File: %s",
-"Line: %s" => "Rango: %s",
-"Trace" => "Tracia",
-"Security Warning" => "Aviso de securitate",
-"Please update your PHP installation to use %s securely." => "Pro favor actualisa tu installation de PHP pro usar %s con securitate.",
-"Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
-"Password" => "Contrasigno",
-"Storage & database" => "Immagazinage & base de datos",
-"Data folder" => "Dossier de datos",
-"Configure the database" => "Configurar le base de datos",
-"Only %s is available." => "Solmente %s es disponibile",
-"Database user" => "Usator de base de datos",
-"Database password" => "Contrasigno de base de datos",
-"Database name" => "Nomine de base de datos",
-"Database tablespace" => "Spatio de tabella de base de datos",
-"Database host" => "Hospite de base de datos",
-"Finish setup" => "Terminar configuration",
-"Finishing …" => "Terminante ...",
-"Log out" => "Clauder le session",
-"Server side authentication failed!" => "Il falleva authentication de latere servitor!",
-"Please contact your administrator." => "Pro favor continge tu administrator.",
-"Forgot your password? Reset it!" => "Tu oblidava tu contrasigno? Re-configura lo!",
-"remember" => "memora",
-"Log in" => "Aperir session",
-"Alternative Logins" => "Accessos de autorisation alternative",
-"Thank you for your patience." => "Gratias pro tu patientia.",
-"Start update" => "Initia actualisation"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/id.js b/core/l10n/id.js
new file mode 100644
index 00000000000..171d4141a2c
--- /dev/null
+++ b/core/l10n/id.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "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",
+    "Checked database schema update" : "Pembaruan skema basis data terperiksa",
+    "Checked database schema update for apps" : "Pembaruan skema basis data terperiksa untuk aplikasi",
+    "Updated \"%s\" to %s" : "Terbaru \"%s\" sampai %s",
+    "Disabled incompatible apps: %s" : "Aplikasi tidak kompatibel yang dinonaktifkan: %s",
+    "No image or file provided" : "Tidak ada gambar atau berkas yang disediakan",
+    "Unknown filetype" : "Tipe berkas tidak 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",
+    "Wednesday" : "Rabu",
+    "Thursday" : "Kamis",
+    "Friday" : "Jumat",
+    "Saturday" : "Sabtu",
+    "January" : "Januari",
+    "February" : "Februari",
+    "March" : "Maret",
+    "April" : "April",
+    "May" : "Mei",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "Agustus",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Pengaturan",
+    "File" : "Berkas",
+    "Folder" : "Folder",
+    "Image" : "gambar",
+    "Audio" : "Audio",
+    "Saving..." : "Menyimpan...",
+    "Couldn't send reset email. Please contact your administrator." : "Tidak dapat mengirim email setel ulang. Silakan hubungi administrator Anda.",
+    "The link to reset your password has been sent to your email. 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." : "Sebuah tautan untuk setel ulang sandi Anda telah dikirim ke email Anda. Jika Anda tidak menerima dalam jangka waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada, tanyakan pada administrator Anda.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?",
+    "I know what I'm doing" : "Saya tahu apa yang saya lakukan",
+    "Reset password" : "Setel ulang sandi",
+    "Password can not be changed. Please contact your administrator." : "Sandi tidak dapat diubah. Silakan hubungi administrator Anda",
+    "No" : "Tidak",
+    "Yes" : "Ya",
+    "Choose" : "Pilih",
+    "Error loading file picker template: {error}" : "Galat memuat templat berkas pemilih: {error}",
+    "Ok" : "Oke",
+    "Error loading message template: {error}" : "Kesalahan memuat templat pesan: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} berkas konflik"],
+    "One file conflict" : "Satu berkas konflik",
+    "New Files" : "Berkas Baru",
+    "Already existing files" : "Berkas sudah ada",
+    "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" : "Kesalahan memuat templat berkas yang sudah ada",
+    "Very weak password" : "Sandi sangat lemah",
+    "Weak password" : "Sandi lemah",
+    "So-so password" : "Sandi lumayan",
+    "Good password" : "Sandi baik",
+    "Strong password" : "Sandi kuat",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Server ini tidak memiliki koneksi internet. Hal ini berarti bahwa beberapa fitur seperti mengaitkan penyimpanan eksternal, pemberitahuan tentang pembaruan atau instalasi aplikasi pihak ke-3 tidak akan bisa. Mengakses berkas dari remote dan mengirim email notifikasi juga tidak akan bekerja. Kami menyarankan untuk mengaktifkan koneksi internet untuk server ini jika Anda menginginkan semua fitur.",
+    "Error occurred while checking server setup" : "Kesalahan tidak terduga saat memeriksa setelan server",
+    "Shared" : "Dibagikan",
+    "Shared with {recipients}" : "Dibagikan dengan {recipients}",
+    "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}",
+    "Share with user or group …" : "Bagikan dengan pengguna atau grup ...",
+    "Share link" : "Bagikan tautan",
+    "The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
+    "Password protect" : "Lindungi dengan sandi",
+    "Choose a password for the public link" : "Tetapkan sandi untuk tautan publik",
+    "Allow Public Upload" : "Izinkan Unggahan Publik",
+    "Email link to person" : "Emailkan tautan ini ke orang",
+    "Send" : "Kirim",
+    "Set expiration date" : "Atur tanggal kedaluwarsa",
+    "Expiration date" : "Tanggal kedaluwarsa",
+    "Adding user..." : "Menambahkan pengguna...",
+    "group" : "grup",
+    "Resharing is not allowed" : "Berbagi ulang tidak diizinkan",
+    "Shared in {item} with {user}" : "Dibagikan dalam {item} dengan {user}",
+    "Unshare" : "Batalkan berbagi",
+    "notify by email" : "notifikasi via email",
+    "can share" : "dapat berbagi",
+    "can edit" : "dapat sunting",
+    "access control" : "kontrol akses",
+    "create" : "buat",
+    "update" : "perbarui",
+    "delete" : "hapus",
+    "Password protected" : "Sandi dilindungi",
+    "Error unsetting expiration date" : "Galat ketika menghapus 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 label",
+    "Error loading dialog template: {error}" : "Galat memuat templat dialog: {error}",
+    "No tags selected for deletion." : "Tidak ada label yang dipilih untuk dihapus.",
+    "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.",
+    "Please reload the page." : "Silakan muat ulang halaman.",
+    "The update was unsuccessful." : "Pembaruan tidak berhasil",
+    "The update was successful. Redirecting you to ownCloud now." : "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Tidak dapat menyetel ulang sandi karena token tidak sah",
+    "Couldn't send reset email. Please make sure your username is correct." : "Tidak dapat menyetel ulang email. Mohon pastikan nama pengguna Anda benar.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Tidak dapat menyetel ulang email karena tidak ada alamat email untuk nama pengguna ini. Silakan hubungi Administrator Anda.",
+    "%s password reset" : "%s sandi disetel ulang",
+    "Use the following link to reset your password: {link}" : "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
+    "You will receive a link to reset your password via Email." : "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
+    "Username" : "Nama pengguna",
+    "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",
+    "New password" : "Sandi baru",
+    "New Password" : "Sandi Baru",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
+    "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",
+    "File not found" : "Berkas tidak ditemukan",
+    "The specified document has not been found on the server." : "Dokumen yang diminta tidak tersedia pada server.",
+    "You can click here to return to %s." : "Anda dapat klik disini unutk kembali ke %s.",
+    "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!",
+    "Internal Server Error" : "Kesalahan Server Internal",
+    "The server encountered an internal error and was unable to complete your request." : "Server mengalami kesalahan internal dan tidak dapat menyelesaikan permintaan Anda.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Silahkan hubungi administrator server jika kesalahan ini muncul kembali berulang kali, harap sertakan rincian teknis di bawah ini dalam laporan Anda.",
+    "More details can be found in the server log." : "Rincian lebih lengkap dapat ditemukan di log server.",
+    "Technical details" : "Rincian teknis",
+    "Remote Address: %s" : "Alamat remote: %s",
+    "Request ID: %s" : "ID Permintaan: %s",
+    "Code: %s" : "Kode: %s",
+    "Message: %s" : "Pesan: %s",
+    "File: %s" : "Berkas: %s",
+    "Line: %s" : "Baris: %s",
+    "Trace" : "Jejak",
+    "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.",
+    "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>",
+    "Password" : "Sandi",
+    "Storage & database" : "Penyimpanan & Basis data",
+    "Data folder" : "Folder data",
+    "Configure the database" : "Konfigurasikan basis data",
+    "Only %s is available." : "Hanya %s yang tersedia",
+    "Database user" : "Pengguna basis data",
+    "Database password" : "Sandi basis data",
+    "Database name" : "Nama basis data",
+    "Database tablespace" : "Tablespace basis data",
+    "Database host" : "Host basis data",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite akan digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami merekomendasikan untuk mengubah setelan ini.",
+    "Finish setup" : "Selesaikan instalasi",
+    "Finishing …" : "Menyelesaikan ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aplikasi ini memerlukan JavaScript untuk beroperasi dengan benar. Mohon <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktifkan JavaScript</a> dan muat ulang halaman.",
+    "%s is available. Get more information on how to update." : "%s tersedia. Dapatkan informasi lebih lanjut tentang cara memperbarui.",
+    "Log out" : "Keluar",
+    "Server side authentication failed!" : "Otentikasi dari sisi server gagal!",
+    "Please contact your administrator." : "Silahkan hubungi administrator anda.",
+    "Forgot your password? Reset it!" : "Lupa sandi Anda? Setel ulang!",
+    "remember" : "selalu masuk",
+    "Log in" : "Masuk",
+    "Alternative Logins" : "Cara Alternatif untuk Masuk",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hai,<br><br>hanya memberi tahu jika %s membagikan <strong>%s</strong> 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.",
+    "You are accessing the server from an untrusted domain." : "Anda mengakses server dari domain yang tidak terpercaya.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Mohon hubungi administrator Anda. Jika Anda seorang administrator dari instansi ini, konfigurasikan pengaturan \"trusted_domain\" didalam config/config.php. Contoh konfigurasi talah disediakan didalam config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Tergantung pada konfigurasi Anda, sebagai seorang administrator Anda kemungkinan dapat menggunakan tombol bawah untuk mempercayai domain ini.",
+    "Add \"%s\" as trusted domain" : "tambahkan \"%s\" sebagai domain terpercaya",
+    "%s will be updated to version %s." : "%s akan diperbarui ke versi %s.",
+    "The following apps will be disabled:" : "Aplikasi berikut akan dinonaktifkan:",
+    "The theme %s has been disabled." : "Tema %s telah dinonaktfkan.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pastikan bahwa basis data, folder konfig, dan folder data telah dicadangkan sebelum melanjutkan.",
+    "Start update" : "Jalankan pembaruan",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Untuk menghindari waktu habis dengan instalasi yang lebih besar, Anda bisa menjalankan perintah berikut dari direktori instalasi Anda:",
+    "This %s instance is currently being updated, which may take a while." : "Instansi %s ini sedang melakukan pembaruan, ini memerlukan beberapa waktu.",
+    "This page will refresh itself when the %s instance is available again." : "Halaman ini akan disegarkan dengan sendiri saat instansi %s tersebut tersedia kembali."
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/id.json b/core/l10n/id.json
new file mode 100644
index 00000000000..de9ef83abd5
--- /dev/null
+++ b/core/l10n/id.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "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",
+    "Checked database schema update" : "Pembaruan skema basis data terperiksa",
+    "Checked database schema update for apps" : "Pembaruan skema basis data terperiksa untuk aplikasi",
+    "Updated \"%s\" to %s" : "Terbaru \"%s\" sampai %s",
+    "Disabled incompatible apps: %s" : "Aplikasi tidak kompatibel yang dinonaktifkan: %s",
+    "No image or file provided" : "Tidak ada gambar atau berkas yang disediakan",
+    "Unknown filetype" : "Tipe berkas tidak 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",
+    "Wednesday" : "Rabu",
+    "Thursday" : "Kamis",
+    "Friday" : "Jumat",
+    "Saturday" : "Sabtu",
+    "January" : "Januari",
+    "February" : "Februari",
+    "March" : "Maret",
+    "April" : "April",
+    "May" : "Mei",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "Agustus",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Pengaturan",
+    "File" : "Berkas",
+    "Folder" : "Folder",
+    "Image" : "gambar",
+    "Audio" : "Audio",
+    "Saving..." : "Menyimpan...",
+    "Couldn't send reset email. Please contact your administrator." : "Tidak dapat mengirim email setel ulang. Silakan hubungi administrator Anda.",
+    "The link to reset your password has been sent to your email. 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." : "Sebuah tautan untuk setel ulang sandi Anda telah dikirim ke email Anda. Jika Anda tidak menerima dalam jangka waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada, tanyakan pada administrator Anda.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?",
+    "I know what I'm doing" : "Saya tahu apa yang saya lakukan",
+    "Reset password" : "Setel ulang sandi",
+    "Password can not be changed. Please contact your administrator." : "Sandi tidak dapat diubah. Silakan hubungi administrator Anda",
+    "No" : "Tidak",
+    "Yes" : "Ya",
+    "Choose" : "Pilih",
+    "Error loading file picker template: {error}" : "Galat memuat templat berkas pemilih: {error}",
+    "Ok" : "Oke",
+    "Error loading message template: {error}" : "Kesalahan memuat templat pesan: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} berkas konflik"],
+    "One file conflict" : "Satu berkas konflik",
+    "New Files" : "Berkas Baru",
+    "Already existing files" : "Berkas sudah ada",
+    "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" : "Kesalahan memuat templat berkas yang sudah ada",
+    "Very weak password" : "Sandi sangat lemah",
+    "Weak password" : "Sandi lemah",
+    "So-so password" : "Sandi lumayan",
+    "Good password" : "Sandi baik",
+    "Strong password" : "Sandi kuat",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Server ini tidak memiliki koneksi internet. Hal ini berarti bahwa beberapa fitur seperti mengaitkan penyimpanan eksternal, pemberitahuan tentang pembaruan atau instalasi aplikasi pihak ke-3 tidak akan bisa. Mengakses berkas dari remote dan mengirim email notifikasi juga tidak akan bekerja. Kami menyarankan untuk mengaktifkan koneksi internet untuk server ini jika Anda menginginkan semua fitur.",
+    "Error occurred while checking server setup" : "Kesalahan tidak terduga saat memeriksa setelan server",
+    "Shared" : "Dibagikan",
+    "Shared with {recipients}" : "Dibagikan dengan {recipients}",
+    "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}",
+    "Share with user or group …" : "Bagikan dengan pengguna atau grup ...",
+    "Share link" : "Bagikan tautan",
+    "The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
+    "Password protect" : "Lindungi dengan sandi",
+    "Choose a password for the public link" : "Tetapkan sandi untuk tautan publik",
+    "Allow Public Upload" : "Izinkan Unggahan Publik",
+    "Email link to person" : "Emailkan tautan ini ke orang",
+    "Send" : "Kirim",
+    "Set expiration date" : "Atur tanggal kedaluwarsa",
+    "Expiration date" : "Tanggal kedaluwarsa",
+    "Adding user..." : "Menambahkan pengguna...",
+    "group" : "grup",
+    "Resharing is not allowed" : "Berbagi ulang tidak diizinkan",
+    "Shared in {item} with {user}" : "Dibagikan dalam {item} dengan {user}",
+    "Unshare" : "Batalkan berbagi",
+    "notify by email" : "notifikasi via email",
+    "can share" : "dapat berbagi",
+    "can edit" : "dapat sunting",
+    "access control" : "kontrol akses",
+    "create" : "buat",
+    "update" : "perbarui",
+    "delete" : "hapus",
+    "Password protected" : "Sandi dilindungi",
+    "Error unsetting expiration date" : "Galat ketika menghapus 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 label",
+    "Error loading dialog template: {error}" : "Galat memuat templat dialog: {error}",
+    "No tags selected for deletion." : "Tidak ada label yang dipilih untuk dihapus.",
+    "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.",
+    "Please reload the page." : "Silakan muat ulang halaman.",
+    "The update was unsuccessful." : "Pembaruan tidak berhasil",
+    "The update was successful. Redirecting you to ownCloud now." : "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Tidak dapat menyetel ulang sandi karena token tidak sah",
+    "Couldn't send reset email. Please make sure your username is correct." : "Tidak dapat menyetel ulang email. Mohon pastikan nama pengguna Anda benar.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Tidak dapat menyetel ulang email karena tidak ada alamat email untuk nama pengguna ini. Silakan hubungi Administrator Anda.",
+    "%s password reset" : "%s sandi disetel ulang",
+    "Use the following link to reset your password: {link}" : "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
+    "You will receive a link to reset your password via Email." : "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
+    "Username" : "Nama pengguna",
+    "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",
+    "New password" : "Sandi baru",
+    "New Password" : "Sandi Baru",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
+    "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",
+    "File not found" : "Berkas tidak ditemukan",
+    "The specified document has not been found on the server." : "Dokumen yang diminta tidak tersedia pada server.",
+    "You can click here to return to %s." : "Anda dapat klik disini unutk kembali ke %s.",
+    "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!",
+    "Internal Server Error" : "Kesalahan Server Internal",
+    "The server encountered an internal error and was unable to complete your request." : "Server mengalami kesalahan internal dan tidak dapat menyelesaikan permintaan Anda.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Silahkan hubungi administrator server jika kesalahan ini muncul kembali berulang kali, harap sertakan rincian teknis di bawah ini dalam laporan Anda.",
+    "More details can be found in the server log." : "Rincian lebih lengkap dapat ditemukan di log server.",
+    "Technical details" : "Rincian teknis",
+    "Remote Address: %s" : "Alamat remote: %s",
+    "Request ID: %s" : "ID Permintaan: %s",
+    "Code: %s" : "Kode: %s",
+    "Message: %s" : "Pesan: %s",
+    "File: %s" : "Berkas: %s",
+    "Line: %s" : "Baris: %s",
+    "Trace" : "Jejak",
+    "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.",
+    "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>",
+    "Password" : "Sandi",
+    "Storage & database" : "Penyimpanan & Basis data",
+    "Data folder" : "Folder data",
+    "Configure the database" : "Konfigurasikan basis data",
+    "Only %s is available." : "Hanya %s yang tersedia",
+    "Database user" : "Pengguna basis data",
+    "Database password" : "Sandi basis data",
+    "Database name" : "Nama basis data",
+    "Database tablespace" : "Tablespace basis data",
+    "Database host" : "Host basis data",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite akan digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami merekomendasikan untuk mengubah setelan ini.",
+    "Finish setup" : "Selesaikan instalasi",
+    "Finishing …" : "Menyelesaikan ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aplikasi ini memerlukan JavaScript untuk beroperasi dengan benar. Mohon <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktifkan JavaScript</a> dan muat ulang halaman.",
+    "%s is available. Get more information on how to update." : "%s tersedia. Dapatkan informasi lebih lanjut tentang cara memperbarui.",
+    "Log out" : "Keluar",
+    "Server side authentication failed!" : "Otentikasi dari sisi server gagal!",
+    "Please contact your administrator." : "Silahkan hubungi administrator anda.",
+    "Forgot your password? Reset it!" : "Lupa sandi Anda? Setel ulang!",
+    "remember" : "selalu masuk",
+    "Log in" : "Masuk",
+    "Alternative Logins" : "Cara Alternatif untuk Masuk",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hai,<br><br>hanya memberi tahu jika %s membagikan <strong>%s</strong> 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.",
+    "You are accessing the server from an untrusted domain." : "Anda mengakses server dari domain yang tidak terpercaya.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Mohon hubungi administrator Anda. Jika Anda seorang administrator dari instansi ini, konfigurasikan pengaturan \"trusted_domain\" didalam config/config.php. Contoh konfigurasi talah disediakan didalam config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Tergantung pada konfigurasi Anda, sebagai seorang administrator Anda kemungkinan dapat menggunakan tombol bawah untuk mempercayai domain ini.",
+    "Add \"%s\" as trusted domain" : "tambahkan \"%s\" sebagai domain terpercaya",
+    "%s will be updated to version %s." : "%s akan diperbarui ke versi %s.",
+    "The following apps will be disabled:" : "Aplikasi berikut akan dinonaktifkan:",
+    "The theme %s has been disabled." : "Tema %s telah dinonaktfkan.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pastikan bahwa basis data, folder konfig, dan folder data telah dicadangkan sebelum melanjutkan.",
+    "Start update" : "Jalankan pembaruan",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Untuk menghindari waktu habis dengan instalasi yang lebih besar, Anda bisa menjalankan perintah berikut dari direktori instalasi Anda:",
+    "This %s instance is currently being updated, which may take a while." : "Instansi %s ini sedang melakukan pembaruan, ini memerlukan beberapa waktu.",
+    "This page will refresh itself when the %s instance is available again." : "Halaman ini akan disegarkan dengan sendiri saat instansi %s tersebut tersedia kembali."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/id.php b/core/l10n/id.php
deleted file mode 100644
index 558bc161e06..00000000000
--- a/core/l10n/id.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"Checked database schema update" => "Pembaruan skema basis data terperiksa",
-"Checked database schema update for apps" => "Pembaruan skema basis data terperiksa untuk aplikasi",
-"Updated \"%s\" to %s" => "Terbaru \"%s\" sampai %s",
-"Disabled incompatible apps: %s" => "Aplikasi tidak kompatibel yang dinonaktifkan: %s",
-"No image or file provided" => "Tidak ada gambar atau berkas yang disediakan",
-"Unknown filetype" => "Tipe berkas tidak 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",
-"Wednesday" => "Rabu",
-"Thursday" => "Kamis",
-"Friday" => "Jumat",
-"Saturday" => "Sabtu",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Maret",
-"April" => "April",
-"May" => "Mei",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "Agustus",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"Settings" => "Pengaturan",
-"File" => "Berkas",
-"Folder" => "Folder",
-"Image" => "gambar",
-"Audio" => "Audio",
-"Saving..." => "Menyimpan...",
-"Couldn't send reset email. Please contact your administrator." => "Tidak dapat mengirim email setel ulang. Silakan hubungi administrator Anda.",
-"The link to reset your password has been sent to your email. 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." => "Sebuah tautan untuk setel ulang sandi Anda telah dikirim ke email Anda. Jika Anda tidak menerima dalam jangka waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada, tanyakan pada administrator Anda.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?",
-"I know what I'm doing" => "Saya tahu apa yang saya lakukan",
-"Reset password" => "Setel ulang sandi",
-"Password can not be changed. Please contact your administrator." => "Sandi tidak dapat diubah. Silakan hubungi administrator Anda",
-"No" => "Tidak",
-"Yes" => "Ya",
-"Choose" => "Pilih",
-"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
-"Ok" => "Oke",
-"Error loading message template: {error}" => "Kesalahan memuat templat pesan: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} berkas konflik"),
-"One file conflict" => "Satu berkas konflik",
-"New Files" => "Berkas Baru",
-"Already existing files" => "Berkas sudah ada",
-"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" => "Kesalahan memuat templat berkas yang sudah ada",
-"Very weak password" => "Sandi sangat lemah",
-"Weak password" => "Sandi lemah",
-"So-so password" => "Sandi lumayan",
-"Good password" => "Sandi baik",
-"Strong password" => "Sandi kuat",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Server ini tidak memiliki koneksi internet. Hal ini berarti bahwa beberapa fitur seperti mengaitkan penyimpanan eksternal, pemberitahuan tentang pembaruan atau instalasi aplikasi pihak ke-3 tidak akan bisa. Mengakses berkas dari remote dan mengirim email notifikasi juga tidak akan bekerja. Kami menyarankan untuk mengaktifkan koneksi internet untuk server ini jika Anda menginginkan semua fitur.",
-"Error occurred while checking server setup" => "Kesalahan tidak terduga saat memeriksa setelan server",
-"Shared" => "Dibagikan",
-"Shared with {recipients}" => "Dibagikan dengan {recipients}",
-"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}",
-"Share with user or group …" => "Bagikan dengan pengguna atau grup ...",
-"Share link" => "Bagikan tautan",
-"The public link will expire no later than {days} days after it is created" => "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
-"Password protect" => "Lindungi dengan sandi",
-"Choose a password for the public link" => "Tetapkan sandi untuk tautan publik",
-"Allow Public Upload" => "Izinkan Unggahan Publik",
-"Email link to person" => "Emailkan tautan ini ke orang",
-"Send" => "Kirim",
-"Set expiration date" => "Atur tanggal kedaluwarsa",
-"Expiration date" => "Tanggal kedaluwarsa",
-"Adding user..." => "Menambahkan pengguna...",
-"group" => "grup",
-"Resharing is not allowed" => "Berbagi ulang tidak diizinkan",
-"Shared in {item} with {user}" => "Dibagikan dalam {item} dengan {user}",
-"Unshare" => "Batalkan berbagi",
-"notify by email" => "notifikasi via email",
-"can share" => "dapat berbagi",
-"can edit" => "dapat sunting",
-"access control" => "kontrol akses",
-"create" => "buat",
-"update" => "perbarui",
-"delete" => "hapus",
-"Password protected" => "Sandi dilindungi",
-"Error unsetting expiration date" => "Galat ketika menghapus 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 label",
-"Error loading dialog template: {error}" => "Galat memuat templat dialog: {error}",
-"No tags selected for deletion." => "Tidak ada label yang dipilih untuk dihapus.",
-"Updating {productName} to version {version}, this may take a while." => "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.",
-"Please reload the page." => "Silakan muat ulang halaman.",
-"The update was unsuccessful." => "Pembaruan tidak berhasil",
-"The update was successful. Redirecting you to ownCloud now." => "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
-"Couldn't reset password because the token is invalid" => "Tidak dapat menyetel ulang sandi karena token tidak sah",
-"Couldn't send reset email. Please make sure your username is correct." => "Tidak dapat menyetel ulang email. Mohon pastikan nama pengguna Anda benar.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Tidak dapat menyetel ulang email karena tidak ada alamat email untuk nama pengguna ini. Silakan hubungi Administrator Anda.",
-"%s password reset" => "%s sandi disetel ulang",
-"Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
-"You will receive a link to reset your password via Email." => "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
-"Username" => "Nama pengguna",
-"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",
-"New password" => "Sandi baru",
-"New Password" => "Sandi Baru",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
-"For the best results, please consider using a GNU/Linux server instead." => "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
-"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",
-"File not found" => "Berkas tidak ditemukan",
-"The specified document has not been found on the server." => "Dokumen yang diminta tidak tersedia pada server.",
-"You can click here to return to %s." => "Anda dapat klik disini unutk kembali ke %s.",
-"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!",
-"Internal Server Error" => "Kesalahan Server Internal",
-"The server encountered an internal error and was unable to complete your request." => "Server mengalami kesalahan internal dan tidak dapat menyelesaikan permintaan Anda.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Silahkan hubungi administrator server jika kesalahan ini muncul kembali berulang kali, harap sertakan rincian teknis di bawah ini dalam laporan Anda.",
-"More details can be found in the server log." => "Rincian lebih lengkap dapat ditemukan di log server.",
-"Technical details" => "Rincian teknis",
-"Remote Address: %s" => "Alamat remote: %s",
-"Request ID: %s" => "ID Permintaan: %s",
-"Code: %s" => "Kode: %s",
-"Message: %s" => "Pesan: %s",
-"File: %s" => "Berkas: %s",
-"Line: %s" => "Baris: %s",
-"Trace" => "Jejak",
-"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.",
-"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>",
-"Password" => "Sandi",
-"Storage & database" => "Penyimpanan & Basis data",
-"Data folder" => "Folder data",
-"Configure the database" => "Konfigurasikan basis data",
-"Only %s is available." => "Hanya %s yang tersedia",
-"Database user" => "Pengguna basis data",
-"Database password" => "Sandi basis data",
-"Database name" => "Nama basis data",
-"Database tablespace" => "Tablespace basis data",
-"Database host" => "Host basis data",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite akan digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami merekomendasikan untuk mengubah setelan ini.",
-"Finish setup" => "Selesaikan instalasi",
-"Finishing …" => "Menyelesaikan ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Aplikasi ini memerlukan JavaScript untuk beroperasi dengan benar. Mohon <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktifkan JavaScript</a> dan muat ulang halaman.",
-"%s is available. Get more information on how to update." => "%s tersedia. Dapatkan informasi lebih lanjut tentang cara memperbarui.",
-"Log out" => "Keluar",
-"Server side authentication failed!" => "Otentikasi dari sisi server gagal!",
-"Please contact your administrator." => "Silahkan hubungi administrator anda.",
-"Forgot your password? Reset it!" => "Lupa sandi Anda? Setel ulang!",
-"remember" => "selalu masuk",
-"Log in" => "Masuk",
-"Alternative Logins" => "Cara Alternatif untuk Masuk",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hai,<br><br>hanya memberi tahu jika %s membagikan <strong>%s</strong> 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.",
-"You are accessing the server from an untrusted domain." => "Anda mengakses server dari domain yang tidak terpercaya.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Mohon hubungi administrator Anda. Jika Anda seorang administrator dari instansi ini, konfigurasikan pengaturan \"trusted_domain\" didalam config/config.php. Contoh konfigurasi talah disediakan didalam config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Tergantung pada konfigurasi Anda, sebagai seorang administrator Anda kemungkinan dapat menggunakan tombol bawah untuk mempercayai domain ini.",
-"Add \"%s\" as trusted domain" => "tambahkan \"%s\" sebagai domain terpercaya",
-"%s will be updated to version %s." => "%s akan diperbarui ke versi %s.",
-"The following apps will be disabled:" => "Aplikasi berikut akan dinonaktifkan:",
-"The theme %s has been disabled." => "Tema %s telah dinonaktfkan.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Pastikan bahwa basis data, folder konfig, dan folder data telah dicadangkan sebelum melanjutkan.",
-"Start update" => "Jalankan pembaruan",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Untuk menghindari waktu habis dengan instalasi yang lebih besar, Anda bisa menjalankan perintah berikut dari direktori instalasi Anda:",
-"This %s instance is currently being updated, which may take a while." => "Instansi %s ini sedang melakukan pembaruan, ini memerlukan beberapa waktu.",
-"This page will refresh itself when the %s instance is available again." => "Halaman ini akan disegarkan dengan sendiri saat instansi %s tersebut tersedia kembali."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/io.js b/core/l10n/io.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/io.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/io.json b/core/l10n/io.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/io.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/io.php b/core/l10n/io.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/io.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/is.js b/core/l10n/is.js
new file mode 100644
index 00000000000..6fe19ee9db9
--- /dev/null
+++ b/core/l10n/is.js
@@ -0,0 +1,90 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Sunnudagur",
+    "Monday" : "Mánudagur",
+    "Tuesday" : "Þriðjudagur",
+    "Wednesday" : "Miðvikudagur",
+    "Thursday" : "Fimmtudagur",
+    "Friday" : "Föstudagur",
+    "Saturday" : "Laugardagur",
+    "January" : "Janúar",
+    "February" : "Febrúar",
+    "March" : "Mars",
+    "April" : "Apríl",
+    "May" : "Maí",
+    "June" : "Júní",
+    "July" : "Júlí",
+    "August" : "Ágúst",
+    "September" : "September",
+    "October" : "Október",
+    "November" : "Nóvember",
+    "December" : "Desember",
+    "Settings" : "Stillingar",
+    "Folder" : "Mappa",
+    "Saving..." : "Er að vista ...",
+    "Reset password" : "Endursetja lykilorð",
+    "No" : "Nei",
+    "Yes" : "Já",
+    "Choose" : "Veldu",
+    "Ok" : "Í lagi",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Hætta við",
+    "Shared" : "Deilt",
+    "Share" : "Deila",
+    "Error" : "Villa",
+    "Error while sharing" : "Villa við deilingu",
+    "Error while unsharing" : "Villa við að hætta deilingu",
+    "Error while changing permissions" : "Villa við að breyta aðgangsheimildum",
+    "Shared with you and the group {group} by {owner}" : "Deilt með þér og hópnum {group} af {owner}",
+    "Shared with you by {owner}" : "Deilt með þér af {owner}",
+    "Password protect" : "Verja með lykilorði",
+    "Email link to person" : "Senda vefhlekk í tölvupóstu til notenda",
+    "Send" : "Senda",
+    "Set expiration date" : "Setja gildistíma",
+    "Expiration date" : "Gildir til",
+    "Resharing is not allowed" : "Endurdeiling er ekki leyfð",
+    "Shared in {item} with {user}" : "Deilt með {item} ásamt {user}",
+    "Unshare" : "Hætta deilingu",
+    "can edit" : "getur breytt",
+    "access control" : "aðgangsstýring",
+    "create" : "mynda",
+    "update" : "uppfæra",
+    "delete" : "eyða",
+    "Password protected" : "Verja með lykilorði",
+    "Error unsetting expiration date" : "Villa við að aftengja gildistíma",
+    "Error setting expiration date" : "Villa við að setja gildistíma",
+    "Sending ..." : "Sendi ...",
+    "Email sent" : "Tölvupóstur sendur",
+    "Warning" : "Aðvörun",
+    "The object type is not specified." : "Tegund ekki tilgreind",
+    "Delete" : "Eyða",
+    "Add" : "Bæta við",
+    "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
+    "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
+    "You will receive a link to reset your password via Email." : "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
+    "Username" : "Notendanafn",
+    "New password" : "Nýtt lykilorð",
+    "Personal" : "Um mig",
+    "Users" : "Notendur",
+    "Apps" : "Forrit",
+    "Admin" : "Stjórnun",
+    "Help" : "Hjálp",
+    "Access forbidden" : "Aðgangur bannaður",
+    "Security Warning" : "Öryggis aðvörun",
+    "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>",
+    "Password" : "Lykilorð",
+    "Data folder" : "Gagnamappa",
+    "Configure the database" : "Stilla gagnagrunn",
+    "Database user" : "Gagnagrunns notandi",
+    "Database password" : "Gagnagrunns lykilorð",
+    "Database name" : "Nafn gagnagrunns",
+    "Database tablespace" : "Töflusvæði gagnagrunns",
+    "Database host" : "Netþjónn gagnagrunns",
+    "Finish setup" : "Virkja uppsetningu",
+    "%s is available. Get more information on how to update." : "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir.",
+    "Log out" : "Útskrá",
+    "remember" : "muna eftir mér",
+    "Log in" : "<strong>Skrá inn</strong>"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/is.json b/core/l10n/is.json
new file mode 100644
index 00000000000..5f24eae33ac
--- /dev/null
+++ b/core/l10n/is.json
@@ -0,0 +1,88 @@
+{ "translations": {
+    "Sunday" : "Sunnudagur",
+    "Monday" : "Mánudagur",
+    "Tuesday" : "Þriðjudagur",
+    "Wednesday" : "Miðvikudagur",
+    "Thursday" : "Fimmtudagur",
+    "Friday" : "Föstudagur",
+    "Saturday" : "Laugardagur",
+    "January" : "Janúar",
+    "February" : "Febrúar",
+    "March" : "Mars",
+    "April" : "Apríl",
+    "May" : "Maí",
+    "June" : "Júní",
+    "July" : "Júlí",
+    "August" : "Ágúst",
+    "September" : "September",
+    "October" : "Október",
+    "November" : "Nóvember",
+    "December" : "Desember",
+    "Settings" : "Stillingar",
+    "Folder" : "Mappa",
+    "Saving..." : "Er að vista ...",
+    "Reset password" : "Endursetja lykilorð",
+    "No" : "Nei",
+    "Yes" : "Já",
+    "Choose" : "Veldu",
+    "Ok" : "Í lagi",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Hætta við",
+    "Shared" : "Deilt",
+    "Share" : "Deila",
+    "Error" : "Villa",
+    "Error while sharing" : "Villa við deilingu",
+    "Error while unsharing" : "Villa við að hætta deilingu",
+    "Error while changing permissions" : "Villa við að breyta aðgangsheimildum",
+    "Shared with you and the group {group} by {owner}" : "Deilt með þér og hópnum {group} af {owner}",
+    "Shared with you by {owner}" : "Deilt með þér af {owner}",
+    "Password protect" : "Verja með lykilorði",
+    "Email link to person" : "Senda vefhlekk í tölvupóstu til notenda",
+    "Send" : "Senda",
+    "Set expiration date" : "Setja gildistíma",
+    "Expiration date" : "Gildir til",
+    "Resharing is not allowed" : "Endurdeiling er ekki leyfð",
+    "Shared in {item} with {user}" : "Deilt með {item} ásamt {user}",
+    "Unshare" : "Hætta deilingu",
+    "can edit" : "getur breytt",
+    "access control" : "aðgangsstýring",
+    "create" : "mynda",
+    "update" : "uppfæra",
+    "delete" : "eyða",
+    "Password protected" : "Verja með lykilorði",
+    "Error unsetting expiration date" : "Villa við að aftengja gildistíma",
+    "Error setting expiration date" : "Villa við að setja gildistíma",
+    "Sending ..." : "Sendi ...",
+    "Email sent" : "Tölvupóstur sendur",
+    "Warning" : "Aðvörun",
+    "The object type is not specified." : "Tegund ekki tilgreind",
+    "Delete" : "Eyða",
+    "Add" : "Bæta við",
+    "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
+    "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
+    "You will receive a link to reset your password via Email." : "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
+    "Username" : "Notendanafn",
+    "New password" : "Nýtt lykilorð",
+    "Personal" : "Um mig",
+    "Users" : "Notendur",
+    "Apps" : "Forrit",
+    "Admin" : "Stjórnun",
+    "Help" : "Hjálp",
+    "Access forbidden" : "Aðgangur bannaður",
+    "Security Warning" : "Öryggis aðvörun",
+    "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>",
+    "Password" : "Lykilorð",
+    "Data folder" : "Gagnamappa",
+    "Configure the database" : "Stilla gagnagrunn",
+    "Database user" : "Gagnagrunns notandi",
+    "Database password" : "Gagnagrunns lykilorð",
+    "Database name" : "Nafn gagnagrunns",
+    "Database tablespace" : "Töflusvæði gagnagrunns",
+    "Database host" : "Netþjónn gagnagrunns",
+    "Finish setup" : "Virkja uppsetningu",
+    "%s is available. Get more information on how to update." : "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir.",
+    "Log out" : "Útskrá",
+    "remember" : "muna eftir mér",
+    "Log in" : "<strong>Skrá inn</strong>"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/is.php b/core/l10n/is.php
deleted file mode 100644
index cec7226680d..00000000000
--- a/core/l10n/is.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Sunnudagur",
-"Monday" => "Mánudagur",
-"Tuesday" => "Þriðjudagur",
-"Wednesday" => "Miðvikudagur",
-"Thursday" => "Fimmtudagur",
-"Friday" => "Föstudagur",
-"Saturday" => "Laugardagur",
-"January" => "Janúar",
-"February" => "Febrúar",
-"March" => "Mars",
-"April" => "Apríl",
-"May" => "Maí",
-"June" => "Júní",
-"July" => "Júlí",
-"August" => "Ágúst",
-"September" => "September",
-"October" => "Október",
-"November" => "Nóvember",
-"December" => "Desember",
-"Settings" => "Stillingar",
-"Folder" => "Mappa",
-"Saving..." => "Er að vista ...",
-"Reset password" => "Endursetja lykilorð",
-"No" => "Nei",
-"Yes" => "Já",
-"Choose" => "Veldu",
-"Ok" => "Í lagi",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Hætta við",
-"Shared" => "Deilt",
-"Share" => "Deila",
-"Error" => "Villa",
-"Error while sharing" => "Villa við deilingu",
-"Error while unsharing" => "Villa við að hætta deilingu",
-"Error while changing permissions" => "Villa við að breyta aðgangsheimildum",
-"Shared with you and the group {group} by {owner}" => "Deilt með þér og hópnum {group} af {owner}",
-"Shared with you by {owner}" => "Deilt með þér af {owner}",
-"Password protect" => "Verja með lykilorði",
-"Email link to person" => "Senda vefhlekk í tölvupóstu til notenda",
-"Send" => "Senda",
-"Set expiration date" => "Setja gildistíma",
-"Expiration date" => "Gildir til",
-"Resharing is not allowed" => "Endurdeiling er ekki leyfð",
-"Shared in {item} with {user}" => "Deilt með {item} ásamt {user}",
-"Unshare" => "Hætta deilingu",
-"can edit" => "getur breytt",
-"access control" => "aðgangsstýring",
-"create" => "mynda",
-"update" => "uppfæra",
-"delete" => "eyða",
-"Password protected" => "Verja með lykilorði",
-"Error unsetting expiration date" => "Villa við að aftengja gildistíma",
-"Error setting expiration date" => "Villa við að setja gildistíma",
-"Sending ..." => "Sendi ...",
-"Email sent" => "Tölvupóstur sendur",
-"Warning" => "Aðvörun",
-"The object type is not specified." => "Tegund ekki tilgreind",
-"Delete" => "Eyða",
-"Add" => "Bæta við",
-"The update was successful. Redirecting you to ownCloud now." => "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
-"Use the following link to reset your password: {link}" => "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
-"You will receive a link to reset your password via Email." => "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
-"Username" => "Notendanafn",
-"New password" => "Nýtt lykilorð",
-"Personal" => "Um mig",
-"Users" => "Notendur",
-"Apps" => "Forrit",
-"Admin" => "Stjórnun",
-"Help" => "Hjálp",
-"Access forbidden" => "Aðgangur bannaður",
-"Security Warning" => "Öryggis aðvörun",
-"Create an <strong>admin account</strong>" => "Útbúa <strong>vefstjóra aðgang</strong>",
-"Password" => "Lykilorð",
-"Data folder" => "Gagnamappa",
-"Configure the database" => "Stilla gagnagrunn",
-"Database user" => "Gagnagrunns notandi",
-"Database password" => "Gagnagrunns lykilorð",
-"Database name" => "Nafn gagnagrunns",
-"Database tablespace" => "Töflusvæði gagnagrunns",
-"Database host" => "Netþjónn gagnagrunns",
-"Finish setup" => "Virkja uppsetningu",
-"%s is available. Get more information on how to update." => "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir.",
-"Log out" => "Útskrá",
-"remember" => "muna eftir mér",
-"Log in" => "<strong>Skrá inn</strong>"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/it.js b/core/l10n/it.js
new file mode 100644
index 00000000000..d444a0a9fb7
--- /dev/null
+++ b/core/l10n/it.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Impossibile inviare email ai seguenti utenti: %s",
+    "Turned on maintenance mode" : "Modalità di manutenzione attivata",
+    "Turned off maintenance mode" : "Modalità di manutenzione disattivata",
+    "Updated database" : "Database aggiornato",
+    "Checked database schema update" : "Verificato l'aggiornamento dello schema del database",
+    "Checked database schema update for apps" : "Verificato l'aggiornamento dello schema del database per le applicazioni",
+    "Updated \"%s\" to %s" : "Aggiornato \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Applicazione incompatibili disabilitate: %s",
+    "No image or file provided" : "Non è stata fornita alcun immagine o file",
+    "Unknown filetype" : "Tipo di file sconosciuto",
+    "Invalid image" : "Immagine non valida",
+    "No temporary profile picture available, try again" : "Nessuna immagine di profilo provvisoria disponibile, riprova",
+    "No crop data provided" : "Dati di ritaglio non forniti",
+    "Sunday" : "Domenica",
+    "Monday" : "Lunedì",
+    "Tuesday" : "Martedì",
+    "Wednesday" : "Mercoledì",
+    "Thursday" : "Giovedì",
+    "Friday" : "Venerdì",
+    "Saturday" : "Sabato",
+    "January" : "Gennaio",
+    "February" : "Febbraio",
+    "March" : "Marzo",
+    "April" : "Aprile",
+    "May" : "Maggio",
+    "June" : "Giugno",
+    "July" : "Luglio",
+    "August" : "Agosto",
+    "September" : "Settembre",
+    "October" : "Ottobre",
+    "November" : "Novembre",
+    "December" : "Dicembre",
+    "Settings" : "Impostazioni",
+    "File" : "File",
+    "Folder" : "Cartella",
+    "Image" : "Immagine",
+    "Audio" : "Audio",
+    "Saving..." : "Salvataggio in corso...",
+    "Couldn't send reset email. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione. Contatta il tuo amministratore.",
+    "The link to reset your password has been sent to your email. 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." : "Il collegamento per reimpostare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, per favore contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
+    "I know what I'm doing" : "So cosa sto facendo",
+    "Reset password" : "Ripristina la password",
+    "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.",
+    "No" : "No",
+    "Yes" : "Sì",
+    "Choose" : "Scegli",
+    "Error loading file picker template: {error}" : "Errore durante il caricamento del modello del selettore file: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Errore durante il caricamento del modello di messaggio: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} file in conflitto","{count} file in conflitto"],
+    "One file conflict" : "Un file in conflitto",
+    "New Files" : "File nuovi",
+    "Already existing files" : "File già esistenti",
+    "Which files do you want to keep?" : "Quali file vuoi mantenere?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file copiato.",
+    "Cancel" : "Annulla",
+    "Continue" : "Continua",
+    "(all selected)" : "(tutti i selezionati)",
+    "({count} selected)" : "({count} selezionati)",
+    "Error loading file exists template" : "Errore durante il caricamento del modello del file esistente",
+    "Very weak password" : "Password molto debole",
+    "Weak password" : "Password debole",
+    "So-so password" : "Password così-così",
+    "Good password" : "Password buona",
+    "Strong password" : "Password forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra no funzionare correttamente.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Questo server non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità.",
+    "Error occurred while checking server setup" : "Si è verificato un errore durante il controllo della configurazione del server",
+    "Shared" : "Condivisi",
+    "Shared with {recipients}" : "Condiviso con {recipients}",
+    "Share" : "Condividi",
+    "Error" : "Errore",
+    "Error while sharing" : "Errore durante la condivisione",
+    "Error while unsharing" : "Errore durante la rimozione della condivisione",
+    "Error while changing permissions" : "Errore durante la modifica dei permessi",
+    "Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}",
+    "Shared with you by {owner}" : "Condiviso con te da {owner}",
+    "Share with user or group …" : "Condividi con utente o gruppo ...",
+    "Share link" : "Condividi collegamento",
+    "The public link will expire no later than {days} days after it is created" : "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione",
+    "Password protect" : "Proteggi con password",
+    "Choose a password for the public link" : "Scegli una password per il collegamento pubblico",
+    "Allow Public Upload" : "Consenti caricamento pubblico",
+    "Email link to person" : "Invia collegamento via email",
+    "Send" : "Invia",
+    "Set expiration date" : "Imposta data di scadenza",
+    "Expiration date" : "Data di scadenza",
+    "Adding user..." : "Aggiunta utente in corso...",
+    "group" : "gruppo",
+    "Resharing is not allowed" : "La ri-condivisione non è consentita",
+    "Shared in {item} with {user}" : "Condiviso in {item} con {user}",
+    "Unshare" : "Rimuovi condivisione",
+    "notify by email" : "notifica tramite email",
+    "can share" : "può condividere",
+    "can edit" : "può modificare",
+    "access control" : "controllo d'accesso",
+    "create" : "creare",
+    "update" : "aggiornare",
+    "delete" : "elimina",
+    "Password protected" : "Protetta da password",
+    "Error unsetting expiration date" : "Errore durante la rimozione della data di scadenza",
+    "Error setting expiration date" : "Errore durante l'impostazione della data di scadenza",
+    "Sending ..." : "Invio in corso...",
+    "Email sent" : "Messaggio inviato",
+    "Warning" : "Avviso",
+    "The object type is not specified." : "Il tipo di oggetto non è specificato.",
+    "Enter new" : "Inserisci nuovo",
+    "Delete" : "Elimina",
+    "Add" : "Aggiungi",
+    "Edit tags" : "Modifica etichette",
+    "Error loading dialog template: {error}" : "Errore durante il caricamento del modello di finestra: {error}",
+    "No tags selected for deletion." : "Nessuna etichetta selezionata per l'eliminazione.",
+    "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
+    "Please reload the page." : "Ricarica la pagina.",
+    "The update was unsuccessful." : "L'aggiornamento non è riuscito.",
+    "The update was successful. Redirecting you to ownCloud now." : "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Impossibile reimpostare la password poiché il token non è valido",
+    "Couldn't send reset email. Please make sure your username is correct." : "Impossibile inviare l'email di reimpostazione. Assicurati che il nome utente sia corretto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
+    "%s password reset" : "Ripristino password di %s",
+    "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",
+    "Username" : "Nome utente",
+    "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?" : "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
+    "Yes, I really want to reset my password now" : "Sì, voglio davvero ripristinare la mia password adesso",
+    "Reset" : "Ripristina",
+    "New password" : "Nuova password",
+    "New Password" : "Nuova password",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.",
+    "Personal" : "Personale",
+    "Users" : "Utenti",
+    "Apps" : "Applicazioni",
+    "Admin" : "Admin",
+    "Help" : "Aiuto",
+    "Error loading tags" : "Errore di caricamento delle etichette",
+    "Tag already exists" : "L'etichetta esiste già",
+    "Error deleting tag(s)" : "Errore di eliminazione delle etichette",
+    "Error tagging" : "Errore di assegnazione delle etichette",
+    "Error untagging" : "Errore di rimozione delle etichette",
+    "Error favoriting" : "Errore di creazione dei preferiti",
+    "Error unfavoriting" : "Errore di rimozione dai preferiti",
+    "Access forbidden" : "Accesso negato",
+    "File not found" : "File non trovato",
+    "The specified document has not been found on the server." : "Il documento specificato non è stato trovato sul server.",
+    "You can click here to return to %s." : "Puoi fare clic qui per tornare a %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ciao,\n\nvolevo informarti che %s ha condiviso %s con te.\nVedi: %s\n\n",
+    "The share will expire on %s." : "La condivisione scadrà il %s.",
+    "Cheers!" : "Saluti!",
+    "Internal Server Error" : "Errore interno del server",
+    "The server encountered an internal error and was unable to complete your request." : "Il server ha riscontrato un errore interno e non è stato in grado di completare la tua richiesta.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Contatta l'amministratore del server se questo errore riappare più volte, includendo i dettagli tecnici sotto riportati nella tua segnalazione.",
+    "More details can be found in the server log." : "Ulteriori dettagli sono disponibili nel log del server.",
+    "Technical details" : "Dettagli tecnici",
+    "Remote Address: %s" : "Indirizzo remoto: %s",
+    "Request ID: %s" : "ID richiesta: %s",
+    "Code: %s" : "Codice: %s",
+    "Message: %s" : "Messaggio: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Riga: %s",
+    "Trace" : "Traccia",
+    "Security Warning" : "Avviso di sicurezza",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La tua versione di PHP è vulnerabile all'attacco NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aggiorna la tua installazione di PHP per utilizzare %s in sicurezza.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
+    "Create an <strong>admin account</strong>" : "Crea un <strong>account amministratore</strong>",
+    "Password" : "Password",
+    "Storage & database" : "Archiviazione e database",
+    "Data folder" : "Cartella dati",
+    "Configure the database" : "Configura il database",
+    "Only %s is available." : "È disponibile solo %s.",
+    "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",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite sarà utilizzato come database. Per installazioni più grandi consigliamo di cambiarlo.",
+    "Finish setup" : "Termina la configurazione",
+    "Finishing …" : "Completamento...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Questa applicazione richiede JavaScript per un corretto funzionamento. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Abilita JavaScript</a> e ricarica questa pagina.",
+    "%s is available. Get more information on how to update." : "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
+    "Log out" : "Esci",
+    "Server side authentication failed!" : "Autenticazione lato server non riuscita!",
+    "Please contact your administrator." : "Contatta il tuo amministratore di sistema.",
+    "Forgot your password? Reset it!" : "Hai dimenticato la password? Reimpostala!",
+    "remember" : "ricorda",
+    "Log in" : "Accedi",
+    "Alternative Logins" : "Accessi alternativi",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ciao,<br><br>volevo informarti che %s ha condiviso <strong>%s</strong> con te.<br><a href=\"%s\">Guarda!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Questa istanza di ownCloud è in modalità utente singolo.",
+    "This means only administrators can use the instance." : "Ciò significa che solo gli amministratori possono utilizzare l'istanza.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contatta il tuo amministratore di sistema se questo messaggio persiste o appare inaspettatamente.",
+    "Thank you for your patience." : "Grazie per la pazienza.",
+    "You are accessing the server from an untrusted domain." : "Stai accedendo al server da un dominio non attendibile.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contatta il tuo amministratore di sistema. Se sei un amministratore di questa istanza, configura l'impostazione \"trusted_domain\" in config/config.php. Un esempio di configurazione è disponibile in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "In base alla tua configurazione, come amministratore potrai utilizzare anche il pulsante in basso per rendere attendibile questo dominio.",
+    "Add \"%s\" as trusted domain" : "Aggiungi \"%s\" come dominio attendibile",
+    "%s will be updated to version %s." : "%s sarà aggiornato alla versione %s.",
+    "The following apps will be disabled:" : "Le seguenti applicazioni saranno disabilitate:",
+    "The theme %s has been disabled." : "Il tema %s è stato disabilitato.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assicurati di aver creato una copia di sicurezza del database, della cartella config e della cartella data prima di procedere. ",
+    "Start update" : "Avvia l'aggiornamento",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Per evitare timeout con installazioni di grandi dimensioni, puoi eseguire il comando che segue dalla cartella di installazione:",
+    "This %s instance is currently being updated, which may take a while." : "Questa istanza di %s è in fase di aggiornamento, potrebbe richiedere del tempo.",
+    "This page will refresh itself when the %s instance is available again." : "Questa pagina si aggiornerà quando l'istanza di %s sarà nuovamente disponibile."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/it.json b/core/l10n/it.json
new file mode 100644
index 00000000000..2be5d0fcd44
--- /dev/null
+++ b/core/l10n/it.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Impossibile inviare email ai seguenti utenti: %s",
+    "Turned on maintenance mode" : "Modalità di manutenzione attivata",
+    "Turned off maintenance mode" : "Modalità di manutenzione disattivata",
+    "Updated database" : "Database aggiornato",
+    "Checked database schema update" : "Verificato l'aggiornamento dello schema del database",
+    "Checked database schema update for apps" : "Verificato l'aggiornamento dello schema del database per le applicazioni",
+    "Updated \"%s\" to %s" : "Aggiornato \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Applicazione incompatibili disabilitate: %s",
+    "No image or file provided" : "Non è stata fornita alcun immagine o file",
+    "Unknown filetype" : "Tipo di file sconosciuto",
+    "Invalid image" : "Immagine non valida",
+    "No temporary profile picture available, try again" : "Nessuna immagine di profilo provvisoria disponibile, riprova",
+    "No crop data provided" : "Dati di ritaglio non forniti",
+    "Sunday" : "Domenica",
+    "Monday" : "Lunedì",
+    "Tuesday" : "Martedì",
+    "Wednesday" : "Mercoledì",
+    "Thursday" : "Giovedì",
+    "Friday" : "Venerdì",
+    "Saturday" : "Sabato",
+    "January" : "Gennaio",
+    "February" : "Febbraio",
+    "March" : "Marzo",
+    "April" : "Aprile",
+    "May" : "Maggio",
+    "June" : "Giugno",
+    "July" : "Luglio",
+    "August" : "Agosto",
+    "September" : "Settembre",
+    "October" : "Ottobre",
+    "November" : "Novembre",
+    "December" : "Dicembre",
+    "Settings" : "Impostazioni",
+    "File" : "File",
+    "Folder" : "Cartella",
+    "Image" : "Immagine",
+    "Audio" : "Audio",
+    "Saving..." : "Salvataggio in corso...",
+    "Couldn't send reset email. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione. Contatta il tuo amministratore.",
+    "The link to reset your password has been sent to your email. 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." : "Il collegamento per reimpostare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, per favore contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
+    "I know what I'm doing" : "So cosa sto facendo",
+    "Reset password" : "Ripristina la password",
+    "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.",
+    "No" : "No",
+    "Yes" : "Sì",
+    "Choose" : "Scegli",
+    "Error loading file picker template: {error}" : "Errore durante il caricamento del modello del selettore file: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Errore durante il caricamento del modello di messaggio: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} file in conflitto","{count} file in conflitto"],
+    "One file conflict" : "Un file in conflitto",
+    "New Files" : "File nuovi",
+    "Already existing files" : "File già esistenti",
+    "Which files do you want to keep?" : "Quali file vuoi mantenere?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file copiato.",
+    "Cancel" : "Annulla",
+    "Continue" : "Continua",
+    "(all selected)" : "(tutti i selezionati)",
+    "({count} selected)" : "({count} selezionati)",
+    "Error loading file exists template" : "Errore durante il caricamento del modello del file esistente",
+    "Very weak password" : "Password molto debole",
+    "Weak password" : "Password debole",
+    "So-so password" : "Password così-così",
+    "Good password" : "Password buona",
+    "Strong password" : "Password forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra no funzionare correttamente.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Questo server non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità.",
+    "Error occurred while checking server setup" : "Si è verificato un errore durante il controllo della configurazione del server",
+    "Shared" : "Condivisi",
+    "Shared with {recipients}" : "Condiviso con {recipients}",
+    "Share" : "Condividi",
+    "Error" : "Errore",
+    "Error while sharing" : "Errore durante la condivisione",
+    "Error while unsharing" : "Errore durante la rimozione della condivisione",
+    "Error while changing permissions" : "Errore durante la modifica dei permessi",
+    "Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}",
+    "Shared with you by {owner}" : "Condiviso con te da {owner}",
+    "Share with user or group …" : "Condividi con utente o gruppo ...",
+    "Share link" : "Condividi collegamento",
+    "The public link will expire no later than {days} days after it is created" : "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione",
+    "Password protect" : "Proteggi con password",
+    "Choose a password for the public link" : "Scegli una password per il collegamento pubblico",
+    "Allow Public Upload" : "Consenti caricamento pubblico",
+    "Email link to person" : "Invia collegamento via email",
+    "Send" : "Invia",
+    "Set expiration date" : "Imposta data di scadenza",
+    "Expiration date" : "Data di scadenza",
+    "Adding user..." : "Aggiunta utente in corso...",
+    "group" : "gruppo",
+    "Resharing is not allowed" : "La ri-condivisione non è consentita",
+    "Shared in {item} with {user}" : "Condiviso in {item} con {user}",
+    "Unshare" : "Rimuovi condivisione",
+    "notify by email" : "notifica tramite email",
+    "can share" : "può condividere",
+    "can edit" : "può modificare",
+    "access control" : "controllo d'accesso",
+    "create" : "creare",
+    "update" : "aggiornare",
+    "delete" : "elimina",
+    "Password protected" : "Protetta da password",
+    "Error unsetting expiration date" : "Errore durante la rimozione della data di scadenza",
+    "Error setting expiration date" : "Errore durante l'impostazione della data di scadenza",
+    "Sending ..." : "Invio in corso...",
+    "Email sent" : "Messaggio inviato",
+    "Warning" : "Avviso",
+    "The object type is not specified." : "Il tipo di oggetto non è specificato.",
+    "Enter new" : "Inserisci nuovo",
+    "Delete" : "Elimina",
+    "Add" : "Aggiungi",
+    "Edit tags" : "Modifica etichette",
+    "Error loading dialog template: {error}" : "Errore durante il caricamento del modello di finestra: {error}",
+    "No tags selected for deletion." : "Nessuna etichetta selezionata per l'eliminazione.",
+    "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
+    "Please reload the page." : "Ricarica la pagina.",
+    "The update was unsuccessful." : "L'aggiornamento non è riuscito.",
+    "The update was successful. Redirecting you to ownCloud now." : "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Impossibile reimpostare la password poiché il token non è valido",
+    "Couldn't send reset email. Please make sure your username is correct." : "Impossibile inviare l'email di reimpostazione. Assicurati che il nome utente sia corretto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
+    "%s password reset" : "Ripristino password di %s",
+    "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",
+    "Username" : "Nome utente",
+    "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?" : "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
+    "Yes, I really want to reset my password now" : "Sì, voglio davvero ripristinare la mia password adesso",
+    "Reset" : "Ripristina",
+    "New password" : "Nuova password",
+    "New Password" : "Nuova password",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.",
+    "Personal" : "Personale",
+    "Users" : "Utenti",
+    "Apps" : "Applicazioni",
+    "Admin" : "Admin",
+    "Help" : "Aiuto",
+    "Error loading tags" : "Errore di caricamento delle etichette",
+    "Tag already exists" : "L'etichetta esiste già",
+    "Error deleting tag(s)" : "Errore di eliminazione delle etichette",
+    "Error tagging" : "Errore di assegnazione delle etichette",
+    "Error untagging" : "Errore di rimozione delle etichette",
+    "Error favoriting" : "Errore di creazione dei preferiti",
+    "Error unfavoriting" : "Errore di rimozione dai preferiti",
+    "Access forbidden" : "Accesso negato",
+    "File not found" : "File non trovato",
+    "The specified document has not been found on the server." : "Il documento specificato non è stato trovato sul server.",
+    "You can click here to return to %s." : "Puoi fare clic qui per tornare a %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ciao,\n\nvolevo informarti che %s ha condiviso %s con te.\nVedi: %s\n\n",
+    "The share will expire on %s." : "La condivisione scadrà il %s.",
+    "Cheers!" : "Saluti!",
+    "Internal Server Error" : "Errore interno del server",
+    "The server encountered an internal error and was unable to complete your request." : "Il server ha riscontrato un errore interno e non è stato in grado di completare la tua richiesta.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Contatta l'amministratore del server se questo errore riappare più volte, includendo i dettagli tecnici sotto riportati nella tua segnalazione.",
+    "More details can be found in the server log." : "Ulteriori dettagli sono disponibili nel log del server.",
+    "Technical details" : "Dettagli tecnici",
+    "Remote Address: %s" : "Indirizzo remoto: %s",
+    "Request ID: %s" : "ID richiesta: %s",
+    "Code: %s" : "Codice: %s",
+    "Message: %s" : "Messaggio: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Riga: %s",
+    "Trace" : "Traccia",
+    "Security Warning" : "Avviso di sicurezza",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La tua versione di PHP è vulnerabile all'attacco NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aggiorna la tua installazione di PHP per utilizzare %s in sicurezza.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
+    "Create an <strong>admin account</strong>" : "Crea un <strong>account amministratore</strong>",
+    "Password" : "Password",
+    "Storage & database" : "Archiviazione e database",
+    "Data folder" : "Cartella dati",
+    "Configure the database" : "Configura il database",
+    "Only %s is available." : "È disponibile solo %s.",
+    "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",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite sarà utilizzato come database. Per installazioni più grandi consigliamo di cambiarlo.",
+    "Finish setup" : "Termina la configurazione",
+    "Finishing …" : "Completamento...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Questa applicazione richiede JavaScript per un corretto funzionamento. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Abilita JavaScript</a> e ricarica questa pagina.",
+    "%s is available. Get more information on how to update." : "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
+    "Log out" : "Esci",
+    "Server side authentication failed!" : "Autenticazione lato server non riuscita!",
+    "Please contact your administrator." : "Contatta il tuo amministratore di sistema.",
+    "Forgot your password? Reset it!" : "Hai dimenticato la password? Reimpostala!",
+    "remember" : "ricorda",
+    "Log in" : "Accedi",
+    "Alternative Logins" : "Accessi alternativi",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ciao,<br><br>volevo informarti che %s ha condiviso <strong>%s</strong> con te.<br><a href=\"%s\">Guarda!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Questa istanza di ownCloud è in modalità utente singolo.",
+    "This means only administrators can use the instance." : "Ciò significa che solo gli amministratori possono utilizzare l'istanza.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contatta il tuo amministratore di sistema se questo messaggio persiste o appare inaspettatamente.",
+    "Thank you for your patience." : "Grazie per la pazienza.",
+    "You are accessing the server from an untrusted domain." : "Stai accedendo al server da un dominio non attendibile.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contatta il tuo amministratore di sistema. Se sei un amministratore di questa istanza, configura l'impostazione \"trusted_domain\" in config/config.php. Un esempio di configurazione è disponibile in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "In base alla tua configurazione, come amministratore potrai utilizzare anche il pulsante in basso per rendere attendibile questo dominio.",
+    "Add \"%s\" as trusted domain" : "Aggiungi \"%s\" come dominio attendibile",
+    "%s will be updated to version %s." : "%s sarà aggiornato alla versione %s.",
+    "The following apps will be disabled:" : "Le seguenti applicazioni saranno disabilitate:",
+    "The theme %s has been disabled." : "Il tema %s è stato disabilitato.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assicurati di aver creato una copia di sicurezza del database, della cartella config e della cartella data prima di procedere. ",
+    "Start update" : "Avvia l'aggiornamento",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Per evitare timeout con installazioni di grandi dimensioni, puoi eseguire il comando che segue dalla cartella di installazione:",
+    "This %s instance is currently being updated, which may take a while." : "Questa istanza di %s è in fase di aggiornamento, potrebbe richiedere del tempo.",
+    "This page will refresh itself when the %s instance is available again." : "Questa pagina si aggiornerà quando l'istanza di %s sarà nuovamente disponibile."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/it.php b/core/l10n/it.php
deleted file mode 100644
index ae3fd59861f..00000000000
--- a/core/l10n/it.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Impossibile inviare email ai seguenti utenti: %s",
-"Turned on maintenance mode" => "Modalità di manutenzione attivata",
-"Turned off maintenance mode" => "Modalità di manutenzione disattivata",
-"Updated database" => "Database aggiornato",
-"Checked database schema update" => "Verificato l'aggiornamento dello schema del database",
-"Checked database schema update for apps" => "Verificato l'aggiornamento dello schema del database per le applicazioni",
-"Updated \"%s\" to %s" => "Aggiornato \"%s\" a %s",
-"Disabled incompatible apps: %s" => "Applicazione incompatibili disabilitate: %s",
-"No image or file provided" => "Non è stata fornita alcun immagine o file",
-"Unknown filetype" => "Tipo di file sconosciuto",
-"Invalid image" => "Immagine non valida",
-"No temporary profile picture available, try again" => "Nessuna immagine di profilo provvisoria disponibile, riprova",
-"No crop data provided" => "Dati di ritaglio non forniti",
-"Sunday" => "Domenica",
-"Monday" => "Lunedì",
-"Tuesday" => "Martedì",
-"Wednesday" => "Mercoledì",
-"Thursday" => "Giovedì",
-"Friday" => "Venerdì",
-"Saturday" => "Sabato",
-"January" => "Gennaio",
-"February" => "Febbraio",
-"March" => "Marzo",
-"April" => "Aprile",
-"May" => "Maggio",
-"June" => "Giugno",
-"July" => "Luglio",
-"August" => "Agosto",
-"September" => "Settembre",
-"October" => "Ottobre",
-"November" => "Novembre",
-"December" => "Dicembre",
-"Settings" => "Impostazioni",
-"File" => "File",
-"Folder" => "Cartella",
-"Image" => "Immagine",
-"Audio" => "Audio",
-"Saving..." => "Salvataggio in corso...",
-"Couldn't send reset email. Please contact your administrator." => "Impossibile inviare l'email di reimpostazione. Contatta il tuo amministratore.",
-"The link to reset your password has been sent to your email. 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." => "Il collegamento per reimpostare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, per favore contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
-"I know what I'm doing" => "So cosa sto facendo",
-"Reset password" => "Ripristina la password",
-"Password can not be changed. Please contact your administrator." => "La password non può essere cambiata. Contatta il tuo amministratore.",
-"No" => "No",
-"Yes" => "Sì",
-"Choose" => "Scegli",
-"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Errore durante il caricamento del modello di messaggio: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} file in conflitto","{count} file in conflitto"),
-"One file conflict" => "Un file in conflitto",
-"New Files" => "File nuovi",
-"Already existing files" => "File già esistenti",
-"Which files do you want to keep?" => "Quali file vuoi mantenere?",
-"If you select both versions, the copied file will have a number added to its name." => "Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file copiato.",
-"Cancel" => "Annulla",
-"Continue" => "Continua",
-"(all selected)" => "(tutti i selezionati)",
-"({count} selected)" => "({count} selezionati)",
-"Error loading file exists template" => "Errore durante il caricamento del modello del file esistente",
-"Very weak password" => "Password molto debole",
-"Weak password" => "Password debole",
-"So-so password" => "Password così-così",
-"Good password" => "Password buona",
-"Strong password" => "Password forte",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra no funzionare correttamente.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Questo server non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità.",
-"Error occurred while checking server setup" => "Si è verificato un errore durante il controllo della configurazione del server",
-"Shared" => "Condivisi",
-"Shared with {recipients}" => "Condiviso con {recipients}",
-"Share" => "Condividi",
-"Error" => "Errore",
-"Error while sharing" => "Errore durante la condivisione",
-"Error while unsharing" => "Errore durante la rimozione della condivisione",
-"Error while changing permissions" => "Errore durante la modifica dei permessi",
-"Shared with you and the group {group} by {owner}" => "Condiviso con te e con il gruppo {group} da {owner}",
-"Shared with you by {owner}" => "Condiviso con te da {owner}",
-"Share with user or group …" => "Condividi con utente o gruppo ...",
-"Share link" => "Condividi collegamento",
-"The public link will expire no later than {days} days after it is created" => "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione",
-"Password protect" => "Proteggi con password",
-"Choose a password for the public link" => "Scegli una password per il collegamento pubblico",
-"Allow Public Upload" => "Consenti caricamento pubblico",
-"Email link to person" => "Invia collegamento via email",
-"Send" => "Invia",
-"Set expiration date" => "Imposta data di scadenza",
-"Expiration date" => "Data di scadenza",
-"Adding user..." => "Aggiunta utente in corso...",
-"group" => "gruppo",
-"Resharing is not allowed" => "La ri-condivisione non è consentita",
-"Shared in {item} with {user}" => "Condiviso in {item} con {user}",
-"Unshare" => "Rimuovi condivisione",
-"notify by email" => "notifica tramite email",
-"can share" => "può condividere",
-"can edit" => "può modificare",
-"access control" => "controllo d'accesso",
-"create" => "creare",
-"update" => "aggiornare",
-"delete" => "elimina",
-"Password protected" => "Protetta da password",
-"Error unsetting expiration date" => "Errore durante la rimozione della data di scadenza",
-"Error setting expiration date" => "Errore durante l'impostazione della data di scadenza",
-"Sending ..." => "Invio in corso...",
-"Email sent" => "Messaggio inviato",
-"Warning" => "Avviso",
-"The object type is not specified." => "Il tipo di oggetto non è specificato.",
-"Enter new" => "Inserisci nuovo",
-"Delete" => "Elimina",
-"Add" => "Aggiungi",
-"Edit tags" => "Modifica etichette",
-"Error loading dialog template: {error}" => "Errore durante il caricamento del modello di finestra: {error}",
-"No tags selected for deletion." => "Nessuna etichetta selezionata per l'eliminazione.",
-"Updating {productName} to version {version}, this may take a while." => "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
-"Please reload the page." => "Ricarica la pagina.",
-"The update was unsuccessful." => "L'aggiornamento non è riuscito.",
-"The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
-"Couldn't reset password because the token is invalid" => "Impossibile reimpostare la password poiché il token non è valido",
-"Couldn't send reset email. Please make sure your username is correct." => "Impossibile inviare l'email di reimpostazione. Assicurati che il nome utente sia corretto.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
-"%s password reset" => "Ripristino password di %s",
-"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",
-"Username" => "Nome utente",
-"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?" => "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
-"Yes, I really want to reset my password now" => "Sì, voglio davvero ripristinare la mia password adesso",
-"Reset" => "Ripristina",
-"New password" => "Nuova password",
-"New Password" => "Nuova password",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!",
-"For the best results, please consider using a GNU/Linux server instead." => "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.",
-"Personal" => "Personale",
-"Users" => "Utenti",
-"Apps" => "Applicazioni",
-"Admin" => "Admin",
-"Help" => "Aiuto",
-"Error loading tags" => "Errore di caricamento delle etichette",
-"Tag already exists" => "L'etichetta esiste già",
-"Error deleting tag(s)" => "Errore di eliminazione delle etichette",
-"Error tagging" => "Errore di assegnazione delle etichette",
-"Error untagging" => "Errore di rimozione delle etichette",
-"Error favoriting" => "Errore di creazione dei preferiti",
-"Error unfavoriting" => "Errore di rimozione dai preferiti",
-"Access forbidden" => "Accesso negato",
-"File not found" => "File non trovato",
-"The specified document has not been found on the server." => "Il documento specificato non è stato trovato sul server.",
-"You can click here to return to %s." => "Puoi fare clic qui per tornare a %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ciao,\n\nvolevo informarti che %s ha condiviso %s con te.\nVedi: %s\n\n",
-"The share will expire on %s." => "La condivisione scadrà il %s.",
-"Cheers!" => "Saluti!",
-"Internal Server Error" => "Errore interno del server",
-"The server encountered an internal error and was unable to complete your request." => "Il server ha riscontrato un errore interno e non è stato in grado di completare la tua richiesta.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Contatta l'amministratore del server se questo errore riappare più volte, includendo i dettagli tecnici sotto riportati nella tua segnalazione.",
-"More details can be found in the server log." => "Ulteriori dettagli sono disponibili nel log del server.",
-"Technical details" => "Dettagli tecnici",
-"Remote Address: %s" => "Indirizzo remoto: %s",
-"Request ID: %s" => "ID richiesta: %s",
-"Code: %s" => "Codice: %s",
-"Message: %s" => "Messaggio: %s",
-"File: %s" => "File: %s",
-"Line: %s" => "Riga: %s",
-"Trace" => "Traccia",
-"Security Warning" => "Avviso di sicurezza",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La tua versione di PHP è vulnerabile all'attacco NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Aggiorna la tua installazione di PHP per utilizzare %s in sicurezza.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
-"Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
-"Password" => "Password",
-"Storage & database" => "Archiviazione e database",
-"Data folder" => "Cartella dati",
-"Configure the database" => "Configura il database",
-"Only %s is available." => "È disponibile solo %s.",
-"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",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite sarà utilizzato come database. Per installazioni più grandi consigliamo di cambiarlo.",
-"Finish setup" => "Termina la configurazione",
-"Finishing …" => "Completamento...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Questa applicazione richiede JavaScript per un corretto funzionamento. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Abilita JavaScript</a> e ricarica questa pagina.",
-"%s is available. Get more information on how to update." => "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
-"Log out" => "Esci",
-"Server side authentication failed!" => "Autenticazione lato server non riuscita!",
-"Please contact your administrator." => "Contatta il tuo amministratore di sistema.",
-"Forgot your password? Reset it!" => "Hai dimenticato la password? Reimpostala!",
-"remember" => "ricorda",
-"Log in" => "Accedi",
-"Alternative Logins" => "Accessi alternativi",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ciao,<br><br>volevo informarti che %s ha condiviso <strong>%s</strong> con te.<br><a href=\"%s\">Guarda!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Questa istanza di ownCloud è in modalità utente singolo.",
-"This means only administrators can use the instance." => "Ciò significa che solo gli amministratori possono utilizzare l'istanza.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contatta il tuo amministratore di sistema se questo messaggio persiste o appare inaspettatamente.",
-"Thank you for your patience." => "Grazie per la pazienza.",
-"You are accessing the server from an untrusted domain." => "Stai accedendo al server da un dominio non attendibile.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Contatta il tuo amministratore di sistema. Se sei un amministratore di questa istanza, configura l'impostazione \"trusted_domain\" in config/config.php. Un esempio di configurazione è disponibile in config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "In base alla tua configurazione, come amministratore potrai utilizzare anche il pulsante in basso per rendere attendibile questo dominio.",
-"Add \"%s\" as trusted domain" => "Aggiungi \"%s\" come dominio attendibile",
-"%s will be updated to version %s." => "%s sarà aggiornato alla versione %s.",
-"The following apps will be disabled:" => "Le seguenti applicazioni saranno disabilitate:",
-"The theme %s has been disabled." => "Il tema %s è stato disabilitato.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Assicurati di aver creato una copia di sicurezza del database, della cartella config e della cartella data prima di procedere. ",
-"Start update" => "Avvia l'aggiornamento",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Per evitare timeout con installazioni di grandi dimensioni, puoi eseguire il comando che segue dalla cartella di installazione:",
-"This %s instance is currently being updated, which may take a while." => "Questa istanza di %s è in fase di aggiornamento, potrebbe richiedere del tempo.",
-"This page will refresh itself when the %s instance is available again." => "Questa pagina si aggiornerà quando l'istanza di %s sarà nuovamente disponibile."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
new file mode 100644
index 00000000000..b84b14ef20c
--- /dev/null
+++ b/core/l10n/ja.js
@@ -0,0 +1,211 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "次のユーザーにメールを送信できませんでした: %s",
+    "Turned on maintenance mode" : "メンテナンスモードがオンになりました",
+    "Turned off maintenance mode" : "メンテナンスモードがオフになりました",
+    "Updated database" : "データベース更新完了",
+    "Checked database schema update" : "指定データベースのスキーマを更新",
+    "Checked database schema update for apps" : "アプリの指定データベースのスキーマを更新",
+    "Updated \"%s\" to %s" : "\"%s\" を %s にアップデートしました。",
+    "Disabled incompatible apps: %s" : "無効化された非互換アプリ：%s",
+    "No image or file provided" : "画像もしくはファイルが提供されていません",
+    "Unknown filetype" : "不明なファイルタイプ",
+    "Invalid image" : "無効な画像",
+    "No temporary profile picture available, try again" : "一時的なプロファイル用画像が利用できません。もう一度試してください",
+    "No crop data provided" : "クロップデータは提供されません",
+    "Sunday" : "日",
+    "Monday" : "月",
+    "Tuesday" : "火",
+    "Wednesday" : "水",
+    "Thursday" : "木",
+    "Friday" : "金",
+    "Saturday" : "土",
+    "January" : "1月",
+    "February" : "2月",
+    "March" : "3月",
+    "April" : "4月",
+    "May" : "5月",
+    "June" : "6月",
+    "July" : "7月",
+    "August" : "8月",
+    "September" : "9月",
+    "October" : "10月",
+    "November" : "11月",
+    "December" : "12月",
+    "Settings" : "設定",
+    "File" : "ファイル",
+    "Folder" : "フォルダー",
+    "Image" : "画像",
+    "Audio" : "オーディオ",
+    "Saving..." : "保存中...",
+    "Couldn't send reset email. Please contact your administrator." : "リセットメールを送信できませんでした。管理者に問い合わせてください。",
+    "The link to reset your password has been sent to your email. 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>それでも見つからなかった場合は、管理者に問合せてください。",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?",
+    "I know what I'm doing" : "どういう操作をしているか理解しています",
+    "Reset password" : "パスワードをリセット",
+    "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。",
+    "No" : "いいえ",
+    "Yes" : "はい",
+    "Choose" : "選択",
+    "Error loading file picker template: {error}" : "ファイル選択テンプレートの読み込みエラー: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} ファイルが競合"],
+    "One file conflict" : "1ファイルが競合",
+    "New Files" : "新しいファイル",
+    "Already existing files" : "既存のファイル",
+    "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} 選択)",
+    "Error loading file exists template" : "既存ファイルのテンプレートの読み込みエラー",
+    "Very weak password" : "非常に弱いパスワード",
+    "Weak password" : "弱いパスワード",
+    "So-so password" : "まずまずのパスワード",
+    "Good password" : "良好なパスワード",
+    "Strong password" : "強いパスワード",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
+    "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました",
+    "Shared" : "共有中",
+    "Shared with {recipients}" : "{recipients} と共有",
+    "Share" : "共有",
+    "Error" : "エラー",
+    "Error while sharing" : "共有でエラー発生",
+    "Error while unsharing" : "共有解除でエラー発生",
+    "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" : "URLで共有",
+    "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
+    "Password protect" : "パスワード保護を有効化",
+    "Choose a password for the public link" : "URLによる共有のパスワードを入力",
+    "Allow Public Upload" : "アップロードを許可",
+    "Email link to person" : "メールリンク",
+    "Send" : "送信",
+    "Set expiration date" : "有効期限を設定",
+    "Expiration date" : "有効期限",
+    "Adding user..." : "ユーザー追加中...",
+    "group" : "グループ",
+    "Resharing is not allowed" : "再共有は許可されていません",
+    "Shared in {item} with {user}" : "{item} 内で {user} と共有中",
+    "Unshare" : "共有解除",
+    "notify by email" : "メールで通知",
+    "can share" : "共有可",
+    "can edit" : "編集を許可",
+    "access control" : "アクセス権限",
+    "create" : "作成",
+    "update" : "アップデート",
+    "delete" : "削除",
+    "Password protected" : "パスワード保護",
+    "Error unsetting expiration date" : "有効期限の未設定エラー",
+    "Error setting expiration date" : "有効期限の設定でエラー発生",
+    "Sending ..." : "送信中...",
+    "Email sent" : "メールを送信しました",
+    "Warning" : "警告",
+    "The object type is not specified." : "オブジェクトタイプが指定されていません。",
+    "Enter new" : "新規に入力",
+    "Delete" : "削除",
+    "Add" : "追加",
+    "Edit tags" : "タグを編集",
+    "Error loading dialog template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
+    "No tags selected for deletion." : "削除するタグが選択されていません。",
+    "Updating {productName} to version {version}, this may take a while." : "{productName} を バージョン {version} に更新しています。しばらくお待ちください。",
+    "Please reload the page." : "ページをリロードしてください。",
+    "The update was unsuccessful." : "アップデートに失敗しました。",
+    "The update was successful. Redirecting you to ownCloud now." : "アップデートに成功しました。今すぐownCloudにリダイレクトします。",
+    "Couldn't reset password because the token is invalid" : "トークンが無効なため、パスワードをリセットできませんでした",
+    "Couldn't send reset email. Please make sure your username is correct." : "リセットメールを送信できませんでした。ユーザー名が正しいことを確認してください。",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "このユーザー名に紐付けられたメールアドレスがないため、リセットメールを送信できませんでした。管理者に問い合わせてください。",
+    "%s password reset" : "%s パスワードリセット",
+    "Use the following link to reset your password: {link}" : "パスワードをリセットするには次のリンクをクリックしてください: {link}",
+    "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" : "はい、今すぐパスワードをリセットします。",
+    "Reset" : "リセット",
+    "New password" : "新しいパスワードを入力",
+    "New Password" : "新しいパスワード",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
+    "For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
+    "Personal" : "個人",
+    "Users" : "ユーザー",
+    "Apps" : "アプリ",
+    "Admin" : "管理",
+    "Help" : "ヘルプ",
+    "Error loading tags" : "タグの読み込みエラー",
+    "Tag already exists" : "タグはすでに存在します",
+    "Error deleting tag(s)" : "タグの削除エラー",
+    "Error tagging" : "タグの付与エラー",
+    "Error untagging" : "タグの解除エラー",
+    "Error favoriting" : "お気に入りに追加エラー",
+    "Error unfavoriting" : "お気に入りから削除エラー",
+    "Access forbidden" : "アクセスが禁止されています",
+    "File not found" : "ファイルが見つかりません",
+    "The specified document has not been found on the server." : "サーバーに指定されたファイルが見つかりませんでした。",
+    "You can click here to return to %s." : "ここをクリックすると、 %s に戻れます。",
+    "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",
+    "The share will expire on %s." : "共有は %s で有効期限が切れます。",
+    "Cheers!" : "それでは！",
+    "The server encountered an internal error and was unable to complete your request." : "サーバー内でエラーが発生したため、リクエストを完了できませんでした。",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "このエラーが繰り返し表示されるようであれば、以下の技術情報を添付してサーバー管理者に報告してください。",
+    "More details can be found in the server log." : "詳しい情報は、サーバーのログを確認してください。",
+    "Technical details" : "技術詳細",
+    "Remote Address: %s" : "リモートアドレス: %s",
+    "Request ID: %s" : "リクエスト ID: %s",
+    "Code: %s" : "コード: %s",
+    "Message: %s" : "メッセージ: %s",
+    "File: %s" : "ファイル: %s",
+    "Line: %s" : "行: %s",
+    "Trace" : "トレース",
+    "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." : "%s を安全に利用するため、インストールされているPHPをアップデートしてください。",
+    "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>を参照してください。",
+    "Create an <strong>admin account</strong>" : "<strong>管理者アカウント</strong>を作成してください",
+    "Password" : "パスワード",
+    "Storage & database" : "ストレージとデータベース",
+    "Data folder" : "データフォルダー",
+    "Configure the database" : "データベースを設定してください",
+    "Only %s is available." : "%s のみ有効です。",
+    "Database user" : "データベースのユーザー名",
+    "Database password" : "データベースのパスワード",
+    "Database name" : "データベース名",
+    "Database tablespace" : "データベースの表領域",
+    "Database host" : "データベースのホスト名",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite をデータベースとして利用します。大規模な運用では、利用しないことをお勧めします。",
+    "Finish setup" : "セットアップを完了します",
+    "Finishing …" : "作業を完了しています ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "このアプリケーションは使用する為、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、ページを更新してください。 ",
+    "%s is available. Get more information on how to update." : "%s が利用可能です。アップデート方法について詳細情報を確認してください。",
+    "Log out" : "ログアウト",
+    "Server side authentication failed!" : "サーバーサイドの認証に失敗しました！",
+    "Please contact your administrator." : "管理者に問い合わせてください。",
+    "Forgot your password? Reset it!" : "パスワードを忘れましたか？リセットします！",
+    "remember" : "パスワードを保存",
+    "Log in" : "ログイン",
+    "Alternative Logins" : "代替ログイン",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> 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." : "しばらくお待ちください。",
+    "You are accessing the server from an untrusted domain." : "信頼されていないドメインからサーバーにアクセスしています。",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "管理者に連絡してください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "環境により、下のボタンで信頼するドメインに追加する必要があるかもしれません。",
+    "Add \"%s\" as trusted domain" : "\"%s\" を信頼するドメイン名に追加",
+    "%s will be updated to version %s." : "%s はバージョン %s にアップデートされました。",
+    "The following apps will be disabled:" : "以下のアプリは無効です：",
+    "The theme %s has been disabled." : "テーマ %s が無効になっています。",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "データベースを確認してください。実行前にconfigフォルダーとdataフォルダーをバックアップします。",
+    "Start update" : "アップデートを開始",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "大規模なサイトの場合、ブラウザーがタイムアウトする可能性がある為、インストールディレクトリで次のコマンドを実行しても構いません。",
+    "This %s instance is currently being updated, which may take a while." : "このサーバー %s は現在更新中です。しばらくお待ちください。",
+    "This page will refresh itself when the %s instance is available again." : "この画面は、サーバー %s の再起動後に自動的に更新されます。"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
new file mode 100644
index 00000000000..d5112b77df9
--- /dev/null
+++ b/core/l10n/ja.json
@@ -0,0 +1,209 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "次のユーザーにメールを送信できませんでした: %s",
+    "Turned on maintenance mode" : "メンテナンスモードがオンになりました",
+    "Turned off maintenance mode" : "メンテナンスモードがオフになりました",
+    "Updated database" : "データベース更新完了",
+    "Checked database schema update" : "指定データベースのスキーマを更新",
+    "Checked database schema update for apps" : "アプリの指定データベースのスキーマを更新",
+    "Updated \"%s\" to %s" : "\"%s\" を %s にアップデートしました。",
+    "Disabled incompatible apps: %s" : "無効化された非互換アプリ：%s",
+    "No image or file provided" : "画像もしくはファイルが提供されていません",
+    "Unknown filetype" : "不明なファイルタイプ",
+    "Invalid image" : "無効な画像",
+    "No temporary profile picture available, try again" : "一時的なプロファイル用画像が利用できません。もう一度試してください",
+    "No crop data provided" : "クロップデータは提供されません",
+    "Sunday" : "日",
+    "Monday" : "月",
+    "Tuesday" : "火",
+    "Wednesday" : "水",
+    "Thursday" : "木",
+    "Friday" : "金",
+    "Saturday" : "土",
+    "January" : "1月",
+    "February" : "2月",
+    "March" : "3月",
+    "April" : "4月",
+    "May" : "5月",
+    "June" : "6月",
+    "July" : "7月",
+    "August" : "8月",
+    "September" : "9月",
+    "October" : "10月",
+    "November" : "11月",
+    "December" : "12月",
+    "Settings" : "設定",
+    "File" : "ファイル",
+    "Folder" : "フォルダー",
+    "Image" : "画像",
+    "Audio" : "オーディオ",
+    "Saving..." : "保存中...",
+    "Couldn't send reset email. Please contact your administrator." : "リセットメールを送信できませんでした。管理者に問い合わせてください。",
+    "The link to reset your password has been sent to your email. 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>それでも見つからなかった場合は、管理者に問合せてください。",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?",
+    "I know what I'm doing" : "どういう操作をしているか理解しています",
+    "Reset password" : "パスワードをリセット",
+    "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。",
+    "No" : "いいえ",
+    "Yes" : "はい",
+    "Choose" : "選択",
+    "Error loading file picker template: {error}" : "ファイル選択テンプレートの読み込みエラー: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} ファイルが競合"],
+    "One file conflict" : "1ファイルが競合",
+    "New Files" : "新しいファイル",
+    "Already existing files" : "既存のファイル",
+    "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} 選択)",
+    "Error loading file exists template" : "既存ファイルのテンプレートの読み込みエラー",
+    "Very weak password" : "非常に弱いパスワード",
+    "Weak password" : "弱いパスワード",
+    "So-so password" : "まずまずのパスワード",
+    "Good password" : "良好なパスワード",
+    "Strong password" : "強いパスワード",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
+    "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました",
+    "Shared" : "共有中",
+    "Shared with {recipients}" : "{recipients} と共有",
+    "Share" : "共有",
+    "Error" : "エラー",
+    "Error while sharing" : "共有でエラー発生",
+    "Error while unsharing" : "共有解除でエラー発生",
+    "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" : "URLで共有",
+    "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
+    "Password protect" : "パスワード保護を有効化",
+    "Choose a password for the public link" : "URLによる共有のパスワードを入力",
+    "Allow Public Upload" : "アップロードを許可",
+    "Email link to person" : "メールリンク",
+    "Send" : "送信",
+    "Set expiration date" : "有効期限を設定",
+    "Expiration date" : "有効期限",
+    "Adding user..." : "ユーザー追加中...",
+    "group" : "グループ",
+    "Resharing is not allowed" : "再共有は許可されていません",
+    "Shared in {item} with {user}" : "{item} 内で {user} と共有中",
+    "Unshare" : "共有解除",
+    "notify by email" : "メールで通知",
+    "can share" : "共有可",
+    "can edit" : "編集を許可",
+    "access control" : "アクセス権限",
+    "create" : "作成",
+    "update" : "アップデート",
+    "delete" : "削除",
+    "Password protected" : "パスワード保護",
+    "Error unsetting expiration date" : "有効期限の未設定エラー",
+    "Error setting expiration date" : "有効期限の設定でエラー発生",
+    "Sending ..." : "送信中...",
+    "Email sent" : "メールを送信しました",
+    "Warning" : "警告",
+    "The object type is not specified." : "オブジェクトタイプが指定されていません。",
+    "Enter new" : "新規に入力",
+    "Delete" : "削除",
+    "Add" : "追加",
+    "Edit tags" : "タグを編集",
+    "Error loading dialog template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
+    "No tags selected for deletion." : "削除するタグが選択されていません。",
+    "Updating {productName} to version {version}, this may take a while." : "{productName} を バージョン {version} に更新しています。しばらくお待ちください。",
+    "Please reload the page." : "ページをリロードしてください。",
+    "The update was unsuccessful." : "アップデートに失敗しました。",
+    "The update was successful. Redirecting you to ownCloud now." : "アップデートに成功しました。今すぐownCloudにリダイレクトします。",
+    "Couldn't reset password because the token is invalid" : "トークンが無効なため、パスワードをリセットできませんでした",
+    "Couldn't send reset email. Please make sure your username is correct." : "リセットメールを送信できませんでした。ユーザー名が正しいことを確認してください。",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "このユーザー名に紐付けられたメールアドレスがないため、リセットメールを送信できませんでした。管理者に問い合わせてください。",
+    "%s password reset" : "%s パスワードリセット",
+    "Use the following link to reset your password: {link}" : "パスワードをリセットするには次のリンクをクリックしてください: {link}",
+    "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" : "はい、今すぐパスワードをリセットします。",
+    "Reset" : "リセット",
+    "New password" : "新しいパスワードを入力",
+    "New Password" : "新しいパスワード",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
+    "For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
+    "Personal" : "個人",
+    "Users" : "ユーザー",
+    "Apps" : "アプリ",
+    "Admin" : "管理",
+    "Help" : "ヘルプ",
+    "Error loading tags" : "タグの読み込みエラー",
+    "Tag already exists" : "タグはすでに存在します",
+    "Error deleting tag(s)" : "タグの削除エラー",
+    "Error tagging" : "タグの付与エラー",
+    "Error untagging" : "タグの解除エラー",
+    "Error favoriting" : "お気に入りに追加エラー",
+    "Error unfavoriting" : "お気に入りから削除エラー",
+    "Access forbidden" : "アクセスが禁止されています",
+    "File not found" : "ファイルが見つかりません",
+    "The specified document has not been found on the server." : "サーバーに指定されたファイルが見つかりませんでした。",
+    "You can click here to return to %s." : "ここをクリックすると、 %s に戻れます。",
+    "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",
+    "The share will expire on %s." : "共有は %s で有効期限が切れます。",
+    "Cheers!" : "それでは！",
+    "The server encountered an internal error and was unable to complete your request." : "サーバー内でエラーが発生したため、リクエストを完了できませんでした。",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "このエラーが繰り返し表示されるようであれば、以下の技術情報を添付してサーバー管理者に報告してください。",
+    "More details can be found in the server log." : "詳しい情報は、サーバーのログを確認してください。",
+    "Technical details" : "技術詳細",
+    "Remote Address: %s" : "リモートアドレス: %s",
+    "Request ID: %s" : "リクエスト ID: %s",
+    "Code: %s" : "コード: %s",
+    "Message: %s" : "メッセージ: %s",
+    "File: %s" : "ファイル: %s",
+    "Line: %s" : "行: %s",
+    "Trace" : "トレース",
+    "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." : "%s を安全に利用するため、インストールされているPHPをアップデートしてください。",
+    "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>を参照してください。",
+    "Create an <strong>admin account</strong>" : "<strong>管理者アカウント</strong>を作成してください",
+    "Password" : "パスワード",
+    "Storage & database" : "ストレージとデータベース",
+    "Data folder" : "データフォルダー",
+    "Configure the database" : "データベースを設定してください",
+    "Only %s is available." : "%s のみ有効です。",
+    "Database user" : "データベースのユーザー名",
+    "Database password" : "データベースのパスワード",
+    "Database name" : "データベース名",
+    "Database tablespace" : "データベースの表領域",
+    "Database host" : "データベースのホスト名",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite をデータベースとして利用します。大規模な運用では、利用しないことをお勧めします。",
+    "Finish setup" : "セットアップを完了します",
+    "Finishing …" : "作業を完了しています ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "このアプリケーションは使用する為、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、ページを更新してください。 ",
+    "%s is available. Get more information on how to update." : "%s が利用可能です。アップデート方法について詳細情報を確認してください。",
+    "Log out" : "ログアウト",
+    "Server side authentication failed!" : "サーバーサイドの認証に失敗しました！",
+    "Please contact your administrator." : "管理者に問い合わせてください。",
+    "Forgot your password? Reset it!" : "パスワードを忘れましたか？リセットします！",
+    "remember" : "パスワードを保存",
+    "Log in" : "ログイン",
+    "Alternative Logins" : "代替ログイン",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> 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." : "しばらくお待ちください。",
+    "You are accessing the server from an untrusted domain." : "信頼されていないドメインからサーバーにアクセスしています。",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "管理者に連絡してください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "環境により、下のボタンで信頼するドメインに追加する必要があるかもしれません。",
+    "Add \"%s\" as trusted domain" : "\"%s\" を信頼するドメイン名に追加",
+    "%s will be updated to version %s." : "%s はバージョン %s にアップデートされました。",
+    "The following apps will be disabled:" : "以下のアプリは無効です：",
+    "The theme %s has been disabled." : "テーマ %s が無効になっています。",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "データベースを確認してください。実行前にconfigフォルダーとdataフォルダーをバックアップします。",
+    "Start update" : "アップデートを開始",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "大規模なサイトの場合、ブラウザーがタイムアウトする可能性がある為、インストールディレクトリで次のコマンドを実行しても構いません。",
+    "This %s instance is currently being updated, which may take a while." : "このサーバー %s は現在更新中です。しばらくお待ちください。",
+    "This page will refresh itself when the %s instance is available again." : "この画面は、サーバー %s の再起動後に自動的に更新されます。"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
deleted file mode 100644
index 450e3adc2e3..00000000000
--- a/core/l10n/ja.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "次のユーザーにメールを送信できませんでした: %s",
-"Turned on maintenance mode" => "メンテナンスモードがオンになりました",
-"Turned off maintenance mode" => "メンテナンスモードがオフになりました",
-"Updated database" => "データベース更新完了",
-"Checked database schema update" => "指定データベースのスキーマを更新",
-"Checked database schema update for apps" => "アプリの指定データベースのスキーマを更新",
-"Updated \"%s\" to %s" => "\"%s\" を %s にアップデートしました。",
-"Disabled incompatible apps: %s" => "無効化された非互換アプリ：%s",
-"No image or file provided" => "画像もしくはファイルが提供されていません",
-"Unknown filetype" => "不明なファイルタイプ",
-"Invalid image" => "無効な画像",
-"No temporary profile picture available, try again" => "一時的なプロファイル用画像が利用できません。もう一度試してください",
-"No crop data provided" => "クロップデータは提供されません",
-"Sunday" => "日",
-"Monday" => "月",
-"Tuesday" => "火",
-"Wednesday" => "水",
-"Thursday" => "木",
-"Friday" => "金",
-"Saturday" => "土",
-"January" => "1月",
-"February" => "2月",
-"March" => "3月",
-"April" => "4月",
-"May" => "5月",
-"June" => "6月",
-"July" => "7月",
-"August" => "8月",
-"September" => "9月",
-"October" => "10月",
-"November" => "11月",
-"December" => "12月",
-"Settings" => "設定",
-"File" => "ファイル",
-"Folder" => "フォルダー",
-"Image" => "画像",
-"Audio" => "オーディオ",
-"Saving..." => "保存中...",
-"Couldn't send reset email. Please contact your administrator." => "リセットメールを送信できませんでした。管理者に問い合わせてください。",
-"The link to reset your password has been sent to your email. 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>それでも見つからなかった場合は、管理者に問合せてください。",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?",
-"I know what I'm doing" => "どういう操作をしているか理解しています",
-"Reset password" => "パスワードをリセット",
-"Password can not be changed. Please contact your administrator." => "パスワードは変更できません。管理者に問い合わせてください。",
-"No" => "いいえ",
-"Yes" => "はい",
-"Choose" => "選択",
-"Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
-"Ok" => "OK",
-"Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} ファイルが競合"),
-"One file conflict" => "1ファイルが競合",
-"New Files" => "新しいファイル",
-"Already existing files" => "既存のファイル",
-"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} 選択)",
-"Error loading file exists template" => "既存ファイルのテンプレートの読み込みエラー",
-"Very weak password" => "非常に弱いパスワード",
-"Weak password" => "弱いパスワード",
-"So-so password" => "まずまずのパスワード",
-"Good password" => "良好なパスワード",
-"Strong password" => "強いパスワード",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、Webサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。すべての機能を利用したい場合は、このサーバーがインターネット接続できるようにすることをお勧めします。",
-"Error occurred while checking server setup" => "サーバー設定のチェック中にエラーが発生しました",
-"Shared" => "共有中",
-"Shared with {recipients}" => "{recipients} と共有",
-"Share" => "共有",
-"Error" => "エラー",
-"Error while sharing" => "共有でエラー発生",
-"Error while unsharing" => "共有解除でエラー発生",
-"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" => "URLで共有",
-"The public link will expire no later than {days} days after it is created" => "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
-"Password protect" => "パスワード保護を有効化",
-"Choose a password for the public link" => "URLによる共有のパスワードを入力",
-"Allow Public Upload" => "アップロードを許可",
-"Email link to person" => "メールリンク",
-"Send" => "送信",
-"Set expiration date" => "有効期限を設定",
-"Expiration date" => "有効期限",
-"Adding user..." => "ユーザーを追加しています...",
-"group" => "グループ",
-"Resharing is not allowed" => "再共有は許可されていません",
-"Shared in {item} with {user}" => "{item} 内で {user} と共有中",
-"Unshare" => "共有解除",
-"notify by email" => "メールで通知",
-"can share" => "共有可",
-"can edit" => "編集を許可",
-"access control" => "アクセス権限",
-"create" => "作成",
-"update" => "アップデート",
-"delete" => "削除",
-"Password protected" => "パスワード保護",
-"Error unsetting expiration date" => "有効期限の未設定エラー",
-"Error setting expiration date" => "有効期限の設定でエラー発生",
-"Sending ..." => "送信中...",
-"Email sent" => "メールを送信しました",
-"Warning" => "警告",
-"The object type is not specified." => "オブジェクトタイプが指定されていません。",
-"Enter new" => "新規に入力",
-"Delete" => "削除",
-"Add" => "追加",
-"Edit tags" => "タグを編集",
-"Error loading dialog template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
-"No tags selected for deletion." => "削除するタグが選択されていません。",
-"Updating {productName} to version {version}, this may take a while." => "{productName} を バージョン {version} に更新しています。しばらくお待ちください。",
-"Please reload the page." => "ページをリロードしてください。",
-"The update was unsuccessful." => "アップデートに失敗しました。",
-"The update was successful. Redirecting you to ownCloud now." => "アップデートに成功しました。今すぐownCloudにリダイレクトします。",
-"Couldn't reset password because the token is invalid" => "トークンが無効なため、パスワードをリセットできませんでした",
-"Couldn't send reset email. Please make sure your username is correct." => "リセットメールを送信できませんでした。ユーザー名が正しいことを確認してください。",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "このユーザー名に紐付けられたメールアドレスがないため、リセットメールを送信できませんでした。管理者に問い合わせてください。",
-"%s password reset" => "%s パスワードリセット",
-"Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックしてください: {link}",
-"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" => "はい、今すぐパスワードをリセットします。",
-"Reset" => "リセット",
-"New password" => "新しいパスワードを入力",
-"New Password" => "新しいパスワード",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
-"For the best results, please consider using a GNU/Linux server instead." => "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
-"Personal" => "個人",
-"Users" => "ユーザー",
-"Apps" => "アプリ",
-"Admin" => "管理",
-"Help" => "ヘルプ",
-"Error loading tags" => "タグの読み込みエラー",
-"Tag already exists" => "タグはすでに存在します",
-"Error deleting tag(s)" => "タグの削除エラー",
-"Error tagging" => "タグの付与エラー",
-"Error untagging" => "タグの解除エラー",
-"Error favoriting" => "お気に入りに追加エラー",
-"Error unfavoriting" => "お気に入りから削除エラー",
-"Access forbidden" => "アクセスが禁止されています",
-"File not found" => "ファイルが見つかりません",
-"The specified document has not been found on the server." => "サーバーに指定されたファイルが見つかりませんでした。",
-"You can click here to return to %s." => "ここをクリックすると、 %s に戻れます。",
-"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",
-"The share will expire on %s." => "共有は %s で有効期限が切れます。",
-"Cheers!" => "それでは！",
-"The server encountered an internal error and was unable to complete your request." => "サーバー内でエラーが発生したため、リクエストを完了できませんでした。",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "このエラーが繰り返し表示されるようであれば、以下の技術情報を添付してサーバー管理者に報告してください。",
-"More details can be found in the server log." => "詳しい情報は、サーバーのログを確認してください。",
-"Technical details" => "技術詳細",
-"Remote Address: %s" => "リモートアドレス: %s",
-"Request ID: %s" => "リクエスト ID: %s",
-"Code: %s" => "コード: %s",
-"Message: %s" => "メッセージ: %s",
-"File: %s" => "ファイル: %s",
-"Line: %s" => "行: %s",
-"Trace" => "トレース",
-"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." => "%s を安全に利用するため、インストールされているPHPをアップデートしてください。",
-"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>を参照してください。",
-"Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
-"Password" => "パスワード",
-"Storage & database" => "ストレージとデータベース",
-"Data folder" => "データフォルダー",
-"Configure the database" => "データベースを設定してください",
-"Only %s is available." => "%s のみ有効です。",
-"Database user" => "データベースのユーザー名",
-"Database password" => "データベースのパスワード",
-"Database name" => "データベース名",
-"Database tablespace" => "データベースの表領域",
-"Database host" => "データベースのホスト名",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite をデータベースとして利用します。大規模な運用では、利用しないことをお勧めします。",
-"Finish setup" => "セットアップを完了します",
-"Finishing …" => "作業を完了しています ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "このアプリケーションは使用する為、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、ページを更新してください。 ",
-"%s is available. Get more information on how to update." => "%s が利用可能です。アップデート方法について詳細情報を確認してください。",
-"Log out" => "ログアウト",
-"Server side authentication failed!" => "サーバーサイドの認証に失敗しました！",
-"Please contact your administrator." => "管理者に問い合わせてください。",
-"Forgot your password? Reset it!" => "パスワードを忘れましたか？リセットします！",
-"remember" => "パスワードを保存",
-"Log in" => "ログイン",
-"Alternative Logins" => "代替ログイン",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> 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." => "しばらくお待ちください。",
-"You are accessing the server from an untrusted domain." => "信頼されていないドメインからサーバーにアクセスしています。",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "管理者に連絡してください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "環境により、下のボタンで信頼するドメインに追加する必要があるかもしれません。",
-"Add \"%s\" as trusted domain" => "\"%s\" を信頼するドメイン名に追加",
-"%s will be updated to version %s." => "%s はバージョン %s にアップデートされました。",
-"The following apps will be disabled:" => "以下のアプリは無効です：",
-"The theme %s has been disabled." => "テーマ %s が無効になっています。",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "データベースを確認してください。実行前にconfigフォルダーとdataフォルダーをバックアップします。",
-"Start update" => "アップデートを開始",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "大規模なサイトの場合、ブラウザーがタイムアウトする可能性がある為、インストールディレクトリで次のコマンドを実行しても構いません。",
-"This %s instance is currently being updated, which may take a while." => "このサーバー %s は現在更新中です。しばらくお待ちください。",
-"This page will refresh itself when the %s instance is available again." => "この画面は、サーバー %s の再起動後に自動的に更新されます。"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/jv.js b/core/l10n/jv.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/jv.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/jv.json b/core/l10n/jv.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/jv.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/jv.php b/core/l10n/jv.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/jv.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js
new file mode 100644
index 00000000000..98843464fd5
--- /dev/null
+++ b/core/l10n/ka_GE.js
@@ -0,0 +1,96 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "კვირა",
+    "Monday" : "ორშაბათი",
+    "Tuesday" : "სამშაბათი",
+    "Wednesday" : "ოთხშაბათი",
+    "Thursday" : "ხუთშაბათი",
+    "Friday" : "პარასკევი",
+    "Saturday" : "შაბათი",
+    "January" : "იანვარი",
+    "February" : "თებერვალი",
+    "March" : "მარტი",
+    "April" : "აპრილი",
+    "May" : "მაისი",
+    "June" : "ივნისი",
+    "July" : "ივლისი",
+    "August" : "აგვისტო",
+    "September" : "სექტემბერი",
+    "October" : "ოქტომბერი",
+    "November" : "ნოემბერი",
+    "December" : "დეკემბერი",
+    "Settings" : "პარამეტრები",
+    "Folder" : "საქაღალდე",
+    "Image" : "სურათი",
+    "Saving..." : "შენახვა...",
+    "Reset password" : "პაროლის შეცვლა",
+    "No" : "არა",
+    "Yes" : "კი",
+    "Choose" : "არჩევა",
+    "Ok" : "დიახ",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "New Files" : "ახალი ფაილები",
+    "Cancel" : "უარყოფა",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი.",
+    "Shared" : "გაზიარებული",
+    "Share" : "გაზიარება",
+    "Error" : "შეცდომა",
+    "Error while sharing" : "შეცდომა გაზიარების დროს",
+    "Error while unsharing" : "შეცდომა გაზიარების გაუქმების დროს",
+    "Error while changing permissions" : "შეცდომა დაშვების ცვლილების დროს",
+    "Shared with you and the group {group} by {owner}" : "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
+    "Shared with you by {owner}" : "გაზიარდა თქვენთვის {owner}–ის მიერ",
+    "Password protect" : "პაროლით დაცვა",
+    "Email link to person" : "ლინკის პიროვნების იმეილზე გაგზავნა",
+    "Send" : "გაგზავნა",
+    "Set expiration date" : "მიუთითე ვადის გასვლის დრო",
+    "Expiration date" : "ვადის გასვლის დრო",
+    "group" : "ჯგუფი",
+    "Resharing is not allowed" : "მეორეჯერ გაზიარება არ არის დაშვებული",
+    "Shared in {item} with {user}" : "გაზიარდა {item}–ში  {user}–ის მიერ",
+    "Unshare" : "გაუზიარებადი",
+    "can edit" : "შეგიძლია შეცვლა",
+    "access control" : "დაშვების კონტროლი",
+    "create" : "შექმნა",
+    "update" : "განახლება",
+    "delete" : "წაშლა",
+    "Password protected" : "პაროლით დაცული",
+    "Error unsetting expiration date" : "შეცდომა ვადის გასვლის მოხსნის დროს",
+    "Error setting expiration date" : "შეცდომა ვადის გასვლის მითითების დროს",
+    "Sending ..." : "გაგზავნა ....",
+    "Email sent" : "იმეილი გაიგზავნა",
+    "Warning" : "გაფრთხილება",
+    "The object type is not specified." : "ობიექტის ტიპი არ არის მითითებული.",
+    "Delete" : "წაშლა",
+    "Add" : "დამატება",
+    "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
+    "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
+    "You will receive a link to reset your password via Email." : "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
+    "Username" : "მომხმარებლის სახელი",
+    "New password" : "ახალი პაროლი",
+    "Personal" : "პირადი",
+    "Users" : "მომხმარებელი",
+    "Apps" : "აპლიკაციები",
+    "Admin" : "ადმინისტრატორი",
+    "Help" : "დახმარება",
+    "Access forbidden" : "წვდომა აკრძალულია",
+    "Security Warning" : "უსაფრთხოების გაფრთხილება",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "თქვენი PHP ვერსია შეიცავს საფრთხეს  NULL Byte შეტევებისთვის (CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
+    "Create an <strong>admin account</strong>" : "შექმენი <strong>ადმინ ექაუნტი</strong>",
+    "Password" : "პაროლი",
+    "Data folder" : "მონაცემთა საქაღალდე",
+    "Configure the database" : "მონაცემთა ბაზის კონფიგურირება",
+    "Database user" : "მონაცემთა ბაზის მომხმარებელი",
+    "Database password" : "მონაცემთა ბაზის პაროლი",
+    "Database name" : "მონაცემთა ბაზის სახელი",
+    "Database tablespace" : "ბაზის ცხრილის ზომა",
+    "Database host" : "მონაცემთა ბაზის ჰოსტი",
+    "Finish setup" : "კონფიგურაციის დასრულება",
+    "Log out" : "გამოსვლა",
+    "remember" : "დამახსოვრება",
+    "Log in" : "შესვლა",
+    "Alternative Logins" : "ალტერნატიული Login–ი"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json
new file mode 100644
index 00000000000..ca45ac7076a
--- /dev/null
+++ b/core/l10n/ka_GE.json
@@ -0,0 +1,94 @@
+{ "translations": {
+    "Sunday" : "კვირა",
+    "Monday" : "ორშაბათი",
+    "Tuesday" : "სამშაბათი",
+    "Wednesday" : "ოთხშაბათი",
+    "Thursday" : "ხუთშაბათი",
+    "Friday" : "პარასკევი",
+    "Saturday" : "შაბათი",
+    "January" : "იანვარი",
+    "February" : "თებერვალი",
+    "March" : "მარტი",
+    "April" : "აპრილი",
+    "May" : "მაისი",
+    "June" : "ივნისი",
+    "July" : "ივლისი",
+    "August" : "აგვისტო",
+    "September" : "სექტემბერი",
+    "October" : "ოქტომბერი",
+    "November" : "ნოემბერი",
+    "December" : "დეკემბერი",
+    "Settings" : "პარამეტრები",
+    "Folder" : "საქაღალდე",
+    "Image" : "სურათი",
+    "Saving..." : "შენახვა...",
+    "Reset password" : "პაროლის შეცვლა",
+    "No" : "არა",
+    "Yes" : "კი",
+    "Choose" : "არჩევა",
+    "Ok" : "დიახ",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "New Files" : "ახალი ფაილები",
+    "Cancel" : "უარყოფა",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი.",
+    "Shared" : "გაზიარებული",
+    "Share" : "გაზიარება",
+    "Error" : "შეცდომა",
+    "Error while sharing" : "შეცდომა გაზიარების დროს",
+    "Error while unsharing" : "შეცდომა გაზიარების გაუქმების დროს",
+    "Error while changing permissions" : "შეცდომა დაშვების ცვლილების დროს",
+    "Shared with you and the group {group} by {owner}" : "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
+    "Shared with you by {owner}" : "გაზიარდა თქვენთვის {owner}–ის მიერ",
+    "Password protect" : "პაროლით დაცვა",
+    "Email link to person" : "ლინკის პიროვნების იმეილზე გაგზავნა",
+    "Send" : "გაგზავნა",
+    "Set expiration date" : "მიუთითე ვადის გასვლის დრო",
+    "Expiration date" : "ვადის გასვლის დრო",
+    "group" : "ჯგუფი",
+    "Resharing is not allowed" : "მეორეჯერ გაზიარება არ არის დაშვებული",
+    "Shared in {item} with {user}" : "გაზიარდა {item}–ში  {user}–ის მიერ",
+    "Unshare" : "გაუზიარებადი",
+    "can edit" : "შეგიძლია შეცვლა",
+    "access control" : "დაშვების კონტროლი",
+    "create" : "შექმნა",
+    "update" : "განახლება",
+    "delete" : "წაშლა",
+    "Password protected" : "პაროლით დაცული",
+    "Error unsetting expiration date" : "შეცდომა ვადის გასვლის მოხსნის დროს",
+    "Error setting expiration date" : "შეცდომა ვადის გასვლის მითითების დროს",
+    "Sending ..." : "გაგზავნა ....",
+    "Email sent" : "იმეილი გაიგზავნა",
+    "Warning" : "გაფრთხილება",
+    "The object type is not specified." : "ობიექტის ტიპი არ არის მითითებული.",
+    "Delete" : "წაშლა",
+    "Add" : "დამატება",
+    "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
+    "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
+    "You will receive a link to reset your password via Email." : "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
+    "Username" : "მომხმარებლის სახელი",
+    "New password" : "ახალი პაროლი",
+    "Personal" : "პირადი",
+    "Users" : "მომხმარებელი",
+    "Apps" : "აპლიკაციები",
+    "Admin" : "ადმინისტრატორი",
+    "Help" : "დახმარება",
+    "Access forbidden" : "წვდომა აკრძალულია",
+    "Security Warning" : "უსაფრთხოების გაფრთხილება",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "თქვენი PHP ვერსია შეიცავს საფრთხეს  NULL Byte შეტევებისთვის (CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
+    "Create an <strong>admin account</strong>" : "შექმენი <strong>ადმინ ექაუნტი</strong>",
+    "Password" : "პაროლი",
+    "Data folder" : "მონაცემთა საქაღალდე",
+    "Configure the database" : "მონაცემთა ბაზის კონფიგურირება",
+    "Database user" : "მონაცემთა ბაზის მომხმარებელი",
+    "Database password" : "მონაცემთა ბაზის პაროლი",
+    "Database name" : "მონაცემთა ბაზის სახელი",
+    "Database tablespace" : "ბაზის ცხრილის ზომა",
+    "Database host" : "მონაცემთა ბაზის ჰოსტი",
+    "Finish setup" : "კონფიგურაციის დასრულება",
+    "Log out" : "გამოსვლა",
+    "remember" : "დამახსოვრება",
+    "Log in" : "შესვლა",
+    "Alternative Logins" : "ალტერნატიული Login–ი"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
deleted file mode 100644
index 2ba7d4d7cca..00000000000
--- a/core/l10n/ka_GE.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "კვირა",
-"Monday" => "ორშაბათი",
-"Tuesday" => "სამშაბათი",
-"Wednesday" => "ოთხშაბათი",
-"Thursday" => "ხუთშაბათი",
-"Friday" => "პარასკევი",
-"Saturday" => "შაბათი",
-"January" => "იანვარი",
-"February" => "თებერვალი",
-"March" => "მარტი",
-"April" => "აპრილი",
-"May" => "მაისი",
-"June" => "ივნისი",
-"July" => "ივლისი",
-"August" => "აგვისტო",
-"September" => "სექტემბერი",
-"October" => "ოქტომბერი",
-"November" => "ნოემბერი",
-"December" => "დეკემბერი",
-"Settings" => "პარამეტრები",
-"Folder" => "საქაღალდე",
-"Image" => "სურათი",
-"Saving..." => "შენახვა...",
-"Reset password" => "პაროლის შეცვლა",
-"No" => "არა",
-"Yes" => "კი",
-"Choose" => "არჩევა",
-"Ok" => "დიახ",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"New Files" => "ახალი ფაილები",
-"Cancel" => "უარყოფა",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი.",
-"Shared" => "გაზიარებული",
-"Share" => "გაზიარება",
-"Error" => "შეცდომა",
-"Error while sharing" => "შეცდომა გაზიარების დროს",
-"Error while unsharing" => "შეცდომა გაზიარების გაუქმების დროს",
-"Error while changing permissions" => "შეცდომა დაშვების ცვლილების დროს",
-"Shared with you and the group {group} by {owner}" => "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
-"Shared with you by {owner}" => "გაზიარდა თქვენთვის {owner}–ის მიერ",
-"Password protect" => "პაროლით დაცვა",
-"Email link to person" => "ლინკის პიროვნების იმეილზე გაგზავნა",
-"Send" => "გაგზავნა",
-"Set expiration date" => "მიუთითე ვადის გასვლის დრო",
-"Expiration date" => "ვადის გასვლის დრო",
-"group" => "ჯგუფი",
-"Resharing is not allowed" => "მეორეჯერ გაზიარება არ არის დაშვებული",
-"Shared in {item} with {user}" => "გაზიარდა {item}–ში  {user}–ის მიერ",
-"Unshare" => "გაუზიარებადი",
-"can edit" => "შეგიძლია შეცვლა",
-"access control" => "დაშვების კონტროლი",
-"create" => "შექმნა",
-"update" => "განახლება",
-"delete" => "წაშლა",
-"Password protected" => "პაროლით დაცული",
-"Error unsetting expiration date" => "შეცდომა ვადის გასვლის მოხსნის დროს",
-"Error setting expiration date" => "შეცდომა ვადის გასვლის მითითების დროს",
-"Sending ..." => "გაგზავნა ....",
-"Email sent" => "იმეილი გაიგზავნა",
-"Warning" => "გაფრთხილება",
-"The object type is not specified." => "ობიექტის ტიპი არ არის მითითებული.",
-"Delete" => "წაშლა",
-"Add" => "დამატება",
-"The update was successful. Redirecting you to ownCloud now." => "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
-"Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
-"You will receive a link to reset your password via Email." => "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
-"Username" => "მომხმარებლის სახელი",
-"New password" => "ახალი პაროლი",
-"Personal" => "პირადი",
-"Users" => "მომხმარებელი",
-"Apps" => "აპლიკაციები",
-"Admin" => "ადმინისტრატორი",
-"Help" => "დახმარება",
-"Access forbidden" => "წვდომა აკრძალულია",
-"Security Warning" => "უსაფრთხოების გაფრთხილება",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "თქვენი PHP ვერსია შეიცავს საფრთხეს  NULL Byte შეტევებისთვის (CVE-2006-7243)",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
-"Create an <strong>admin account</strong>" => "შექმენი <strong>ადმინ ექაუნტი</strong>",
-"Password" => "პაროლი",
-"Data folder" => "მონაცემთა საქაღალდე",
-"Configure the database" => "მონაცემთა ბაზის კონფიგურირება",
-"Database user" => "მონაცემთა ბაზის მომხმარებელი",
-"Database password" => "მონაცემთა ბაზის პაროლი",
-"Database name" => "მონაცემთა ბაზის სახელი",
-"Database tablespace" => "ბაზის ცხრილის ზომა",
-"Database host" => "მონაცემთა ბაზის ჰოსტი",
-"Finish setup" => "კონფიგურაციის დასრულება",
-"Log out" => "გამოსვლა",
-"remember" => "დამახსოვრება",
-"Log in" => "შესვლა",
-"Alternative Logins" => "ალტერნატიული Login–ი"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/km.js b/core/l10n/km.js
new file mode 100644
index 00000000000..9a5f98d62ec
--- /dev/null
+++ b/core/l10n/km.js
@@ -0,0 +1,102 @@
+OC.L10N.register(
+    "core",
+    {
+    "Unknown filetype" : "មិន​ស្គាល់​ប្រភេទ​ឯកសារ",
+    "Invalid image" : "រូបភាព​មិន​ត្រឹម​ត្រូវ",
+    "Sunday" : "ថ្ងៃអាទិត្យ",
+    "Monday" : "ថ្ងៃចន្ទ",
+    "Tuesday" : "ថ្ងៃអង្គារ",
+    "Wednesday" : "ថ្ងៃពុធ",
+    "Thursday" : "ថ្ងៃព្រហស្បតិ៍",
+    "Friday" : "ថ្ងៃសុក្រ",
+    "Saturday" : "ថ្ងៃសៅរ៍",
+    "January" : "ខែមករា",
+    "February" : "ខែកុម្ភៈ",
+    "March" : "ខែមីនា",
+    "April" : "ខែមេសា",
+    "May" : "ខែឧសភា",
+    "June" : "ខែមិថុនា",
+    "July" : "ខែកក្កដា",
+    "August" : "ខែសីហា",
+    "September" : "ខែកញ្ញា",
+    "October" : "ខែតុលា",
+    "November" : "ខែវិច្ឆិកា",
+    "December" : "ខែធ្នូ",
+    "Settings" : "ការកំណត់",
+    "Folder" : "ថត",
+    "Saving..." : "កំពុង​រក្សាទុក",
+    "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
+    "No" : "ទេ",
+    "Yes" : "ព្រម",
+    "Choose" : "ជ្រើស",
+    "Ok" : "ព្រម",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "New Files" : "ឯកសារ​ថ្មី",
+    "Already existing files" : "មាន​ឯកសារ​នេះ​រួច​ហើយ",
+    "Cancel" : "លើកលែង",
+    "Continue" : "បន្ត",
+    "(all selected)" : "(បាន​ជ្រើស​ទាំង​អស់)",
+    "({count} selected)" : "(បាន​ជ្រើស {count})",
+    "Very weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
+    "Weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ",
+    "So-so password" : "ពាក្យ​សម្ងាត់​ធម្មតា",
+    "Good password" : "ពាក្យ​សម្ងាត់​ល្អ",
+    "Strong password" : "ពាក្យ​សម្ងាត់​ខ្លាំង",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "ម៉ាស៊ីន​មេ​វេប​របស់​អ្នក​មិន​បានរៀបចំត្រឹមត្រូវ ដើម្បី​អនុញ្ញាតិ​អោយ​មាន​ឯកសារ​ធ្វើ​សមកាលកម្មបាន​ទេ ព្រោះថា WebDAV ហាក់​បី​ដូច​ជាខូចហើយ។",
+    "Shared" : "បាន​ចែក​រំលែក",
+    "Share" : "ចែក​រំលែក",
+    "Error" : "កំហុស",
+    "Error while sharing" : "កំហុស​ពេល​ចែក​រំលែក",
+    "Error while unsharing" : "កំពុង​ពេល​លែង​ចែក​រំលែក",
+    "Error while changing permissions" : "មាន​កំហុស​នៅ​ពេល​ប្ដូរ​សិទ្ធិ",
+    "Shared with you and the group {group} by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
+    "Shared with you by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
+    "Password protect" : "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
+    "Allow Public Upload" : "អនុញ្ញាត​ការ​ផ្ទុកឡើង​ជា​សាធារណៈ",
+    "Send" : "ផ្ញើ",
+    "Set expiration date" : "កំណត់​ពេល​ផុត​កំណត់",
+    "Expiration date" : "ពេល​ផុត​កំណត់",
+    "group" : "ក្រុម",
+    "Resharing is not allowed" : "មិន​អនុញ្ញាត​ឲ្យ​មាន​ការ​ចែក​រំលែក​ឡើង​វិញ",
+    "Shared in {item} with {user}" : "បាន​ចែក​រំលែក​ក្នុង {item} ជាមួយ {user}",
+    "Unshare" : "លែង​ចែក​រំលែក",
+    "can share" : "អាច​ចែក​រំលែក",
+    "can edit" : "អាច​កែប្រែ",
+    "access control" : "សិទ្ធិ​បញ្ជា",
+    "create" : "បង្កើត",
+    "update" : "ធ្វើ​បច្ចុប្បន្នភាព",
+    "delete" : "លុប",
+    "Password protected" : "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
+    "Sending ..." : "កំពុង​ផ្ញើ ...",
+    "Email sent" : "បាន​ផ្ញើ​អ៊ីមែល",
+    "Warning" : "បម្រាម",
+    "The object type is not specified." : "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
+    "Delete" : "លុប",
+    "Add" : "បញ្ចូល",
+    "Please reload the page." : "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
+    "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
+    "Personal" : "ផ្ទាល់​ខ្លួន",
+    "Users" : "អ្នកប្រើ",
+    "Apps" : "កម្មវិធី",
+    "Admin" : "អ្នក​គ្រប់​គ្រង",
+    "Help" : "ជំនួយ",
+    "Access forbidden" : "បាន​ហាមឃាត់​ការ​ចូល",
+    "Security Warning" : "បម្រាម​សុវត្ថិភាព",
+    "Create an <strong>admin account</strong>" : "បង្កើត​<strong>គណនី​អភិបាល</strong>",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Storage & database" : "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ",
+    "Data folder" : "ថត​ទិន្នន័យ",
+    "Configure the database" : "កំណត់​សណ្ឋាន​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database user" : "អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database password" : "ពាក្យ​សម្ងាត់​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database name" : "ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database host" : "ម៉ាស៊ីន​មូលដ្ឋាន​ទិន្នន័យ",
+    "Finish setup" : "បញ្ចប់​ការ​ដំឡើង",
+    "Finishing …" : "កំពុង​បញ្ចប់ ...",
+    "Log out" : "ចាក​ចេញ",
+    "remember" : "ចងចាំ",
+    "Log in" : "ចូល",
+    "Alternative Logins" : "ការ​ចូល​ជំនួស"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/km.json b/core/l10n/km.json
new file mode 100644
index 00000000000..0dc4d605b23
--- /dev/null
+++ b/core/l10n/km.json
@@ -0,0 +1,100 @@
+{ "translations": {
+    "Unknown filetype" : "មិន​ស្គាល់​ប្រភេទ​ឯកសារ",
+    "Invalid image" : "រូបភាព​មិន​ត្រឹម​ត្រូវ",
+    "Sunday" : "ថ្ងៃអាទិត្យ",
+    "Monday" : "ថ្ងៃចន្ទ",
+    "Tuesday" : "ថ្ងៃអង្គារ",
+    "Wednesday" : "ថ្ងៃពុធ",
+    "Thursday" : "ថ្ងៃព្រហស្បតិ៍",
+    "Friday" : "ថ្ងៃសុក្រ",
+    "Saturday" : "ថ្ងៃសៅរ៍",
+    "January" : "ខែមករា",
+    "February" : "ខែកុម្ភៈ",
+    "March" : "ខែមីនា",
+    "April" : "ខែមេសា",
+    "May" : "ខែឧសភា",
+    "June" : "ខែមិថុនា",
+    "July" : "ខែកក្កដា",
+    "August" : "ខែសីហា",
+    "September" : "ខែកញ្ញា",
+    "October" : "ខែតុលា",
+    "November" : "ខែវិច្ឆិកា",
+    "December" : "ខែធ្នូ",
+    "Settings" : "ការកំណត់",
+    "Folder" : "ថត",
+    "Saving..." : "កំពុង​រក្សាទុក",
+    "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
+    "No" : "ទេ",
+    "Yes" : "ព្រម",
+    "Choose" : "ជ្រើស",
+    "Ok" : "ព្រម",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "New Files" : "ឯកសារ​ថ្មី",
+    "Already existing files" : "មាន​ឯកសារ​នេះ​រួច​ហើយ",
+    "Cancel" : "លើកលែង",
+    "Continue" : "បន្ត",
+    "(all selected)" : "(បាន​ជ្រើស​ទាំង​អស់)",
+    "({count} selected)" : "(បាន​ជ្រើស {count})",
+    "Very weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
+    "Weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ",
+    "So-so password" : "ពាក្យ​សម្ងាត់​ធម្មតា",
+    "Good password" : "ពាក្យ​សម្ងាត់​ល្អ",
+    "Strong password" : "ពាក្យ​សម្ងាត់​ខ្លាំង",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "ម៉ាស៊ីន​មេ​វេប​របស់​អ្នក​មិន​បានរៀបចំត្រឹមត្រូវ ដើម្បី​អនុញ្ញាតិ​អោយ​មាន​ឯកសារ​ធ្វើ​សមកាលកម្មបាន​ទេ ព្រោះថា WebDAV ហាក់​បី​ដូច​ជាខូចហើយ។",
+    "Shared" : "បាន​ចែក​រំលែក",
+    "Share" : "ចែក​រំលែក",
+    "Error" : "កំហុស",
+    "Error while sharing" : "កំហុស​ពេល​ចែក​រំលែក",
+    "Error while unsharing" : "កំពុង​ពេល​លែង​ចែក​រំលែក",
+    "Error while changing permissions" : "មាន​កំហុស​នៅ​ពេល​ប្ដូរ​សិទ្ធិ",
+    "Shared with you and the group {group} by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
+    "Shared with you by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
+    "Password protect" : "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
+    "Allow Public Upload" : "អនុញ្ញាត​ការ​ផ្ទុកឡើង​ជា​សាធារណៈ",
+    "Send" : "ផ្ញើ",
+    "Set expiration date" : "កំណត់​ពេល​ផុត​កំណត់",
+    "Expiration date" : "ពេល​ផុត​កំណត់",
+    "group" : "ក្រុម",
+    "Resharing is not allowed" : "មិន​អនុញ្ញាត​ឲ្យ​មាន​ការ​ចែក​រំលែក​ឡើង​វិញ",
+    "Shared in {item} with {user}" : "បាន​ចែក​រំលែក​ក្នុង {item} ជាមួយ {user}",
+    "Unshare" : "លែង​ចែក​រំលែក",
+    "can share" : "អាច​ចែក​រំលែក",
+    "can edit" : "អាច​កែប្រែ",
+    "access control" : "សិទ្ធិ​បញ្ជា",
+    "create" : "បង្កើត",
+    "update" : "ធ្វើ​បច្ចុប្បន្នភាព",
+    "delete" : "លុប",
+    "Password protected" : "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
+    "Sending ..." : "កំពុង​ផ្ញើ ...",
+    "Email sent" : "បាន​ផ្ញើ​អ៊ីមែល",
+    "Warning" : "បម្រាម",
+    "The object type is not specified." : "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
+    "Delete" : "លុប",
+    "Add" : "បញ្ចូល",
+    "Please reload the page." : "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
+    "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
+    "Personal" : "ផ្ទាល់​ខ្លួន",
+    "Users" : "អ្នកប្រើ",
+    "Apps" : "កម្មវិធី",
+    "Admin" : "អ្នក​គ្រប់​គ្រង",
+    "Help" : "ជំនួយ",
+    "Access forbidden" : "បាន​ហាមឃាត់​ការ​ចូល",
+    "Security Warning" : "បម្រាម​សុវត្ថិភាព",
+    "Create an <strong>admin account</strong>" : "បង្កើត​<strong>គណនី​អភិបាល</strong>",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Storage & database" : "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ",
+    "Data folder" : "ថត​ទិន្នន័យ",
+    "Configure the database" : "កំណត់​សណ្ឋាន​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database user" : "អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database password" : "ពាក្យ​សម្ងាត់​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database name" : "ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database host" : "ម៉ាស៊ីន​មូលដ្ឋាន​ទិន្នន័យ",
+    "Finish setup" : "បញ្ចប់​ការ​ដំឡើង",
+    "Finishing …" : "កំពុង​បញ្ចប់ ...",
+    "Log out" : "ចាក​ចេញ",
+    "remember" : "ចងចាំ",
+    "Log in" : "ចូល",
+    "Alternative Logins" : "ការ​ចូល​ជំនួស"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/km.php b/core/l10n/km.php
deleted file mode 100644
index 1e7c3b93df9..00000000000
--- a/core/l10n/km.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown filetype" => "មិន​ស្គាល់​ប្រភេទ​ឯកសារ",
-"Invalid image" => "រូបភាព​មិន​ត្រឹម​ត្រូវ",
-"Sunday" => "ថ្ងៃអាទិត្យ",
-"Monday" => "ថ្ងៃចន្ទ",
-"Tuesday" => "ថ្ងៃអង្គារ",
-"Wednesday" => "ថ្ងៃពុធ",
-"Thursday" => "ថ្ងៃព្រហស្បតិ៍",
-"Friday" => "ថ្ងៃសុក្រ",
-"Saturday" => "ថ្ងៃសៅរ៍",
-"January" => "ខែមករា",
-"February" => "ខែកុម្ភៈ",
-"March" => "ខែមីនា",
-"April" => "ខែមេសា",
-"May" => "ខែឧសភា",
-"June" => "ខែមិថុនា",
-"July" => "ខែកក្កដា",
-"August" => "ខែសីហា",
-"September" => "ខែកញ្ញា",
-"October" => "ខែតុលា",
-"November" => "ខែវិច្ឆិកា",
-"December" => "ខែធ្នូ",
-"Settings" => "ការកំណត់",
-"Folder" => "ថត",
-"Saving..." => "កំពុង​រក្សាទុក",
-"Reset password" => "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
-"No" => "ទេ",
-"Yes" => "ព្រម",
-"Choose" => "ជ្រើស",
-"Ok" => "ព្រម",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"New Files" => "ឯកសារ​ថ្មី",
-"Already existing files" => "មាន​ឯកសារ​នេះ​រួច​ហើយ",
-"Cancel" => "លើកលែង",
-"Continue" => "បន្ត",
-"(all selected)" => "(បាន​ជ្រើស​ទាំង​អស់)",
-"({count} selected)" => "(បាន​ជ្រើស {count})",
-"Very weak password" => "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
-"Weak password" => "ពាក្យ​សម្ងាត់​ខ្សោយ",
-"So-so password" => "ពាក្យ​សម្ងាត់​ធម្មតា",
-"Good password" => "ពាក្យ​សម្ងាត់​ល្អ",
-"Strong password" => "ពាក្យ​សម្ងាត់​ខ្លាំង",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "ម៉ាស៊ីន​មេ​វេប​របស់​អ្នក​មិន​បានរៀបចំត្រឹមត្រូវ ដើម្បី​អនុញ្ញាតិ​អោយ​មាន​ឯកសារ​ធ្វើ​សមកាលកម្មបាន​ទេ ព្រោះថា WebDAV ហាក់​បី​ដូច​ជាខូចហើយ។",
-"Shared" => "បាន​ចែក​រំលែក",
-"Share" => "ចែក​រំលែក",
-"Error" => "កំហុស",
-"Error while sharing" => "កំហុស​ពេល​ចែក​រំលែក",
-"Error while unsharing" => "កំពុង​ពេល​លែង​ចែក​រំលែក",
-"Error while changing permissions" => "មាន​កំហុស​នៅ​ពេល​ប្ដូរ​សិទ្ធិ",
-"Shared with you and the group {group} by {owner}" => "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
-"Shared with you by {owner}" => "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
-"Password protect" => "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
-"Allow Public Upload" => "អនុញ្ញាត​ការ​ផ្ទុកឡើង​ជា​សាធារណៈ",
-"Send" => "ផ្ញើ",
-"Set expiration date" => "កំណត់​ពេល​ផុត​កំណត់",
-"Expiration date" => "ពេល​ផុត​កំណត់",
-"group" => "ក្រុម",
-"Resharing is not allowed" => "មិន​អនុញ្ញាត​ឲ្យ​មាន​ការ​ចែក​រំលែក​ឡើង​វិញ",
-"Shared in {item} with {user}" => "បាន​ចែក​រំលែក​ក្នុង {item} ជាមួយ {user}",
-"Unshare" => "លែង​ចែក​រំលែក",
-"can share" => "អាច​ចែក​រំលែក",
-"can edit" => "អាច​កែប្រែ",
-"access control" => "សិទ្ធិ​បញ្ជា",
-"create" => "បង្កើត",
-"update" => "ធ្វើ​បច្ចុប្បន្នភាព",
-"delete" => "លុប",
-"Password protected" => "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
-"Sending ..." => "កំពុង​ផ្ញើ ...",
-"Email sent" => "បាន​ផ្ញើ​អ៊ីមែល",
-"Warning" => "បម្រាម",
-"The object type is not specified." => "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
-"Delete" => "លុប",
-"Add" => "បញ្ចូល",
-"Please reload the page." => "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
-"Username" => "ឈ្មោះ​អ្នកប្រើ",
-"New password" => "ពាក្យ​សម្ងាត់​ថ្មី",
-"Personal" => "ផ្ទាល់​ខ្លួន",
-"Users" => "អ្នកប្រើ",
-"Apps" => "កម្មវិធី",
-"Admin" => "អ្នក​គ្រប់​គ្រង",
-"Help" => "ជំនួយ",
-"Access forbidden" => "បាន​ហាមឃាត់​ការ​ចូល",
-"Security Warning" => "បម្រាម​សុវត្ថិភាព",
-"Create an <strong>admin account</strong>" => "បង្កើត​<strong>គណនី​អភិបាល</strong>",
-"Password" => "ពាក្យសម្ងាត់",
-"Storage & database" => "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ",
-"Data folder" => "ថត​ទិន្នន័យ",
-"Configure the database" => "កំណត់​សណ្ឋាន​មូលដ្ឋាន​ទិន្នន័យ",
-"Database user" => "អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្នន័យ",
-"Database password" => "ពាក្យ​សម្ងាត់​មូលដ្ឋាន​ទិន្នន័យ",
-"Database name" => "ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ",
-"Database host" => "ម៉ាស៊ីន​មូលដ្ឋាន​ទិន្នន័យ",
-"Finish setup" => "បញ្ចប់​ការ​ដំឡើង",
-"Finishing …" => "កំពុង​បញ្ចប់ ...",
-"Log out" => "ចាក​ចេញ",
-"remember" => "ចងចាំ",
-"Log in" => "ចូល",
-"Alternative Logins" => "ការ​ចូល​ជំនួស"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/kn.js b/core/l10n/kn.js
new file mode 100644
index 00000000000..87077ecad97
--- /dev/null
+++ b/core/l10n/kn.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/kn.json b/core/l10n/kn.json
new file mode 100644
index 00000000000..c499f696550
--- /dev/null
+++ b/core/l10n/kn.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/kn.php b/core/l10n/kn.php
deleted file mode 100644
index 1191769faa7..00000000000
--- a/core/l10n/kn.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
new file mode 100644
index 00000000000..d727727cf9f
--- /dev/null
+++ b/core/l10n/ko.js
@@ -0,0 +1,163 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "%s 님에게 메일을 보낼 수 없습니다.",
+    "Turned on maintenance mode" : "유지 보수 모드 켜짐",
+    "Turned off maintenance mode" : "유지 보수 모드 꺼짐",
+    "Updated database" : "데이터베이스 업데이트 됨",
+    "No image or file provided" : "이미지나 파일이 없음",
+    "Unknown filetype" : "알려지지 않은 파일 형식",
+    "Invalid image" : "잘못된 이미지",
+    "No temporary profile picture available, try again" : "사용 가능한 프로필 사진이 없습니다. 다시 시도하십시오.",
+    "No crop data provided" : "선택된 데이터가 없습니다.",
+    "Sunday" : "일요일",
+    "Monday" : "월요일",
+    "Tuesday" : "화요일",
+    "Wednesday" : "수요일",
+    "Thursday" : "목요일",
+    "Friday" : "금요일",
+    "Saturday" : "토요일",
+    "January" : "1월",
+    "February" : "2월",
+    "March" : "3월",
+    "April" : "4월",
+    "May" : "5월",
+    "June" : "6월",
+    "July" : "7월",
+    "August" : "8월",
+    "September" : "9월",
+    "October" : "10월",
+    "November" : "11월",
+    "December" : "12월",
+    "Settings" : "설정",
+    "File" : "파일",
+    "Folder" : "폴더",
+    "Image" : "그림",
+    "Saving..." : "저장 중...",
+    "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
+    "Reset password" : "암호 재설정",
+    "Password can not be changed. Please contact your administrator." : "비밀번호를 변경할수 없습니다. 관리자에게 문의하십시오.",
+    "No" : "아니요",
+    "Yes" : "예",
+    "Choose" : "선택",
+    "Error loading file picker template: {error}" : "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
+    "Ok" : "확인",
+    "Error loading message template: {error}" : "메시지 템플릿을 불러오는 중 오류 발생: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["파일 {count}개 충돌"],
+    "One file conflict" : "파일 1개 충돌",
+    "New Files" : "새 파일",
+    "Already existing files" : "파일이 이미 존재합니다",
+    "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}개 선택됨)",
+    "Error loading file exists template" : "파일 존재함 템플릿을 불러오는 중 오류 발생",
+    "Very weak password" : "매우 약한 암호",
+    "Weak password" : "약한 암호",
+    "So-so password" : "그저 그런 암호",
+    "Good password" : "좋은 암호",
+    "Strong password" : "강력한 암호",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "서버에서 인터넷에 연결할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 제 3자 앱 설치 등 일부 기능을 사용할 수 없습니다. 외부에서 파일에 접근하거나 알림 이메일을 보내지 못할 수도 있습니다. 모든 기능을 사용하려면 인터넷에 연결하는 것을 추천합니다.",
+    "Shared" : "공유됨",
+    "Share" : "공유",
+    "Error" : "오류",
+    "Error while sharing" : "공유하는 중 오류 발생",
+    "Error while unsharing" : "공유 해제하는 중 오류 발생",
+    "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" : "암호 보호",
+    "Allow Public Upload" : "공개 업로드 허용",
+    "Email link to person" : "이메일 주소",
+    "Send" : "전송",
+    "Set expiration date" : "만료 날짜 설정",
+    "Expiration date" : "만료 날짜",
+    "group" : "그룹",
+    "Resharing is not allowed" : "다시 공유할 수 없습니다",
+    "Shared in {item} with {user}" : "{user} 님과 {item}에서 공유 중",
+    "Unshare" : "공유 해제",
+    "notify by email" : "이메일로 알림",
+    "can share" : "공유 가능",
+    "can edit" : "편집 가능",
+    "access control" : "접근 제어",
+    "create" : "생성",
+    "update" : "업데이트",
+    "delete" : "삭제",
+    "Password protected" : "암호로 보호됨",
+    "Error unsetting expiration date" : "만료 날짜 해제 오류",
+    "Error setting expiration date" : "만료 날짜 설정 오류",
+    "Sending ..." : "전송 중...",
+    "Email sent" : "이메일 발송됨",
+    "Warning" : "경고",
+    "The object type is not specified." : "객체 유형이 지정되지 않았습니다.",
+    "Enter new" : "새로운 값 입력",
+    "Delete" : "삭제",
+    "Add" : "추가",
+    "Edit tags" : "태그 편집",
+    "Error loading dialog template: {error}" : "대화 상자 템플릿을 불러오는 중 오류 발생: {error}",
+    "No tags selected for deletion." : "삭제할 태그를 선택하지 않았습니다.",
+    "Please reload the page." : "페이지를 새로 고치십시오.",
+    "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
+    "%s password reset" : "%s 암호 재설정",
+    "Use the following link to reset your password: {link}" : "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
+    "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" : "예, 지금 내 암호를 재설정합니다",
+    "Reset" : "재설정",
+    "New password" : "새 암호",
+    "New Password" : "새 암호",
+    "Personal" : "개인",
+    "Users" : "사용자",
+    "Apps" : "앱",
+    "Admin" : "관리자",
+    "Help" : "도움말",
+    "Error loading tags" : "태그 불러오기 오류",
+    "Tag already exists" : "태그가 이미 존재합니다",
+    "Error deleting tag(s)" : "태그 삭제 오류",
+    "Error tagging" : "태그 추가 오류",
+    "Error untagging" : "태그 해제 오류",
+    "Error favoriting" : "즐겨찾기 추가 오류",
+    "Error unfavoriting" : "즐겨찾기 삭제 오류",
+    "Access forbidden" : "접근 금지됨",
+    "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 버전을 업데이트하십시오.",
+    "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>를 참조하십시오.",
+    "Create an <strong>admin account</strong>" : "<strong>관리자 계정</strong> 만들기",
+    "Password" : "암호",
+    "Storage & database" : "스토리지 & 데이터베이스",
+    "Data folder" : "데이터 폴더",
+    "Configure the database" : "데이터베이스 설정",
+    "Only %s is available." : "%s 만 가능합니다.",
+    "Database user" : "데이터베이스 사용자",
+    "Database password" : "데이터베이스 암호",
+    "Database name" : "데이터베이스 이름",
+    "Database tablespace" : "데이터베이스 테이블 공간",
+    "Database host" : "데이터베이스 호스트",
+    "Finish setup" : "설치 완료",
+    "Finishing …" : "완료 중 ...",
+    "%s is available. Get more information on how to update." : "%s을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 자세한 정보를 얻으십시오.",
+    "Log out" : "로그아웃",
+    "Server side authentication failed!" : "서버 인증 실패!",
+    "Please contact your administrator." : "관리자에게 문의하십시오.",
+    "Forgot your password? Reset it!" : "암호를 잊으셨다구요? 재설정하세요!",
+    "remember" : "기억하기",
+    "Log in" : "로그인",
+    "Alternative Logins" : "대체 로그인",
+    "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." : "기다려 주셔서 감사합니다.",
+    "Start update" : "업데이트 시작"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
new file mode 100644
index 00000000000..2ddffff685b
--- /dev/null
+++ b/core/l10n/ko.json
@@ -0,0 +1,161 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "%s 님에게 메일을 보낼 수 없습니다.",
+    "Turned on maintenance mode" : "유지 보수 모드 켜짐",
+    "Turned off maintenance mode" : "유지 보수 모드 꺼짐",
+    "Updated database" : "데이터베이스 업데이트 됨",
+    "No image or file provided" : "이미지나 파일이 없음",
+    "Unknown filetype" : "알려지지 않은 파일 형식",
+    "Invalid image" : "잘못된 이미지",
+    "No temporary profile picture available, try again" : "사용 가능한 프로필 사진이 없습니다. 다시 시도하십시오.",
+    "No crop data provided" : "선택된 데이터가 없습니다.",
+    "Sunday" : "일요일",
+    "Monday" : "월요일",
+    "Tuesday" : "화요일",
+    "Wednesday" : "수요일",
+    "Thursday" : "목요일",
+    "Friday" : "금요일",
+    "Saturday" : "토요일",
+    "January" : "1월",
+    "February" : "2월",
+    "March" : "3월",
+    "April" : "4월",
+    "May" : "5월",
+    "June" : "6월",
+    "July" : "7월",
+    "August" : "8월",
+    "September" : "9월",
+    "October" : "10월",
+    "November" : "11월",
+    "December" : "12월",
+    "Settings" : "설정",
+    "File" : "파일",
+    "Folder" : "폴더",
+    "Image" : "그림",
+    "Saving..." : "저장 중...",
+    "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
+    "Reset password" : "암호 재설정",
+    "Password can not be changed. Please contact your administrator." : "비밀번호를 변경할수 없습니다. 관리자에게 문의하십시오.",
+    "No" : "아니요",
+    "Yes" : "예",
+    "Choose" : "선택",
+    "Error loading file picker template: {error}" : "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
+    "Ok" : "확인",
+    "Error loading message template: {error}" : "메시지 템플릿을 불러오는 중 오류 발생: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["파일 {count}개 충돌"],
+    "One file conflict" : "파일 1개 충돌",
+    "New Files" : "새 파일",
+    "Already existing files" : "파일이 이미 존재합니다",
+    "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}개 선택됨)",
+    "Error loading file exists template" : "파일 존재함 템플릿을 불러오는 중 오류 발생",
+    "Very weak password" : "매우 약한 암호",
+    "Weak password" : "약한 암호",
+    "So-so password" : "그저 그런 암호",
+    "Good password" : "좋은 암호",
+    "Strong password" : "강력한 암호",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "서버에서 인터넷에 연결할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 제 3자 앱 설치 등 일부 기능을 사용할 수 없습니다. 외부에서 파일에 접근하거나 알림 이메일을 보내지 못할 수도 있습니다. 모든 기능을 사용하려면 인터넷에 연결하는 것을 추천합니다.",
+    "Shared" : "공유됨",
+    "Share" : "공유",
+    "Error" : "오류",
+    "Error while sharing" : "공유하는 중 오류 발생",
+    "Error while unsharing" : "공유 해제하는 중 오류 발생",
+    "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" : "암호 보호",
+    "Allow Public Upload" : "공개 업로드 허용",
+    "Email link to person" : "이메일 주소",
+    "Send" : "전송",
+    "Set expiration date" : "만료 날짜 설정",
+    "Expiration date" : "만료 날짜",
+    "group" : "그룹",
+    "Resharing is not allowed" : "다시 공유할 수 없습니다",
+    "Shared in {item} with {user}" : "{user} 님과 {item}에서 공유 중",
+    "Unshare" : "공유 해제",
+    "notify by email" : "이메일로 알림",
+    "can share" : "공유 가능",
+    "can edit" : "편집 가능",
+    "access control" : "접근 제어",
+    "create" : "생성",
+    "update" : "업데이트",
+    "delete" : "삭제",
+    "Password protected" : "암호로 보호됨",
+    "Error unsetting expiration date" : "만료 날짜 해제 오류",
+    "Error setting expiration date" : "만료 날짜 설정 오류",
+    "Sending ..." : "전송 중...",
+    "Email sent" : "이메일 발송됨",
+    "Warning" : "경고",
+    "The object type is not specified." : "객체 유형이 지정되지 않았습니다.",
+    "Enter new" : "새로운 값 입력",
+    "Delete" : "삭제",
+    "Add" : "추가",
+    "Edit tags" : "태그 편집",
+    "Error loading dialog template: {error}" : "대화 상자 템플릿을 불러오는 중 오류 발생: {error}",
+    "No tags selected for deletion." : "삭제할 태그를 선택하지 않았습니다.",
+    "Please reload the page." : "페이지를 새로 고치십시오.",
+    "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
+    "%s password reset" : "%s 암호 재설정",
+    "Use the following link to reset your password: {link}" : "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
+    "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" : "예, 지금 내 암호를 재설정합니다",
+    "Reset" : "재설정",
+    "New password" : "새 암호",
+    "New Password" : "새 암호",
+    "Personal" : "개인",
+    "Users" : "사용자",
+    "Apps" : "앱",
+    "Admin" : "관리자",
+    "Help" : "도움말",
+    "Error loading tags" : "태그 불러오기 오류",
+    "Tag already exists" : "태그가 이미 존재합니다",
+    "Error deleting tag(s)" : "태그 삭제 오류",
+    "Error tagging" : "태그 추가 오류",
+    "Error untagging" : "태그 해제 오류",
+    "Error favoriting" : "즐겨찾기 추가 오류",
+    "Error unfavoriting" : "즐겨찾기 삭제 오류",
+    "Access forbidden" : "접근 금지됨",
+    "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 버전을 업데이트하십시오.",
+    "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>를 참조하십시오.",
+    "Create an <strong>admin account</strong>" : "<strong>관리자 계정</strong> 만들기",
+    "Password" : "암호",
+    "Storage & database" : "스토리지 & 데이터베이스",
+    "Data folder" : "데이터 폴더",
+    "Configure the database" : "데이터베이스 설정",
+    "Only %s is available." : "%s 만 가능합니다.",
+    "Database user" : "데이터베이스 사용자",
+    "Database password" : "데이터베이스 암호",
+    "Database name" : "데이터베이스 이름",
+    "Database tablespace" : "데이터베이스 테이블 공간",
+    "Database host" : "데이터베이스 호스트",
+    "Finish setup" : "설치 완료",
+    "Finishing …" : "완료 중 ...",
+    "%s is available. Get more information on how to update." : "%s을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 자세한 정보를 얻으십시오.",
+    "Log out" : "로그아웃",
+    "Server side authentication failed!" : "서버 인증 실패!",
+    "Please contact your administrator." : "관리자에게 문의하십시오.",
+    "Forgot your password? Reset it!" : "암호를 잊으셨다구요? 재설정하세요!",
+    "remember" : "기억하기",
+    "Log in" : "로그인",
+    "Alternative Logins" : "대체 로그인",
+    "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." : "기다려 주셔서 감사합니다.",
+    "Start update" : "업데이트 시작"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
deleted file mode 100644
index 71eff300d06..00000000000
--- a/core/l10n/ko.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "%s 님에게 메일을 보낼 수 없습니다.",
-"Turned on maintenance mode" => "유지 보수 모드 켜짐",
-"Turned off maintenance mode" => "유지 보수 모드 꺼짐",
-"Updated database" => "데이터베이스 업데이트 됨",
-"No image or file provided" => "이미지나 파일이 없음",
-"Unknown filetype" => "알려지지 않은 파일 형식",
-"Invalid image" => "잘못된 이미지",
-"No temporary profile picture available, try again" => "사용 가능한 프로필 사진이 없습니다. 다시 시도하십시오.",
-"No crop data provided" => "선택된 데이터가 없습니다.",
-"Sunday" => "일요일",
-"Monday" => "월요일",
-"Tuesday" => "화요일",
-"Wednesday" => "수요일",
-"Thursday" => "목요일",
-"Friday" => "금요일",
-"Saturday" => "토요일",
-"January" => "1월",
-"February" => "2월",
-"March" => "3월",
-"April" => "4월",
-"May" => "5월",
-"June" => "6월",
-"July" => "7월",
-"August" => "8월",
-"September" => "9월",
-"October" => "10월",
-"November" => "11월",
-"December" => "12월",
-"Settings" => "설정",
-"File" => "파일",
-"Folder" => "폴더",
-"Image" => "그림",
-"Saving..." => "저장 중...",
-"Couldn't send reset email. Please contact your administrator." => "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
-"Reset password" => "암호 재설정",
-"Password can not be changed. Please contact your administrator." => "비밀번호를 변경할수 없습니다. 관리자에게 문의하십시오.",
-"No" => "아니요",
-"Yes" => "예",
-"Choose" => "선택",
-"Error loading file picker template: {error}" => "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
-"Ok" => "확인",
-"Error loading message template: {error}" => "메시지 템플릿을 불러오는 중 오류 발생: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("파일 {count}개 충돌"),
-"One file conflict" => "파일 1개 충돌",
-"New Files" => "새 파일",
-"Already existing files" => "파일이 이미 존재합니다",
-"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}개 선택됨)",
-"Error loading file exists template" => "파일 존재함 템플릿을 불러오는 중 오류 발생",
-"Very weak password" => "매우 약한 암호",
-"Weak password" => "약한 암호",
-"So-so password" => "그저 그런 암호",
-"Good password" => "좋은 암호",
-"Strong password" => "강력한 암호",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "서버에서 인터넷에 연결할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 제 3자 앱 설치 등 일부 기능을 사용할 수 없습니다. 외부에서 파일에 접근하거나 알림 이메일을 보내지 못할 수도 있습니다. 모든 기능을 사용하려면 인터넷에 연결하는 것을 추천합니다.",
-"Shared" => "공유됨",
-"Share" => "공유",
-"Error" => "오류",
-"Error while sharing" => "공유하는 중 오류 발생",
-"Error while unsharing" => "공유 해제하는 중 오류 발생",
-"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" => "암호 보호",
-"Allow Public Upload" => "공개 업로드 허용",
-"Email link to person" => "이메일 주소",
-"Send" => "전송",
-"Set expiration date" => "만료 날짜 설정",
-"Expiration date" => "만료 날짜",
-"group" => "그룹",
-"Resharing is not allowed" => "다시 공유할 수 없습니다",
-"Shared in {item} with {user}" => "{user} 님과 {item}에서 공유 중",
-"Unshare" => "공유 해제",
-"notify by email" => "이메일로 알림",
-"can share" => "공유 가능",
-"can edit" => "편집 가능",
-"access control" => "접근 제어",
-"create" => "생성",
-"update" => "업데이트",
-"delete" => "삭제",
-"Password protected" => "암호로 보호됨",
-"Error unsetting expiration date" => "만료 날짜 해제 오류",
-"Error setting expiration date" => "만료 날짜 설정 오류",
-"Sending ..." => "전송 중...",
-"Email sent" => "이메일 발송됨",
-"Warning" => "경고",
-"The object type is not specified." => "객체 유형이 지정되지 않았습니다.",
-"Enter new" => "새로운 값 입력",
-"Delete" => "삭제",
-"Add" => "추가",
-"Edit tags" => "태그 편집",
-"Error loading dialog template: {error}" => "대화 상자 템플릿을 불러오는 중 오류 발생: {error}",
-"No tags selected for deletion." => "삭제할 태그를 선택하지 않았습니다.",
-"Please reload the page." => "페이지를 새로 고치십시오.",
-"The update was successful. Redirecting you to ownCloud now." => "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
-"%s password reset" => "%s 암호 재설정",
-"Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
-"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" => "예, 지금 내 암호를 재설정합니다",
-"Reset" => "재설정",
-"New password" => "새 암호",
-"New Password" => "새 암호",
-"Personal" => "개인",
-"Users" => "사용자",
-"Apps" => "앱",
-"Admin" => "관리자",
-"Help" => "도움말",
-"Error loading tags" => "태그 불러오기 오류",
-"Tag already exists" => "태그가 이미 존재합니다",
-"Error deleting tag(s)" => "태그 삭제 오류",
-"Error tagging" => "태그 추가 오류",
-"Error untagging" => "태그 해제 오류",
-"Error favoriting" => "즐겨찾기 추가 오류",
-"Error unfavoriting" => "즐겨찾기 삭제 오류",
-"Access forbidden" => "접근 금지됨",
-"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 버전을 업데이트하십시오.",
-"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>를 참조하십시오.",
-"Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong> 만들기",
-"Password" => "암호",
-"Storage & database" => "스토리지 & 데이터베이스",
-"Data folder" => "데이터 폴더",
-"Configure the database" => "데이터베이스 설정",
-"Only %s is available." => "%s 만 가능합니다.",
-"Database user" => "데이터베이스 사용자",
-"Database password" => "데이터베이스 암호",
-"Database name" => "데이터베이스 이름",
-"Database tablespace" => "데이터베이스 테이블 공간",
-"Database host" => "데이터베이스 호스트",
-"Finish setup" => "설치 완료",
-"Finishing …" => "완료 중 ...",
-"%s is available. Get more information on how to update." => "%s을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 자세한 정보를 얻으십시오.",
-"Log out" => "로그아웃",
-"Server side authentication failed!" => "서버 인증 실패!",
-"Please contact your administrator." => "관리자에게 문의하십시오.",
-"Forgot your password? Reset it!" => "암호를 잊으셨다구요? 재설정하세요!",
-"remember" => "기억하기",
-"Log in" => "로그인",
-"Alternative Logins" => "대체 로그인",
-"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." => "기다려 주셔서 감사합니다.",
-"Start update" => "업데이트 시작"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ku_IQ.js b/core/l10n/ku_IQ.js
new file mode 100644
index 00000000000..7e41b5614a9
--- /dev/null
+++ b/core/l10n/ku_IQ.js
@@ -0,0 +1,31 @@
+OC.L10N.register(
+    "core",
+    {
+    "Settings" : "ده‌ستكاری",
+    "Folder" : "بوخچه",
+    "Saving..." : "پاشکه‌وتده‌کات...",
+    "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
+    "No" : "نەخێر",
+    "Yes" : "بەڵێ",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "لابردن",
+    "Share" : "هاوبەشی کردن",
+    "Error" : "هه‌ڵه",
+    "Warning" : "ئاگاداری",
+    "Add" : "زیادکردن",
+    "Username" : "ناوی به‌کارهێنه‌ر",
+    "New password" : "وشەی نهێنی نوێ",
+    "Users" : "به‌كارهێنه‌ر",
+    "Apps" : "به‌رنامه‌كان",
+    "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
+    "Help" : "یارمەتی",
+    "Password" : "وشەی تێپەربو",
+    "Data folder" : "زانیاری فۆڵده‌ر",
+    "Database user" : "به‌كارهێنه‌ری داتابه‌یس",
+    "Database password" : "وشه‌ی نهێنی داتا به‌یس",
+    "Database name" : "ناوی داتابه‌یس",
+    "Database host" : "هۆستی داتابه‌یس",
+    "Finish setup" : "كۆتایی هات ده‌ستكاریه‌كان",
+    "Log out" : "چوونەدەرەوە"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ku_IQ.json b/core/l10n/ku_IQ.json
new file mode 100644
index 00000000000..aa06ff50be6
--- /dev/null
+++ b/core/l10n/ku_IQ.json
@@ -0,0 +1,29 @@
+{ "translations": {
+    "Settings" : "ده‌ستكاری",
+    "Folder" : "بوخچه",
+    "Saving..." : "پاشکه‌وتده‌کات...",
+    "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
+    "No" : "نەخێر",
+    "Yes" : "بەڵێ",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "لابردن",
+    "Share" : "هاوبەشی کردن",
+    "Error" : "هه‌ڵه",
+    "Warning" : "ئاگاداری",
+    "Add" : "زیادکردن",
+    "Username" : "ناوی به‌کارهێنه‌ر",
+    "New password" : "وشەی نهێنی نوێ",
+    "Users" : "به‌كارهێنه‌ر",
+    "Apps" : "به‌رنامه‌كان",
+    "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
+    "Help" : "یارمەتی",
+    "Password" : "وشەی تێپەربو",
+    "Data folder" : "زانیاری فۆڵده‌ر",
+    "Database user" : "به‌كارهێنه‌ری داتابه‌یس",
+    "Database password" : "وشه‌ی نهێنی داتا به‌یس",
+    "Database name" : "ناوی داتابه‌یس",
+    "Database host" : "هۆستی داتابه‌یس",
+    "Finish setup" : "كۆتایی هات ده‌ستكاریه‌كان",
+    "Log out" : "چوونەدەرەوە"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
deleted file mode 100644
index d188db0dab6..00000000000
--- a/core/l10n/ku_IQ.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Settings" => "ده‌ستكاری",
-"Folder" => "بوخچه",
-"Saving..." => "پاشکه‌وتده‌کات...",
-"Reset password" => "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
-"No" => "نەخێر",
-"Yes" => "بەڵێ",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "لابردن",
-"Share" => "هاوبەشی کردن",
-"Error" => "هه‌ڵه",
-"Warning" => "ئاگاداری",
-"Add" => "زیادکردن",
-"Username" => "ناوی به‌کارهێنه‌ر",
-"New password" => "وشەی نهێنی نوێ",
-"Users" => "به‌كارهێنه‌ر",
-"Apps" => "به‌رنامه‌كان",
-"Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
-"Help" => "یارمەتی",
-"Password" => "وشەی تێپەربو",
-"Data folder" => "زانیاری فۆڵده‌ر",
-"Database user" => "به‌كارهێنه‌ری داتابه‌یس",
-"Database password" => "وشه‌ی نهێنی داتا به‌یس",
-"Database name" => "ناوی داتابه‌یس",
-"Database host" => "هۆستی داتابه‌یس",
-"Finish setup" => "كۆتایی هات ده‌ستكاریه‌كان",
-"Log out" => "چوونەدەرەوە"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/lb.js b/core/l10n/lb.js
new file mode 100644
index 00000000000..c5e76d21f53
--- /dev/null
+++ b/core/l10n/lb.js
@@ -0,0 +1,121 @@
+OC.L10N.register(
+    "core",
+    {
+    "Turned on maintenance mode" : "Maintenance Modus ass un",
+    "Turned off maintenance mode" : "Maintenance Modus ass aus",
+    "Updated database" : "Datebank ass geupdate ginn",
+    "No image or file provided" : "Kee Bild oder Fichier uginn",
+    "Unknown filetype" : "Onbekannten Fichier Typ",
+    "Invalid image" : "Ongülteg d'Bild",
+    "Sunday" : "Sonndeg",
+    "Monday" : "Méindeg",
+    "Tuesday" : "Dënschdeg",
+    "Wednesday" : "Mëttwoch",
+    "Thursday" : "Donneschdeg",
+    "Friday" : "Freideg",
+    "Saturday" : "Samschdeg",
+    "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",
+    "Settings" : "Astellungen",
+    "File" : "Fichier",
+    "Folder" : "Dossier",
+    "Saving..." : "Speicheren...",
+    "Reset password" : "Passwuert zréck setzen",
+    "No" : "Nee",
+    "Yes" : "Jo",
+    "Choose" : "Auswielen",
+    "Ok" : "OK",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Which files do you want to keep?" : "Weieng Fichieren wëlls de gär behalen?",
+    "Cancel" : "Ofbriechen",
+    "Continue" : "Weider",
+    "(all selected)" : "(all ausgewielt)",
+    "({count} selected)" : "({count} ausgewielt)",
+    "Shared" : "Gedeelt",
+    "Share" : "Deelen",
+    "Error" : "Feeler",
+    "Error while sharing" : "Feeler beim Deelen",
+    "Error while unsharing" : "Feeler beim Annuléiere vum Deelen",
+    "Error while changing permissions" : "Feeler beim Ännere vun de Rechter",
+    "Shared with you and the group {group} by {owner}" : "Gedeelt mat dir an der Grupp {group} vum {owner}",
+    "Shared with you by {owner}" : "Gedeelt mat dir vum {owner}",
+    "Share link" : "Link deelen",
+    "Password protect" : "Passwuertgeschützt",
+    "Allow Public Upload" : "Ëffentlechen Upload erlaaben",
+    "Email link to person" : "Link enger Persoun mailen",
+    "Send" : "Schécken",
+    "Set expiration date" : "Verfallsdatum setzen",
+    "Expiration date" : "Verfallsdatum",
+    "group" : "Grupp",
+    "Resharing is not allowed" : "Weiderdeelen ass net erlaabt",
+    "Shared in {item} with {user}" : "Gedeelt an {item} mat {user}",
+    "Unshare" : "Net méi deelen",
+    "notify by email" : "via e-mail Bescheed ginn",
+    "can share" : "kann deelen",
+    "can edit" : "kann änneren",
+    "access control" : "Zougrëffskontroll",
+    "create" : "erstellen",
+    "update" : "aktualiséieren",
+    "delete" : "läschen",
+    "Password protected" : "Passwuertgeschützt",
+    "Error unsetting expiration date" : "Feeler beim Läsche vum Verfallsdatum",
+    "Error setting expiration date" : "Feeler beim Setze vum Verfallsdatum",
+    "Sending ..." : "Gëtt geschéckt...",
+    "Email sent" : "Email geschéckt",
+    "Warning" : "Warnung",
+    "The object type is not specified." : "Den Typ vum Object ass net uginn.",
+    "Enter new" : "Gëff nei an",
+    "Delete" : "Läschen",
+    "Add" : "Dobäisetzen",
+    "Edit tags" : "Tags editéieren",
+    "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
+    "%s password reset" : "%s Passwuert ass nei gesat",
+    "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
+    "You will receive a link to reset your password via Email." : "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.",
+    "Username" : "Benotzernumm",
+    "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?" : "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?",
+    "Yes, I really want to reset my password now" : "Jo, ech wëll mäi Passwuert elo zrécksetzen",
+    "Reset" : "Zeréck setzen",
+    "New password" : "Neit Passwuert",
+    "Personal" : "Perséinlech",
+    "Users" : "Benotzer",
+    "Apps" : "Applikatiounen",
+    "Admin" : "Admin",
+    "Help" : "Hëllef",
+    "Error tagging" : "Fehler beim Taggen",
+    "Error untagging" : "Fehler beim Tag läschen",
+    "Access forbidden" : "Zougrëff net erlaabt",
+    "Cheers!" : "Prost!",
+    "Security Warning" : "Sécherheets-Warnung",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Deng PHP-Versioun ass verwonnbar duerch d'NULL-Byte-Attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aktualiséier w.e.gl deng PHP-Installatioun fir %s sécher kennen ze benotzen.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
+    "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën",
+    "Password" : "Passwuert",
+    "Data folder" : "Daten-Dossier",
+    "Configure the database" : "D'Datebank konfiguréieren",
+    "Database user" : "Datebank-Benotzer",
+    "Database password" : "Datebank-Passwuert",
+    "Database name" : "Datebank Numm",
+    "Database tablespace" : "Tabelle-Plaz vun der Datebank",
+    "Database host" : "Datebank-Server",
+    "Finish setup" : "Installatioun ofschléissen",
+    "Finishing …" : "Schléissen of ...",
+    "%s is available. Get more information on how to update." : "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséierung ofleeft.",
+    "Log out" : "Ofmellen",
+    "remember" : "verhalen",
+    "Log in" : "Umellen",
+    "Alternative Logins" : "Alternativ Umeldungen",
+    "Thank you for your patience." : "Merci fir deng Gedold."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/lb.json b/core/l10n/lb.json
new file mode 100644
index 00000000000..58f01166dfd
--- /dev/null
+++ b/core/l10n/lb.json
@@ -0,0 +1,119 @@
+{ "translations": {
+    "Turned on maintenance mode" : "Maintenance Modus ass un",
+    "Turned off maintenance mode" : "Maintenance Modus ass aus",
+    "Updated database" : "Datebank ass geupdate ginn",
+    "No image or file provided" : "Kee Bild oder Fichier uginn",
+    "Unknown filetype" : "Onbekannten Fichier Typ",
+    "Invalid image" : "Ongülteg d'Bild",
+    "Sunday" : "Sonndeg",
+    "Monday" : "Méindeg",
+    "Tuesday" : "Dënschdeg",
+    "Wednesday" : "Mëttwoch",
+    "Thursday" : "Donneschdeg",
+    "Friday" : "Freideg",
+    "Saturday" : "Samschdeg",
+    "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",
+    "Settings" : "Astellungen",
+    "File" : "Fichier",
+    "Folder" : "Dossier",
+    "Saving..." : "Speicheren...",
+    "Reset password" : "Passwuert zréck setzen",
+    "No" : "Nee",
+    "Yes" : "Jo",
+    "Choose" : "Auswielen",
+    "Ok" : "OK",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Which files do you want to keep?" : "Weieng Fichieren wëlls de gär behalen?",
+    "Cancel" : "Ofbriechen",
+    "Continue" : "Weider",
+    "(all selected)" : "(all ausgewielt)",
+    "({count} selected)" : "({count} ausgewielt)",
+    "Shared" : "Gedeelt",
+    "Share" : "Deelen",
+    "Error" : "Feeler",
+    "Error while sharing" : "Feeler beim Deelen",
+    "Error while unsharing" : "Feeler beim Annuléiere vum Deelen",
+    "Error while changing permissions" : "Feeler beim Ännere vun de Rechter",
+    "Shared with you and the group {group} by {owner}" : "Gedeelt mat dir an der Grupp {group} vum {owner}",
+    "Shared with you by {owner}" : "Gedeelt mat dir vum {owner}",
+    "Share link" : "Link deelen",
+    "Password protect" : "Passwuertgeschützt",
+    "Allow Public Upload" : "Ëffentlechen Upload erlaaben",
+    "Email link to person" : "Link enger Persoun mailen",
+    "Send" : "Schécken",
+    "Set expiration date" : "Verfallsdatum setzen",
+    "Expiration date" : "Verfallsdatum",
+    "group" : "Grupp",
+    "Resharing is not allowed" : "Weiderdeelen ass net erlaabt",
+    "Shared in {item} with {user}" : "Gedeelt an {item} mat {user}",
+    "Unshare" : "Net méi deelen",
+    "notify by email" : "via e-mail Bescheed ginn",
+    "can share" : "kann deelen",
+    "can edit" : "kann änneren",
+    "access control" : "Zougrëffskontroll",
+    "create" : "erstellen",
+    "update" : "aktualiséieren",
+    "delete" : "läschen",
+    "Password protected" : "Passwuertgeschützt",
+    "Error unsetting expiration date" : "Feeler beim Läsche vum Verfallsdatum",
+    "Error setting expiration date" : "Feeler beim Setze vum Verfallsdatum",
+    "Sending ..." : "Gëtt geschéckt...",
+    "Email sent" : "Email geschéckt",
+    "Warning" : "Warnung",
+    "The object type is not specified." : "Den Typ vum Object ass net uginn.",
+    "Enter new" : "Gëff nei an",
+    "Delete" : "Läschen",
+    "Add" : "Dobäisetzen",
+    "Edit tags" : "Tags editéieren",
+    "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
+    "%s password reset" : "%s Passwuert ass nei gesat",
+    "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
+    "You will receive a link to reset your password via Email." : "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.",
+    "Username" : "Benotzernumm",
+    "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?" : "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?",
+    "Yes, I really want to reset my password now" : "Jo, ech wëll mäi Passwuert elo zrécksetzen",
+    "Reset" : "Zeréck setzen",
+    "New password" : "Neit Passwuert",
+    "Personal" : "Perséinlech",
+    "Users" : "Benotzer",
+    "Apps" : "Applikatiounen",
+    "Admin" : "Admin",
+    "Help" : "Hëllef",
+    "Error tagging" : "Fehler beim Taggen",
+    "Error untagging" : "Fehler beim Tag läschen",
+    "Access forbidden" : "Zougrëff net erlaabt",
+    "Cheers!" : "Prost!",
+    "Security Warning" : "Sécherheets-Warnung",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Deng PHP-Versioun ass verwonnbar duerch d'NULL-Byte-Attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aktualiséier w.e.gl deng PHP-Installatioun fir %s sécher kennen ze benotzen.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
+    "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën",
+    "Password" : "Passwuert",
+    "Data folder" : "Daten-Dossier",
+    "Configure the database" : "D'Datebank konfiguréieren",
+    "Database user" : "Datebank-Benotzer",
+    "Database password" : "Datebank-Passwuert",
+    "Database name" : "Datebank Numm",
+    "Database tablespace" : "Tabelle-Plaz vun der Datebank",
+    "Database host" : "Datebank-Server",
+    "Finish setup" : "Installatioun ofschléissen",
+    "Finishing …" : "Schléissen of ...",
+    "%s is available. Get more information on how to update." : "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséierung ofleeft.",
+    "Log out" : "Ofmellen",
+    "remember" : "verhalen",
+    "Log in" : "Umellen",
+    "Alternative Logins" : "Alternativ Umeldungen",
+    "Thank you for your patience." : "Merci fir deng Gedold."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
deleted file mode 100644
index e448a2b500d..00000000000
--- a/core/l10n/lb.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Turned on maintenance mode" => "Maintenance Modus ass un",
-"Turned off maintenance mode" => "Maintenance Modus ass aus",
-"Updated database" => "Datebank ass geupdate ginn",
-"No image or file provided" => "Kee Bild oder Fichier uginn",
-"Unknown filetype" => "Onbekannten Fichier Typ",
-"Invalid image" => "Ongülteg d'Bild",
-"Sunday" => "Sonndeg",
-"Monday" => "Méindeg",
-"Tuesday" => "Dënschdeg",
-"Wednesday" => "Mëttwoch",
-"Thursday" => "Donneschdeg",
-"Friday" => "Freideg",
-"Saturday" => "Samschdeg",
-"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",
-"Settings" => "Astellungen",
-"File" => "Fichier",
-"Folder" => "Dossier",
-"Saving..." => "Speicheren...",
-"Reset password" => "Passwuert zréck setzen",
-"No" => "Nee",
-"Yes" => "Jo",
-"Choose" => "Auswielen",
-"Ok" => "OK",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Which files do you want to keep?" => "Weieng Fichieren wëlls de gär behalen?",
-"Cancel" => "Ofbriechen",
-"Continue" => "Weider",
-"(all selected)" => "(all ausgewielt)",
-"({count} selected)" => "({count} ausgewielt)",
-"Shared" => "Gedeelt",
-"Share" => "Deelen",
-"Error" => "Feeler",
-"Error while sharing" => "Feeler beim Deelen",
-"Error while unsharing" => "Feeler beim Annuléiere vum Deelen",
-"Error while changing permissions" => "Feeler beim Ännere vun de Rechter",
-"Shared with you and the group {group} by {owner}" => "Gedeelt mat dir an der Grupp {group} vum {owner}",
-"Shared with you by {owner}" => "Gedeelt mat dir vum {owner}",
-"Share link" => "Link deelen",
-"Password protect" => "Passwuertgeschützt",
-"Allow Public Upload" => "Ëffentlechen Upload erlaaben",
-"Email link to person" => "Link enger Persoun mailen",
-"Send" => "Schécken",
-"Set expiration date" => "Verfallsdatum setzen",
-"Expiration date" => "Verfallsdatum",
-"group" => "Grupp",
-"Resharing is not allowed" => "Weiderdeelen ass net erlaabt",
-"Shared in {item} with {user}" => "Gedeelt an {item} mat {user}",
-"Unshare" => "Net méi deelen",
-"notify by email" => "via e-mail Bescheed ginn",
-"can share" => "kann deelen",
-"can edit" => "kann änneren",
-"access control" => "Zougrëffskontroll",
-"create" => "erstellen",
-"update" => "aktualiséieren",
-"delete" => "läschen",
-"Password protected" => "Passwuertgeschützt",
-"Error unsetting expiration date" => "Feeler beim Läsche vum Verfallsdatum",
-"Error setting expiration date" => "Feeler beim Setze vum Verfallsdatum",
-"Sending ..." => "Gëtt geschéckt...",
-"Email sent" => "Email geschéckt",
-"Warning" => "Warnung",
-"The object type is not specified." => "Den Typ vum Object ass net uginn.",
-"Enter new" => "Gëff nei an",
-"Delete" => "Läschen",
-"Add" => "Dobäisetzen",
-"Edit tags" => "Tags editéieren",
-"The update was successful. Redirecting you to ownCloud now." => "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
-"%s password reset" => "%s Passwuert ass nei gesat",
-"Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
-"You will receive a link to reset your password via Email." => "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.",
-"Username" => "Benotzernumm",
-"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?" => "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?",
-"Yes, I really want to reset my password now" => "Jo, ech wëll mäi Passwuert elo zrécksetzen",
-"Reset" => "Zeréck setzen",
-"New password" => "Neit Passwuert",
-"Personal" => "Perséinlech",
-"Users" => "Benotzer",
-"Apps" => "Applikatiounen",
-"Admin" => "Admin",
-"Help" => "Hëllef",
-"Error tagging" => "Fehler beim Taggen",
-"Error untagging" => "Fehler beim Tag läschen",
-"Access forbidden" => "Zougrëff net erlaabt",
-"Cheers!" => "Prost!",
-"Security Warning" => "Sécherheets-Warnung",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deng PHP-Versioun ass verwonnbar duerch d'NULL-Byte-Attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Aktualiséier w.e.gl deng PHP-Installatioun fir %s sécher kennen ze benotzen.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
-"Create an <strong>admin account</strong>" => "En <strong>Admin-Account</strong> uleeën",
-"Password" => "Passwuert",
-"Data folder" => "Daten-Dossier",
-"Configure the database" => "D'Datebank konfiguréieren",
-"Database user" => "Datebank-Benotzer",
-"Database password" => "Datebank-Passwuert",
-"Database name" => "Datebank Numm",
-"Database tablespace" => "Tabelle-Plaz vun der Datebank",
-"Database host" => "Datebank-Server",
-"Finish setup" => "Installatioun ofschléissen",
-"Finishing …" => "Schléissen of ...",
-"%s is available. Get more information on how to update." => "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséierung ofleeft.",
-"Log out" => "Ofmellen",
-"remember" => "verhalen",
-"Log in" => "Umellen",
-"Alternative Logins" => "Alternativ Umeldungen",
-"Thank you for your patience." => "Merci fir deng Gedold."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js
new file mode 100644
index 00000000000..e407dcafa21
--- /dev/null
+++ b/core/l10n/lt_LT.js
@@ -0,0 +1,148 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nepavyko nusiųsti el. pašto šiems naudotojams: %s ",
+    "Turned on maintenance mode" : "Įjungta priežiūros veiksena",
+    "Turned off maintenance mode" : "Išjungta priežiūros veiksena",
+    "Updated database" : "Atnaujinta duomenų bazė",
+    "No image or file provided" : "Nenurodytas paveikslėlis ar failas",
+    "Unknown filetype" : "Nežinomas failo tipas",
+    "Invalid image" : "Netinkamas paveikslėlis",
+    "No temporary profile picture available, try again" : "Nėra laikino profilio paveikslėlio, bandykite dar kartą",
+    "No crop data provided" : "Nenurodyti apkirpimo duomenys",
+    "Sunday" : "Sekmadienis",
+    "Monday" : "Pirmadienis",
+    "Tuesday" : "Antradienis",
+    "Wednesday" : "Trečiadienis",
+    "Thursday" : "Ketvirtadienis",
+    "Friday" : "Penktadienis",
+    "Saturday" : "Šeštadienis",
+    "January" : "Sausis",
+    "February" : "Vasaris",
+    "March" : "Kovas",
+    "April" : "Balandis",
+    "May" : "Gegužė",
+    "June" : "Birželis",
+    "July" : "Liepa",
+    "August" : "Rugpjūtis",
+    "September" : "Rugsėjis",
+    "October" : "Spalis",
+    "November" : "Lapkritis",
+    "December" : "Gruodis",
+    "Settings" : "Nustatymai",
+    "File" : "Failas",
+    "Folder" : "Katalogas",
+    "Saving..." : "Saugoma...",
+    "Reset password" : "Atkurti slaptažodį",
+    "No" : "Ne",
+    "Yes" : "Taip",
+    "Choose" : "Pasirinkite",
+    "Error loading file picker template: {error}" : "Klaida įkeliant failo parinkimo ruošinį: {error}",
+    "Ok" : "Gerai",
+    "Error loading message template: {error}" : "Klaida įkeliant žinutės ruošinį: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"],
+    "One file conflict" : "Vienas failo konfliktas",
+    "Which files do you want to keep?" : "Kuriuos failus norite laikyti?",
+    "If you select both versions, the copied file will have a number added to its name." : "Jei pasirenkate abi versijas, nukopijuotas failas turės pridėtą numerį pavadinime.",
+    "Cancel" : "Atšaukti",
+    "Continue" : "Tęsti",
+    "(all selected)" : "(visi pažymėti)",
+    "({count} selected)" : "({count} pažymėtų)",
+    "Error loading file exists template" : "Klaida įkeliant esančių failų ruošinį",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas.",
+    "Shared" : "Dalinamasi",
+    "Share" : "Dalintis",
+    "Error" : "Klaida",
+    "Error while sharing" : "Klaida, dalijimosi metu",
+    "Error while unsharing" : "Klaida, kai atšaukiamas dalijimasis",
+    "Error while changing permissions" : "Klaida, keičiant privilegijas",
+    "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
+    "Shared with you by {owner}" : "Pasidalino su Jumis {owner}",
+    "Share with user or group …" : "Dalintis su vartotoju arba grupe...",
+    "Share link" : "Dalintis nuoroda",
+    "Password protect" : "Apsaugotas slaptažodžiu",
+    "Allow Public Upload" : "Leisti viešą įkėlimą",
+    "Email link to person" : "Nusiųsti nuorodą paštu",
+    "Send" : "Siųsti",
+    "Set expiration date" : "Nustatykite galiojimo laiką",
+    "Expiration date" : "Galiojimo laikas",
+    "group" : "grupė",
+    "Resharing is not allowed" : "Dalijinasis išnaujo negalimas",
+    "Shared in {item} with {user}" : "Pasidalino {item} su {user}",
+    "Unshare" : "Nebesidalinti",
+    "notify by email" : "pranešti el. paštu",
+    "can share" : "gali dalintis",
+    "can edit" : "gali redaguoti",
+    "access control" : "priėjimo kontrolė",
+    "create" : "sukurti",
+    "update" : "atnaujinti",
+    "delete" : "ištrinti",
+    "Password protected" : "Apsaugota slaptažodžiu",
+    "Error unsetting expiration date" : "Klaida nuimant galiojimo laiką",
+    "Error setting expiration date" : "Klaida nustatant galiojimo laiką",
+    "Sending ..." : "Siunčiama...",
+    "Email sent" : "Laiškas išsiųstas",
+    "Warning" : "Įspėjimas",
+    "The object type is not specified." : "Objekto tipas nenurodytas.",
+    "Enter new" : "Įveskite naują",
+    "Delete" : "Ištrinti",
+    "Add" : "Pridėti",
+    "Edit tags" : "Redaguoti žymes",
+    "Error loading dialog template: {error}" : "Klaida įkeliant dialogo ruošinį: {error}",
+    "No tags selected for deletion." : "Trynimui nepasirinkta jokia žymė.",
+    "Please reload the page." : "Prašome perkrauti puslapį.",
+    "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
+    "%s password reset" : "%s slaptažodžio atnaujinimas",
+    "Use the following link to reset your password: {link}" : "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
+    "You will receive a link to reset your password via Email." : "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
+    "Username" : "Prisijungimo vardas",
+    "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?" : "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
+    "Yes, I really want to reset my password now" : "Taip, aš tikrai noriu atnaujinti slaptažodį",
+    "Reset" : "Atstatyti",
+    "New password" : "Naujas slaptažodis",
+    "Personal" : "Asmeniniai",
+    "Users" : "Vartotojai",
+    "Apps" : "Programos",
+    "Admin" : "Administravimas",
+    "Help" : "Pagalba",
+    "Error loading tags" : "Klaida įkeliant žymes",
+    "Tag already exists" : "Žymė jau egzistuoja",
+    "Error deleting tag(s)" : "Klaida trinant žymę(-es)",
+    "Error tagging" : "Klaida pridedant žymę",
+    "Error untagging" : "Klaida šalinant žymę",
+    "Error favoriting" : "Klaida įtraukiant į mėgstamus.",
+    "Error unfavoriting" : "Klaida pašalinant iš mėgstamų.",
+    "Access forbidden" : "Priėjimas draudžiamas",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n",
+    "The share will expire on %s." : "Bendrinimo laikas baigsis %s.",
+    "Cheers!" : "Sveikinimai!",
+    "Security Warning" : "Saugumo pranešimas",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Prašome atnaujinti savo PHP, kad saugiai naudoti %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
+    "Create an <strong>admin account</strong>" : "Sukurti <strong>administratoriaus paskyrą</strong>",
+    "Password" : "Slaptažodis",
+    "Data folder" : "Duomenų katalogas",
+    "Configure the database" : "Nustatyti duomenų bazę",
+    "Database user" : "Duomenų bazės vartotojas",
+    "Database password" : "Duomenų bazės slaptažodis",
+    "Database name" : "Duomenų bazės pavadinimas",
+    "Database tablespace" : "Duomenų bazės loginis saugojimas",
+    "Database host" : "Duomenų bazės serveris",
+    "Finish setup" : "Baigti diegimą",
+    "Finishing …" : "Baigiama ...",
+    "%s is available. Get more information on how to update." : "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą.",
+    "Log out" : "Atsijungti",
+    "Server side authentication failed!" : "Autentikacija serveryje nepavyko!",
+    "Please contact your administrator." : "Kreipkitės į savo sistemos administratorių.",
+    "remember" : "prisiminti",
+    "Log in" : "Prisijungti",
+    "Alternative Logins" : "Alternatyvūs prisijungimai",
+    "This ownCloud instance is currently in single user mode." : "Ši ownCloud sistema yra vieno naudotojo veiksenoje.",
+    "This means only administrators can use the instance." : "Tai reiškia, kad tik administratorius gali naudotis sistema.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Susisiekite su savo sistemos administratoriumi jei šis pranešimas nedingsta arba jei jis pasirodė netikėtai.",
+    "Thank you for your patience." : "Dėkojame už jūsų kantrumą."
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json
new file mode 100644
index 00000000000..97dafb6fa00
--- /dev/null
+++ b/core/l10n/lt_LT.json
@@ -0,0 +1,146 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nepavyko nusiųsti el. pašto šiems naudotojams: %s ",
+    "Turned on maintenance mode" : "Įjungta priežiūros veiksena",
+    "Turned off maintenance mode" : "Išjungta priežiūros veiksena",
+    "Updated database" : "Atnaujinta duomenų bazė",
+    "No image or file provided" : "Nenurodytas paveikslėlis ar failas",
+    "Unknown filetype" : "Nežinomas failo tipas",
+    "Invalid image" : "Netinkamas paveikslėlis",
+    "No temporary profile picture available, try again" : "Nėra laikino profilio paveikslėlio, bandykite dar kartą",
+    "No crop data provided" : "Nenurodyti apkirpimo duomenys",
+    "Sunday" : "Sekmadienis",
+    "Monday" : "Pirmadienis",
+    "Tuesday" : "Antradienis",
+    "Wednesday" : "Trečiadienis",
+    "Thursday" : "Ketvirtadienis",
+    "Friday" : "Penktadienis",
+    "Saturday" : "Šeštadienis",
+    "January" : "Sausis",
+    "February" : "Vasaris",
+    "March" : "Kovas",
+    "April" : "Balandis",
+    "May" : "Gegužė",
+    "June" : "Birželis",
+    "July" : "Liepa",
+    "August" : "Rugpjūtis",
+    "September" : "Rugsėjis",
+    "October" : "Spalis",
+    "November" : "Lapkritis",
+    "December" : "Gruodis",
+    "Settings" : "Nustatymai",
+    "File" : "Failas",
+    "Folder" : "Katalogas",
+    "Saving..." : "Saugoma...",
+    "Reset password" : "Atkurti slaptažodį",
+    "No" : "Ne",
+    "Yes" : "Taip",
+    "Choose" : "Pasirinkite",
+    "Error loading file picker template: {error}" : "Klaida įkeliant failo parinkimo ruošinį: {error}",
+    "Ok" : "Gerai",
+    "Error loading message template: {error}" : "Klaida įkeliant žinutės ruošinį: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"],
+    "One file conflict" : "Vienas failo konfliktas",
+    "Which files do you want to keep?" : "Kuriuos failus norite laikyti?",
+    "If you select both versions, the copied file will have a number added to its name." : "Jei pasirenkate abi versijas, nukopijuotas failas turės pridėtą numerį pavadinime.",
+    "Cancel" : "Atšaukti",
+    "Continue" : "Tęsti",
+    "(all selected)" : "(visi pažymėti)",
+    "({count} selected)" : "({count} pažymėtų)",
+    "Error loading file exists template" : "Klaida įkeliant esančių failų ruošinį",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas.",
+    "Shared" : "Dalinamasi",
+    "Share" : "Dalintis",
+    "Error" : "Klaida",
+    "Error while sharing" : "Klaida, dalijimosi metu",
+    "Error while unsharing" : "Klaida, kai atšaukiamas dalijimasis",
+    "Error while changing permissions" : "Klaida, keičiant privilegijas",
+    "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
+    "Shared with you by {owner}" : "Pasidalino su Jumis {owner}",
+    "Share with user or group …" : "Dalintis su vartotoju arba grupe...",
+    "Share link" : "Dalintis nuoroda",
+    "Password protect" : "Apsaugotas slaptažodžiu",
+    "Allow Public Upload" : "Leisti viešą įkėlimą",
+    "Email link to person" : "Nusiųsti nuorodą paštu",
+    "Send" : "Siųsti",
+    "Set expiration date" : "Nustatykite galiojimo laiką",
+    "Expiration date" : "Galiojimo laikas",
+    "group" : "grupė",
+    "Resharing is not allowed" : "Dalijinasis išnaujo negalimas",
+    "Shared in {item} with {user}" : "Pasidalino {item} su {user}",
+    "Unshare" : "Nebesidalinti",
+    "notify by email" : "pranešti el. paštu",
+    "can share" : "gali dalintis",
+    "can edit" : "gali redaguoti",
+    "access control" : "priėjimo kontrolė",
+    "create" : "sukurti",
+    "update" : "atnaujinti",
+    "delete" : "ištrinti",
+    "Password protected" : "Apsaugota slaptažodžiu",
+    "Error unsetting expiration date" : "Klaida nuimant galiojimo laiką",
+    "Error setting expiration date" : "Klaida nustatant galiojimo laiką",
+    "Sending ..." : "Siunčiama...",
+    "Email sent" : "Laiškas išsiųstas",
+    "Warning" : "Įspėjimas",
+    "The object type is not specified." : "Objekto tipas nenurodytas.",
+    "Enter new" : "Įveskite naują",
+    "Delete" : "Ištrinti",
+    "Add" : "Pridėti",
+    "Edit tags" : "Redaguoti žymes",
+    "Error loading dialog template: {error}" : "Klaida įkeliant dialogo ruošinį: {error}",
+    "No tags selected for deletion." : "Trynimui nepasirinkta jokia žymė.",
+    "Please reload the page." : "Prašome perkrauti puslapį.",
+    "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
+    "%s password reset" : "%s slaptažodžio atnaujinimas",
+    "Use the following link to reset your password: {link}" : "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
+    "You will receive a link to reset your password via Email." : "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
+    "Username" : "Prisijungimo vardas",
+    "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?" : "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
+    "Yes, I really want to reset my password now" : "Taip, aš tikrai noriu atnaujinti slaptažodį",
+    "Reset" : "Atstatyti",
+    "New password" : "Naujas slaptažodis",
+    "Personal" : "Asmeniniai",
+    "Users" : "Vartotojai",
+    "Apps" : "Programos",
+    "Admin" : "Administravimas",
+    "Help" : "Pagalba",
+    "Error loading tags" : "Klaida įkeliant žymes",
+    "Tag already exists" : "Žymė jau egzistuoja",
+    "Error deleting tag(s)" : "Klaida trinant žymę(-es)",
+    "Error tagging" : "Klaida pridedant žymę",
+    "Error untagging" : "Klaida šalinant žymę",
+    "Error favoriting" : "Klaida įtraukiant į mėgstamus.",
+    "Error unfavoriting" : "Klaida pašalinant iš mėgstamų.",
+    "Access forbidden" : "Priėjimas draudžiamas",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n",
+    "The share will expire on %s." : "Bendrinimo laikas baigsis %s.",
+    "Cheers!" : "Sveikinimai!",
+    "Security Warning" : "Saugumo pranešimas",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Prašome atnaujinti savo PHP, kad saugiai naudoti %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
+    "Create an <strong>admin account</strong>" : "Sukurti <strong>administratoriaus paskyrą</strong>",
+    "Password" : "Slaptažodis",
+    "Data folder" : "Duomenų katalogas",
+    "Configure the database" : "Nustatyti duomenų bazę",
+    "Database user" : "Duomenų bazės vartotojas",
+    "Database password" : "Duomenų bazės slaptažodis",
+    "Database name" : "Duomenų bazės pavadinimas",
+    "Database tablespace" : "Duomenų bazės loginis saugojimas",
+    "Database host" : "Duomenų bazės serveris",
+    "Finish setup" : "Baigti diegimą",
+    "Finishing …" : "Baigiama ...",
+    "%s is available. Get more information on how to update." : "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą.",
+    "Log out" : "Atsijungti",
+    "Server side authentication failed!" : "Autentikacija serveryje nepavyko!",
+    "Please contact your administrator." : "Kreipkitės į savo sistemos administratorių.",
+    "remember" : "prisiminti",
+    "Log in" : "Prisijungti",
+    "Alternative Logins" : "Alternatyvūs prisijungimai",
+    "This ownCloud instance is currently in single user mode." : "Ši ownCloud sistema yra vieno naudotojo veiksenoje.",
+    "This means only administrators can use the instance." : "Tai reiškia, kad tik administratorius gali naudotis sistema.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Susisiekite su savo sistemos administratoriumi jei šis pranešimas nedingsta arba jei jis pasirodė netikėtai.",
+    "Thank you for your patience." : "Dėkojame už jūsų kantrumą."
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
deleted file mode 100644
index d3b98951506..00000000000
--- a/core/l10n/lt_LT.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nepavyko nusiųsti el. pašto šiems naudotojams: %s ",
-"Turned on maintenance mode" => "Įjungta priežiūros veiksena",
-"Turned off maintenance mode" => "Išjungta priežiūros veiksena",
-"Updated database" => "Atnaujinta duomenų bazė",
-"No image or file provided" => "Nenurodytas paveikslėlis ar failas",
-"Unknown filetype" => "Nežinomas failo tipas",
-"Invalid image" => "Netinkamas paveikslėlis",
-"No temporary profile picture available, try again" => "Nėra laikino profilio paveikslėlio, bandykite dar kartą",
-"No crop data provided" => "Nenurodyti apkirpimo duomenys",
-"Sunday" => "Sekmadienis",
-"Monday" => "Pirmadienis",
-"Tuesday" => "Antradienis",
-"Wednesday" => "Trečiadienis",
-"Thursday" => "Ketvirtadienis",
-"Friday" => "Penktadienis",
-"Saturday" => "Šeštadienis",
-"January" => "Sausis",
-"February" => "Vasaris",
-"March" => "Kovas",
-"April" => "Balandis",
-"May" => "Gegužė",
-"June" => "Birželis",
-"July" => "Liepa",
-"August" => "Rugpjūtis",
-"September" => "Rugsėjis",
-"October" => "Spalis",
-"November" => "Lapkritis",
-"December" => "Gruodis",
-"Settings" => "Nustatymai",
-"File" => "Failas",
-"Folder" => "Katalogas",
-"Saving..." => "Saugoma...",
-"Reset password" => "Atkurti slaptažodį",
-"No" => "Ne",
-"Yes" => "Taip",
-"Choose" => "Pasirinkite",
-"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}",
-"Ok" => "Gerai",
-"Error loading message template: {error}" => "Klaida įkeliant žinutės ruošinį: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"),
-"One file conflict" => "Vienas failo konfliktas",
-"Which files do you want to keep?" => "Kuriuos failus norite laikyti?",
-"If you select both versions, the copied file will have a number added to its name." => "Jei pasirenkate abi versijas, nukopijuotas failas turės pridėtą numerį pavadinime.",
-"Cancel" => "Atšaukti",
-"Continue" => "Tęsti",
-"(all selected)" => "(visi pažymėti)",
-"({count} selected)" => "({count} pažymėtų)",
-"Error loading file exists template" => "Klaida įkeliant esančių failų ruošinį",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas.",
-"Shared" => "Dalinamasi",
-"Share" => "Dalintis",
-"Error" => "Klaida",
-"Error while sharing" => "Klaida, dalijimosi metu",
-"Error while unsharing" => "Klaida, kai atšaukiamas dalijimasis",
-"Error while changing permissions" => "Klaida, keičiant privilegijas",
-"Shared with you and the group {group} by {owner}" => "Pasidalino su Jumis ir {group} grupe {owner}",
-"Shared with you by {owner}" => "Pasidalino su Jumis {owner}",
-"Share with user or group …" => "Dalintis su vartotoju arba grupe...",
-"Share link" => "Dalintis nuoroda",
-"Password protect" => "Apsaugotas slaptažodžiu",
-"Allow Public Upload" => "Leisti viešą įkėlimą",
-"Email link to person" => "Nusiųsti nuorodą paštu",
-"Send" => "Siųsti",
-"Set expiration date" => "Nustatykite galiojimo laiką",
-"Expiration date" => "Galiojimo laikas",
-"group" => "grupė",
-"Resharing is not allowed" => "Dalijinasis išnaujo negalimas",
-"Shared in {item} with {user}" => "Pasidalino {item} su {user}",
-"Unshare" => "Nebesidalinti",
-"notify by email" => "pranešti el. paštu",
-"can share" => "gali dalintis",
-"can edit" => "gali redaguoti",
-"access control" => "priėjimo kontrolė",
-"create" => "sukurti",
-"update" => "atnaujinti",
-"delete" => "ištrinti",
-"Password protected" => "Apsaugota slaptažodžiu",
-"Error unsetting expiration date" => "Klaida nuimant galiojimo laiką",
-"Error setting expiration date" => "Klaida nustatant galiojimo laiką",
-"Sending ..." => "Siunčiama...",
-"Email sent" => "Laiškas išsiųstas",
-"Warning" => "Įspėjimas",
-"The object type is not specified." => "Objekto tipas nenurodytas.",
-"Enter new" => "Įveskite naują",
-"Delete" => "Ištrinti",
-"Add" => "Pridėti",
-"Edit tags" => "Redaguoti žymes",
-"Error loading dialog template: {error}" => "Klaida įkeliant dialogo ruošinį: {error}",
-"No tags selected for deletion." => "Trynimui nepasirinkta jokia žymė.",
-"Please reload the page." => "Prašome perkrauti puslapį.",
-"The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
-"%s password reset" => "%s slaptažodžio atnaujinimas",
-"Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
-"You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
-"Username" => "Prisijungimo vardas",
-"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?" => "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
-"Yes, I really want to reset my password now" => "Taip, aš tikrai noriu atnaujinti slaptažodį",
-"Reset" => "Atstatyti",
-"New password" => "Naujas slaptažodis",
-"Personal" => "Asmeniniai",
-"Users" => "Vartotojai",
-"Apps" => "Programos",
-"Admin" => "Administravimas",
-"Help" => "Pagalba",
-"Error loading tags" => "Klaida įkeliant žymes",
-"Tag already exists" => "Žymė jau egzistuoja",
-"Error deleting tag(s)" => "Klaida trinant žymę(-es)",
-"Error tagging" => "Klaida pridedant žymę",
-"Error untagging" => "Klaida šalinant žymę",
-"Error favoriting" => "Klaida įtraukiant į mėgstamus.",
-"Error unfavoriting" => "Klaida pašalinant iš mėgstamų.",
-"Access forbidden" => "Priėjimas draudžiamas",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n",
-"The share will expire on %s." => "Bendrinimo laikas baigsis %s.",
-"Cheers!" => "Sveikinimai!",
-"Security Warning" => "Saugumo pranešimas",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Prašome atnaujinti savo PHP, kad saugiai naudoti %s.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
-"Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
-"Password" => "Slaptažodis",
-"Data folder" => "Duomenų katalogas",
-"Configure the database" => "Nustatyti duomenų bazę",
-"Database user" => "Duomenų bazės vartotojas",
-"Database password" => "Duomenų bazės slaptažodis",
-"Database name" => "Duomenų bazės pavadinimas",
-"Database tablespace" => "Duomenų bazės loginis saugojimas",
-"Database host" => "Duomenų bazės serveris",
-"Finish setup" => "Baigti diegimą",
-"Finishing …" => "Baigiama ...",
-"%s is available. Get more information on how to update." => "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą.",
-"Log out" => "Atsijungti",
-"Server side authentication failed!" => "Autentikacija serveryje nepavyko!",
-"Please contact your administrator." => "Kreipkitės į savo sistemos administratorių.",
-"remember" => "prisiminti",
-"Log in" => "Prisijungti",
-"Alternative Logins" => "Alternatyvūs prisijungimai",
-"This ownCloud instance is currently in single user mode." => "Ši ownCloud sistema yra vieno naudotojo veiksenoje.",
-"This means only administrators can use the instance." => "Tai reiškia, kad tik administratorius gali naudotis sistema.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Susisiekite su savo sistemos administratoriumi jei šis pranešimas nedingsta arba jei jis pasirodė netikėtai.",
-"Thank you for your patience." => "Dėkojame už jūsų kantrumą."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
new file mode 100644
index 00000000000..b075199d180
--- /dev/null
+++ b/core/l10n/lv.js
@@ -0,0 +1,103 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Svētdiena",
+    "Monday" : "Pirmdiena",
+    "Tuesday" : "Otrdiena",
+    "Wednesday" : "Trešdiena",
+    "Thursday" : "Ceturtdiena",
+    "Friday" : "Piektdiena",
+    "Saturday" : "Sestdiena",
+    "January" : "Janvāris",
+    "February" : "Februāris",
+    "March" : "Marts",
+    "April" : "Aprīlis",
+    "May" : "Maijs",
+    "June" : "Jūnijs",
+    "July" : "Jūlijs",
+    "August" : "Augusts",
+    "September" : "Septembris",
+    "October" : "Oktobris",
+    "November" : "Novembris",
+    "December" : "Decembris",
+    "Settings" : "Iestatījumi",
+    "Folder" : "Mape",
+    "Saving..." : "Saglabā...",
+    "Reset password" : "Mainīt paroli",
+    "No" : "Nē",
+    "Yes" : "Jā",
+    "Choose" : "Izvēlieties",
+    "Ok" : "Labi",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "New Files" : "Jaunās datnes",
+    "Cancel" : "Atcelt",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Šim serverim nav savienojums ar internetu. Tas nozīmē ka nebūs tādas iespējas kā ārējo datu nesēju montēšana, paziņojumi par atjauninājumiem vai citu izstrādātāju programmu uzstādīšana. Attālināta failu piekļuve vai paziņojumu epastu sūtīšana iespējams arī nedarbosies. Ir rekomendēts iespējot interneta savienojumu lai gūtu iespēju izmantotu visus risinājumus.",
+    "Shared" : "Kopīgs",
+    "Share" : "Dalīties",
+    "Error" : "Kļūda",
+    "Error while sharing" : "Kļūda, daloties",
+    "Error while unsharing" : "Kļūda, beidzot dalīties",
+    "Error while changing permissions" : "Kļūda, mainot atļaujas",
+    "Shared with you and the group {group} by {owner}" : "{owner} dalījās ar jums un grupu {group}",
+    "Shared with you by {owner}" : "{owner} dalījās ar jums",
+    "Password protect" : "Aizsargāt ar paroli",
+    "Allow Public Upload" : "Ļaut publisko augšupielādi.",
+    "Email link to person" : "Sūtīt saiti personai pa e-pastu",
+    "Send" : "Sūtīt",
+    "Set expiration date" : "Iestaties termiņa datumu",
+    "Expiration date" : "Termiņa datums",
+    "group" : "grupa",
+    "Resharing is not allowed" : "Atkārtota dalīšanās nav atļauta",
+    "Shared in {item} with {user}" : "Dalījās ar {item} ar {user}",
+    "Unshare" : "Pārtraukt dalīšanos",
+    "can edit" : "var rediģēt",
+    "access control" : "piekļuves vadība",
+    "create" : "izveidot",
+    "update" : "atjaunināt",
+    "delete" : "dzēst",
+    "Password protected" : "Aizsargāts ar paroli",
+    "Error unsetting expiration date" : "Kļūda, noņemot termiņa datumu",
+    "Error setting expiration date" : "Kļūda, iestatot termiņa datumu",
+    "Sending ..." : "Sūta...",
+    "Email sent" : "Vēstule nosūtīta",
+    "Warning" : "Brīdinājums",
+    "The object type is not specified." : "Nav norādīts objekta tips.",
+    "Delete" : "Dzēst",
+    "Add" : "Pievienot",
+    "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
+    "%s password reset" : "%s paroles maiņa",
+    "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
+    "You will receive a link to reset your password via Email." : "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
+    "Username" : "Lietotājvārds",
+    "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?" : "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?",
+    "Yes, I really want to reset my password now" : "Jā, Es tiešām vēlos mainīt savu paroli",
+    "New password" : "Jauna parole",
+    "Personal" : "Personīgi",
+    "Users" : "Lietotāji",
+    "Apps" : "Lietotnes",
+    "Admin" : "Administratori",
+    "Help" : "Palīdzība",
+    "Access forbidden" : "Pieeja ir liegta",
+    "Security Warning" : "Brīdinājums par drošību",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Jūsu PHP ir ievainojamība pret NULL Byte uzbrukumiem (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Lūdzu atjauniniet PHP instalāciju lai varētu droši izmantot %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
+    "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>",
+    "Password" : "Parole",
+    "Data folder" : "Datu mape",
+    "Configure the database" : "Konfigurēt datubāzi",
+    "Database user" : "Datubāzes lietotājs",
+    "Database password" : "Datubāzes parole",
+    "Database name" : "Datubāzes nosaukums",
+    "Database tablespace" : "Datubāzes tabulas telpa",
+    "Database host" : "Datubāzes serveris",
+    "Finish setup" : "Pabeigt iestatīšanu",
+    "%s is available. Get more information on how to update." : "%s ir pieejams. Uzziniet vairāk kā atjaunināt.",
+    "Log out" : "Izrakstīties",
+    "remember" : "atcerēties",
+    "Log in" : "Ierakstīties",
+    "Alternative Logins" : "Alternatīvās pieteikšanās"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/core/l10n/lv.json b/core/l10n/lv.json
new file mode 100644
index 00000000000..a9eabfb9289
--- /dev/null
+++ b/core/l10n/lv.json
@@ -0,0 +1,101 @@
+{ "translations": {
+    "Sunday" : "Svētdiena",
+    "Monday" : "Pirmdiena",
+    "Tuesday" : "Otrdiena",
+    "Wednesday" : "Trešdiena",
+    "Thursday" : "Ceturtdiena",
+    "Friday" : "Piektdiena",
+    "Saturday" : "Sestdiena",
+    "January" : "Janvāris",
+    "February" : "Februāris",
+    "March" : "Marts",
+    "April" : "Aprīlis",
+    "May" : "Maijs",
+    "June" : "Jūnijs",
+    "July" : "Jūlijs",
+    "August" : "Augusts",
+    "September" : "Septembris",
+    "October" : "Oktobris",
+    "November" : "Novembris",
+    "December" : "Decembris",
+    "Settings" : "Iestatījumi",
+    "Folder" : "Mape",
+    "Saving..." : "Saglabā...",
+    "Reset password" : "Mainīt paroli",
+    "No" : "Nē",
+    "Yes" : "Jā",
+    "Choose" : "Izvēlieties",
+    "Ok" : "Labi",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "New Files" : "Jaunās datnes",
+    "Cancel" : "Atcelt",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Šim serverim nav savienojums ar internetu. Tas nozīmē ka nebūs tādas iespējas kā ārējo datu nesēju montēšana, paziņojumi par atjauninājumiem vai citu izstrādātāju programmu uzstādīšana. Attālināta failu piekļuve vai paziņojumu epastu sūtīšana iespējams arī nedarbosies. Ir rekomendēts iespējot interneta savienojumu lai gūtu iespēju izmantotu visus risinājumus.",
+    "Shared" : "Kopīgs",
+    "Share" : "Dalīties",
+    "Error" : "Kļūda",
+    "Error while sharing" : "Kļūda, daloties",
+    "Error while unsharing" : "Kļūda, beidzot dalīties",
+    "Error while changing permissions" : "Kļūda, mainot atļaujas",
+    "Shared with you and the group {group} by {owner}" : "{owner} dalījās ar jums un grupu {group}",
+    "Shared with you by {owner}" : "{owner} dalījās ar jums",
+    "Password protect" : "Aizsargāt ar paroli",
+    "Allow Public Upload" : "Ļaut publisko augšupielādi.",
+    "Email link to person" : "Sūtīt saiti personai pa e-pastu",
+    "Send" : "Sūtīt",
+    "Set expiration date" : "Iestaties termiņa datumu",
+    "Expiration date" : "Termiņa datums",
+    "group" : "grupa",
+    "Resharing is not allowed" : "Atkārtota dalīšanās nav atļauta",
+    "Shared in {item} with {user}" : "Dalījās ar {item} ar {user}",
+    "Unshare" : "Pārtraukt dalīšanos",
+    "can edit" : "var rediģēt",
+    "access control" : "piekļuves vadība",
+    "create" : "izveidot",
+    "update" : "atjaunināt",
+    "delete" : "dzēst",
+    "Password protected" : "Aizsargāts ar paroli",
+    "Error unsetting expiration date" : "Kļūda, noņemot termiņa datumu",
+    "Error setting expiration date" : "Kļūda, iestatot termiņa datumu",
+    "Sending ..." : "Sūta...",
+    "Email sent" : "Vēstule nosūtīta",
+    "Warning" : "Brīdinājums",
+    "The object type is not specified." : "Nav norādīts objekta tips.",
+    "Delete" : "Dzēst",
+    "Add" : "Pievienot",
+    "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
+    "%s password reset" : "%s paroles maiņa",
+    "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
+    "You will receive a link to reset your password via Email." : "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
+    "Username" : "Lietotājvārds",
+    "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?" : "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?",
+    "Yes, I really want to reset my password now" : "Jā, Es tiešām vēlos mainīt savu paroli",
+    "New password" : "Jauna parole",
+    "Personal" : "Personīgi",
+    "Users" : "Lietotāji",
+    "Apps" : "Lietotnes",
+    "Admin" : "Administratori",
+    "Help" : "Palīdzība",
+    "Access forbidden" : "Pieeja ir liegta",
+    "Security Warning" : "Brīdinājums par drošību",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Jūsu PHP ir ievainojamība pret NULL Byte uzbrukumiem (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Lūdzu atjauniniet PHP instalāciju lai varētu droši izmantot %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
+    "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>",
+    "Password" : "Parole",
+    "Data folder" : "Datu mape",
+    "Configure the database" : "Konfigurēt datubāzi",
+    "Database user" : "Datubāzes lietotājs",
+    "Database password" : "Datubāzes parole",
+    "Database name" : "Datubāzes nosaukums",
+    "Database tablespace" : "Datubāzes tabulas telpa",
+    "Database host" : "Datubāzes serveris",
+    "Finish setup" : "Pabeigt iestatīšanu",
+    "%s is available. Get more information on how to update." : "%s ir pieejams. Uzziniet vairāk kā atjaunināt.",
+    "Log out" : "Izrakstīties",
+    "remember" : "atcerēties",
+    "Log in" : "Ierakstīties",
+    "Alternative Logins" : "Alternatīvās pieteikšanās"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
deleted file mode 100644
index 4ed068bf751..00000000000
--- a/core/l10n/lv.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Svētdiena",
-"Monday" => "Pirmdiena",
-"Tuesday" => "Otrdiena",
-"Wednesday" => "Trešdiena",
-"Thursday" => "Ceturtdiena",
-"Friday" => "Piektdiena",
-"Saturday" => "Sestdiena",
-"January" => "Janvāris",
-"February" => "Februāris",
-"March" => "Marts",
-"April" => "Aprīlis",
-"May" => "Maijs",
-"June" => "Jūnijs",
-"July" => "Jūlijs",
-"August" => "Augusts",
-"September" => "Septembris",
-"October" => "Oktobris",
-"November" => "Novembris",
-"December" => "Decembris",
-"Settings" => "Iestatījumi",
-"Folder" => "Mape",
-"Saving..." => "Saglabā...",
-"Reset password" => "Mainīt paroli",
-"No" => "Nē",
-"Yes" => "Jā",
-"Choose" => "Izvēlieties",
-"Ok" => "Labi",
-"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
-"New Files" => "Jaunās datnes",
-"Cancel" => "Atcelt",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Šim serverim nav savienojums ar internetu. Tas nozīmē ka nebūs tādas iespējas kā ārējo datu nesēju montēšana, paziņojumi par atjauninājumiem vai citu izstrādātāju programmu uzstādīšana. Attālināta failu piekļuve vai paziņojumu epastu sūtīšana iespējams arī nedarbosies. Ir rekomendēts iespējot interneta savienojumu lai gūtu iespēju izmantotu visus risinājumus.",
-"Shared" => "Kopīgs",
-"Share" => "Dalīties",
-"Error" => "Kļūda",
-"Error while sharing" => "Kļūda, daloties",
-"Error while unsharing" => "Kļūda, beidzot dalīties",
-"Error while changing permissions" => "Kļūda, mainot atļaujas",
-"Shared with you and the group {group} by {owner}" => "{owner} dalījās ar jums un grupu {group}",
-"Shared with you by {owner}" => "{owner} dalījās ar jums",
-"Password protect" => "Aizsargāt ar paroli",
-"Allow Public Upload" => "Ļaut publisko augšupielādi.",
-"Email link to person" => "Sūtīt saiti personai pa e-pastu",
-"Send" => "Sūtīt",
-"Set expiration date" => "Iestaties termiņa datumu",
-"Expiration date" => "Termiņa datums",
-"group" => "grupa",
-"Resharing is not allowed" => "Atkārtota dalīšanās nav atļauta",
-"Shared in {item} with {user}" => "Dalījās ar {item} ar {user}",
-"Unshare" => "Pārtraukt dalīšanos",
-"can edit" => "var rediģēt",
-"access control" => "piekļuves vadība",
-"create" => "izveidot",
-"update" => "atjaunināt",
-"delete" => "dzēst",
-"Password protected" => "Aizsargāts ar paroli",
-"Error unsetting expiration date" => "Kļūda, noņemot termiņa datumu",
-"Error setting expiration date" => "Kļūda, iestatot termiņa datumu",
-"Sending ..." => "Sūta...",
-"Email sent" => "Vēstule nosūtīta",
-"Warning" => "Brīdinājums",
-"The object type is not specified." => "Nav norādīts objekta tips.",
-"Delete" => "Dzēst",
-"Add" => "Pievienot",
-"The update was successful. Redirecting you to ownCloud now." => "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
-"%s password reset" => "%s paroles maiņa",
-"Use the following link to reset your password: {link}" => "Izmantojiet šo saiti, lai mainītu paroli: {link}",
-"You will receive a link to reset your password via Email." => "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
-"Username" => "Lietotājvārds",
-"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?" => "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?",
-"Yes, I really want to reset my password now" => "Jā, Es tiešām vēlos mainīt savu paroli",
-"New password" => "Jauna parole",
-"Personal" => "Personīgi",
-"Users" => "Lietotāji",
-"Apps" => "Lietotnes",
-"Admin" => "Administratori",
-"Help" => "Palīdzība",
-"Access forbidden" => "Pieeja ir liegta",
-"Security Warning" => "Brīdinājums par drošību",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsu PHP ir ievainojamība pret NULL Byte uzbrukumiem (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Lūdzu atjauniniet PHP instalāciju lai varētu droši izmantot %s.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
-"Create an <strong>admin account</strong>" => "Izveidot <strong>administratora kontu</strong>",
-"Password" => "Parole",
-"Data folder" => "Datu mape",
-"Configure the database" => "Konfigurēt datubāzi",
-"Database user" => "Datubāzes lietotājs",
-"Database password" => "Datubāzes parole",
-"Database name" => "Datubāzes nosaukums",
-"Database tablespace" => "Datubāzes tabulas telpa",
-"Database host" => "Datubāzes serveris",
-"Finish setup" => "Pabeigt iestatīšanu",
-"%s is available. Get more information on how to update." => "%s ir pieejams. Uzziniet vairāk kā atjaunināt.",
-"Log out" => "Izrakstīties",
-"remember" => "atcerēties",
-"Log in" => "Ierakstīties",
-"Alternative Logins" => "Alternatīvās pieteikšanās"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/core/l10n/mg.js b/core/l10n/mg.js
new file mode 100644
index 00000000000..bc4e6c6bc64
--- /dev/null
+++ b/core/l10n/mg.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/mg.json b/core/l10n/mg.json
new file mode 100644
index 00000000000..4ebc0d2d45d
--- /dev/null
+++ b/core/l10n/mg.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/mg.php b/core/l10n/mg.php
deleted file mode 100644
index e012fb1656e..00000000000
--- a/core/l10n/mg.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/mk.js b/core/l10n/mk.js
new file mode 100644
index 00000000000..1104f50f255
--- /dev/null
+++ b/core/l10n/mk.js
@@ -0,0 +1,131 @@
+OC.L10N.register(
+    "core",
+    {
+    "Turned on maintenance mode" : "Вклучен е модот за одржување",
+    "Turned off maintenance mode" : "Ислкучен е модот за одржување",
+    "Updated database" : "Базата е надградена",
+    "No image or file provided" : "Не е доставена фотографија или датотека",
+    "Unknown filetype" : "Непознат тип на датотека",
+    "Invalid image" : "Невалидна фотографија",
+    "Sunday" : "Недела",
+    "Monday" : "Понеделник",
+    "Tuesday" : "Вторник",
+    "Wednesday" : "Среда",
+    "Thursday" : "Четврток",
+    "Friday" : "Петок",
+    "Saturday" : "Сабота",
+    "January" : "Јануари",
+    "February" : "Февруари",
+    "March" : "Март",
+    "April" : "Април",
+    "May" : "Мај",
+    "June" : "Јуни",
+    "July" : "Јули",
+    "August" : "Август",
+    "September" : "Септември",
+    "October" : "Октомври",
+    "November" : "Ноември",
+    "December" : "Декември",
+    "Settings" : "Подесувања",
+    "Folder" : "Папка",
+    "Saving..." : "Снимам...",
+    "Reset password" : "Ресетирај лозинка",
+    "No" : "Не",
+    "Yes" : "Да",
+    "Choose" : "Избери",
+    "Ok" : "Во ред",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "One file conflict" : "Конфликт со една датотека",
+    "Cancel" : "Откажи",
+    "Continue" : "Продолжи",
+    "(all selected)" : "(сите одбрани)",
+    "({count} selected)" : "({count} одбраните)",
+    "Error loading file exists template" : "Грешка при вчитување на датотеката, шаблонот постои ",
+    "Very weak password" : "Многу слаба лозинка",
+    "Weak password" : "Слаба лозинка",
+    "So-so password" : "Така така лозинка",
+    "Good password" : "Добра лозинка",
+    "Strong password" : "Јака лозинка",
+    "Shared" : "Споделен",
+    "Share" : "Сподели",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка при споделување",
+    "Error while unsharing" : "Грешка при прекин на споделување",
+    "Error while changing permissions" : "Грешка при промена на привилегии",
+    "Shared with you and the group {group} by {owner}" : "Споделено со Вас и групата {group} од {owner}",
+    "Shared with you by {owner}" : "Споделено со Вас од {owner}",
+    "Share link" : "Сподели ја врската",
+    "Password protect" : "Заштити со лозинка",
+    "Allow Public Upload" : "Дозволи јавен аплоуд",
+    "Email link to person" : "Прати врска по е-пошта на личност",
+    "Send" : "Прати",
+    "Set expiration date" : "Постави рок на траење",
+    "Expiration date" : "Рок на траење",
+    "group" : "група",
+    "Resharing is not allowed" : "Повторно споделување не е дозволено",
+    "Shared in {item} with {user}" : "Споделено во {item} со {user}",
+    "Unshare" : "Не споделувај",
+    "notify by email" : "извести преку електронска пошта",
+    "can edit" : "може да се измени",
+    "access control" : "контрола на пристап",
+    "create" : "креирај",
+    "update" : "ажурирај",
+    "delete" : "избриши",
+    "Password protected" : "Заштитено со лозинка",
+    "Error unsetting expiration date" : "Грешка при тргање на рокот на траење",
+    "Error setting expiration date" : "Грешка при поставување на рок на траење",
+    "Sending ..." : "Праќање...",
+    "Email sent" : "Е-порака пратена",
+    "Warning" : "Предупредување",
+    "The object type is not specified." : "Не е специфициран типот на објект.",
+    "Enter new" : "Внеси нов",
+    "Delete" : "Избриши",
+    "Add" : "Додади",
+    "Edit tags" : "Уреди ги таговите",
+    "No tags selected for deletion." : "Не се селектирани тагови за бришење.",
+    "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
+    "%s password reset" : "%s ресетирање на лозинката",
+    "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
+    "You will receive a link to reset your password via Email." : "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
+    "Username" : "Корисничко име",
+    "Yes, I really want to reset my password now" : "Да, јас сега навистина сакам да ја поништам својата лозинка",
+    "Reset" : "Поништи",
+    "New password" : "Нова лозинка",
+    "Personal" : "Лично",
+    "Users" : "Корисници",
+    "Apps" : "Аппликации",
+    "Admin" : "Админ",
+    "Help" : "Помош",
+    "Error loading tags" : "Грешка при вчитување на таговите",
+    "Tag already exists" : "Тагот веќе постои",
+    "Error deleting tag(s)" : "Грешка при бришење на таго(вите)",
+    "Error tagging" : "Грешка при тагување",
+    "Error untagging" : "Грешка при отстранување на таговите",
+    "Error favoriting" : "Грешка при ",
+    "Access forbidden" : "Забранет пристап",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здраво,\n\nСамо да ве известам дека  %s shared %s with you.\nView it: %s\n\n",
+    "Cheers!" : "Поздрав!",
+    "Security Warning" : "Безбедносно предупредување",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
+    "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>",
+    "Password" : "Лозинка",
+    "Data folder" : "Фолдер со податоци",
+    "Configure the database" : "Конфигурирај ја базата",
+    "Database user" : "Корисник на база",
+    "Database password" : "Лозинка на база",
+    "Database name" : "Име на база",
+    "Database tablespace" : "Табела во базата на податоци",
+    "Database host" : "Сервер со база",
+    "Finish setup" : "Заврши го подесувањето",
+    "Finishing …" : "Завршувам ...",
+    "Log out" : "Одјава",
+    "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!",
+    "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.",
+    "remember" : "запамти",
+    "Log in" : "Најава",
+    "Alternative Logins" : "Алтернативни најавувања",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.",
+    "Thank you for your patience." : "Благодариме на вашето трпение."
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/core/l10n/mk.json b/core/l10n/mk.json
new file mode 100644
index 00000000000..1301731bf95
--- /dev/null
+++ b/core/l10n/mk.json
@@ -0,0 +1,129 @@
+{ "translations": {
+    "Turned on maintenance mode" : "Вклучен е модот за одржување",
+    "Turned off maintenance mode" : "Ислкучен е модот за одржување",
+    "Updated database" : "Базата е надградена",
+    "No image or file provided" : "Не е доставена фотографија или датотека",
+    "Unknown filetype" : "Непознат тип на датотека",
+    "Invalid image" : "Невалидна фотографија",
+    "Sunday" : "Недела",
+    "Monday" : "Понеделник",
+    "Tuesday" : "Вторник",
+    "Wednesday" : "Среда",
+    "Thursday" : "Четврток",
+    "Friday" : "Петок",
+    "Saturday" : "Сабота",
+    "January" : "Јануари",
+    "February" : "Февруари",
+    "March" : "Март",
+    "April" : "Април",
+    "May" : "Мај",
+    "June" : "Јуни",
+    "July" : "Јули",
+    "August" : "Август",
+    "September" : "Септември",
+    "October" : "Октомври",
+    "November" : "Ноември",
+    "December" : "Декември",
+    "Settings" : "Подесувања",
+    "Folder" : "Папка",
+    "Saving..." : "Снимам...",
+    "Reset password" : "Ресетирај лозинка",
+    "No" : "Не",
+    "Yes" : "Да",
+    "Choose" : "Избери",
+    "Ok" : "Во ред",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "One file conflict" : "Конфликт со една датотека",
+    "Cancel" : "Откажи",
+    "Continue" : "Продолжи",
+    "(all selected)" : "(сите одбрани)",
+    "({count} selected)" : "({count} одбраните)",
+    "Error loading file exists template" : "Грешка при вчитување на датотеката, шаблонот постои ",
+    "Very weak password" : "Многу слаба лозинка",
+    "Weak password" : "Слаба лозинка",
+    "So-so password" : "Така така лозинка",
+    "Good password" : "Добра лозинка",
+    "Strong password" : "Јака лозинка",
+    "Shared" : "Споделен",
+    "Share" : "Сподели",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка при споделување",
+    "Error while unsharing" : "Грешка при прекин на споделување",
+    "Error while changing permissions" : "Грешка при промена на привилегии",
+    "Shared with you and the group {group} by {owner}" : "Споделено со Вас и групата {group} од {owner}",
+    "Shared with you by {owner}" : "Споделено со Вас од {owner}",
+    "Share link" : "Сподели ја врската",
+    "Password protect" : "Заштити со лозинка",
+    "Allow Public Upload" : "Дозволи јавен аплоуд",
+    "Email link to person" : "Прати врска по е-пошта на личност",
+    "Send" : "Прати",
+    "Set expiration date" : "Постави рок на траење",
+    "Expiration date" : "Рок на траење",
+    "group" : "група",
+    "Resharing is not allowed" : "Повторно споделување не е дозволено",
+    "Shared in {item} with {user}" : "Споделено во {item} со {user}",
+    "Unshare" : "Не споделувај",
+    "notify by email" : "извести преку електронска пошта",
+    "can edit" : "може да се измени",
+    "access control" : "контрола на пристап",
+    "create" : "креирај",
+    "update" : "ажурирај",
+    "delete" : "избриши",
+    "Password protected" : "Заштитено со лозинка",
+    "Error unsetting expiration date" : "Грешка при тргање на рокот на траење",
+    "Error setting expiration date" : "Грешка при поставување на рок на траење",
+    "Sending ..." : "Праќање...",
+    "Email sent" : "Е-порака пратена",
+    "Warning" : "Предупредување",
+    "The object type is not specified." : "Не е специфициран типот на објект.",
+    "Enter new" : "Внеси нов",
+    "Delete" : "Избриши",
+    "Add" : "Додади",
+    "Edit tags" : "Уреди ги таговите",
+    "No tags selected for deletion." : "Не се селектирани тагови за бришење.",
+    "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
+    "%s password reset" : "%s ресетирање на лозинката",
+    "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
+    "You will receive a link to reset your password via Email." : "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
+    "Username" : "Корисничко име",
+    "Yes, I really want to reset my password now" : "Да, јас сега навистина сакам да ја поништам својата лозинка",
+    "Reset" : "Поништи",
+    "New password" : "Нова лозинка",
+    "Personal" : "Лично",
+    "Users" : "Корисници",
+    "Apps" : "Аппликации",
+    "Admin" : "Админ",
+    "Help" : "Помош",
+    "Error loading tags" : "Грешка при вчитување на таговите",
+    "Tag already exists" : "Тагот веќе постои",
+    "Error deleting tag(s)" : "Грешка при бришење на таго(вите)",
+    "Error tagging" : "Грешка при тагување",
+    "Error untagging" : "Грешка при отстранување на таговите",
+    "Error favoriting" : "Грешка при ",
+    "Access forbidden" : "Забранет пристап",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здраво,\n\nСамо да ве известам дека  %s shared %s with you.\nView it: %s\n\n",
+    "Cheers!" : "Поздрав!",
+    "Security Warning" : "Безбедносно предупредување",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
+    "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>",
+    "Password" : "Лозинка",
+    "Data folder" : "Фолдер со податоци",
+    "Configure the database" : "Конфигурирај ја базата",
+    "Database user" : "Корисник на база",
+    "Database password" : "Лозинка на база",
+    "Database name" : "Име на база",
+    "Database tablespace" : "Табела во базата на податоци",
+    "Database host" : "Сервер со база",
+    "Finish setup" : "Заврши го подесувањето",
+    "Finishing …" : "Завршувам ...",
+    "Log out" : "Одјава",
+    "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!",
+    "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.",
+    "remember" : "запамти",
+    "Log in" : "Најава",
+    "Alternative Logins" : "Алтернативни најавувања",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.",
+    "Thank you for your patience." : "Благодариме на вашето трпение."
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
deleted file mode 100644
index ed41f264605..00000000000
--- a/core/l10n/mk.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Turned on maintenance mode" => "Вклучен е модот за одржување",
-"Turned off maintenance mode" => "Ислкучен е модот за одржување",
-"Updated database" => "Базата е надградена",
-"No image or file provided" => "Не е доставена фотографија или датотека",
-"Unknown filetype" => "Непознат тип на датотека",
-"Invalid image" => "Невалидна фотографија",
-"Sunday" => "Недела",
-"Monday" => "Понеделник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Среда",
-"Thursday" => "Четврток",
-"Friday" => "Петок",
-"Saturday" => "Сабота",
-"January" => "Јануари",
-"February" => "Февруари",
-"March" => "Март",
-"April" => "Април",
-"May" => "Мај",
-"June" => "Јуни",
-"July" => "Јули",
-"August" => "Август",
-"September" => "Септември",
-"October" => "Октомври",
-"November" => "Ноември",
-"December" => "Декември",
-"Settings" => "Подесувања",
-"Folder" => "Папка",
-"Saving..." => "Снимам...",
-"Reset password" => "Ресетирај лозинка",
-"No" => "Не",
-"Yes" => "Да",
-"Choose" => "Избери",
-"Ok" => "Во ред",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"One file conflict" => "Конфликт со една датотека",
-"Cancel" => "Откажи",
-"Continue" => "Продолжи",
-"(all selected)" => "(сите одбрани)",
-"({count} selected)" => "({count} одбраните)",
-"Error loading file exists template" => "Грешка при вчитување на датотеката, шаблонот постои ",
-"Very weak password" => "Многу слаба лозинка",
-"Weak password" => "Слаба лозинка",
-"So-so password" => "Така така лозинка",
-"Good password" => "Добра лозинка",
-"Strong password" => "Јака лозинка",
-"Shared" => "Споделен",
-"Share" => "Сподели",
-"Error" => "Грешка",
-"Error while sharing" => "Грешка при споделување",
-"Error while unsharing" => "Грешка при прекин на споделување",
-"Error while changing permissions" => "Грешка при промена на привилегии",
-"Shared with you and the group {group} by {owner}" => "Споделено со Вас и групата {group} од {owner}",
-"Shared with you by {owner}" => "Споделено со Вас од {owner}",
-"Share link" => "Сподели ја врската",
-"Password protect" => "Заштити со лозинка",
-"Allow Public Upload" => "Дозволи јавен аплоуд",
-"Email link to person" => "Прати врска по е-пошта на личност",
-"Send" => "Прати",
-"Set expiration date" => "Постави рок на траење",
-"Expiration date" => "Рок на траење",
-"group" => "група",
-"Resharing is not allowed" => "Повторно споделување не е дозволено",
-"Shared in {item} with {user}" => "Споделено во {item} со {user}",
-"Unshare" => "Не споделувај",
-"notify by email" => "извести преку електронска пошта",
-"can edit" => "може да се измени",
-"access control" => "контрола на пристап",
-"create" => "креирај",
-"update" => "ажурирај",
-"delete" => "избриши",
-"Password protected" => "Заштитено со лозинка",
-"Error unsetting expiration date" => "Грешка при тргање на рокот на траење",
-"Error setting expiration date" => "Грешка при поставување на рок на траење",
-"Sending ..." => "Праќање...",
-"Email sent" => "Е-порака пратена",
-"Warning" => "Предупредување",
-"The object type is not specified." => "Не е специфициран типот на објект.",
-"Enter new" => "Внеси нов",
-"Delete" => "Избриши",
-"Add" => "Додади",
-"Edit tags" => "Уреди ги таговите",
-"No tags selected for deletion." => "Не се селектирани тагови за бришење.",
-"The update was successful. Redirecting you to ownCloud now." => "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
-"%s password reset" => "%s ресетирање на лозинката",
-"Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
-"You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
-"Username" => "Корисничко име",
-"Yes, I really want to reset my password now" => "Да, јас сега навистина сакам да ја поништам својата лозинка",
-"Reset" => "Поништи",
-"New password" => "Нова лозинка",
-"Personal" => "Лично",
-"Users" => "Корисници",
-"Apps" => "Аппликации",
-"Admin" => "Админ",
-"Help" => "Помош",
-"Error loading tags" => "Грешка при вчитување на таговите",
-"Tag already exists" => "Тагот веќе постои",
-"Error deleting tag(s)" => "Грешка при бришење на таго(вите)",
-"Error tagging" => "Грешка при тагување",
-"Error untagging" => "Грешка при отстранување на таговите",
-"Error favoriting" => "Грешка при ",
-"Access forbidden" => "Забранет пристап",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здраво,\n\nСамо да ве известам дека  %s shared %s with you.\nView it: %s\n\n",
-"Cheers!" => "Поздрав!",
-"Security Warning" => "Безбедносно предупредување",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
-"Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>",
-"Password" => "Лозинка",
-"Data folder" => "Фолдер со податоци",
-"Configure the database" => "Конфигурирај ја базата",
-"Database user" => "Корисник на база",
-"Database password" => "Лозинка на база",
-"Database name" => "Име на база",
-"Database tablespace" => "Табела во базата на податоци",
-"Database host" => "Сервер со база",
-"Finish setup" => "Заврши го подесувањето",
-"Finishing …" => "Завршувам ...",
-"Log out" => "Одјава",
-"Server side authentication failed!" => "Автентификацијата на серверската страна е неуспешна!",
-"Please contact your administrator." => "Ве молиме контактирајте го вашиот администратор.",
-"remember" => "запамти",
-"Log in" => "Најава",
-"Alternative Logins" => "Алтернативни најавувања",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.",
-"Thank you for your patience." => "Благодариме на вашето трпение."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/core/l10n/ml.js b/core/l10n/ml.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/ml.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ml.json b/core/l10n/ml.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/ml.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ml.php b/core/l10n/ml.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/ml.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ml_IN.js b/core/l10n/ml_IN.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/ml_IN.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ml_IN.json b/core/l10n/ml_IN.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/ml_IN.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ml_IN.php b/core/l10n/ml_IN.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/ml_IN.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/mn.js b/core/l10n/mn.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/mn.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/mn.json b/core/l10n/mn.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/mn.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/mn.php b/core/l10n/mn.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/mn.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ms_MY.js b/core/l10n/ms_MY.js
new file mode 100644
index 00000000000..e59d7eafff5
--- /dev/null
+++ b/core/l10n/ms_MY.js
@@ -0,0 +1,64 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Ahad",
+    "Monday" : "Isnin",
+    "Tuesday" : "Selasa",
+    "Wednesday" : "Rabu",
+    "Thursday" : "Khamis",
+    "Friday" : "Jumaat",
+    "Saturday" : "Sabtu",
+    "January" : "Januari",
+    "February" : "Februari",
+    "March" : "Mac",
+    "April" : "April",
+    "May" : "Mei",
+    "June" : "Jun",
+    "July" : "Julai",
+    "August" : "Ogos",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Disember",
+    "Settings" : "Tetapan",
+    "Folder" : "Folder",
+    "Saving..." : "Simpan...",
+    "Reset password" : "Penetapan semula kata laluan",
+    "No" : "Tidak",
+    "Yes" : "Ya",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "Batal",
+    "Share" : "Kongsi",
+    "Error" : "Ralat",
+    "group" : "kumpulan",
+    "can share" : "boleh berkongsi",
+    "can edit" : "boleh mengubah",
+    "Warning" : "Amaran",
+    "Delete" : "Padam",
+    "Add" : "Tambah",
+    "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
+    "You will receive a link to reset your password via Email." : "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
+    "Username" : "Nama pengguna",
+    "New password" : "Kata laluan baru",
+    "Personal" : "Peribadi",
+    "Users" : "Pengguna",
+    "Apps" : "Aplikasi",
+    "Admin" : "Admin",
+    "Help" : "Bantuan",
+    "Access forbidden" : "Larangan akses",
+    "Security Warning" : "Amaran keselamatan",
+    "Create an <strong>admin account</strong>" : "buat <strong>akaun admin</strong>",
+    "Password" : "Kata laluan",
+    "Data folder" : "Fail data",
+    "Configure the database" : "Konfigurasi pangkalan data",
+    "Database user" : "Nama pengguna pangkalan data",
+    "Database password" : "Kata laluan pangkalan data",
+    "Database name" : "Nama pangkalan data",
+    "Database host" : "Hos pangkalan data",
+    "Finish setup" : "Setup selesai",
+    "Log out" : "Log keluar",
+    "remember" : "ingat",
+    "Log in" : "Log masuk"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/ms_MY.json b/core/l10n/ms_MY.json
new file mode 100644
index 00000000000..5a18fca03d4
--- /dev/null
+++ b/core/l10n/ms_MY.json
@@ -0,0 +1,62 @@
+{ "translations": {
+    "Sunday" : "Ahad",
+    "Monday" : "Isnin",
+    "Tuesday" : "Selasa",
+    "Wednesday" : "Rabu",
+    "Thursday" : "Khamis",
+    "Friday" : "Jumaat",
+    "Saturday" : "Sabtu",
+    "January" : "Januari",
+    "February" : "Februari",
+    "March" : "Mac",
+    "April" : "April",
+    "May" : "Mei",
+    "June" : "Jun",
+    "July" : "Julai",
+    "August" : "Ogos",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Disember",
+    "Settings" : "Tetapan",
+    "Folder" : "Folder",
+    "Saving..." : "Simpan...",
+    "Reset password" : "Penetapan semula kata laluan",
+    "No" : "Tidak",
+    "Yes" : "Ya",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "Batal",
+    "Share" : "Kongsi",
+    "Error" : "Ralat",
+    "group" : "kumpulan",
+    "can share" : "boleh berkongsi",
+    "can edit" : "boleh mengubah",
+    "Warning" : "Amaran",
+    "Delete" : "Padam",
+    "Add" : "Tambah",
+    "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
+    "You will receive a link to reset your password via Email." : "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
+    "Username" : "Nama pengguna",
+    "New password" : "Kata laluan baru",
+    "Personal" : "Peribadi",
+    "Users" : "Pengguna",
+    "Apps" : "Aplikasi",
+    "Admin" : "Admin",
+    "Help" : "Bantuan",
+    "Access forbidden" : "Larangan akses",
+    "Security Warning" : "Amaran keselamatan",
+    "Create an <strong>admin account</strong>" : "buat <strong>akaun admin</strong>",
+    "Password" : "Kata laluan",
+    "Data folder" : "Fail data",
+    "Configure the database" : "Konfigurasi pangkalan data",
+    "Database user" : "Nama pengguna pangkalan data",
+    "Database password" : "Kata laluan pangkalan data",
+    "Database name" : "Nama pangkalan data",
+    "Database host" : "Hos pangkalan data",
+    "Finish setup" : "Setup selesai",
+    "Log out" : "Log keluar",
+    "remember" : "ingat",
+    "Log in" : "Log masuk"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
deleted file mode 100644
index 414b190fe6c..00000000000
--- a/core/l10n/ms_MY.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Ahad",
-"Monday" => "Isnin",
-"Tuesday" => "Selasa",
-"Wednesday" => "Rabu",
-"Thursday" => "Khamis",
-"Friday" => "Jumaat",
-"Saturday" => "Sabtu",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Mac",
-"April" => "April",
-"May" => "Mei",
-"June" => "Jun",
-"July" => "Julai",
-"August" => "Ogos",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Disember",
-"Settings" => "Tetapan",
-"Folder" => "Folder",
-"Saving..." => "Simpan...",
-"Reset password" => "Penetapan semula kata laluan",
-"No" => "Tidak",
-"Yes" => "Ya",
-"Ok" => "Ok",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"Cancel" => "Batal",
-"Share" => "Kongsi",
-"Error" => "Ralat",
-"group" => "kumpulan",
-"can share" => "boleh berkongsi",
-"can edit" => "boleh mengubah",
-"Warning" => "Amaran",
-"Delete" => "Padam",
-"Add" => "Tambah",
-"Use the following link to reset your password: {link}" => "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
-"You will receive a link to reset your password via Email." => "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
-"Username" => "Nama pengguna",
-"New password" => "Kata laluan baru",
-"Personal" => "Peribadi",
-"Users" => "Pengguna",
-"Apps" => "Aplikasi",
-"Admin" => "Admin",
-"Help" => "Bantuan",
-"Access forbidden" => "Larangan akses",
-"Security Warning" => "Amaran keselamatan",
-"Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
-"Password" => "Kata laluan",
-"Data folder" => "Fail data",
-"Configure the database" => "Konfigurasi pangkalan data",
-"Database user" => "Nama pengguna pangkalan data",
-"Database password" => "Kata laluan pangkalan data",
-"Database name" => "Nama pangkalan data",
-"Database host" => "Hos pangkalan data",
-"Finish setup" => "Setup selesai",
-"Log out" => "Log keluar",
-"remember" => "ingat",
-"Log in" => "Log masuk"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/mt_MT.js b/core/l10n/mt_MT.js
new file mode 100644
index 00000000000..67c2c3e89fc
--- /dev/null
+++ b/core/l10n/mt_MT.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""]
+},
+"nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);");
diff --git a/core/l10n/mt_MT.json b/core/l10n/mt_MT.json
new file mode 100644
index 00000000000..3a66955ce40
--- /dev/null
+++ b/core/l10n/mt_MT.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""]
+},"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);"
+}
\ No newline at end of file
diff --git a/core/l10n/mt_MT.php b/core/l10n/mt_MT.php
deleted file mode 100644
index 98de84e3313..00000000000
--- a/core/l10n/mt_MT.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","","","")
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);";
diff --git a/core/l10n/my_MM.js b/core/l10n/my_MM.js
new file mode 100644
index 00000000000..22634059032
--- /dev/null
+++ b/core/l10n/my_MM.js
@@ -0,0 +1,48 @@
+OC.L10N.register(
+    "core",
+    {
+    "January" : "ဇန်နဝါရီ",
+    "February" : "ဖေဖော်ဝါရီ",
+    "March" : "မတ်",
+    "April" : "ဧပြီ",
+    "May" : "မေ",
+    "June" : "ဇွန်",
+    "July" : "ဇူလိုင်",
+    "August" : "ဩဂုတ်",
+    "September" : "စက်တင်ဘာ",
+    "October" : "အောက်တိုဘာ",
+    "November" : "နိုဝင်ဘာ",
+    "December" : "ဒီဇင်ဘာ",
+    "No" : "မဟုတ်ဘူး",
+    "Yes" : "ဟုတ်",
+    "Choose" : "ရွေးချယ်",
+    "Ok" : "အိုကေ",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "ပယ်ဖျက်မည်",
+    "Set expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
+    "Expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်",
+    "Resharing is not allowed" : "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ",
+    "can edit" : "ပြင်ဆင်နိုင်",
+    "create" : "ဖန်တီးမည်",
+    "delete" : "ဖျက်မည်",
+    "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
+    "Add" : "ပေါင်းထည့်",
+    "You will receive a link to reset your password via Email." : "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
+    "Username" : "သုံးစွဲသူအမည်",
+    "New password" : "စကားဝှက်အသစ်",
+    "Users" : "သုံးစွဲသူ",
+    "Apps" : "Apps",
+    "Admin" : "အက်ဒမင်",
+    "Help" : "အကူအညီ",
+    "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
+    "Create an <strong>admin account</strong>" : "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
+    "Password" : "စကားဝှက်",
+    "Data folder" : "အချက်အလက်ဖိုလ်ဒါလ်",
+    "Database user" : "Database သုံးစွဲသူ",
+    "Database password" : "Database စကားဝှက်",
+    "Database name" : "Database အမည်",
+    "Finish setup" : "တပ်ဆင်ခြင်းပြီးပါပြီ။",
+    "remember" : "မှတ်မိစေသည်",
+    "Log in" : "ဝင်ရောက်ရန်"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/my_MM.json b/core/l10n/my_MM.json
new file mode 100644
index 00000000000..f1cf06aa7bf
--- /dev/null
+++ b/core/l10n/my_MM.json
@@ -0,0 +1,46 @@
+{ "translations": {
+    "January" : "ဇန်နဝါရီ",
+    "February" : "ဖေဖော်ဝါရီ",
+    "March" : "မတ်",
+    "April" : "ဧပြီ",
+    "May" : "မေ",
+    "June" : "ဇွန်",
+    "July" : "ဇူလိုင်",
+    "August" : "ဩဂုတ်",
+    "September" : "စက်တင်ဘာ",
+    "October" : "အောက်တိုဘာ",
+    "November" : "နိုဝင်ဘာ",
+    "December" : "ဒီဇင်ဘာ",
+    "No" : "မဟုတ်ဘူး",
+    "Yes" : "ဟုတ်",
+    "Choose" : "ရွေးချယ်",
+    "Ok" : "အိုကေ",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "ပယ်ဖျက်မည်",
+    "Set expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
+    "Expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်",
+    "Resharing is not allowed" : "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ",
+    "can edit" : "ပြင်ဆင်နိုင်",
+    "create" : "ဖန်တီးမည်",
+    "delete" : "ဖျက်မည်",
+    "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
+    "Add" : "ပေါင်းထည့်",
+    "You will receive a link to reset your password via Email." : "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
+    "Username" : "သုံးစွဲသူအမည်",
+    "New password" : "စကားဝှက်အသစ်",
+    "Users" : "သုံးစွဲသူ",
+    "Apps" : "Apps",
+    "Admin" : "အက်ဒမင်",
+    "Help" : "အကူအညီ",
+    "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
+    "Create an <strong>admin account</strong>" : "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
+    "Password" : "စကားဝှက်",
+    "Data folder" : "အချက်အလက်ဖိုလ်ဒါလ်",
+    "Database user" : "Database သုံးစွဲသူ",
+    "Database password" : "Database စကားဝှက်",
+    "Database name" : "Database အမည်",
+    "Finish setup" : "တပ်ဆင်ခြင်းပြီးပါပြီ။",
+    "remember" : "မှတ်မိစေသည်",
+    "Log in" : "ဝင်ရောက်ရန်"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
deleted file mode 100644
index eec76317284..00000000000
--- a/core/l10n/my_MM.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"January" => "ဇန်နဝါရီ",
-"February" => "ဖေဖော်ဝါရီ",
-"March" => "မတ်",
-"April" => "ဧပြီ",
-"May" => "မေ",
-"June" => "ဇွန်",
-"July" => "ဇူလိုင်",
-"August" => "ဩဂုတ်",
-"September" => "စက်တင်ဘာ",
-"October" => "အောက်တိုဘာ",
-"November" => "နိုဝင်ဘာ",
-"December" => "ဒီဇင်ဘာ",
-"No" => "မဟုတ်ဘူး",
-"Yes" => "ဟုတ်",
-"Choose" => "ရွေးချယ်",
-"Ok" => "အိုကေ",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"Cancel" => "ပယ်ဖျက်မည်",
-"Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
-"Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်",
-"Resharing is not allowed" => "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ",
-"can edit" => "ပြင်ဆင်နိုင်",
-"create" => "ဖန်တီးမည်",
-"delete" => "ဖျက်မည်",
-"Password protected" => "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
-"Add" => "ပေါင်းထည့်",
-"You will receive a link to reset your password via Email." => "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
-"Username" => "သုံးစွဲသူအမည်",
-"New password" => "စကားဝှက်အသစ်",
-"Users" => "သုံးစွဲသူ",
-"Apps" => "Apps",
-"Admin" => "အက်ဒမင်",
-"Help" => "အကူအညီ",
-"Security Warning" => "လုံခြုံရေးသတိပေးချက်",
-"Create an <strong>admin account</strong>" => "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
-"Password" => "စကားဝှက်",
-"Data folder" => "အချက်အလက်ဖိုလ်ဒါလ်",
-"Database user" => "Database သုံးစွဲသူ",
-"Database password" => "Database စကားဝှက်",
-"Database name" => "Database အမည်",
-"Finish setup" => "တပ်ဆင်ခြင်းပြီးပါပြီ။",
-"remember" => "မှတ်မိစေသည်",
-"Log in" => "ဝင်ရောက်ရန်"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
new file mode 100644
index 00000000000..b9002240d49
--- /dev/null
+++ b/core/l10n/nb_NO.js
@@ -0,0 +1,211 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Klarte ikke å sende mail til følgende brukere: %s",
+    "Turned on maintenance mode" : "Slo på vedlikeholdsmodus",
+    "Turned off maintenance mode" : "Slo av vedlikeholdsmodus",
+    "Updated database" : "Oppdaterte databasen",
+    "Checked database schema update" : "Sjekket oppdatering av databaseskjema",
+    "Checked database schema update for apps" : "Sjekket databaseskjema-oppdatering for apper",
+    "Updated \"%s\" to %s" : "Oppdaterte \"%s\" til %s",
+    "Disabled incompatible apps: %s" : "Deaktiverte ukompatible apper: %s",
+    "No image or file provided" : "Bilde eller fil ikke angitt",
+    "Unknown filetype" : "Ukjent filtype",
+    "Invalid image" : "Ugyldig bilde",
+    "No temporary profile picture available, try again" : "Foreløpig profilbilde ikke tilgjengelig. Prøv igjen",
+    "No crop data provided" : "Ingen beskjæringsinformasjon angitt",
+    "Sunday" : "Søndag",
+    "Monday" : "Mandag",
+    "Tuesday" : "Tirsdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Lørdag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mars",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Innstillinger",
+    "File" : "Fil",
+    "Folder" : "Mappe",
+    "Image" : "Bilde",
+    "Audio" : "Audio",
+    "Saving..." : "Lagrer...",
+    "Couldn't send reset email. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling. Kontakt administratoren.",
+    "The link to reset your password has been sent to your email. 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." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?",
+    "I know what I'm doing" : "Jeg vet hva jeg gjør",
+    "Reset password" : "Tilbakestill passord",
+    "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.",
+    "No" : "Nei",
+    "Yes" : "Ja",
+    "Choose" : "Velg",
+    "Error loading file picker template: {error}" : "Feil ved lasting av filvelger-mal: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Feil ved lasting av meldingsmal: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"],
+    "One file conflict" : "En filkonflikt",
+    "New Files" : "Nye filer",
+    "Already existing files" : "Allerede eksisterende filer",
+    "Which files do you want to keep?" : "Hvilke filer vil du beholde?",
+    "If you select both versions, the copied file will have a number added to its name." : "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet.",
+    "Cancel" : "Avbryt",
+    "Continue" : "Fortsett",
+    "(all selected)" : "(alle valgt)",
+    "({count} selected)" : "({count} valgt)",
+    "Error loading file exists template" : "Feil ved lasting av \"filen eksisterer\"-mal",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "So-so password" : "So-so-passord",
+    "Good password" : "Bra passord",
+    "Strong password" : "Sterkt passord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din nettserver er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke fungere.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Denne serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, f.eks. å koble opp ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet.",
+    "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett",
+    "Shared" : "Delt",
+    "Shared with {recipients}" : "Delt med {recipients}",
+    "Share" : "Del",
+    "Error" : "Feil",
+    "Error while sharing" : "Feil under deling",
+    "Error while unsharing" : "Feil ved oppheving av deling",
+    "Error while changing permissions" : "Feil ved endring av tillatelser",
+    "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}",
+    "Shared with you by {owner}" : "Delt med deg av {owner}",
+    "Share with user or group …" : "Del med bruker eller gruppe …",
+    "Share link" : "Del lenke",
+    "The public link will expire no later than {days} days after it is created" : "Den offentlige lenken vil utløpe senest {days} dager etter at den lages",
+    "Password protect" : "Passordbeskyttet",
+    "Choose a password for the public link" : "Velg et passord for den offentlige lenken",
+    "Allow Public Upload" : "Tillat Offentlig Opplasting",
+    "Email link to person" : "Email lenke til person",
+    "Send" : "Send",
+    "Set expiration date" : "Sett utløpsdato",
+    "Expiration date" : "Utløpsdato",
+    "Adding user..." : "Legger til bruker...",
+    "group" : "gruppe",
+    "Resharing is not allowed" : "Videre deling er ikke tillatt",
+    "Shared in {item} with {user}" : "Delt i {item} med {user}",
+    "Unshare" : "Avslutt deling",
+    "notify by email" : "Varsle på email",
+    "can share" : "kan dele",
+    "can edit" : "kan endre",
+    "access control" : "tilgangskontroll",
+    "create" : "opprette",
+    "update" : "oppdatere",
+    "delete" : "slette",
+    "Password protected" : "Passordbeskyttet",
+    "Error unsetting expiration date" : "Feil ved nullstilling av utløpsdato",
+    "Error setting expiration date" : "Kan ikke sette utløpsdato",
+    "Sending ..." : "Sender...",
+    "Email sent" : "E-post sendt",
+    "Warning" : "Advarsel",
+    "The object type is not specified." : "Objekttypen er ikke spesifisert.",
+    "Enter new" : "Oppgi ny",
+    "Delete" : "Slett",
+    "Add" : "Legg til",
+    "Edit tags" : "Rediger merkelapper",
+    "Error loading dialog template: {error}" : "Feil ved lasting av dialogmal: {error}",
+    "No tags selected for deletion." : "Ingen merkelapper valgt for sletting.",
+    "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.",
+    "Please reload the page." : "Vennligst last siden på nytt.",
+    "The update was unsuccessful." : "Oppdateringen var vellykket.",
+    "The update was successful. Redirecting you to ownCloud now." : "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Klarte ikke å tilbakestille passordet fordi token er ugyldig.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Klarte ikke å sende e-post for tilbakestilling av passord. Sjekk at brukernavnet ditt er korrekt.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.",
+    "%s password reset" : "%s tilbakestilling av passord",
+    "Use the following link to reset your password: {link}" : "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
+    "You will receive a link to reset your password via Email." : "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
+    "Username" : "Brukernavn",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er tilbakestilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?",
+    "Yes, I really want to reset my password now" : "Ja, jeg vil virkelig tilbakestille passordet mitt nå",
+    "Reset" : "Tilbakestill",
+    "New password" : "Nytt passord",
+    "New Password" : "Nytt passord",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.",
+    "Personal" : "Personlig",
+    "Users" : "Brukere",
+    "Apps" : "Apper",
+    "Admin" : "Admin",
+    "Help" : "Hjelp",
+    "Error loading tags" : "Feil ved lasting av merkelapper",
+    "Tag already exists" : "Merkelappen finnes allerede",
+    "Error deleting tag(s)" : "Feil ved sletting av merkelapp(er)",
+    "Error tagging" : "Feil ved merking",
+    "Error untagging" : "Feil ved fjerning av merkelapp",
+    "Error favoriting" : "Feil ved favorittmerking",
+    "Error unfavoriting" : "Feil ved fjerning av favorittmerking",
+    "Access forbidden" : "Tilgang nektet",
+    "File not found" : "Finner ikke filen",
+    "The specified document has not been found on the server." : "Det angitte dokumentet ble ikke funnet på serveren.",
+    "You can click here to return to %s." : "Du kan klikke her for å gå tilbake til %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hei,\n\nDette er en beskjed om at %s delte %s med deg.\nVis den: %s\n\n",
+    "The share will expire on %s." : "Delingen vil opphøre %s.",
+    "Cheers!" : "Ha det!",
+    "The server encountered an internal error and was unable to complete your request." : "Serveren støtte på en intern feil og kunne ikke fullføre forespørselen din.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontakt server-administratoren hvis denne feilen oppstår flere ganger. Vennligst ta med de tekniske detaljene nedenfor i rapporten din.",
+    "More details can be found in the server log." : "Flere detaljer finnes i server-loggen.",
+    "Technical details" : "Tekniske detaljer",
+    "Remote Address: %s" : "Ekstern adresse: %s",
+    "Request ID: %s" : "Forespørsels-ID: %s",
+    "Code: %s" : "Kode: %s",
+    "Message: %s" : "Melding: %s",
+    "File: %s" : "Fil: %s",
+    "Line: %s" : "Linje: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Sikkerhetsadvarsel",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP-versjonen din er sårbar for NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Vennligst oppdater PHP-installasjonen din for å bruke %s på en sikker måte.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
+    "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>",
+    "Password" : "Passord",
+    "Storage & database" : "Lagring og database",
+    "Data folder" : "Datamappe",
+    "Configure the database" : "Konfigurer databasen",
+    "Only %s is available." : "Kun %s er tilgjengelig.",
+    "Database user" : "Databasebruker",
+    "Database password" : "Databasepassord",
+    "Database name" : "Databasenavn",
+    "Database tablespace" : "Database tabellområde",
+    "Database host" : "Databasevert",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite vil bli brukt som database. For større installasjoner anbefaler vi å endre dette.",
+    "Finish setup" : "Fullfør oppsetting",
+    "Finishing …" : "Ferdigstiller ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiver JavaScript</a> og last siden på nytt.",
+    "%s is available. Get more information on how to update." : "%s er tilgjengelig. Få mer informasjon om hvordan du kan oppdatere.",
+    "Log out" : "Logg ut",
+    "Server side authentication failed!" : "Autentisering feilet på serveren!",
+    "Please contact your administrator." : "Vennligst kontakt administratoren din.",
+    "Forgot your password? Reset it!" : "Glemt passordet ditt? Tilbakestill det!",
+    "remember" : "husk",
+    "Log in" : "Logg inn",
+    "Alternative Logins" : "Alternative innlogginger",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>Dette er en beskjed om at %s delte <strong>%s</strong> med deg.<br><a href=\"%s\">Vis den!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Denne ownCloud-instansen er for øyeblikket i enbrukermodus.",
+    "This means only administrators can use the instance." : "Dette betyr at kun administratorer kan bruke instansen.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakt systemadministratoren hvis denne meldingen var uventet eller ikke forsvinner.",
+    "Thank you for your patience." : "Takk for din tålmodighet.",
+    "You are accessing the server from an untrusted domain." : "Du aksesserer serveren fra et ikke tiltrodd domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domain\" i config/config.php. En eksempelkonfigurasjon er gitt i config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Avhengig av konfigurasjonen kan du, som administrator, kanskje også bruke kanppen nedenfor til å stole på dette domenet.",
+    "Add \"%s\" as trusted domain" : "Legg til \"%s\" som et tiltrodd domene",
+    "%s will be updated to version %s." : "%s vil bli oppdatert til versjon %s.",
+    "The following apps will be disabled:" : "Følgende apper vil bli deaktivert:",
+    "The theme %s has been disabled." : "Temaet %s har blitt deaktivert.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Forsikre deg om at databasen, config-mappen og datamappen er blitt sikkerhetskopiert før du fortsetter.",
+    "Start update" : "Start oppdatering",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "For å unngå tidsavbrudd ved store installasjoner, kan du i stedet kjøre følgende kommando fra installasjonsmappen:",
+    "This %s instance is currently being updated, which may take a while." : "%s-instansen er under oppdatering, noe som kan ta litt tid.",
+    "This page will refresh itself when the %s instance is available again." : "Denne siden vil bli lastet på nytt når %s-instansen er tilgjengelig igjen."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
new file mode 100644
index 00000000000..efc4c5babb4
--- /dev/null
+++ b/core/l10n/nb_NO.json
@@ -0,0 +1,209 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Klarte ikke å sende mail til følgende brukere: %s",
+    "Turned on maintenance mode" : "Slo på vedlikeholdsmodus",
+    "Turned off maintenance mode" : "Slo av vedlikeholdsmodus",
+    "Updated database" : "Oppdaterte databasen",
+    "Checked database schema update" : "Sjekket oppdatering av databaseskjema",
+    "Checked database schema update for apps" : "Sjekket databaseskjema-oppdatering for apper",
+    "Updated \"%s\" to %s" : "Oppdaterte \"%s\" til %s",
+    "Disabled incompatible apps: %s" : "Deaktiverte ukompatible apper: %s",
+    "No image or file provided" : "Bilde eller fil ikke angitt",
+    "Unknown filetype" : "Ukjent filtype",
+    "Invalid image" : "Ugyldig bilde",
+    "No temporary profile picture available, try again" : "Foreløpig profilbilde ikke tilgjengelig. Prøv igjen",
+    "No crop data provided" : "Ingen beskjæringsinformasjon angitt",
+    "Sunday" : "Søndag",
+    "Monday" : "Mandag",
+    "Tuesday" : "Tirsdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Lørdag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mars",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Innstillinger",
+    "File" : "Fil",
+    "Folder" : "Mappe",
+    "Image" : "Bilde",
+    "Audio" : "Audio",
+    "Saving..." : "Lagrer...",
+    "Couldn't send reset email. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling. Kontakt administratoren.",
+    "The link to reset your password has been sent to your email. 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." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?",
+    "I know what I'm doing" : "Jeg vet hva jeg gjør",
+    "Reset password" : "Tilbakestill passord",
+    "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.",
+    "No" : "Nei",
+    "Yes" : "Ja",
+    "Choose" : "Velg",
+    "Error loading file picker template: {error}" : "Feil ved lasting av filvelger-mal: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Feil ved lasting av meldingsmal: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"],
+    "One file conflict" : "En filkonflikt",
+    "New Files" : "Nye filer",
+    "Already existing files" : "Allerede eksisterende filer",
+    "Which files do you want to keep?" : "Hvilke filer vil du beholde?",
+    "If you select both versions, the copied file will have a number added to its name." : "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet.",
+    "Cancel" : "Avbryt",
+    "Continue" : "Fortsett",
+    "(all selected)" : "(alle valgt)",
+    "({count} selected)" : "({count} valgt)",
+    "Error loading file exists template" : "Feil ved lasting av \"filen eksisterer\"-mal",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "So-so password" : "So-so-passord",
+    "Good password" : "Bra passord",
+    "Strong password" : "Sterkt passord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din nettserver er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke fungere.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Denne serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, f.eks. å koble opp ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet.",
+    "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett",
+    "Shared" : "Delt",
+    "Shared with {recipients}" : "Delt med {recipients}",
+    "Share" : "Del",
+    "Error" : "Feil",
+    "Error while sharing" : "Feil under deling",
+    "Error while unsharing" : "Feil ved oppheving av deling",
+    "Error while changing permissions" : "Feil ved endring av tillatelser",
+    "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}",
+    "Shared with you by {owner}" : "Delt med deg av {owner}",
+    "Share with user or group …" : "Del med bruker eller gruppe …",
+    "Share link" : "Del lenke",
+    "The public link will expire no later than {days} days after it is created" : "Den offentlige lenken vil utløpe senest {days} dager etter at den lages",
+    "Password protect" : "Passordbeskyttet",
+    "Choose a password for the public link" : "Velg et passord for den offentlige lenken",
+    "Allow Public Upload" : "Tillat Offentlig Opplasting",
+    "Email link to person" : "Email lenke til person",
+    "Send" : "Send",
+    "Set expiration date" : "Sett utløpsdato",
+    "Expiration date" : "Utløpsdato",
+    "Adding user..." : "Legger til bruker...",
+    "group" : "gruppe",
+    "Resharing is not allowed" : "Videre deling er ikke tillatt",
+    "Shared in {item} with {user}" : "Delt i {item} med {user}",
+    "Unshare" : "Avslutt deling",
+    "notify by email" : "Varsle på email",
+    "can share" : "kan dele",
+    "can edit" : "kan endre",
+    "access control" : "tilgangskontroll",
+    "create" : "opprette",
+    "update" : "oppdatere",
+    "delete" : "slette",
+    "Password protected" : "Passordbeskyttet",
+    "Error unsetting expiration date" : "Feil ved nullstilling av utløpsdato",
+    "Error setting expiration date" : "Kan ikke sette utløpsdato",
+    "Sending ..." : "Sender...",
+    "Email sent" : "E-post sendt",
+    "Warning" : "Advarsel",
+    "The object type is not specified." : "Objekttypen er ikke spesifisert.",
+    "Enter new" : "Oppgi ny",
+    "Delete" : "Slett",
+    "Add" : "Legg til",
+    "Edit tags" : "Rediger merkelapper",
+    "Error loading dialog template: {error}" : "Feil ved lasting av dialogmal: {error}",
+    "No tags selected for deletion." : "Ingen merkelapper valgt for sletting.",
+    "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.",
+    "Please reload the page." : "Vennligst last siden på nytt.",
+    "The update was unsuccessful." : "Oppdateringen var vellykket.",
+    "The update was successful. Redirecting you to ownCloud now." : "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Klarte ikke å tilbakestille passordet fordi token er ugyldig.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Klarte ikke å sende e-post for tilbakestilling av passord. Sjekk at brukernavnet ditt er korrekt.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.",
+    "%s password reset" : "%s tilbakestilling av passord",
+    "Use the following link to reset your password: {link}" : "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
+    "You will receive a link to reset your password via Email." : "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
+    "Username" : "Brukernavn",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er tilbakestilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?",
+    "Yes, I really want to reset my password now" : "Ja, jeg vil virkelig tilbakestille passordet mitt nå",
+    "Reset" : "Tilbakestill",
+    "New password" : "Nytt passord",
+    "New Password" : "Nytt passord",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.",
+    "Personal" : "Personlig",
+    "Users" : "Brukere",
+    "Apps" : "Apper",
+    "Admin" : "Admin",
+    "Help" : "Hjelp",
+    "Error loading tags" : "Feil ved lasting av merkelapper",
+    "Tag already exists" : "Merkelappen finnes allerede",
+    "Error deleting tag(s)" : "Feil ved sletting av merkelapp(er)",
+    "Error tagging" : "Feil ved merking",
+    "Error untagging" : "Feil ved fjerning av merkelapp",
+    "Error favoriting" : "Feil ved favorittmerking",
+    "Error unfavoriting" : "Feil ved fjerning av favorittmerking",
+    "Access forbidden" : "Tilgang nektet",
+    "File not found" : "Finner ikke filen",
+    "The specified document has not been found on the server." : "Det angitte dokumentet ble ikke funnet på serveren.",
+    "You can click here to return to %s." : "Du kan klikke her for å gå tilbake til %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hei,\n\nDette er en beskjed om at %s delte %s med deg.\nVis den: %s\n\n",
+    "The share will expire on %s." : "Delingen vil opphøre %s.",
+    "Cheers!" : "Ha det!",
+    "The server encountered an internal error and was unable to complete your request." : "Serveren støtte på en intern feil og kunne ikke fullføre forespørselen din.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontakt server-administratoren hvis denne feilen oppstår flere ganger. Vennligst ta med de tekniske detaljene nedenfor i rapporten din.",
+    "More details can be found in the server log." : "Flere detaljer finnes i server-loggen.",
+    "Technical details" : "Tekniske detaljer",
+    "Remote Address: %s" : "Ekstern adresse: %s",
+    "Request ID: %s" : "Forespørsels-ID: %s",
+    "Code: %s" : "Kode: %s",
+    "Message: %s" : "Melding: %s",
+    "File: %s" : "Fil: %s",
+    "Line: %s" : "Linje: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Sikkerhetsadvarsel",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP-versjonen din er sårbar for NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Vennligst oppdater PHP-installasjonen din for å bruke %s på en sikker måte.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
+    "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>",
+    "Password" : "Passord",
+    "Storage & database" : "Lagring og database",
+    "Data folder" : "Datamappe",
+    "Configure the database" : "Konfigurer databasen",
+    "Only %s is available." : "Kun %s er tilgjengelig.",
+    "Database user" : "Databasebruker",
+    "Database password" : "Databasepassord",
+    "Database name" : "Databasenavn",
+    "Database tablespace" : "Database tabellområde",
+    "Database host" : "Databasevert",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite vil bli brukt som database. For større installasjoner anbefaler vi å endre dette.",
+    "Finish setup" : "Fullfør oppsetting",
+    "Finishing …" : "Ferdigstiller ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiver JavaScript</a> og last siden på nytt.",
+    "%s is available. Get more information on how to update." : "%s er tilgjengelig. Få mer informasjon om hvordan du kan oppdatere.",
+    "Log out" : "Logg ut",
+    "Server side authentication failed!" : "Autentisering feilet på serveren!",
+    "Please contact your administrator." : "Vennligst kontakt administratoren din.",
+    "Forgot your password? Reset it!" : "Glemt passordet ditt? Tilbakestill det!",
+    "remember" : "husk",
+    "Log in" : "Logg inn",
+    "Alternative Logins" : "Alternative innlogginger",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>Dette er en beskjed om at %s delte <strong>%s</strong> med deg.<br><a href=\"%s\">Vis den!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Denne ownCloud-instansen er for øyeblikket i enbrukermodus.",
+    "This means only administrators can use the instance." : "Dette betyr at kun administratorer kan bruke instansen.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakt systemadministratoren hvis denne meldingen var uventet eller ikke forsvinner.",
+    "Thank you for your patience." : "Takk for din tålmodighet.",
+    "You are accessing the server from an untrusted domain." : "Du aksesserer serveren fra et ikke tiltrodd domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domain\" i config/config.php. En eksempelkonfigurasjon er gitt i config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Avhengig av konfigurasjonen kan du, som administrator, kanskje også bruke kanppen nedenfor til å stole på dette domenet.",
+    "Add \"%s\" as trusted domain" : "Legg til \"%s\" som et tiltrodd domene",
+    "%s will be updated to version %s." : "%s vil bli oppdatert til versjon %s.",
+    "The following apps will be disabled:" : "Følgende apper vil bli deaktivert:",
+    "The theme %s has been disabled." : "Temaet %s har blitt deaktivert.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Forsikre deg om at databasen, config-mappen og datamappen er blitt sikkerhetskopiert før du fortsetter.",
+    "Start update" : "Start oppdatering",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "For å unngå tidsavbrudd ved store installasjoner, kan du i stedet kjøre følgende kommando fra installasjonsmappen:",
+    "This %s instance is currently being updated, which may take a while." : "%s-instansen er under oppdatering, noe som kan ta litt tid.",
+    "This page will refresh itself when the %s instance is available again." : "Denne siden vil bli lastet på nytt når %s-instansen er tilgjengelig igjen."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
deleted file mode 100644
index 1074ad1b217..00000000000
--- a/core/l10n/nb_NO.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Klarte ikke å sende mail til følgende brukere: %s",
-"Turned on maintenance mode" => "Slo på vedlikeholdsmodus",
-"Turned off maintenance mode" => "Slo av vedlikeholdsmodus",
-"Updated database" => "Oppdaterte databasen",
-"Checked database schema update" => "Sjekket oppdatering av databaseskjema",
-"Checked database schema update for apps" => "Sjekket databaseskjema-oppdatering for apper",
-"Updated \"%s\" to %s" => "Oppdaterte \"%s\" til %s",
-"Disabled incompatible apps: %s" => "Deaktiverte ukompatible apper: %s",
-"No image or file provided" => "Bilde eller fil ikke angitt",
-"Unknown filetype" => "Ukjent filtype",
-"Invalid image" => "Ugyldig bilde",
-"No temporary profile picture available, try again" => "Foreløpig profilbilde ikke tilgjengelig. Prøv igjen",
-"No crop data provided" => "Ingen beskjæringsinformasjon angitt",
-"Sunday" => "Søndag",
-"Monday" => "Mandag",
-"Tuesday" => "Tirsdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Lørdag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mars",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"Settings" => "Innstillinger",
-"File" => "Fil",
-"Folder" => "Mappe",
-"Image" => "Bilde",
-"Audio" => "Audio",
-"Saving..." => "Lagrer...",
-"Couldn't send reset email. Please contact your administrator." => "Klarte ikke å sende e-post for tilbakestilling. Kontakt administratoren.",
-"The link to reset your password has been sent to your email. 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." => "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?",
-"I know what I'm doing" => "Jeg vet hva jeg gjør",
-"Reset password" => "Tilbakestill passord",
-"Password can not be changed. Please contact your administrator." => "Passordet kan ikke endres. Kontakt administratoren din.",
-"No" => "Nei",
-"Yes" => "Ja",
-"Choose" => "Velg",
-"Error loading file picker template: {error}" => "Feil ved lasting av filvelger-mal: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Feil ved lasting av meldingsmal: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
-"One file conflict" => "En filkonflikt",
-"New Files" => "Nye filer",
-"Already existing files" => "Allerede eksisterende filer",
-"Which files do you want to keep?" => "Hvilke filer vil du beholde?",
-"If you select both versions, the copied file will have a number added to its name." => "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet.",
-"Cancel" => "Avbryt",
-"Continue" => "Fortsett",
-"(all selected)" => "(alle valgt)",
-"({count} selected)" => "({count} valgt)",
-"Error loading file exists template" => "Feil ved lasting av \"filen eksisterer\"-mal",
-"Very weak password" => "Veldig svakt passord",
-"Weak password" => "Svakt passord",
-"So-so password" => "So-so-passord",
-"Good password" => "Bra passord",
-"Strong password" => "Sterkt passord",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettserver er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke fungere.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Denne serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, f.eks. å koble opp ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet.",
-"Error occurred while checking server setup" => "Feil oppstod ved sjekking av server-oppsett",
-"Shared" => "Delt",
-"Shared with {recipients}" => "Delt med {recipients}",
-"Share" => "Del",
-"Error" => "Feil",
-"Error while sharing" => "Feil under deling",
-"Error while unsharing" => "Feil ved oppheving av deling",
-"Error while changing permissions" => "Feil ved endring av tillatelser",
-"Shared with you and the group {group} by {owner}" => "Delt med deg og gruppen {group} av {owner}",
-"Shared with you by {owner}" => "Delt med deg av {owner}",
-"Share with user or group …" => "Del med bruker eller gruppe …",
-"Share link" => "Del lenke",
-"The public link will expire no later than {days} days after it is created" => "Den offentlige lenken vil utløpe senest {days} dager etter at den lages",
-"Password protect" => "Passordbeskyttet",
-"Choose a password for the public link" => "Velg et passord for den offentlige lenken",
-"Allow Public Upload" => "Tillat Offentlig Opplasting",
-"Email link to person" => "Email lenke til person",
-"Send" => "Send",
-"Set expiration date" => "Sett utløpsdato",
-"Expiration date" => "Utløpsdato",
-"Adding user..." => "Legger til bruker...",
-"group" => "gruppe",
-"Resharing is not allowed" => "Videre deling er ikke tillatt",
-"Shared in {item} with {user}" => "Delt i {item} med {user}",
-"Unshare" => "Avslutt deling",
-"notify by email" => "Varsle på email",
-"can share" => "kan dele",
-"can edit" => "kan endre",
-"access control" => "tilgangskontroll",
-"create" => "opprette",
-"update" => "oppdatere",
-"delete" => "slette",
-"Password protected" => "Passordbeskyttet",
-"Error unsetting expiration date" => "Feil ved nullstilling av utløpsdato",
-"Error setting expiration date" => "Kan ikke sette utløpsdato",
-"Sending ..." => "Sender...",
-"Email sent" => "E-post sendt",
-"Warning" => "Advarsel",
-"The object type is not specified." => "Objekttypen er ikke spesifisert.",
-"Enter new" => "Oppgi ny",
-"Delete" => "Slett",
-"Add" => "Legg til",
-"Edit tags" => "Rediger merkelapper",
-"Error loading dialog template: {error}" => "Feil ved lasting av dialogmal: {error}",
-"No tags selected for deletion." => "Ingen merkelapper valgt for sletting.",
-"Updating {productName} to version {version}, this may take a while." => "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.",
-"Please reload the page." => "Vennligst last siden på nytt.",
-"The update was unsuccessful." => "Oppdateringen var vellykket.",
-"The update was successful. Redirecting you to ownCloud now." => "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.",
-"Couldn't reset password because the token is invalid" => "Klarte ikke å tilbakestille passordet fordi token er ugyldig.",
-"Couldn't send reset email. Please make sure your username is correct." => "Klarte ikke å sende e-post for tilbakestilling av passord. Sjekk at brukernavnet ditt er korrekt.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.",
-"%s password reset" => "%s tilbakestilling av passord",
-"Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
-"You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
-"Username" => "Brukernavn",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er tilbakestilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?",
-"Yes, I really want to reset my password now" => "Ja, jeg vil virkelig tilbakestille passordet mitt nå",
-"Reset" => "Tilbakestill",
-"New password" => "Nytt passord",
-"New Password" => "Nytt passord",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!",
-"For the best results, please consider using a GNU/Linux server instead." => "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.",
-"Personal" => "Personlig",
-"Users" => "Brukere",
-"Apps" => "Apper",
-"Admin" => "Admin",
-"Help" => "Hjelp",
-"Error loading tags" => "Feil ved lasting av merkelapper",
-"Tag already exists" => "Merkelappen finnes allerede",
-"Error deleting tag(s)" => "Feil ved sletting av merkelapp(er)",
-"Error tagging" => "Feil ved merking",
-"Error untagging" => "Feil ved fjerning av merkelapp",
-"Error favoriting" => "Feil ved favorittmerking",
-"Error unfavoriting" => "Feil ved fjerning av favorittmerking",
-"Access forbidden" => "Tilgang nektet",
-"File not found" => "Finner ikke filen",
-"The specified document has not been found on the server." => "Det angitte dokumentet ble ikke funnet på serveren.",
-"You can click here to return to %s." => "Du kan klikke her for å gå tilbake til %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei,\n\nDette er en beskjed om at %s delte %s med deg.\nVis den: %s\n\n",
-"The share will expire on %s." => "Delingen vil opphøre %s.",
-"Cheers!" => "Ha det!",
-"The server encountered an internal error and was unable to complete your request." => "Serveren støtte på en intern feil og kunne ikke fullføre forespørselen din.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Kontakt server-administratoren hvis denne feilen oppstår flere ganger. Vennligst ta med de tekniske detaljene nedenfor i rapporten din.",
-"More details can be found in the server log." => "Flere detaljer finnes i server-loggen.",
-"Technical details" => "Tekniske detaljer",
-"Remote Address: %s" => "Ekstern adresse: %s",
-"Request ID: %s" => "Forespørsels-ID: %s",
-"Code: %s" => "Kode: %s",
-"Message: %s" => "Melding: %s",
-"File: %s" => "Fil: %s",
-"Line: %s" => "Linje: %s",
-"Trace" => "Trace",
-"Security Warning" => "Sikkerhetsadvarsel",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-versjonen din er sårbar for NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Vennligst oppdater PHP-installasjonen din for å bruke %s på en sikker måte.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
-"Create an <strong>admin account</strong>" => "Opprett en <strong>administrator-konto</strong>",
-"Password" => "Passord",
-"Storage & database" => "Lagring og database",
-"Data folder" => "Datamappe",
-"Configure the database" => "Konfigurer databasen",
-"Only %s is available." => "Kun %s er tilgjengelig.",
-"Database user" => "Databasebruker",
-"Database password" => "Databasepassord",
-"Database name" => "Databasenavn",
-"Database tablespace" => "Database tabellområde",
-"Database host" => "Databasevert",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite vil bli brukt som database. For større installasjoner anbefaler vi å endre dette.",
-"Finish setup" => "Fullfør oppsetting",
-"Finishing …" => "Ferdigstiller ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiver JavaScript</a> og last siden på nytt.",
-"%s is available. Get more information on how to update." => "%s er tilgjengelig. Få mer informasjon om hvordan du kan oppdatere.",
-"Log out" => "Logg ut",
-"Server side authentication failed!" => "Autentisering feilet på serveren!",
-"Please contact your administrator." => "Vennligst kontakt administratoren din.",
-"Forgot your password? Reset it!" => "Glemt passordet ditt? Tilbakestill det!",
-"remember" => "husk",
-"Log in" => "Logg inn",
-"Alternative Logins" => "Alternative innlogginger",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hei,<br><br>Dette er en beskjed om at %s delte <strong>%s</strong> med deg.<br><a href=\"%s\">Vis den!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Denne ownCloud-instansen er for øyeblikket i enbrukermodus.",
-"This means only administrators can use the instance." => "Dette betyr at kun administratorer kan bruke instansen.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren hvis denne meldingen var uventet eller ikke forsvinner.",
-"Thank you for your patience." => "Takk for din tålmodighet.",
-"You are accessing the server from an untrusted domain." => "Du aksesserer serveren fra et ikke tiltrodd domene.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domain\" i config/config.php. En eksempelkonfigurasjon er gitt i config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Avhengig av konfigurasjonen kan du, som administrator, kanskje også bruke kanppen nedenfor til å stole på dette domenet.",
-"Add \"%s\" as trusted domain" => "Legg til \"%s\" som et tiltrodd domene",
-"%s will be updated to version %s." => "%s vil bli oppdatert til versjon %s.",
-"The following apps will be disabled:" => "Følgende apper vil bli deaktivert:",
-"The theme %s has been disabled." => "Temaet %s har blitt deaktivert.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Forsikre deg om at databasen, config-mappen og datamappen er blitt sikkerhetskopiert før du fortsetter.",
-"Start update" => "Start oppdatering",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "For å unngå tidsavbrudd ved store installasjoner, kan du i stedet kjøre følgende kommando fra installasjonsmappen:",
-"This %s instance is currently being updated, which may take a while." => "%s-instansen er under oppdatering, noe som kan ta litt tid.",
-"This page will refresh itself when the %s instance is available again." => "Denne siden vil bli lastet på nytt når %s-instansen er tilgjengelig igjen."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nds.js b/core/l10n/nds.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/nds.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/nds.json b/core/l10n/nds.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/nds.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/nds.php b/core/l10n/nds.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/nds.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ne.js b/core/l10n/ne.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/ne.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ne.json b/core/l10n/ne.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/ne.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ne.php b/core/l10n/ne.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/ne.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
new file mode 100644
index 00000000000..df638124f77
--- /dev/null
+++ b/core/l10n/nl.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Kon geen e-mail sturen aan de volgende gebruikers: %s",
+    "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld",
+    "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld",
+    "Updated database" : "Database bijgewerkt",
+    "Checked database schema update" : "Database schema-update gecontroleerd",
+    "Checked database schema update for apps" : "Database schema-update voor apps gecontroleerd",
+    "Updated \"%s\" to %s" : "Bijgewerkt \"%s\" naar %s",
+    "Disabled incompatible apps: %s" : "Gedeactiveerde incompatibele apps: %s",
+    "No image or file provided" : "Geen afbeelding of bestand opgegeven",
+    "Unknown filetype" : "Onbekend bestandsformaat",
+    "Invalid image" : "Ongeldige afbeelding",
+    "No temporary profile picture available, try again" : "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw",
+    "No crop data provided" : "Geen bijsnijdingsgegevens opgegeven",
+    "Sunday" : "zondag",
+    "Monday" : "maandag",
+    "Tuesday" : "dinsdag",
+    "Wednesday" : "woensdag",
+    "Thursday" : "donderdag",
+    "Friday" : "vrijdag",
+    "Saturday" : "zaterdag",
+    "January" : "januari",
+    "February" : "februari",
+    "March" : "maart",
+    "April" : "april",
+    "May" : "mei",
+    "June" : "juni",
+    "July" : "juli",
+    "August" : "augustus",
+    "September" : "september",
+    "October" : "oktober",
+    "November" : "november",
+    "December" : "december",
+    "Settings" : "Instellingen",
+    "File" : "Bestand",
+    "Folder" : "Map",
+    "Image" : "Afbeelding",
+    "Audio" : "Audio",
+    "Saving..." : "Opslaan",
+    "Couldn't send reset email. Please contact your administrator." : "Kon herstel e-mail niet versturen. Neem contact op met uw beheerder.",
+    "The link to reset your password has been sent to your email. 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." : "De link om uw wachtwoord te herstellen is per e-mail naar u verstuurd. Als u dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan uw spammap. <br>Als het daar niet in zit, neem dan contact op met uw beheerder.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Uw bestanden zijn versleuteld. Als u de herstelsleutel niet hebt geactiveerd, is er geen mogelijk om uw gegevens terug te krijgen nadat uw wachtwoord is hersteld. <br>Als u niet weet wat u moet doen, neem dan eerst contact op met uw beheerder. <br>Wilt u echt verder gaan?",
+    "I know what I'm doing" : "Ik weet wat ik doe",
+    "Reset password" : "Reset wachtwoord",
+    "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.",
+    "No" : "Nee",
+    "Yes" : "Ja",
+    "Choose" : "Kies",
+    "Error loading file picker template: {error}" : "Fout bij laden bestandenselecteur sjabloon: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Fout bij laden berichtensjabloon: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} bestandsconflict","{count} bestandsconflicten"],
+    "One file conflict" : "Een bestandsconflict",
+    "New Files" : "Nieuwe bestanden",
+    "Already existing files" : "Al aanwezige bestanden",
+    "Which files do you want to keep?" : "Welke bestanden wilt u bewaren?",
+    "If you select both versions, the copied file will have a number added to its name." : "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen.",
+    "Cancel" : "Annuleer",
+    "Continue" : "Verder",
+    "(all selected)" : "(alles geselecteerd)",
+    "({count} selected)" : "({count} geselecteerd)",
+    "Error loading file exists template" : "Fout bij laden bestand bestaat al sjabloon",
+    "Very weak password" : "Zeer zwak wachtwoord",
+    "Weak password" : "Zwak wachtwoord",
+    "So-so password" : "Matig wachtwoord",
+    "Good password" : "Goed wachtwoord",
+    "Strong password" : "Sterk wachtwoord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
+    "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie",
+    "Shared" : "Gedeeld",
+    "Shared with {recipients}" : "Gedeeld met {recipients}",
+    "Share" : "Delen",
+    "Error" : "Fout",
+    "Error while sharing" : "Fout tijdens het delen",
+    "Error while unsharing" : "Fout tijdens het stoppen met delen",
+    "Error while changing permissions" : "Fout tijdens het veranderen van permissies",
+    "Shared with you and the group {group} by {owner}" : "Gedeeld met u en de groep {group} door {owner}",
+    "Shared with you by {owner}" : "Gedeeld met u door {owner}",
+    "Share with user or group …" : "Delen met gebruiker of groep ...",
+    "Share link" : "Deel link",
+    "The public link will expire no later than {days} days after it is created" : "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
+    "Password protect" : "Wachtwoord beveiligd",
+    "Choose a password for the public link" : "Kies een wachtwoord voor de openbare link",
+    "Allow Public Upload" : "Sta publieke uploads toe",
+    "Email link to person" : "E-mail link naar persoon",
+    "Send" : "Versturen",
+    "Set expiration date" : "Stel vervaldatum in",
+    "Expiration date" : "Vervaldatum",
+    "Adding user..." : "Toevoegen gebruiker...",
+    "group" : "groep",
+    "Resharing is not allowed" : "Verder delen is niet toegestaan",
+    "Shared in {item} with {user}" : "Gedeeld in {item} met {user}",
+    "Unshare" : "Stop met delen",
+    "notify by email" : "melden per e-mail",
+    "can share" : "kan delen",
+    "can edit" : "kan wijzigen",
+    "access control" : "toegangscontrole",
+    "create" : "creëer",
+    "update" : "bijwerken",
+    "delete" : "verwijderen",
+    "Password protected" : "Wachtwoord beveiligd",
+    "Error unsetting expiration date" : "Fout tijdens het verwijderen van de vervaldatum",
+    "Error setting expiration date" : "Fout tijdens het instellen van de vervaldatum",
+    "Sending ..." : "Versturen ...",
+    "Email sent" : "E-mail verzonden",
+    "Warning" : "Waarschuwing",
+    "The object type is not specified." : "Het object type is niet gespecificeerd.",
+    "Enter new" : "Opgeven nieuw",
+    "Delete" : "Verwijder",
+    "Add" : "Toevoegen",
+    "Edit tags" : "Bewerken tags",
+    "Error loading dialog template: {error}" : "Fout bij laden dialoog sjabloon: {error}",
+    "No tags selected for deletion." : "Geen tags geselecteerd voor verwijdering.",
+    "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.",
+    "Please reload the page." : "Herlaad deze pagina.",
+    "The update was unsuccessful." : "De update is niet geslaagd.",
+    "The update was successful. Redirecting you to ownCloud now." : "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Kon het wachtwoord niet herstellen, omdat het token ongeldig is",
+    "Couldn't send reset email. Please make sure your username is correct." : "Kon e-mail niet versturen. Verifieer of uw gebruikersnaam correct is.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kon geen herstel e-mail versturen, omdat er geen e-mailadres bekend is bij deze gebruikersnaam. Neem contact op met uw beheerder.",
+    "%s password reset" : "%s wachtwoord reset",
+    "Use the following link to reset your password: {link}" : "Gebruik de volgende link om uw wachtwoord te resetten: {link}",
+    "You will receive a link to reset your password via Email." : "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
+    "Username" : "Gebruikersnaam",
+    "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?" : "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?",
+    "Yes, I really want to reset my password now" : "Ja, ik wil mijn wachtwoord nu echt resetten",
+    "Reset" : "Reset",
+    "New password" : "Nieuw wachtwoord",
+    "New Password" : "Nieuw wachtwoord",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.",
+    "Personal" : "Persoonlijk",
+    "Users" : "Gebruikers",
+    "Apps" : "Apps",
+    "Admin" : "Beheerder",
+    "Help" : "Help",
+    "Error loading tags" : "Fout bij laden tags",
+    "Tag already exists" : "Tag bestaat al",
+    "Error deleting tag(s)" : "Fout bij verwijderen tag(s)",
+    "Error tagging" : "Fout bij taggen",
+    "Error untagging" : "Fout bij ont-taggen",
+    "Error favoriting" : "Fout bij favoriet maken",
+    "Error unfavoriting" : "Fout bij verwijderen favorietstatus",
+    "Access forbidden" : "Toegang verboden",
+    "File not found" : "Bestand niet gevonden",
+    "The specified document has not been found on the server." : "Het opgegeven document is niet gevonden op deze server.",
+    "You can click here to return to %s." : "Klik hier om terug te keren naar %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\n%s deelt %s met u.\nBekijk het hier: %s\n\n",
+    "The share will expire on %s." : "De share vervalt op %s.",
+    "Cheers!" : "Proficiat!",
+    "Internal Server Error" : "Interne serverfout",
+    "The server encountered an internal error and was unable to complete your request." : "De server ontdekte een interne fout en kon uw aanvraag niet verder uitvoeren.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Neem contact op mer de serverbeheerder als deze fout meerdere keren optreedt en neem de onderstaande technische details op in uw melding.",
+    "More details can be found in the server log." : "Meer details in de serverlogging,",
+    "Technical details" : "Technische details",
+    "Remote Address: %s" : "Extern adres: %s",
+    "Request ID: %s" : "Aanvraag ID: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Boodschap: %s",
+    "File: %s" : "Bestand: %s",
+    "Line: %s" : "Regel: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Beveiligingswaarschuwing",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Uw PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
+    "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan",
+    "Password" : "Wachtwoord",
+    "Storage & database" : "Opslag & database",
+    "Data folder" : "Gegevensmap",
+    "Configure the database" : "Configureer de database",
+    "Only %s is available." : "Alleen %s is beschikbaar.",
+    "Database user" : "Gebruiker database",
+    "Database password" : "Wachtwoord database",
+    "Database name" : "Naam database",
+    "Database tablespace" : "Database tablespace",
+    "Database host" : "Databaseserver",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit te veranderen.",
+    "Finish setup" : "Installatie afronden",
+    "Finishing …" : "Afronden ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Deze applicatie heeft JavaScript nodig. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface.",
+    "%s is available. Get more information on how to update." : "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
+    "Log out" : "Afmelden",
+    "Server side authentication failed!" : "Authenticatie bij de server mislukte!",
+    "Please contact your administrator." : "Neem contact op met uw systeembeheerder.",
+    "Forgot your password? Reset it!" : "Wachtwoord vergeten? Herstel het!",
+    "remember" : "onthoud gegevens",
+    "Log in" : "Meld u aan",
+    "Alternative Logins" : "Alternatieve inlogs",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Deze ownCloud werkt momenteel in enkele gebruiker modus.",
+    "This means only administrators can use the instance." : "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Neem contact op met uw systeembeheerder als deze melding aanhoudt of onverwacht verscheen.",
+    "Thank you for your patience." : "Bedankt voor uw geduld.",
+    "You are accessing the server from an untrusted domain." : "U benadert de server vanaf een niet vertrouwd domein.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Neem contact op met uw beheerder. Als u de beheerder van deze service bent, configureer dan de \"trusted_domain\" instelling in config/config.php. Een voorbeeldconfiguratie is gegeven in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Afhankelijk van uw configuratie zou u als beheerder ook de onderstaande knop kunnen gebruiken om dit domein te vertrouwen.",
+    "Add \"%s\" as trusted domain" : "\"%s\" toevoegen als vertrouwd domein",
+    "%s will be updated to version %s." : "%s wordt bijgewerkt naar versie %s.",
+    "The following apps will be disabled:" : "De volgende apps worden uitgeschakeld:",
+    "The theme %s has been disabled." : "Het thema %s is uitgeschakeld.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Let erop dat de database, de config map en de data map zijn gebackupped voordat u verder gaat.",
+    "Start update" : "Begin de update",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Om time-outs tijdens grotere installaties te voorkomen, kunt u in plaats hiervan de volgende opdracht geven vanaf uw installatiedirectory:",
+    "This %s instance is currently being updated, which may take a while." : "Deze %s-installatie wordt momenteel geüpdatet. Dat kan enige tijd duren.",
+    "This page will refresh itself when the %s instance is available again." : "Deze pagina wordt ververst als de %s-installatie weer beschikbaar is."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
new file mode 100644
index 00000000000..a25e8c5d50e
--- /dev/null
+++ b/core/l10n/nl.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Kon geen e-mail sturen aan de volgende gebruikers: %s",
+    "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld",
+    "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld",
+    "Updated database" : "Database bijgewerkt",
+    "Checked database schema update" : "Database schema-update gecontroleerd",
+    "Checked database schema update for apps" : "Database schema-update voor apps gecontroleerd",
+    "Updated \"%s\" to %s" : "Bijgewerkt \"%s\" naar %s",
+    "Disabled incompatible apps: %s" : "Gedeactiveerde incompatibele apps: %s",
+    "No image or file provided" : "Geen afbeelding of bestand opgegeven",
+    "Unknown filetype" : "Onbekend bestandsformaat",
+    "Invalid image" : "Ongeldige afbeelding",
+    "No temporary profile picture available, try again" : "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw",
+    "No crop data provided" : "Geen bijsnijdingsgegevens opgegeven",
+    "Sunday" : "zondag",
+    "Monday" : "maandag",
+    "Tuesday" : "dinsdag",
+    "Wednesday" : "woensdag",
+    "Thursday" : "donderdag",
+    "Friday" : "vrijdag",
+    "Saturday" : "zaterdag",
+    "January" : "januari",
+    "February" : "februari",
+    "March" : "maart",
+    "April" : "april",
+    "May" : "mei",
+    "June" : "juni",
+    "July" : "juli",
+    "August" : "augustus",
+    "September" : "september",
+    "October" : "oktober",
+    "November" : "november",
+    "December" : "december",
+    "Settings" : "Instellingen",
+    "File" : "Bestand",
+    "Folder" : "Map",
+    "Image" : "Afbeelding",
+    "Audio" : "Audio",
+    "Saving..." : "Opslaan",
+    "Couldn't send reset email. Please contact your administrator." : "Kon herstel e-mail niet versturen. Neem contact op met uw beheerder.",
+    "The link to reset your password has been sent to your email. 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." : "De link om uw wachtwoord te herstellen is per e-mail naar u verstuurd. Als u dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan uw spammap. <br>Als het daar niet in zit, neem dan contact op met uw beheerder.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Uw bestanden zijn versleuteld. Als u de herstelsleutel niet hebt geactiveerd, is er geen mogelijk om uw gegevens terug te krijgen nadat uw wachtwoord is hersteld. <br>Als u niet weet wat u moet doen, neem dan eerst contact op met uw beheerder. <br>Wilt u echt verder gaan?",
+    "I know what I'm doing" : "Ik weet wat ik doe",
+    "Reset password" : "Reset wachtwoord",
+    "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.",
+    "No" : "Nee",
+    "Yes" : "Ja",
+    "Choose" : "Kies",
+    "Error loading file picker template: {error}" : "Fout bij laden bestandenselecteur sjabloon: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Fout bij laden berichtensjabloon: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} bestandsconflict","{count} bestandsconflicten"],
+    "One file conflict" : "Een bestandsconflict",
+    "New Files" : "Nieuwe bestanden",
+    "Already existing files" : "Al aanwezige bestanden",
+    "Which files do you want to keep?" : "Welke bestanden wilt u bewaren?",
+    "If you select both versions, the copied file will have a number added to its name." : "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen.",
+    "Cancel" : "Annuleer",
+    "Continue" : "Verder",
+    "(all selected)" : "(alles geselecteerd)",
+    "({count} selected)" : "({count} geselecteerd)",
+    "Error loading file exists template" : "Fout bij laden bestand bestaat al sjabloon",
+    "Very weak password" : "Zeer zwak wachtwoord",
+    "Weak password" : "Zwak wachtwoord",
+    "So-so password" : "Matig wachtwoord",
+    "Good password" : "Goed wachtwoord",
+    "Strong password" : "Sterk wachtwoord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
+    "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie",
+    "Shared" : "Gedeeld",
+    "Shared with {recipients}" : "Gedeeld met {recipients}",
+    "Share" : "Delen",
+    "Error" : "Fout",
+    "Error while sharing" : "Fout tijdens het delen",
+    "Error while unsharing" : "Fout tijdens het stoppen met delen",
+    "Error while changing permissions" : "Fout tijdens het veranderen van permissies",
+    "Shared with you and the group {group} by {owner}" : "Gedeeld met u en de groep {group} door {owner}",
+    "Shared with you by {owner}" : "Gedeeld met u door {owner}",
+    "Share with user or group …" : "Delen met gebruiker of groep ...",
+    "Share link" : "Deel link",
+    "The public link will expire no later than {days} days after it is created" : "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
+    "Password protect" : "Wachtwoord beveiligd",
+    "Choose a password for the public link" : "Kies een wachtwoord voor de openbare link",
+    "Allow Public Upload" : "Sta publieke uploads toe",
+    "Email link to person" : "E-mail link naar persoon",
+    "Send" : "Versturen",
+    "Set expiration date" : "Stel vervaldatum in",
+    "Expiration date" : "Vervaldatum",
+    "Adding user..." : "Toevoegen gebruiker...",
+    "group" : "groep",
+    "Resharing is not allowed" : "Verder delen is niet toegestaan",
+    "Shared in {item} with {user}" : "Gedeeld in {item} met {user}",
+    "Unshare" : "Stop met delen",
+    "notify by email" : "melden per e-mail",
+    "can share" : "kan delen",
+    "can edit" : "kan wijzigen",
+    "access control" : "toegangscontrole",
+    "create" : "creëer",
+    "update" : "bijwerken",
+    "delete" : "verwijderen",
+    "Password protected" : "Wachtwoord beveiligd",
+    "Error unsetting expiration date" : "Fout tijdens het verwijderen van de vervaldatum",
+    "Error setting expiration date" : "Fout tijdens het instellen van de vervaldatum",
+    "Sending ..." : "Versturen ...",
+    "Email sent" : "E-mail verzonden",
+    "Warning" : "Waarschuwing",
+    "The object type is not specified." : "Het object type is niet gespecificeerd.",
+    "Enter new" : "Opgeven nieuw",
+    "Delete" : "Verwijder",
+    "Add" : "Toevoegen",
+    "Edit tags" : "Bewerken tags",
+    "Error loading dialog template: {error}" : "Fout bij laden dialoog sjabloon: {error}",
+    "No tags selected for deletion." : "Geen tags geselecteerd voor verwijdering.",
+    "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.",
+    "Please reload the page." : "Herlaad deze pagina.",
+    "The update was unsuccessful." : "De update is niet geslaagd.",
+    "The update was successful. Redirecting you to ownCloud now." : "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Kon het wachtwoord niet herstellen, omdat het token ongeldig is",
+    "Couldn't send reset email. Please make sure your username is correct." : "Kon e-mail niet versturen. Verifieer of uw gebruikersnaam correct is.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kon geen herstel e-mail versturen, omdat er geen e-mailadres bekend is bij deze gebruikersnaam. Neem contact op met uw beheerder.",
+    "%s password reset" : "%s wachtwoord reset",
+    "Use the following link to reset your password: {link}" : "Gebruik de volgende link om uw wachtwoord te resetten: {link}",
+    "You will receive a link to reset your password via Email." : "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
+    "Username" : "Gebruikersnaam",
+    "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?" : "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?",
+    "Yes, I really want to reset my password now" : "Ja, ik wil mijn wachtwoord nu echt resetten",
+    "Reset" : "Reset",
+    "New password" : "Nieuw wachtwoord",
+    "New Password" : "Nieuw wachtwoord",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.",
+    "Personal" : "Persoonlijk",
+    "Users" : "Gebruikers",
+    "Apps" : "Apps",
+    "Admin" : "Beheerder",
+    "Help" : "Help",
+    "Error loading tags" : "Fout bij laden tags",
+    "Tag already exists" : "Tag bestaat al",
+    "Error deleting tag(s)" : "Fout bij verwijderen tag(s)",
+    "Error tagging" : "Fout bij taggen",
+    "Error untagging" : "Fout bij ont-taggen",
+    "Error favoriting" : "Fout bij favoriet maken",
+    "Error unfavoriting" : "Fout bij verwijderen favorietstatus",
+    "Access forbidden" : "Toegang verboden",
+    "File not found" : "Bestand niet gevonden",
+    "The specified document has not been found on the server." : "Het opgegeven document is niet gevonden op deze server.",
+    "You can click here to return to %s." : "Klik hier om terug te keren naar %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\n%s deelt %s met u.\nBekijk het hier: %s\n\n",
+    "The share will expire on %s." : "De share vervalt op %s.",
+    "Cheers!" : "Proficiat!",
+    "Internal Server Error" : "Interne serverfout",
+    "The server encountered an internal error and was unable to complete your request." : "De server ontdekte een interne fout en kon uw aanvraag niet verder uitvoeren.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Neem contact op mer de serverbeheerder als deze fout meerdere keren optreedt en neem de onderstaande technische details op in uw melding.",
+    "More details can be found in the server log." : "Meer details in de serverlogging,",
+    "Technical details" : "Technische details",
+    "Remote Address: %s" : "Extern adres: %s",
+    "Request ID: %s" : "Aanvraag ID: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Boodschap: %s",
+    "File: %s" : "Bestand: %s",
+    "Line: %s" : "Regel: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Beveiligingswaarschuwing",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Uw PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
+    "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan",
+    "Password" : "Wachtwoord",
+    "Storage & database" : "Opslag & database",
+    "Data folder" : "Gegevensmap",
+    "Configure the database" : "Configureer de database",
+    "Only %s is available." : "Alleen %s is beschikbaar.",
+    "Database user" : "Gebruiker database",
+    "Database password" : "Wachtwoord database",
+    "Database name" : "Naam database",
+    "Database tablespace" : "Database tablespace",
+    "Database host" : "Databaseserver",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit te veranderen.",
+    "Finish setup" : "Installatie afronden",
+    "Finishing …" : "Afronden ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Deze applicatie heeft JavaScript nodig. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface.",
+    "%s is available. Get more information on how to update." : "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
+    "Log out" : "Afmelden",
+    "Server side authentication failed!" : "Authenticatie bij de server mislukte!",
+    "Please contact your administrator." : "Neem contact op met uw systeembeheerder.",
+    "Forgot your password? Reset it!" : "Wachtwoord vergeten? Herstel het!",
+    "remember" : "onthoud gegevens",
+    "Log in" : "Meld u aan",
+    "Alternative Logins" : "Alternatieve inlogs",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Deze ownCloud werkt momenteel in enkele gebruiker modus.",
+    "This means only administrators can use the instance." : "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Neem contact op met uw systeembeheerder als deze melding aanhoudt of onverwacht verscheen.",
+    "Thank you for your patience." : "Bedankt voor uw geduld.",
+    "You are accessing the server from an untrusted domain." : "U benadert de server vanaf een niet vertrouwd domein.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Neem contact op met uw beheerder. Als u de beheerder van deze service bent, configureer dan de \"trusted_domain\" instelling in config/config.php. Een voorbeeldconfiguratie is gegeven in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Afhankelijk van uw configuratie zou u als beheerder ook de onderstaande knop kunnen gebruiken om dit domein te vertrouwen.",
+    "Add \"%s\" as trusted domain" : "\"%s\" toevoegen als vertrouwd domein",
+    "%s will be updated to version %s." : "%s wordt bijgewerkt naar versie %s.",
+    "The following apps will be disabled:" : "De volgende apps worden uitgeschakeld:",
+    "The theme %s has been disabled." : "Het thema %s is uitgeschakeld.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Let erop dat de database, de config map en de data map zijn gebackupped voordat u verder gaat.",
+    "Start update" : "Begin de update",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Om time-outs tijdens grotere installaties te voorkomen, kunt u in plaats hiervan de volgende opdracht geven vanaf uw installatiedirectory:",
+    "This %s instance is currently being updated, which may take a while." : "Deze %s-installatie wordt momenteel geüpdatet. Dat kan enige tijd duren.",
+    "This page will refresh itself when the %s instance is available again." : "Deze pagina wordt ververst als de %s-installatie weer beschikbaar is."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
deleted file mode 100644
index b6c3b5ce401..00000000000
--- a/core/l10n/nl.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Kon geen e-mail sturen aan de volgende gebruikers: %s",
-"Turned on maintenance mode" => "Onderhoudsmodus ingeschakeld",
-"Turned off maintenance mode" => "Onderhoudsmodus uitgeschakeld",
-"Updated database" => "Database bijgewerkt",
-"Checked database schema update" => "Database schema-update gecontroleerd",
-"Checked database schema update for apps" => "Database schema-update voor apps gecontroleerd",
-"Updated \"%s\" to %s" => "Bijgewerkt \"%s\" naar %s",
-"Disabled incompatible apps: %s" => "Gedeactiveerde incompatibele apps: %s",
-"No image or file provided" => "Geen afbeelding of bestand opgegeven",
-"Unknown filetype" => "Onbekend bestandsformaat",
-"Invalid image" => "Ongeldige afbeelding",
-"No temporary profile picture available, try again" => "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw",
-"No crop data provided" => "Geen bijsnijdingsgegevens opgegeven",
-"Sunday" => "zondag",
-"Monday" => "maandag",
-"Tuesday" => "dinsdag",
-"Wednesday" => "woensdag",
-"Thursday" => "donderdag",
-"Friday" => "vrijdag",
-"Saturday" => "zaterdag",
-"January" => "januari",
-"February" => "februari",
-"March" => "maart",
-"April" => "april",
-"May" => "mei",
-"June" => "juni",
-"July" => "juli",
-"August" => "augustus",
-"September" => "september",
-"October" => "oktober",
-"November" => "november",
-"December" => "december",
-"Settings" => "Instellingen",
-"File" => "Bestand",
-"Folder" => "Map",
-"Image" => "Afbeelding",
-"Audio" => "Audio",
-"Saving..." => "Opslaan",
-"Couldn't send reset email. Please contact your administrator." => "Kon herstel e-mail niet versturen. Neem contact op met uw beheerder.",
-"The link to reset your password has been sent to your email. 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." => "De link om uw wachtwoord te herstellen is per e-mail naar u verstuurd. Als u dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan uw spammap. <br>Als het daar niet in zit, neem dan contact op met uw beheerder.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Uw bestanden zijn versleuteld. Als u de herstelsleutel niet hebt geactiveerd, is er geen mogelijk om uw gegevens terug te krijgen nadat uw wachtwoord is hersteld. <br>Als u niet weet wat u moet doen, neem dan eerst contact op met uw beheerder. <br>Wilt u echt verder gaan?",
-"I know what I'm doing" => "Ik weet wat ik doe",
-"Reset password" => "Reset wachtwoord",
-"Password can not be changed. Please contact your administrator." => "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.",
-"No" => "Nee",
-"Yes" => "Ja",
-"Choose" => "Kies",
-"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} bestandsconflict","{count} bestandsconflicten"),
-"One file conflict" => "Een bestandsconflict",
-"New Files" => "Nieuwe bestanden",
-"Already existing files" => "Al aanwezige bestanden",
-"Which files do you want to keep?" => "Welke bestanden wilt u bewaren?",
-"If you select both versions, the copied file will have a number added to its name." => "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen.",
-"Cancel" => "Annuleer",
-"Continue" => "Verder",
-"(all selected)" => "(alles geselecteerd)",
-"({count} selected)" => "({count} geselecteerd)",
-"Error loading file exists template" => "Fout bij laden bestand bestaat al sjabloon",
-"Very weak password" => "Zeer zwak wachtwoord",
-"Weak password" => "Zwak wachtwoord",
-"So-so password" => "Matig wachtwoord",
-"Good password" => "Goed wachtwoord",
-"Strong password" => "Sterk wachtwoord",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
-"Error occurred while checking server setup" => "Een fout trad op bij checken serverconfiguratie",
-"Shared" => "Gedeeld",
-"Shared with {recipients}" => "Gedeeld met {recipients}",
-"Share" => "Delen",
-"Error" => "Fout",
-"Error while sharing" => "Fout tijdens het delen",
-"Error while unsharing" => "Fout tijdens het stoppen met delen",
-"Error while changing permissions" => "Fout tijdens het veranderen van permissies",
-"Shared with you and the group {group} by {owner}" => "Gedeeld met u en de groep {group} door {owner}",
-"Shared with you by {owner}" => "Gedeeld met u door {owner}",
-"Share with user or group …" => "Delen met gebruiker of groep ...",
-"Share link" => "Deel link",
-"The public link will expire no later than {days} days after it is created" => "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
-"Password protect" => "Wachtwoord beveiligd",
-"Choose a password for the public link" => "Kies een wachtwoord voor de openbare link",
-"Allow Public Upload" => "Sta publieke uploads toe",
-"Email link to person" => "E-mail link naar persoon",
-"Send" => "Versturen",
-"Set expiration date" => "Stel vervaldatum in",
-"Expiration date" => "Vervaldatum",
-"Adding user..." => "Toevoegen gebruiker...",
-"group" => "groep",
-"Resharing is not allowed" => "Verder delen is niet toegestaan",
-"Shared in {item} with {user}" => "Gedeeld in {item} met {user}",
-"Unshare" => "Stop met delen",
-"notify by email" => "melden per e-mail",
-"can share" => "kan delen",
-"can edit" => "kan wijzigen",
-"access control" => "toegangscontrole",
-"create" => "creëer",
-"update" => "bijwerken",
-"delete" => "verwijderen",
-"Password protected" => "Wachtwoord beveiligd",
-"Error unsetting expiration date" => "Fout tijdens het verwijderen van de vervaldatum",
-"Error setting expiration date" => "Fout tijdens het instellen van de vervaldatum",
-"Sending ..." => "Versturen ...",
-"Email sent" => "E-mail verzonden",
-"Warning" => "Waarschuwing",
-"The object type is not specified." => "Het object type is niet gespecificeerd.",
-"Enter new" => "Opgeven nieuw",
-"Delete" => "Verwijder",
-"Add" => "Toevoegen",
-"Edit tags" => "Bewerken tags",
-"Error loading dialog template: {error}" => "Fout bij laden dialoog sjabloon: {error}",
-"No tags selected for deletion." => "Geen tags geselecteerd voor verwijdering.",
-"Updating {productName} to version {version}, this may take a while." => "Bijwerken {productName} naar versie {version}, dit kan even duren.",
-"Please reload the page." => "Herlaad deze pagina.",
-"The update was unsuccessful." => "De update is niet geslaagd.",
-"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
-"Couldn't reset password because the token is invalid" => "Kon het wachtwoord niet herstellen, omdat het token ongeldig is",
-"Couldn't send reset email. Please make sure your username is correct." => "Kon e-mail niet versturen. Verifieer of uw gebruikersnaam correct is.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Kon geen herstel e-mail versturen, omdat er geen e-mailadres bekend is bij deze gebruikersnaam. Neem contact op met uw beheerder.",
-"%s password reset" => "%s wachtwoord reset",
-"Use the following link to reset your password: {link}" => "Gebruik de volgende link om uw wachtwoord te resetten: {link}",
-"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
-"Username" => "Gebruikersnaam",
-"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?" => "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?",
-"Yes, I really want to reset my password now" => "Ja, ik wil mijn wachtwoord nu echt resetten",
-"Reset" => "Reset",
-"New password" => "Nieuw wachtwoord",
-"New Password" => "Nieuw wachtwoord",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!",
-"For the best results, please consider using a GNU/Linux server instead." => "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.",
-"Personal" => "Persoonlijk",
-"Users" => "Gebruikers",
-"Apps" => "Apps",
-"Admin" => "Beheerder",
-"Help" => "Help",
-"Error loading tags" => "Fout bij laden tags",
-"Tag already exists" => "Tag bestaat al",
-"Error deleting tag(s)" => "Fout bij verwijderen tag(s)",
-"Error tagging" => "Fout bij taggen",
-"Error untagging" => "Fout bij ont-taggen",
-"Error favoriting" => "Fout bij favoriet maken",
-"Error unfavoriting" => "Fout bij verwijderen favorietstatus",
-"Access forbidden" => "Toegang verboden",
-"File not found" => "Bestand niet gevonden",
-"The specified document has not been found on the server." => "Het opgegeven document is niet gevonden op deze server.",
-"You can click here to return to %s." => "Klik hier om terug te keren naar %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\n%s deelt %s met u.\nBekijk het hier: %s\n\n",
-"The share will expire on %s." => "De share vervalt op %s.",
-"Cheers!" => "Proficiat!",
-"Internal Server Error" => "Interne serverfout",
-"The server encountered an internal error and was unable to complete your request." => "De server ontdekte een interne fout en kon uw aanvraag niet verder uitvoeren.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Neem contact op mer de serverbeheerder als deze fout meerdere keren optreedt en neem de onderstaande technische details op in uw melding.",
-"More details can be found in the server log." => "Meer details in de serverlogging,",
-"Technical details" => "Technische details",
-"Remote Address: %s" => "Extern adres: %s",
-"Request ID: %s" => "Aanvraag ID: %s",
-"Code: %s" => "Code: %s",
-"Message: %s" => "Boodschap: %s",
-"File: %s" => "Bestand: %s",
-"Line: %s" => "Regel: %s",
-"Trace" => "Trace",
-"Security Warning" => "Beveiligingswaarschuwing",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uw PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
-"Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
-"Password" => "Wachtwoord",
-"Storage & database" => "Opslag & database",
-"Data folder" => "Gegevensmap",
-"Configure the database" => "Configureer de database",
-"Only %s is available." => "Alleen %s is beschikbaar.",
-"Database user" => "Gebruiker database",
-"Database password" => "Wachtwoord database",
-"Database name" => "Naam database",
-"Database tablespace" => "Database tablespace",
-"Database host" => "Databaseserver",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit te veranderen.",
-"Finish setup" => "Installatie afronden",
-"Finishing …" => "Afronden ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Deze applicatie heeft JavaScript nodig. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface.",
-"%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
-"Log out" => "Afmelden",
-"Server side authentication failed!" => "Authenticatie bij de server mislukte!",
-"Please contact your administrator." => "Neem contact op met uw systeembeheerder.",
-"Forgot your password? Reset it!" => "Wachtwoord vergeten? Herstel het!",
-"remember" => "onthoud gegevens",
-"Log in" => "Meld u aan",
-"Alternative Logins" => "Alternatieve inlogs",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Deze ownCloud werkt momenteel in enkele gebruiker modus.",
-"This means only administrators can use the instance." => "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Neem contact op met uw systeembeheerder als deze melding aanhoudt of onverwacht verscheen.",
-"Thank you for your patience." => "Bedankt voor uw geduld.",
-"You are accessing the server from an untrusted domain." => "U benadert de server vanaf een niet vertrouwd domein.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Neem contact op met uw beheerder. Als u de beheerder van deze service bent, configureer dan de \"trusted_domain\" instelling in config/config.php. Een voorbeeldconfiguratie is gegeven in config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Afhankelijk van uw configuratie zou u als beheerder ook de onderstaande knop kunnen gebruiken om dit domein te vertrouwen.",
-"Add \"%s\" as trusted domain" => "\"%s\" toevoegen als vertrouwd domein",
-"%s will be updated to version %s." => "%s wordt bijgewerkt naar versie %s.",
-"The following apps will be disabled:" => "De volgende apps worden uitgeschakeld:",
-"The theme %s has been disabled." => "Het thema %s is uitgeschakeld.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Let erop dat de database, de config map en de data map zijn gebackupped voordat u verder gaat.",
-"Start update" => "Begin de update",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Om time-outs tijdens grotere installaties te voorkomen, kunt u in plaats hiervan de volgende opdracht geven vanaf uw installatiedirectory:",
-"This %s instance is currently being updated, which may take a while." => "Deze %s-installatie wordt momenteel geüpdatet. Dat kan enige tijd duren.",
-"This page will refresh itself when the %s instance is available again." => "Deze pagina wordt ververst als de %s-installatie weer beschikbaar is."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nn_NO.js b/core/l10n/nn_NO.js
new file mode 100644
index 00000000000..ed4f66d57df
--- /dev/null
+++ b/core/l10n/nn_NO.js
@@ -0,0 +1,126 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Kunne ikkje snede e-post til følgande brukarar: %s ",
+    "Turned on maintenance mode" : "Skrudde på vedlikehaldsmodus",
+    "Turned off maintenance mode" : "Skrudde av vedlikehaldsmodus",
+    "Updated database" : "Database oppdatert",
+    "No image or file provided" : "Inga bilete eller fil gitt",
+    "Unknown filetype" : "Ukjend filtype",
+    "Invalid image" : "Ugyldig bilete",
+    "No temporary profile picture available, try again" : "Inga midlertidig profilbilete tilgjengeleg, prøv igjen",
+    "No crop data provided" : "Ingen beskjeringsdata gitt",
+    "Sunday" : "Søndag",
+    "Monday" : "Måndag",
+    "Tuesday" : "Tysdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Laurdag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mars",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Innstillingar",
+    "Folder" : "Mappe",
+    "Saving..." : "Lagrar …",
+    "I know what I'm doing" : "Eg veit kva eg gjer",
+    "Reset password" : "Nullstill passord",
+    "No" : "Nei",
+    "Yes" : "Ja",
+    "Choose" : "Vel",
+    "Error loading file picker template: {error}" : "Klarte ikkje å lasta filplukkarmal: {error}",
+    "Ok" : "Greitt",
+    "Error loading message template: {error}" : "Klarte ikkje å lasta meldingsmal: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonfliktar"],
+    "One file conflict" : "Éin filkonflikt",
+    "Which files do you want to keep?" : "Kva filer vil du spara?",
+    "If you select both versions, the copied file will have a number added to its name." : "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet.",
+    "Cancel" : "Avbryt",
+    "Continue" : "Gå vidare",
+    "(all selected)" : "(alle valte)",
+    "({count} selected)" : "({count} valte)",
+    "Error loading file exists template" : "Klarte ikkje å lasta fil-finst-mal",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane.",
+    "Shared" : "Delt",
+    "Share" : "Del",
+    "Error" : "Feil",
+    "Error while sharing" : "Feil ved deling",
+    "Error while unsharing" : "Feil ved udeling",
+    "Error while changing permissions" : "Feil ved endring av tillatingar",
+    "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppa {group} av {owner}",
+    "Shared with you by {owner}" : "Delt med deg av {owner}",
+    "Share link" : "Del lenkje",
+    "Password protect" : "Passordvern",
+    "Choose a password for the public link" : "Vel eit passord for den offentlege lenkja",
+    "Allow Public Upload" : "Tillat offentleg opplasting",
+    "Email link to person" : "Send lenkja over e-post",
+    "Send" : "Send",
+    "Set expiration date" : "Set utløpsdato",
+    "Expiration date" : "Utløpsdato",
+    "group" : "gruppe",
+    "Resharing is not allowed" : "Vidaredeling er ikkje tillate",
+    "Shared in {item} with {user}" : "Delt i {item} med {brukar}",
+    "Unshare" : "Udel",
+    "can share" : "kan dela",
+    "can edit" : "kan endra",
+    "access control" : "tilgangskontroll",
+    "create" : "lag",
+    "update" : "oppdater",
+    "delete" : "slett",
+    "Password protected" : "Passordverna",
+    "Error unsetting expiration date" : "Klarte ikkje fjerna utløpsdato",
+    "Error setting expiration date" : "Klarte ikkje setja utløpsdato",
+    "Sending ..." : "Sender …",
+    "Email sent" : "E-post sendt",
+    "Warning" : "Åtvaring",
+    "The object type is not specified." : "Objekttypen er ikkje spesifisert.",
+    "Delete" : "Slett",
+    "Add" : "Legg til",
+    "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
+    "%s password reset" : "%s passordnullstilling",
+    "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
+    "You will receive a link to reset your password via Email." : "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
+    "Username" : "Brukarnamn",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
+    "Yes, I really want to reset my password now" : "Ja, eg vil nullstilla passordet mitt no",
+    "New password" : "Nytt passord",
+    "Personal" : "Personleg",
+    "Users" : "Brukarar",
+    "Apps" : "Program",
+    "Admin" : "Admin",
+    "Help" : "Hjelp",
+    "Access forbidden" : "Tilgang forbudt",
+    "Security Warning" : "Tryggleiksåtvaring",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
+    "Create an <strong>admin account</strong>" : "Lag ein <strong>admin-konto</strong>",
+    "Password" : "Passord",
+    "Data folder" : "Datamappe",
+    "Configure the database" : "Set opp databasen",
+    "Database user" : "Databasebrukar",
+    "Database password" : "Databasepassord",
+    "Database name" : "Databasenamn",
+    "Database tablespace" : "Tabellnamnrom for database",
+    "Database host" : "Databasetenar",
+    "Finish setup" : "Fullfør oppsettet",
+    "%s is available. Get more information on how to update." : "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer.",
+    "Log out" : "Logg ut",
+    "remember" : "hugs",
+    "Log in" : "Logg inn",
+    "Alternative Logins" : "Alternative innloggingar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/nn_NO.json b/core/l10n/nn_NO.json
new file mode 100644
index 00000000000..a4be2d9acee
--- /dev/null
+++ b/core/l10n/nn_NO.json
@@ -0,0 +1,124 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Kunne ikkje snede e-post til følgande brukarar: %s ",
+    "Turned on maintenance mode" : "Skrudde på vedlikehaldsmodus",
+    "Turned off maintenance mode" : "Skrudde av vedlikehaldsmodus",
+    "Updated database" : "Database oppdatert",
+    "No image or file provided" : "Inga bilete eller fil gitt",
+    "Unknown filetype" : "Ukjend filtype",
+    "Invalid image" : "Ugyldig bilete",
+    "No temporary profile picture available, try again" : "Inga midlertidig profilbilete tilgjengeleg, prøv igjen",
+    "No crop data provided" : "Ingen beskjeringsdata gitt",
+    "Sunday" : "Søndag",
+    "Monday" : "Måndag",
+    "Tuesday" : "Tysdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Laurdag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mars",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Innstillingar",
+    "Folder" : "Mappe",
+    "Saving..." : "Lagrar …",
+    "I know what I'm doing" : "Eg veit kva eg gjer",
+    "Reset password" : "Nullstill passord",
+    "No" : "Nei",
+    "Yes" : "Ja",
+    "Choose" : "Vel",
+    "Error loading file picker template: {error}" : "Klarte ikkje å lasta filplukkarmal: {error}",
+    "Ok" : "Greitt",
+    "Error loading message template: {error}" : "Klarte ikkje å lasta meldingsmal: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonfliktar"],
+    "One file conflict" : "Éin filkonflikt",
+    "Which files do you want to keep?" : "Kva filer vil du spara?",
+    "If you select both versions, the copied file will have a number added to its name." : "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet.",
+    "Cancel" : "Avbryt",
+    "Continue" : "Gå vidare",
+    "(all selected)" : "(alle valte)",
+    "({count} selected)" : "({count} valte)",
+    "Error loading file exists template" : "Klarte ikkje å lasta fil-finst-mal",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane.",
+    "Shared" : "Delt",
+    "Share" : "Del",
+    "Error" : "Feil",
+    "Error while sharing" : "Feil ved deling",
+    "Error while unsharing" : "Feil ved udeling",
+    "Error while changing permissions" : "Feil ved endring av tillatingar",
+    "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppa {group} av {owner}",
+    "Shared with you by {owner}" : "Delt med deg av {owner}",
+    "Share link" : "Del lenkje",
+    "Password protect" : "Passordvern",
+    "Choose a password for the public link" : "Vel eit passord for den offentlege lenkja",
+    "Allow Public Upload" : "Tillat offentleg opplasting",
+    "Email link to person" : "Send lenkja over e-post",
+    "Send" : "Send",
+    "Set expiration date" : "Set utløpsdato",
+    "Expiration date" : "Utløpsdato",
+    "group" : "gruppe",
+    "Resharing is not allowed" : "Vidaredeling er ikkje tillate",
+    "Shared in {item} with {user}" : "Delt i {item} med {brukar}",
+    "Unshare" : "Udel",
+    "can share" : "kan dela",
+    "can edit" : "kan endra",
+    "access control" : "tilgangskontroll",
+    "create" : "lag",
+    "update" : "oppdater",
+    "delete" : "slett",
+    "Password protected" : "Passordverna",
+    "Error unsetting expiration date" : "Klarte ikkje fjerna utløpsdato",
+    "Error setting expiration date" : "Klarte ikkje setja utløpsdato",
+    "Sending ..." : "Sender …",
+    "Email sent" : "E-post sendt",
+    "Warning" : "Åtvaring",
+    "The object type is not specified." : "Objekttypen er ikkje spesifisert.",
+    "Delete" : "Slett",
+    "Add" : "Legg til",
+    "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
+    "%s password reset" : "%s passordnullstilling",
+    "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
+    "You will receive a link to reset your password via Email." : "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
+    "Username" : "Brukarnamn",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
+    "Yes, I really want to reset my password now" : "Ja, eg vil nullstilla passordet mitt no",
+    "New password" : "Nytt passord",
+    "Personal" : "Personleg",
+    "Users" : "Brukarar",
+    "Apps" : "Program",
+    "Admin" : "Admin",
+    "Help" : "Hjelp",
+    "Access forbidden" : "Tilgang forbudt",
+    "Security Warning" : "Tryggleiksåtvaring",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
+    "Create an <strong>admin account</strong>" : "Lag ein <strong>admin-konto</strong>",
+    "Password" : "Passord",
+    "Data folder" : "Datamappe",
+    "Configure the database" : "Set opp databasen",
+    "Database user" : "Databasebrukar",
+    "Database password" : "Databasepassord",
+    "Database name" : "Databasenamn",
+    "Database tablespace" : "Tabellnamnrom for database",
+    "Database host" : "Databasetenar",
+    "Finish setup" : "Fullfør oppsettet",
+    "%s is available. Get more information on how to update." : "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer.",
+    "Log out" : "Logg ut",
+    "remember" : "hugs",
+    "Log in" : "Logg inn",
+    "Alternative Logins" : "Alternative innloggingar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
deleted file mode 100644
index dcbad11138d..00000000000
--- a/core/l10n/nn_NO.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Kunne ikkje snede e-post til følgande brukarar: %s ",
-"Turned on maintenance mode" => "Skrudde på vedlikehaldsmodus",
-"Turned off maintenance mode" => "Skrudde av vedlikehaldsmodus",
-"Updated database" => "Database oppdatert",
-"No image or file provided" => "Inga bilete eller fil gitt",
-"Unknown filetype" => "Ukjend filtype",
-"Invalid image" => "Ugyldig bilete",
-"No temporary profile picture available, try again" => "Inga midlertidig profilbilete tilgjengeleg, prøv igjen",
-"No crop data provided" => "Ingen beskjeringsdata gitt",
-"Sunday" => "Søndag",
-"Monday" => "Måndag",
-"Tuesday" => "Tysdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Laurdag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mars",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"Settings" => "Innstillingar",
-"Folder" => "Mappe",
-"Saving..." => "Lagrar …",
-"I know what I'm doing" => "Eg veit kva eg gjer",
-"Reset password" => "Nullstill passord",
-"No" => "Nei",
-"Yes" => "Ja",
-"Choose" => "Vel",
-"Error loading file picker template: {error}" => "Klarte ikkje å lasta filplukkarmal: {error}",
-"Ok" => "Greitt",
-"Error loading message template: {error}" => "Klarte ikkje å lasta meldingsmal: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonfliktar"),
-"One file conflict" => "Éin filkonflikt",
-"Which files do you want to keep?" => "Kva filer vil du spara?",
-"If you select both versions, the copied file will have a number added to its name." => "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet.",
-"Cancel" => "Avbryt",
-"Continue" => "Gå vidare",
-"(all selected)" => "(alle valte)",
-"({count} selected)" => "({count} valte)",
-"Error loading file exists template" => "Klarte ikkje å lasta fil-finst-mal",
-"Very weak password" => "Veldig svakt passord",
-"Weak password" => "Svakt passord",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane.",
-"Shared" => "Delt",
-"Share" => "Del",
-"Error" => "Feil",
-"Error while sharing" => "Feil ved deling",
-"Error while unsharing" => "Feil ved udeling",
-"Error while changing permissions" => "Feil ved endring av tillatingar",
-"Shared with you and the group {group} by {owner}" => "Delt med deg og gruppa {group} av {owner}",
-"Shared with you by {owner}" => "Delt med deg av {owner}",
-"Share link" => "Del lenkje",
-"Password protect" => "Passordvern",
-"Choose a password for the public link" => "Vel eit passord for den offentlege lenkja",
-"Allow Public Upload" => "Tillat offentleg opplasting",
-"Email link to person" => "Send lenkja over e-post",
-"Send" => "Send",
-"Set expiration date" => "Set utløpsdato",
-"Expiration date" => "Utløpsdato",
-"group" => "gruppe",
-"Resharing is not allowed" => "Vidaredeling er ikkje tillate",
-"Shared in {item} with {user}" => "Delt i {item} med {brukar}",
-"Unshare" => "Udel",
-"can share" => "kan dela",
-"can edit" => "kan endra",
-"access control" => "tilgangskontroll",
-"create" => "lag",
-"update" => "oppdater",
-"delete" => "slett",
-"Password protected" => "Passordverna",
-"Error unsetting expiration date" => "Klarte ikkje fjerna utløpsdato",
-"Error setting expiration date" => "Klarte ikkje setja utløpsdato",
-"Sending ..." => "Sender …",
-"Email sent" => "E-post sendt",
-"Warning" => "Åtvaring",
-"The object type is not specified." => "Objekttypen er ikkje spesifisert.",
-"Delete" => "Slett",
-"Add" => "Legg til",
-"The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
-"%s password reset" => "%s passordnullstilling",
-"Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
-"You will receive a link to reset your password via Email." => "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
-"Username" => "Brukarnamn",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
-"Yes, I really want to reset my password now" => "Ja, eg vil nullstilla passordet mitt no",
-"New password" => "Nytt passord",
-"Personal" => "Personleg",
-"Users" => "Brukarar",
-"Apps" => "Program",
-"Admin" => "Admin",
-"Help" => "Hjelp",
-"Access forbidden" => "Tilgang forbudt",
-"Security Warning" => "Tryggleiksåtvaring",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
-"Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
-"Password" => "Passord",
-"Data folder" => "Datamappe",
-"Configure the database" => "Set opp databasen",
-"Database user" => "Databasebrukar",
-"Database password" => "Databasepassord",
-"Database name" => "Databasenamn",
-"Database tablespace" => "Tabellnamnrom for database",
-"Database host" => "Databasetenar",
-"Finish setup" => "Fullfør oppsettet",
-"%s is available. Get more information on how to update." => "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer.",
-"Log out" => "Logg ut",
-"remember" => "hugs",
-"Log in" => "Logg inn",
-"Alternative Logins" => "Alternative innloggingar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nqo.js b/core/l10n/nqo.js
new file mode 100644
index 00000000000..87077ecad97
--- /dev/null
+++ b/core/l10n/nqo.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/nqo.json b/core/l10n/nqo.json
new file mode 100644
index 00000000000..c499f696550
--- /dev/null
+++ b/core/l10n/nqo.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/nqo.php b/core/l10n/nqo.php
deleted file mode 100644
index 1191769faa7..00000000000
--- a/core/l10n/nqo.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/oc.js b/core/l10n/oc.js
new file mode 100644
index 00000000000..42d1151455d
--- /dev/null
+++ b/core/l10n/oc.js
@@ -0,0 +1,79 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Dimenge",
+    "Monday" : "Diluns",
+    "Tuesday" : "Dimarç",
+    "Wednesday" : "Dimecres",
+    "Thursday" : "Dijòus",
+    "Friday" : "Divendres",
+    "Saturday" : "Dissabte",
+    "January" : "genièr",
+    "February" : "febrièr",
+    "March" : "març",
+    "April" : "abril",
+    "May" : "mai",
+    "June" : "junh",
+    "July" : "julhet",
+    "August" : "agost",
+    "September" : "septembre",
+    "October" : "octobre",
+    "November" : "Novembre",
+    "December" : "Decembre",
+    "Settings" : "Configuracion",
+    "Folder" : "Dorsièr",
+    "Saving..." : "Enregistra...",
+    "Reset password" : "Senhal tornat botar",
+    "No" : "Non",
+    "Yes" : "Òc",
+    "Choose" : "Causís",
+    "Ok" : "D'accòrdi",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Annula",
+    "Share" : "Parteja",
+    "Error" : "Error",
+    "Error while sharing" : "Error al partejar",
+    "Error while unsharing" : "Error al non partejar",
+    "Error while changing permissions" : "Error al cambiar permissions",
+    "Password protect" : "Parat per senhal",
+    "Set expiration date" : "Met la data d'expiracion",
+    "Expiration date" : "Data d'expiracion",
+    "group" : "grop",
+    "Resharing is not allowed" : "Tornar partejar es pas permis",
+    "Unshare" : "Pas partejador",
+    "can edit" : "pòt modificar",
+    "access control" : "Contraròtle d'acces",
+    "create" : "crea",
+    "update" : "met a jorn",
+    "delete" : "escafa",
+    "Password protected" : "Parat per senhal",
+    "Error unsetting expiration date" : "Error al metre de la data d'expiracion",
+    "Error setting expiration date" : "Error setting expiration date",
+    "Delete" : "Escafa",
+    "Add" : "Ajusta",
+    "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
+    "You will receive a link to reset your password via Email." : "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
+    "Username" : "Non d'usancièr",
+    "New password" : "Senhal novèl",
+    "Personal" : "Personal",
+    "Users" : "Usancièrs",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Ajuda",
+    "Access forbidden" : "Acces enebit",
+    "Security Warning" : "Avertiment de securitat",
+    "Create an <strong>admin account</strong>" : "Crea un <strong>compte admin</strong>",
+    "Password" : "Senhal",
+    "Data folder" : "Dorsièr de donadas",
+    "Configure the database" : "Configura la basa de donadas",
+    "Database user" : "Usancièr de la basa de donadas",
+    "Database password" : "Senhal de la basa de donadas",
+    "Database name" : "Nom de la basa de donadas",
+    "Database tablespace" : "Espandi de taula de basa de donadas",
+    "Database host" : "Òste de basa de donadas",
+    "Finish setup" : "Configuracion acabada",
+    "Log out" : "Sortida",
+    "remember" : "bremba-te",
+    "Log in" : "Dintrada"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/oc.json b/core/l10n/oc.json
new file mode 100644
index 00000000000..4faa8cd0be1
--- /dev/null
+++ b/core/l10n/oc.json
@@ -0,0 +1,77 @@
+{ "translations": {
+    "Sunday" : "Dimenge",
+    "Monday" : "Diluns",
+    "Tuesday" : "Dimarç",
+    "Wednesday" : "Dimecres",
+    "Thursday" : "Dijòus",
+    "Friday" : "Divendres",
+    "Saturday" : "Dissabte",
+    "January" : "genièr",
+    "February" : "febrièr",
+    "March" : "març",
+    "April" : "abril",
+    "May" : "mai",
+    "June" : "junh",
+    "July" : "julhet",
+    "August" : "agost",
+    "September" : "septembre",
+    "October" : "octobre",
+    "November" : "Novembre",
+    "December" : "Decembre",
+    "Settings" : "Configuracion",
+    "Folder" : "Dorsièr",
+    "Saving..." : "Enregistra...",
+    "Reset password" : "Senhal tornat botar",
+    "No" : "Non",
+    "Yes" : "Òc",
+    "Choose" : "Causís",
+    "Ok" : "D'accòrdi",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Annula",
+    "Share" : "Parteja",
+    "Error" : "Error",
+    "Error while sharing" : "Error al partejar",
+    "Error while unsharing" : "Error al non partejar",
+    "Error while changing permissions" : "Error al cambiar permissions",
+    "Password protect" : "Parat per senhal",
+    "Set expiration date" : "Met la data d'expiracion",
+    "Expiration date" : "Data d'expiracion",
+    "group" : "grop",
+    "Resharing is not allowed" : "Tornar partejar es pas permis",
+    "Unshare" : "Pas partejador",
+    "can edit" : "pòt modificar",
+    "access control" : "Contraròtle d'acces",
+    "create" : "crea",
+    "update" : "met a jorn",
+    "delete" : "escafa",
+    "Password protected" : "Parat per senhal",
+    "Error unsetting expiration date" : "Error al metre de la data d'expiracion",
+    "Error setting expiration date" : "Error setting expiration date",
+    "Delete" : "Escafa",
+    "Add" : "Ajusta",
+    "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
+    "You will receive a link to reset your password via Email." : "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
+    "Username" : "Non d'usancièr",
+    "New password" : "Senhal novèl",
+    "Personal" : "Personal",
+    "Users" : "Usancièrs",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Ajuda",
+    "Access forbidden" : "Acces enebit",
+    "Security Warning" : "Avertiment de securitat",
+    "Create an <strong>admin account</strong>" : "Crea un <strong>compte admin</strong>",
+    "Password" : "Senhal",
+    "Data folder" : "Dorsièr de donadas",
+    "Configure the database" : "Configura la basa de donadas",
+    "Database user" : "Usancièr de la basa de donadas",
+    "Database password" : "Senhal de la basa de donadas",
+    "Database name" : "Nom de la basa de donadas",
+    "Database tablespace" : "Espandi de taula de basa de donadas",
+    "Database host" : "Òste de basa de donadas",
+    "Finish setup" : "Configuracion acabada",
+    "Log out" : "Sortida",
+    "remember" : "bremba-te",
+    "Log in" : "Dintrada"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
deleted file mode 100644
index d785441ee28..00000000000
--- a/core/l10n/oc.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Dimenge",
-"Monday" => "Diluns",
-"Tuesday" => "Dimarç",
-"Wednesday" => "Dimecres",
-"Thursday" => "Dijòus",
-"Friday" => "Divendres",
-"Saturday" => "Dissabte",
-"January" => "genièr",
-"February" => "febrièr",
-"March" => "març",
-"April" => "abril",
-"May" => "mai",
-"June" => "junh",
-"July" => "julhet",
-"August" => "agost",
-"September" => "septembre",
-"October" => "octobre",
-"November" => "Novembre",
-"December" => "Decembre",
-"Settings" => "Configuracion",
-"Folder" => "Dorsièr",
-"Saving..." => "Enregistra...",
-"Reset password" => "Senhal tornat botar",
-"No" => "Non",
-"Yes" => "Òc",
-"Choose" => "Causís",
-"Ok" => "D'accòrdi",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Annula",
-"Share" => "Parteja",
-"Error" => "Error",
-"Error while sharing" => "Error al partejar",
-"Error while unsharing" => "Error al non partejar",
-"Error while changing permissions" => "Error al cambiar permissions",
-"Password protect" => "Parat per senhal",
-"Set expiration date" => "Met la data d'expiracion",
-"Expiration date" => "Data d'expiracion",
-"group" => "grop",
-"Resharing is not allowed" => "Tornar partejar es pas permis",
-"Unshare" => "Pas partejador",
-"can edit" => "pòt modificar",
-"access control" => "Contraròtle d'acces",
-"create" => "crea",
-"update" => "met a jorn",
-"delete" => "escafa",
-"Password protected" => "Parat per senhal",
-"Error unsetting expiration date" => "Error al metre de la data d'expiracion",
-"Error setting expiration date" => "Error setting expiration date",
-"Delete" => "Escafa",
-"Add" => "Ajusta",
-"Use the following link to reset your password: {link}" => "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
-"You will receive a link to reset your password via Email." => "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
-"Username" => "Non d'usancièr",
-"New password" => "Senhal novèl",
-"Personal" => "Personal",
-"Users" => "Usancièrs",
-"Apps" => "Apps",
-"Admin" => "Admin",
-"Help" => "Ajuda",
-"Access forbidden" => "Acces enebit",
-"Security Warning" => "Avertiment de securitat",
-"Create an <strong>admin account</strong>" => "Crea un <strong>compte admin</strong>",
-"Password" => "Senhal",
-"Data folder" => "Dorsièr de donadas",
-"Configure the database" => "Configura la basa de donadas",
-"Database user" => "Usancièr de la basa de donadas",
-"Database password" => "Senhal de la basa de donadas",
-"Database name" => "Nom de la basa de donadas",
-"Database tablespace" => "Espandi de taula de basa de donadas",
-"Database host" => "Òste de basa de donadas",
-"Finish setup" => "Configuracion acabada",
-"Log out" => "Sortida",
-"remember" => "bremba-te",
-"Log in" => "Dintrada"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/or_IN.js b/core/l10n/or_IN.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/or_IN.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/or_IN.json b/core/l10n/or_IN.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/or_IN.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/or_IN.php b/core/l10n/or_IN.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/or_IN.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/pa.js b/core/l10n/pa.js
new file mode 100644
index 00000000000..8be57366967
--- /dev/null
+++ b/core/l10n/pa.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "ਐਤਵਾਰ",
+    "Monday" : "ਸੋਮਵਾਰ",
+    "Tuesday" : "ਮੰਗਲਵਾਰ",
+    "Wednesday" : "ਬੁੱਧਵਾਰ",
+    "Thursday" : "ਵੀਰਵਾਰ",
+    "Friday" : "ਸ਼ੁੱਕਰਵਾਰ",
+    "Saturday" : "ਸ਼ਨਿੱਚਰਵਾਰ",
+    "January" : "ਜਨਵਰੀ",
+    "February" : "ਫਰਵਰੀ",
+    "March" : "ਮਾਰਚ",
+    "April" : "ਅਪਰੈ",
+    "May" : "ਮਈ",
+    "June" : "ਜੂਨ",
+    "July" : "ਜੁਲਾਈ",
+    "August" : "ਅਗਸਤ",
+    "September" : "ਸਤੰਬ",
+    "October" : "ਅਕਤੂਬਰ",
+    "November" : "ਨਵੰਬ",
+    "December" : "ਦਸੰਬਰ",
+    "Settings" : "ਸੈਟਿੰਗ",
+    "Saving..." : "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ",
+    "No" : "ਨਹੀਂ",
+    "Yes" : "ਹਾਂ",
+    "Choose" : "ਚੁਣੋ",
+    "Ok" : "ਠੀਕ ਹੈ",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "ਰੱਦ ਕਰੋ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
+    "Error" : "ਗਲ",
+    "Send" : "ਭੇਜੋ",
+    "Warning" : "ਚੇਤਾਵਨੀ",
+    "Delete" : "ਹਟਾਓ",
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
+    "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+    "Password" : "ਪਾਸਵਰ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/pa.json b/core/l10n/pa.json
new file mode 100644
index 00000000000..d801809d018
--- /dev/null
+++ b/core/l10n/pa.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Sunday" : "ਐਤਵਾਰ",
+    "Monday" : "ਸੋਮਵਾਰ",
+    "Tuesday" : "ਮੰਗਲਵਾਰ",
+    "Wednesday" : "ਬੁੱਧਵਾਰ",
+    "Thursday" : "ਵੀਰਵਾਰ",
+    "Friday" : "ਸ਼ੁੱਕਰਵਾਰ",
+    "Saturday" : "ਸ਼ਨਿੱਚਰਵਾਰ",
+    "January" : "ਜਨਵਰੀ",
+    "February" : "ਫਰਵਰੀ",
+    "March" : "ਮਾਰਚ",
+    "April" : "ਅਪਰੈ",
+    "May" : "ਮਈ",
+    "June" : "ਜੂਨ",
+    "July" : "ਜੁਲਾਈ",
+    "August" : "ਅਗਸਤ",
+    "September" : "ਸਤੰਬ",
+    "October" : "ਅਕਤੂਬਰ",
+    "November" : "ਨਵੰਬ",
+    "December" : "ਦਸੰਬਰ",
+    "Settings" : "ਸੈਟਿੰਗ",
+    "Saving..." : "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ",
+    "No" : "ਨਹੀਂ",
+    "Yes" : "ਹਾਂ",
+    "Choose" : "ਚੁਣੋ",
+    "Ok" : "ਠੀਕ ਹੈ",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "ਰੱਦ ਕਰੋ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
+    "Error" : "ਗਲ",
+    "Send" : "ਭੇਜੋ",
+    "Warning" : "ਚੇਤਾਵਨੀ",
+    "Delete" : "ਹਟਾਓ",
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
+    "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+    "Password" : "ਪਾਸਵਰ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/pa.php b/core/l10n/pa.php
deleted file mode 100644
index 820ea0280eb..00000000000
--- a/core/l10n/pa.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "ਐਤਵਾਰ",
-"Monday" => "ਸੋਮਵਾਰ",
-"Tuesday" => "ਮੰਗਲਵਾਰ",
-"Wednesday" => "ਬੁੱਧਵਾਰ",
-"Thursday" => "ਵੀਰਵਾਰ",
-"Friday" => "ਸ਼ੁੱਕਰਵਾਰ",
-"Saturday" => "ਸ਼ਨਿੱਚਰਵਾਰ",
-"January" => "ਜਨਵਰੀ",
-"February" => "ਫਰਵਰੀ",
-"March" => "ਮਾਰਚ",
-"April" => "ਅਪਰੈ",
-"May" => "ਮਈ",
-"June" => "ਜੂਨ",
-"July" => "ਜੁਲਾਈ",
-"August" => "ਅਗਸਤ",
-"September" => "ਸਤੰਬ",
-"October" => "ਅਕਤੂਬਰ",
-"November" => "ਨਵੰਬ",
-"December" => "ਦਸੰਬਰ",
-"Settings" => "ਸੈਟਿੰਗ",
-"Saving..." => "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ",
-"No" => "ਨਹੀਂ",
-"Yes" => "ਹਾਂ",
-"Choose" => "ਚੁਣੋ",
-"Ok" => "ਠੀਕ ਹੈ",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "ਰੱਦ ਕਰੋ",
-"Share" => "ਸਾਂਝਾ ਕਰੋ",
-"Error" => "ਗਲ",
-"Send" => "ਭੇਜੋ",
-"Warning" => "ਚੇਤਾਵਨੀ",
-"Delete" => "ਹਟਾਓ",
-"Username" => "ਯੂਜ਼ਰ-ਨਾਂ",
-"Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
-"Password" => "ਪਾਸਵਰ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
new file mode 100644
index 00000000000..c330e002863
--- /dev/null
+++ b/core/l10n/pl.js
@@ -0,0 +1,210 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nie można było wysłać wiadomości do następujących użytkowników: %s",
+    "Turned on maintenance mode" : "Włączony tryb konserwacji",
+    "Turned off maintenance mode" : "Wyłączony tryb konserwacji",
+    "Updated database" : "Zaktualizuj bazę",
+    "Checked database schema update" : "Sprawdzono aktualizację schematu bazy danych",
+    "Checked database schema update for apps" : "Sprawdzono aktualizację schematu bazy danych dla aplikacji",
+    "Updated \"%s\" to %s" : "Zaktualizowano \"%s\" do %s",
+    "Disabled incompatible apps: %s" : "Wyłączone niekompatybilne aplikacja: %s",
+    "No image or file provided" : "Brak obrazu lub pliku dostarczonego",
+    "Unknown filetype" : "Nieznany typ pliku",
+    "Invalid image" : "Nieprawidłowe zdjęcie",
+    "No temporary profile picture available, try again" : "Brak obrazka profilu tymczasowego, spróbuj ponownie",
+    "No crop data provided" : "Brak danych do przycięcia",
+    "Sunday" : "Niedziela",
+    "Monday" : "Poniedziałek",
+    "Tuesday" : "Wtorek",
+    "Wednesday" : "Środa",
+    "Thursday" : "Czwartek",
+    "Friday" : "Piątek",
+    "Saturday" : "Sobota",
+    "January" : "Styczeń",
+    "February" : "Luty",
+    "March" : "Marzec",
+    "April" : "Kwiecień",
+    "May" : "Maj",
+    "June" : "Czerwiec",
+    "July" : "Lipiec",
+    "August" : "Sierpień",
+    "September" : "Wrzesień",
+    "October" : "Październik",
+    "November" : "Listopad",
+    "December" : "Grudzień",
+    "Settings" : "Ustawienia",
+    "File" : "Plik",
+    "Folder" : "Folder",
+    "Image" : "Obraz",
+    "Audio" : "Dźwięk",
+    "Saving..." : "Zapisywanie...",
+    "Couldn't send reset email. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Skontaktuj się z administratorem.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link do zresetowanego hasła, został wysłany na twój adres e-mail. Jeśli nie dostałeś wiadomości w rozsądnym czasie, sprawdź folder ze spamem.<br> Jeśli nie ma wiadomości w tym folderze, skontaktuj się ze swoim administratorem.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ",
+    "I know what I'm doing" : "Wiem co robię",
+    "Reset password" : "Zresetuj hasło",
+    "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.",
+    "No" : "Nie",
+    "Yes" : "Tak",
+    "Choose" : "Wybierz",
+    "Error loading file picker template: {error}" : "Błąd podczas ładowania pliku wybranego szablonu: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Błąd podczas ładowania szablonu wiadomości: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"],
+    "One file conflict" : "Konflikt pliku",
+    "New Files" : "Nowe pliki",
+    "Already existing files" : "Już istniejące pliki",
+    "Which files do you want to keep?" : "Które pliki chcesz zachować?",
+    "If you select both versions, the copied file will have a number added to its name." : "Jeśli wybierzesz obie wersje, skopiowany plik będzie miał dodany numerek w nazwie",
+    "Cancel" : "Anuluj",
+    "Continue" : "Kontynuuj ",
+    "(all selected)" : "(wszystkie zaznaczone)",
+    "({count} selected)" : "({count} zaznaczonych)",
+    "Error loading file exists template" : "Błąd podczas ładowania szablonu istniejącego pliku",
+    "Very weak password" : "Bardzo słabe hasło",
+    "Weak password" : "Słabe hasło",
+    "So-so password" : "Mało skomplikowane hasło",
+    "Good password" : "Dobre hasło",
+    "Strong password" : "Mocne hasło",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub aplikacje firm 3-trzecich nie działają. Dostęp do plików z zewnątrz i wysyłanie powiadomień e-mail może również nie działać. Sugerujemy podłączenie tego serwera do internetu, jeśli chcesz mieć wszystkie funkcje.",
+    "Error occurred while checking server setup" : "Pojawił się błąd podczas sprawdzania ustawień serwera",
+    "Shared" : "Udostępniono",
+    "Shared with {recipients}" : "Współdzielony z {recipients}",
+    "Share" : "Udostępnij",
+    "Error" : "Błąd",
+    "Error while sharing" : "Błąd podczas współdzielenia",
+    "Error while unsharing" : "Błąd podczas zatrzymywania współdzielenia",
+    "Error while changing permissions" : "Błąd przy zmianie uprawnień",
+    "Shared with you and the group {group} by {owner}" : "Udostępnione tobie i grupie {group} przez {owner}",
+    "Shared with you by {owner}" : "Udostępnione tobie przez {owner}",
+    "Share with user or group …" : "Współdziel z użytkownikiem lub grupą ...",
+    "Share link" : "Udostępnij link",
+    "The public link will expire no later than {days} days after it is created" : "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
+    "Password protect" : "Zabezpiecz hasłem",
+    "Choose a password for the public link" : "Wybierz hasło dla linku publicznego",
+    "Allow Public Upload" : "Pozwól na  publiczne wczytywanie",
+    "Email link to person" : "Wyślij osobie odnośnik poprzez e-mail",
+    "Send" : "Wyślij",
+    "Set expiration date" : "Ustaw datę wygaśnięcia",
+    "Expiration date" : "Data wygaśnięcia",
+    "group" : "grupa",
+    "Resharing is not allowed" : "Współdzielenie nie jest możliwe",
+    "Shared in {item} with {user}" : "Współdzielone w {item} z {user}",
+    "Unshare" : "Zatrzymaj współdzielenie",
+    "notify by email" : "powiadom przez emaila",
+    "can share" : "może współdzielić",
+    "can edit" : "może edytować",
+    "access control" : "kontrola dostępu",
+    "create" : "utwórz",
+    "update" : "uaktualnij",
+    "delete" : "usuń",
+    "Password protected" : "Zabezpieczone hasłem",
+    "Error unsetting expiration date" : "Błąd podczas usuwania daty wygaśnięcia",
+    "Error setting expiration date" : "Błąd podczas ustawiania daty wygaśnięcia",
+    "Sending ..." : "Wysyłanie...",
+    "Email sent" : "E-mail wysłany",
+    "Warning" : "Ostrzeżenie",
+    "The object type is not specified." : "Nie określono typu obiektu.",
+    "Enter new" : "Wpisz nowy",
+    "Delete" : "Usuń",
+    "Add" : "Dodaj",
+    "Edit tags" : "Edytuj tagi",
+    "Error loading dialog template: {error}" : "Błąd podczas ładowania szablonu dialogu: {error}",
+    "No tags selected for deletion." : "Nie zaznaczono tagów do usunięcia.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualizuję {productName} do wersji {version}, to może chwilę potrwać.",
+    "Please reload the page." : "Proszę przeładować stronę",
+    "The update was unsuccessful." : "Aktualizacja nie powiodła się.",
+    "The update was successful. Redirecting you to ownCloud now." : "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Nie można zresetować hasła, ponieważ token jest niepoprawny",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika jest poprawna.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika  lub adres email jest poprawny. Skontaktuj się z administratorem.",
+    "%s password reset" : "%s reset hasła",
+    "Use the following link to reset your password: {link}" : "Użyj tego odnośnika by zresetować hasło: {link}",
+    "You will receive a link to reset your password via Email." : "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
+    "Username" : "Nazwa użytkownika",
+    "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?" : "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?",
+    "Yes, I really want to reset my password now" : "Tak, naprawdę chcę zresetować hasło teraz",
+    "Reset" : "Resetuj",
+    "New password" : "Nowe hasło",
+    "New Password" : "Nowe hasło",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.",
+    "Personal" : "Osobiste",
+    "Users" : "Użytkownicy",
+    "Apps" : "Aplikacje",
+    "Admin" : "Administrator",
+    "Help" : "Pomoc",
+    "Error loading tags" : "Błąd ładowania tagów",
+    "Tag already exists" : "Tag już istnieje",
+    "Error deleting tag(s)" : "Błąd przy osuwaniu tag(ów)",
+    "Error tagging" : "Błąd tagowania",
+    "Error untagging" : "Błąd odtagowania",
+    "Error favoriting" : "Błąd podczas dodawania do ulubionch",
+    "Error unfavoriting" : "Błąd przy usuwaniu z ulubionych",
+    "Access forbidden" : "Dostęp zabroniony",
+    "File not found" : "Nie odnaleziono pliku",
+    "The specified document has not been found on the server." : "Wskazany dokument nie został znaleziony na serwerze.",
+    "You can click here to return to %s." : "Możesz kliknąć tutaj aby powrócić do %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Witaj,\n\ntylko informuję, że %s współdzieli z Tobą %s.\nZobacz tutaj: %s\n\n",
+    "The share will expire on %s." : "Ten zasób wygaśnie %s",
+    "Cheers!" : "Pozdrawiam!",
+    "The server encountered an internal error and was unable to complete your request." : "Serwer napotkał błąd wewnętrzny i nie był w stanie ukończyć Twojego żądania.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Proszę skontaktować się z administratorem jeśli ten błąd będzie się pojawiał wielokrotnie, proszę do zgłoszenia dołączyć szczegóły techniczne opisane poniżej.",
+    "More details can be found in the server log." : "Więcej szczegółów można znaleźć w logu serwera.",
+    "Technical details" : "Szczegóły techniczne",
+    "Remote Address: %s" : "Adres zdalny: %s",
+    "Request ID: %s" : "ID żądania: %s",
+    "Code: %s" : "Kod: %s",
+    "Message: %s" : "Komunikat: %s",
+    "File: %s" : "Plik: %s",
+    "Line: %s" : "Linia: %s",
+    "Trace" : "Ślad",
+    "Security Warning" : "Ostrzeżenie o zabezpieczeniach",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Twója wersja PHP jest narażona na NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Proszę uaktualnij swoją instalacje PHP aby używać %s bezpiecznie.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
+    "Create an <strong>admin account</strong>" : "Utwórz <strong>konta administratora</strong>",
+    "Password" : "Hasło",
+    "Storage & database" : "Zasoby dysku & baza danych",
+    "Data folder" : "Katalog danych",
+    "Configure the database" : "Skonfiguruj bazę danych",
+    "Only %s is available." : "Dostępne jest wyłącznie %s.",
+    "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",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Jako baza danych zostanie użyty SQLite. Dla większych instalacji doradzamy zmianę na inną.",
+    "Finish setup" : "Zakończ konfigurowanie",
+    "Finishing …" : "Kończę ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ta aplikacja wymaga JavaScript do poprawnego działania. Proszę <a href=\"http://enable-javascript.com/\" target=\"_blank\">włącz JavaScript</a> i przeładuj stronę.",
+    "%s is available. Get more information on how to update." : "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
+    "Log out" : "Wyloguj",
+    "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!",
+    "Please contact your administrator." : "Skontaktuj się z administratorem",
+    "Forgot your password? Reset it!" : "Nie pamiętasz hasła? Zresetuj je!",
+    "remember" : "pamiętaj",
+    "Log in" : "Zaloguj",
+    "Alternative Logins" : "Alternatywne loginy",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Ta instalacja ownCloud działa obecnie w trybie pojedynczego użytkownika.",
+    "This means only administrators can use the instance." : "To oznacza, że tylko administratorzy mogą w tej chwili używać aplikacji.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Skontaktuj się z administratorem, jeśli ten komunikat pojawił się nieoczekiwanie lub wyświetla się ciągle.",
+    "Thank you for your patience." : "Dziękuję za cierpliwość.",
+    "You are accessing the server from an untrusted domain." : "Dostajesz się do serwera z niezaufanej domeny.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Proszę skontaktuj się z administratorem. Jeśli jesteś administratorem tej instancji, skonfiguruj parametr \"trusted_domain\" w pliku config/config.php. Przykładowa konfiguracja jest dostępna w pliku config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "W zależności od konfiguracji, jako administrator możesz także użyć poniższego przycisku aby zaufać tej domenie.",
+    "Add \"%s\" as trusted domain" : "Dodaj \"%s\" jako domenę zaufaną",
+    "%s will be updated to version %s." : "%s zostanie zaktualizowane do wersji %s.",
+    "The following apps will be disabled:" : "Następujące aplikacje zostaną zablokowane:",
+    "The theme %s has been disabled." : "Motyw %s został wyłączony.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Proszę się upewnić, że baza danych, folder konfiguracji oraz folder danych zostały zarchiwizowane przed przejściem dalej.",
+    "Start update" : "Rozpocznij aktualizację",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Aby uniknąć timeout-ów przy większych instalacjach, możesz zamiast tego uruchomić następującą komendę w katalogu Twojej instalacji:",
+    "This %s instance is currently being updated, which may take a while." : "Ta instancja %s jest właśnie aktualizowana, co może chwilę potrwać.",
+    "This page will refresh itself when the %s instance is available again." : "Strona odświeży się gdy instancja %s będzie ponownie dostępna."
+},
+"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
new file mode 100644
index 00000000000..ccfa0685c2a
--- /dev/null
+++ b/core/l10n/pl.json
@@ -0,0 +1,208 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nie można było wysłać wiadomości do następujących użytkowników: %s",
+    "Turned on maintenance mode" : "Włączony tryb konserwacji",
+    "Turned off maintenance mode" : "Wyłączony tryb konserwacji",
+    "Updated database" : "Zaktualizuj bazę",
+    "Checked database schema update" : "Sprawdzono aktualizację schematu bazy danych",
+    "Checked database schema update for apps" : "Sprawdzono aktualizację schematu bazy danych dla aplikacji",
+    "Updated \"%s\" to %s" : "Zaktualizowano \"%s\" do %s",
+    "Disabled incompatible apps: %s" : "Wyłączone niekompatybilne aplikacja: %s",
+    "No image or file provided" : "Brak obrazu lub pliku dostarczonego",
+    "Unknown filetype" : "Nieznany typ pliku",
+    "Invalid image" : "Nieprawidłowe zdjęcie",
+    "No temporary profile picture available, try again" : "Brak obrazka profilu tymczasowego, spróbuj ponownie",
+    "No crop data provided" : "Brak danych do przycięcia",
+    "Sunday" : "Niedziela",
+    "Monday" : "Poniedziałek",
+    "Tuesday" : "Wtorek",
+    "Wednesday" : "Środa",
+    "Thursday" : "Czwartek",
+    "Friday" : "Piątek",
+    "Saturday" : "Sobota",
+    "January" : "Styczeń",
+    "February" : "Luty",
+    "March" : "Marzec",
+    "April" : "Kwiecień",
+    "May" : "Maj",
+    "June" : "Czerwiec",
+    "July" : "Lipiec",
+    "August" : "Sierpień",
+    "September" : "Wrzesień",
+    "October" : "Październik",
+    "November" : "Listopad",
+    "December" : "Grudzień",
+    "Settings" : "Ustawienia",
+    "File" : "Plik",
+    "Folder" : "Folder",
+    "Image" : "Obraz",
+    "Audio" : "Dźwięk",
+    "Saving..." : "Zapisywanie...",
+    "Couldn't send reset email. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Skontaktuj się z administratorem.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link do zresetowanego hasła, został wysłany na twój adres e-mail. Jeśli nie dostałeś wiadomości w rozsądnym czasie, sprawdź folder ze spamem.<br> Jeśli nie ma wiadomości w tym folderze, skontaktuj się ze swoim administratorem.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ",
+    "I know what I'm doing" : "Wiem co robię",
+    "Reset password" : "Zresetuj hasło",
+    "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.",
+    "No" : "Nie",
+    "Yes" : "Tak",
+    "Choose" : "Wybierz",
+    "Error loading file picker template: {error}" : "Błąd podczas ładowania pliku wybranego szablonu: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Błąd podczas ładowania szablonu wiadomości: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"],
+    "One file conflict" : "Konflikt pliku",
+    "New Files" : "Nowe pliki",
+    "Already existing files" : "Już istniejące pliki",
+    "Which files do you want to keep?" : "Które pliki chcesz zachować?",
+    "If you select both versions, the copied file will have a number added to its name." : "Jeśli wybierzesz obie wersje, skopiowany plik będzie miał dodany numerek w nazwie",
+    "Cancel" : "Anuluj",
+    "Continue" : "Kontynuuj ",
+    "(all selected)" : "(wszystkie zaznaczone)",
+    "({count} selected)" : "({count} zaznaczonych)",
+    "Error loading file exists template" : "Błąd podczas ładowania szablonu istniejącego pliku",
+    "Very weak password" : "Bardzo słabe hasło",
+    "Weak password" : "Słabe hasło",
+    "So-so password" : "Mało skomplikowane hasło",
+    "Good password" : "Dobre hasło",
+    "Strong password" : "Mocne hasło",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub aplikacje firm 3-trzecich nie działają. Dostęp do plików z zewnątrz i wysyłanie powiadomień e-mail może również nie działać. Sugerujemy podłączenie tego serwera do internetu, jeśli chcesz mieć wszystkie funkcje.",
+    "Error occurred while checking server setup" : "Pojawił się błąd podczas sprawdzania ustawień serwera",
+    "Shared" : "Udostępniono",
+    "Shared with {recipients}" : "Współdzielony z {recipients}",
+    "Share" : "Udostępnij",
+    "Error" : "Błąd",
+    "Error while sharing" : "Błąd podczas współdzielenia",
+    "Error while unsharing" : "Błąd podczas zatrzymywania współdzielenia",
+    "Error while changing permissions" : "Błąd przy zmianie uprawnień",
+    "Shared with you and the group {group} by {owner}" : "Udostępnione tobie i grupie {group} przez {owner}",
+    "Shared with you by {owner}" : "Udostępnione tobie przez {owner}",
+    "Share with user or group …" : "Współdziel z użytkownikiem lub grupą ...",
+    "Share link" : "Udostępnij link",
+    "The public link will expire no later than {days} days after it is created" : "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
+    "Password protect" : "Zabezpiecz hasłem",
+    "Choose a password for the public link" : "Wybierz hasło dla linku publicznego",
+    "Allow Public Upload" : "Pozwól na  publiczne wczytywanie",
+    "Email link to person" : "Wyślij osobie odnośnik poprzez e-mail",
+    "Send" : "Wyślij",
+    "Set expiration date" : "Ustaw datę wygaśnięcia",
+    "Expiration date" : "Data wygaśnięcia",
+    "group" : "grupa",
+    "Resharing is not allowed" : "Współdzielenie nie jest możliwe",
+    "Shared in {item} with {user}" : "Współdzielone w {item} z {user}",
+    "Unshare" : "Zatrzymaj współdzielenie",
+    "notify by email" : "powiadom przez emaila",
+    "can share" : "może współdzielić",
+    "can edit" : "może edytować",
+    "access control" : "kontrola dostępu",
+    "create" : "utwórz",
+    "update" : "uaktualnij",
+    "delete" : "usuń",
+    "Password protected" : "Zabezpieczone hasłem",
+    "Error unsetting expiration date" : "Błąd podczas usuwania daty wygaśnięcia",
+    "Error setting expiration date" : "Błąd podczas ustawiania daty wygaśnięcia",
+    "Sending ..." : "Wysyłanie...",
+    "Email sent" : "E-mail wysłany",
+    "Warning" : "Ostrzeżenie",
+    "The object type is not specified." : "Nie określono typu obiektu.",
+    "Enter new" : "Wpisz nowy",
+    "Delete" : "Usuń",
+    "Add" : "Dodaj",
+    "Edit tags" : "Edytuj tagi",
+    "Error loading dialog template: {error}" : "Błąd podczas ładowania szablonu dialogu: {error}",
+    "No tags selected for deletion." : "Nie zaznaczono tagów do usunięcia.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualizuję {productName} do wersji {version}, to może chwilę potrwać.",
+    "Please reload the page." : "Proszę przeładować stronę",
+    "The update was unsuccessful." : "Aktualizacja nie powiodła się.",
+    "The update was successful. Redirecting you to ownCloud now." : "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Nie można zresetować hasła, ponieważ token jest niepoprawny",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika jest poprawna.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika  lub adres email jest poprawny. Skontaktuj się z administratorem.",
+    "%s password reset" : "%s reset hasła",
+    "Use the following link to reset your password: {link}" : "Użyj tego odnośnika by zresetować hasło: {link}",
+    "You will receive a link to reset your password via Email." : "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
+    "Username" : "Nazwa użytkownika",
+    "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?" : "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?",
+    "Yes, I really want to reset my password now" : "Tak, naprawdę chcę zresetować hasło teraz",
+    "Reset" : "Resetuj",
+    "New password" : "Nowe hasło",
+    "New Password" : "Nowe hasło",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.",
+    "Personal" : "Osobiste",
+    "Users" : "Użytkownicy",
+    "Apps" : "Aplikacje",
+    "Admin" : "Administrator",
+    "Help" : "Pomoc",
+    "Error loading tags" : "Błąd ładowania tagów",
+    "Tag already exists" : "Tag już istnieje",
+    "Error deleting tag(s)" : "Błąd przy osuwaniu tag(ów)",
+    "Error tagging" : "Błąd tagowania",
+    "Error untagging" : "Błąd odtagowania",
+    "Error favoriting" : "Błąd podczas dodawania do ulubionch",
+    "Error unfavoriting" : "Błąd przy usuwaniu z ulubionych",
+    "Access forbidden" : "Dostęp zabroniony",
+    "File not found" : "Nie odnaleziono pliku",
+    "The specified document has not been found on the server." : "Wskazany dokument nie został znaleziony na serwerze.",
+    "You can click here to return to %s." : "Możesz kliknąć tutaj aby powrócić do %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Witaj,\n\ntylko informuję, że %s współdzieli z Tobą %s.\nZobacz tutaj: %s\n\n",
+    "The share will expire on %s." : "Ten zasób wygaśnie %s",
+    "Cheers!" : "Pozdrawiam!",
+    "The server encountered an internal error and was unable to complete your request." : "Serwer napotkał błąd wewnętrzny i nie był w stanie ukończyć Twojego żądania.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Proszę skontaktować się z administratorem jeśli ten błąd będzie się pojawiał wielokrotnie, proszę do zgłoszenia dołączyć szczegóły techniczne opisane poniżej.",
+    "More details can be found in the server log." : "Więcej szczegółów można znaleźć w logu serwera.",
+    "Technical details" : "Szczegóły techniczne",
+    "Remote Address: %s" : "Adres zdalny: %s",
+    "Request ID: %s" : "ID żądania: %s",
+    "Code: %s" : "Kod: %s",
+    "Message: %s" : "Komunikat: %s",
+    "File: %s" : "Plik: %s",
+    "Line: %s" : "Linia: %s",
+    "Trace" : "Ślad",
+    "Security Warning" : "Ostrzeżenie o zabezpieczeniach",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Twója wersja PHP jest narażona na NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Proszę uaktualnij swoją instalacje PHP aby używać %s bezpiecznie.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
+    "Create an <strong>admin account</strong>" : "Utwórz <strong>konta administratora</strong>",
+    "Password" : "Hasło",
+    "Storage & database" : "Zasoby dysku & baza danych",
+    "Data folder" : "Katalog danych",
+    "Configure the database" : "Skonfiguruj bazę danych",
+    "Only %s is available." : "Dostępne jest wyłącznie %s.",
+    "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",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Jako baza danych zostanie użyty SQLite. Dla większych instalacji doradzamy zmianę na inną.",
+    "Finish setup" : "Zakończ konfigurowanie",
+    "Finishing …" : "Kończę ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ta aplikacja wymaga JavaScript do poprawnego działania. Proszę <a href=\"http://enable-javascript.com/\" target=\"_blank\">włącz JavaScript</a> i przeładuj stronę.",
+    "%s is available. Get more information on how to update." : "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
+    "Log out" : "Wyloguj",
+    "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!",
+    "Please contact your administrator." : "Skontaktuj się z administratorem",
+    "Forgot your password? Reset it!" : "Nie pamiętasz hasła? Zresetuj je!",
+    "remember" : "pamiętaj",
+    "Log in" : "Zaloguj",
+    "Alternative Logins" : "Alternatywne loginy",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Ta instalacja ownCloud działa obecnie w trybie pojedynczego użytkownika.",
+    "This means only administrators can use the instance." : "To oznacza, że tylko administratorzy mogą w tej chwili używać aplikacji.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Skontaktuj się z administratorem, jeśli ten komunikat pojawił się nieoczekiwanie lub wyświetla się ciągle.",
+    "Thank you for your patience." : "Dziękuję za cierpliwość.",
+    "You are accessing the server from an untrusted domain." : "Dostajesz się do serwera z niezaufanej domeny.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Proszę skontaktuj się z administratorem. Jeśli jesteś administratorem tej instancji, skonfiguruj parametr \"trusted_domain\" w pliku config/config.php. Przykładowa konfiguracja jest dostępna w pliku config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "W zależności od konfiguracji, jako administrator możesz także użyć poniższego przycisku aby zaufać tej domenie.",
+    "Add \"%s\" as trusted domain" : "Dodaj \"%s\" jako domenę zaufaną",
+    "%s will be updated to version %s." : "%s zostanie zaktualizowane do wersji %s.",
+    "The following apps will be disabled:" : "Następujące aplikacje zostaną zablokowane:",
+    "The theme %s has been disabled." : "Motyw %s został wyłączony.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Proszę się upewnić, że baza danych, folder konfiguracji oraz folder danych zostały zarchiwizowane przed przejściem dalej.",
+    "Start update" : "Rozpocznij aktualizację",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Aby uniknąć timeout-ów przy większych instalacjach, możesz zamiast tego uruchomić następującą komendę w katalogu Twojej instalacji:",
+    "This %s instance is currently being updated, which may take a while." : "Ta instancja %s jest właśnie aktualizowana, co może chwilę potrwać.",
+    "This page will refresh itself when the %s instance is available again." : "Strona odświeży się gdy instancja %s będzie ponownie dostępna."
+},"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
deleted file mode 100644
index 98d041bc34f..00000000000
--- a/core/l10n/pl.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nie można było wysłać wiadomości do następujących użytkowników: %s",
-"Turned on maintenance mode" => "Włączony tryb konserwacji",
-"Turned off maintenance mode" => "Wyłączony tryb konserwacji",
-"Updated database" => "Zaktualizuj bazę",
-"Checked database schema update" => "Sprawdzono aktualizację schematu bazy danych",
-"Checked database schema update for apps" => "Sprawdzono aktualizację schematu bazy danych dla aplikacji",
-"Updated \"%s\" to %s" => "Zaktualizowano \"%s\" do %s",
-"Disabled incompatible apps: %s" => "Wyłączone niekompatybilne aplikacja: %s",
-"No image or file provided" => "Brak obrazu lub pliku dostarczonego",
-"Unknown filetype" => "Nieznany typ pliku",
-"Invalid image" => "Nieprawidłowe zdjęcie",
-"No temporary profile picture available, try again" => "Brak obrazka profilu tymczasowego, spróbuj ponownie",
-"No crop data provided" => "Brak danych do przycięcia",
-"Sunday" => "Niedziela",
-"Monday" => "Poniedziałek",
-"Tuesday" => "Wtorek",
-"Wednesday" => "Środa",
-"Thursday" => "Czwartek",
-"Friday" => "Piątek",
-"Saturday" => "Sobota",
-"January" => "Styczeń",
-"February" => "Luty",
-"March" => "Marzec",
-"April" => "Kwiecień",
-"May" => "Maj",
-"June" => "Czerwiec",
-"July" => "Lipiec",
-"August" => "Sierpień",
-"September" => "Wrzesień",
-"October" => "Październik",
-"November" => "Listopad",
-"December" => "Grudzień",
-"Settings" => "Ustawienia",
-"File" => "Plik",
-"Folder" => "Folder",
-"Image" => "Obraz",
-"Audio" => "Dźwięk",
-"Saving..." => "Zapisywanie...",
-"Couldn't send reset email. Please contact your administrator." => "Nie mogę wysłać maila resetującego. Skontaktuj się z administratorem.",
-"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Link do zresetowanego hasła, został wysłany na twój adres e-mail. Jeśli nie dostałeś wiadomości w rozsądnym czasie, sprawdź folder ze spamem.<br> Jeśli nie ma wiadomości w tym folderze, skontaktuj się ze swoim administratorem.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ",
-"I know what I'm doing" => "Wiem co robię",
-"Reset password" => "Zresetuj hasło",
-"Password can not be changed. Please contact your administrator." => "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.",
-"No" => "Nie",
-"Yes" => "Tak",
-"Choose" => "Wybierz",
-"Error loading file picker template: {error}" => "Błąd podczas ładowania pliku wybranego szablonu: {error}",
-"Ok" => "OK",
-"Error loading message template: {error}" => "Błąd podczas ładowania szablonu wiadomości: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"),
-"One file conflict" => "Konflikt pliku",
-"New Files" => "Nowe pliki",
-"Already existing files" => "Już istniejące pliki",
-"Which files do you want to keep?" => "Które pliki chcesz zachować?",
-"If you select both versions, the copied file will have a number added to its name." => "Jeśli wybierzesz obie wersje, skopiowany plik będzie miał dodany numerek w nazwie",
-"Cancel" => "Anuluj",
-"Continue" => "Kontynuuj ",
-"(all selected)" => "(wszystkie zaznaczone)",
-"({count} selected)" => "({count} zaznaczonych)",
-"Error loading file exists template" => "Błąd podczas ładowania szablonu istniejącego pliku",
-"Very weak password" => "Bardzo słabe hasło",
-"Weak password" => "Słabe hasło",
-"So-so password" => "Mało skomplikowane hasło",
-"Good password" => "Dobre hasło",
-"Strong password" => "Mocne hasło",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub aplikacje firm 3-trzecich nie działają. Dostęp do plików z zewnątrz i wysyłanie powiadomień e-mail może również nie działać. Sugerujemy podłączenie tego serwera do internetu, jeśli chcesz mieć wszystkie funkcje.",
-"Error occurred while checking server setup" => "Pojawił się błąd podczas sprawdzania ustawień serwera",
-"Shared" => "Udostępniono",
-"Shared with {recipients}" => "Współdzielony z {recipients}",
-"Share" => "Udostępnij",
-"Error" => "Błąd",
-"Error while sharing" => "Błąd podczas współdzielenia",
-"Error while unsharing" => "Błąd podczas zatrzymywania współdzielenia",
-"Error while changing permissions" => "Błąd przy zmianie uprawnień",
-"Shared with you and the group {group} by {owner}" => "Udostępnione tobie i grupie {group} przez {owner}",
-"Shared with you by {owner}" => "Udostępnione tobie przez {owner}",
-"Share with user or group …" => "Współdziel z użytkownikiem lub grupą ...",
-"Share link" => "Udostępnij link",
-"The public link will expire no later than {days} days after it is created" => "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
-"Password protect" => "Zabezpiecz hasłem",
-"Choose a password for the public link" => "Wybierz hasło dla linku publicznego",
-"Allow Public Upload" => "Pozwól na  publiczne wczytywanie",
-"Email link to person" => "Wyślij osobie odnośnik poprzez e-mail",
-"Send" => "Wyślij",
-"Set expiration date" => "Ustaw datę wygaśnięcia",
-"Expiration date" => "Data wygaśnięcia",
-"group" => "grupa",
-"Resharing is not allowed" => "Współdzielenie nie jest możliwe",
-"Shared in {item} with {user}" => "Współdzielone w {item} z {user}",
-"Unshare" => "Zatrzymaj współdzielenie",
-"notify by email" => "powiadom przez emaila",
-"can share" => "może współdzielić",
-"can edit" => "może edytować",
-"access control" => "kontrola dostępu",
-"create" => "utwórz",
-"update" => "uaktualnij",
-"delete" => "usuń",
-"Password protected" => "Zabezpieczone hasłem",
-"Error unsetting expiration date" => "Błąd podczas usuwania daty wygaśnięcia",
-"Error setting expiration date" => "Błąd podczas ustawiania daty wygaśnięcia",
-"Sending ..." => "Wysyłanie...",
-"Email sent" => "E-mail wysłany",
-"Warning" => "Ostrzeżenie",
-"The object type is not specified." => "Nie określono typu obiektu.",
-"Enter new" => "Wpisz nowy",
-"Delete" => "Usuń",
-"Add" => "Dodaj",
-"Edit tags" => "Edytuj tagi",
-"Error loading dialog template: {error}" => "Błąd podczas ładowania szablonu dialogu: {error}",
-"No tags selected for deletion." => "Nie zaznaczono tagów do usunięcia.",
-"Updating {productName} to version {version}, this may take a while." => "Aktualizuję {productName} do wersji {version}, to może chwilę potrwać.",
-"Please reload the page." => "Proszę przeładować stronę",
-"The update was unsuccessful." => "Aktualizacja nie powiodła się.",
-"The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
-"Couldn't reset password because the token is invalid" => "Nie można zresetować hasła, ponieważ token jest niepoprawny",
-"Couldn't send reset email. Please make sure your username is correct." => "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika jest poprawna.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika  lub adres email jest poprawny. Skontaktuj się z administratorem.",
-"%s password reset" => "%s reset hasła",
-"Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {link}",
-"You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
-"Username" => "Nazwa użytkownika",
-"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?" => "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?",
-"Yes, I really want to reset my password now" => "Tak, naprawdę chcę zresetować hasło teraz",
-"Reset" => "Resetuj",
-"New password" => "Nowe hasło",
-"New Password" => "Nowe hasło",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!",
-"For the best results, please consider using a GNU/Linux server instead." => "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.",
-"Personal" => "Osobiste",
-"Users" => "Użytkownicy",
-"Apps" => "Aplikacje",
-"Admin" => "Administrator",
-"Help" => "Pomoc",
-"Error loading tags" => "Błąd ładowania tagów",
-"Tag already exists" => "Tag już istnieje",
-"Error deleting tag(s)" => "Błąd przy osuwaniu tag(ów)",
-"Error tagging" => "Błąd tagowania",
-"Error untagging" => "Błąd odtagowania",
-"Error favoriting" => "Błąd podczas dodawania do ulubionch",
-"Error unfavoriting" => "Błąd przy usuwaniu z ulubionych",
-"Access forbidden" => "Dostęp zabroniony",
-"File not found" => "Nie odnaleziono pliku",
-"The specified document has not been found on the server." => "Wskazany dokument nie został znaleziony na serwerze.",
-"You can click here to return to %s." => "Możesz kliknąć tutaj aby powrócić do %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Witaj,\n\ntylko informuję, że %s współdzieli z Tobą %s.\nZobacz tutaj: %s\n\n",
-"The share will expire on %s." => "Ten zasób wygaśnie %s",
-"Cheers!" => "Pozdrawiam!",
-"The server encountered an internal error and was unable to complete your request." => "Serwer napotkał błąd wewnętrzny i nie był w stanie ukończyć Twojego żądania.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Proszę skontaktować się z administratorem jeśli ten błąd będzie się pojawiał wielokrotnie, proszę do zgłoszenia dołączyć szczegóły techniczne opisane poniżej.",
-"More details can be found in the server log." => "Więcej szczegółów można znaleźć w logu serwera.",
-"Technical details" => "Szczegóły techniczne",
-"Remote Address: %s" => "Adres zdalny: %s",
-"Request ID: %s" => "ID żądania: %s",
-"Code: %s" => "Kod: %s",
-"Message: %s" => "Komunikat: %s",
-"File: %s" => "Plik: %s",
-"Line: %s" => "Linia: %s",
-"Trace" => "Ślad",
-"Security Warning" => "Ostrzeżenie o zabezpieczeniach",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Twója wersja PHP jest narażona na NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Proszę uaktualnij swoją instalacje PHP aby używać %s bezpiecznie.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
-"Create an <strong>admin account</strong>" => "Utwórz <strong>konta administratora</strong>",
-"Password" => "Hasło",
-"Storage & database" => "Zasoby dysku & baza danych",
-"Data folder" => "Katalog danych",
-"Configure the database" => "Skonfiguruj bazę danych",
-"Only %s is available." => "Dostępne jest wyłącznie %s.",
-"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",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Jako baza danych zostanie użyty SQLite. Dla większych instalacji doradzamy zmianę na inną.",
-"Finish setup" => "Zakończ konfigurowanie",
-"Finishing …" => "Kończę ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Ta aplikacja wymaga JavaScript do poprawnego działania. Proszę <a href=\"http://enable-javascript.com/\" target=\"_blank\">włącz JavaScript</a> i przeładuj stronę.",
-"%s is available. Get more information on how to update." => "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
-"Log out" => "Wyloguj",
-"Server side authentication failed!" => "Uwierzytelnianie po stronie serwera nie powiodło się!",
-"Please contact your administrator." => "Skontaktuj się z administratorem",
-"Forgot your password? Reset it!" => "Nie pamiętasz hasła? Zresetuj je!",
-"remember" => "pamiętaj",
-"Log in" => "Zaloguj",
-"Alternative Logins" => "Alternatywne loginy",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Ta instalacja ownCloud działa obecnie w trybie pojedynczego użytkownika.",
-"This means only administrators can use the instance." => "To oznacza, że tylko administratorzy mogą w tej chwili używać aplikacji.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Skontaktuj się z administratorem, jeśli ten komunikat pojawił się nieoczekiwanie lub wyświetla się ciągle.",
-"Thank you for your patience." => "Dziękuję za cierpliwość.",
-"You are accessing the server from an untrusted domain." => "Dostajesz się do serwera z niezaufanej domeny.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Proszę skontaktuj się z administratorem. Jeśli jesteś administratorem tej instancji, skonfiguruj parametr \"trusted_domain\" w pliku config/config.php. Przykładowa konfiguracja jest dostępna w pliku config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "W zależności od konfiguracji, jako administrator możesz także użyć poniższego przycisku aby zaufać tej domenie.",
-"Add \"%s\" as trusted domain" => "Dodaj \"%s\" jako domenę zaufaną",
-"%s will be updated to version %s." => "%s zostanie zaktualizowane do wersji %s.",
-"The following apps will be disabled:" => "Następujące aplikacje zostaną zablokowane:",
-"The theme %s has been disabled." => "Motyw %s został wyłączony.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Proszę się upewnić, że baza danych, folder konfiguracji oraz folder danych zostały zarchiwizowane przed przejściem dalej.",
-"Start update" => "Rozpocznij aktualizację",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Aby uniknąć timeout-ów przy większych instalacjach, możesz zamiast tego uruchomić następującą komendę w katalogu Twojej instalacji:",
-"This %s instance is currently being updated, which may take a while." => "Ta instancja %s jest właśnie aktualizowana, co może chwilę potrwać.",
-"This page will refresh itself when the %s instance is available again." => "Strona odświeży się gdy instancja %s będzie ponownie dostępna."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
new file mode 100644
index 00000000000..0ec3aa08f20
--- /dev/null
+++ b/core/l10n/pt_BR.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Não foi possível enviar e-mail para os seguintes usuários: %s",
+    "Turned on maintenance mode" : "Ativar modo de manutenção",
+    "Turned off maintenance mode" : "Desligar o modo de manutenção",
+    "Updated database" : "Atualizar o banco de dados",
+    "Checked database schema update" : "Verificado atualização do esquema de banco de dados",
+    "Checked database schema update for apps" : "Verificar atualização do esquema de banco de dados para aplicativos",
+    "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s",
+    "Disabled incompatible apps: %s" : "Desabilitar aplicativos incompatíveis : %s",
+    "No image or file provided" : "Nenhuma imagem ou arquivo fornecido",
+    "Unknown filetype" : "Tipo de arquivo desconhecido",
+    "Invalid image" : "Imagem inválida",
+    "No temporary profile picture available, try again" : "Nenhuma imagem temporária disponível no perfil, tente novamente",
+    "No crop data provided" : "Nenhum dado para coleta foi fornecido",
+    "Sunday" : "Domingo",
+    "Monday" : "Segunda-feira",
+    "Tuesday" : "Terça-feira",
+    "Wednesday" : "Quarta-feira",
+    "Thursday" : "Quinta-feira",
+    "Friday" : "Sexta-feira",
+    "Saturday" : "Sábado",
+    "January" : "Janeiro",
+    "February" : "Fevereiro",
+    "March" : "Março",
+    "April" : "Abril",
+    "May" : "Maio",
+    "June" : "Junho",
+    "July" : "Julho",
+    "August" : "Agosto",
+    "September" : "Setembro",
+    "October" : "Outubro",
+    "November" : "Novembro",
+    "December" : "Dezembro",
+    "Settings" : "Configurações",
+    "File" : "Arquivo",
+    "Folder" : "Pasta",
+    "Image" : "Imagem",
+    "Audio" : "Audio",
+    "Saving..." : "Salvando...",
+    "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição. Por favor, contate o administrador.",
+    "The link to reset your password has been sent to your email. 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." : "O link para redefinir sua senha foi enviada para o seu e-mail. Se você não recebê-lo dentro de um período razoável de tempo, verifique suas pastas de spam/lixo. <br> Se ele não estiver lá, pergunte ao administrador do local.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Seus arquivos são criptografados. Se você não ativou a chave de recuperação, não haverá maneira de obter seus dados de volta após a sua senha ser redefinida. <br/> Se você não tem certeza do que fazer, por favor, contate o administrador antes de continuar. <br/> Você realmente deseja continuar?",
+    "I know what I'm doing" : "Eu sei o que estou fazendo",
+    "Reset password" : "Redefinir senha",
+    "Password can not be changed. Please contact your administrator." : "A senha não pode ser alterada. Por favor, contate o administrador.",
+    "No" : "Não",
+    "Yes" : "Sim",
+    "Choose" : "Escolher",
+    "Error loading file picker template: {error}" : "Erro no seletor de carregamento modelo de arquivos: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Erro no carregamento de modelo de mensagem: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflito de arquivo","{count} conflitos de arquivos"],
+    "One file conflict" : "Conflito em um arquivo",
+    "New Files" : "Novos Arquivos",
+    "Already existing files" : "Arquivos já existentes",
+    "Which files do you want to keep?" : "Qual arquivo você quer manter?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos os selecionados)",
+    "({count} selected)" : "({count} selecionados)",
+    "Error loading file exists template" : "Erro ao carregar arquivo existe modelo",
+    "Very weak password" : "Senha muito fraca",
+    "Weak password" : "Senha fraca",
+    "So-so password" : "Senha mais ou menos",
+    "Good password" : "Boa senha",
+    "Strong password" : "Senha forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Este servidor não tem conexão com a internet. Isso significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de 3ºs terceiros não funcionam. Acessar arquivos remotamente e envio de e-mails de notificação também não podem funcionar. Sugerimos permitir conexão com a internet para esse servidor, se você deseja ter todas as funcionalidades.",
+    "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor",
+    "Shared" : "Compartilhados",
+    "Shared with {recipients}" : "Compartilhado com {recipients}",
+    "Share" : "Compartilhar",
+    "Error" : "Erro",
+    "Error while sharing" : "Erro ao compartilhar",
+    "Error while unsharing" : "Erro ao descompartilhar",
+    "Error while changing permissions" : "Erro ao mudar permissões",
+    "Shared with you and the group {group} by {owner}" : "Compartilhado com você e com o grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartilhado com você por {owner}",
+    "Share with user or group …" : "Compartilhar com usuário ou grupo ...",
+    "Share link" : "Compartilhar link",
+    "The public link will expire no later than {days} days after it is created" : "O link público irá expirar não antes de {days} depois de ser criado",
+    "Password protect" : "Proteger com senha",
+    "Choose a password for the public link" : "Escolha uma senha para o link público",
+    "Allow Public Upload" : "Permitir Envio Público",
+    "Email link to person" : "Enviar link por e-mail",
+    "Send" : "Enviar",
+    "Set expiration date" : "Definir data de expiração",
+    "Expiration date" : "Data de expiração",
+    "Adding user..." : "Adicionando usuário...",
+    "group" : "grupo",
+    "Resharing is not allowed" : "Não é permitido re-compartilhar",
+    "Shared in {item} with {user}" : "Compartilhado em {item} com {user}",
+    "Unshare" : "Descompartilhar",
+    "notify by email" : "notificar por e-mail",
+    "can share" : "pode compartilhar",
+    "can edit" : "pode editar",
+    "access control" : "controle de acesso",
+    "create" : "criar",
+    "update" : "atualizar",
+    "delete" : "remover",
+    "Password protected" : "Protegido com senha",
+    "Error unsetting expiration date" : "Erro ao remover data de expiração",
+    "Error setting expiration date" : "Erro ao definir data de expiração",
+    "Sending ..." : "Enviando ...",
+    "Email sent" : "E-mail enviado",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "O tipo de objeto não foi especificado.",
+    "Enter new" : "Entrar uma nova",
+    "Delete" : "Eliminar",
+    "Add" : "Adicionar",
+    "Edit tags" : "Editar etiqueta",
+    "Error loading dialog template: {error}" : "Erro carregando diálogo de formatação: {error}",
+    "No tags selected for deletion." : "Nenhuma etiqueta selecionada para deleção.",
+    "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
+    "Please reload the page." : "Por favor recarregue a página",
+    "The update was unsuccessful." : "A atualização não foi bem sucedida.",
+    "The update was successful. Redirecting you to ownCloud now." : "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
+    "Couldn't reset password because the token is invalid" : "Não foi possível redefinir a senha porque o token é inválido",
+    "Couldn't send reset email. Please make sure your username is correct." : "Não foi possível enviar e-mail de redefinição. Verifique se o seu nome de usuário está correto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.",
+    "%s password reset" : "%s redefinir senha",
+    "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 por e-mail.",
+    "Username" : "Nome de usuário",
+    "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?" : "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
+    "Yes, I really want to reset my password now" : "Sim, realmente quero criar uma nova senha.",
+    "Reset" : "Resetar",
+    "New password" : "Nova senha",
+    "New Password" : "Nova Senha",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.",
+    "Personal" : "Pessoal",
+    "Users" : "Usuários",
+    "Apps" : "Aplicações",
+    "Admin" : "Admin",
+    "Help" : "Ajuda",
+    "Error loading tags" : " Erro carregando etiqueta",
+    "Tag already exists" : "Etiqueta já existe",
+    "Error deleting tag(s)" : "Erro deletando etiqueta(s)",
+    "Error tagging" : "Erro etiquetando",
+    "Error untagging" : "Erro retirando etiqueta",
+    "Error favoriting" : "Erro colocando nos favoritos",
+    "Error unfavoriting" : "Erro retirando do favoritos",
+    "Access forbidden" : "Acesso proibido",
+    "File not found" : "Arquivo não encontrado",
+    "The specified document has not been found on the server." : "O documento especificado não foi encontrado no servidor.",
+    "You can click here to return to %s." : "Você pode clicar aqui para retornar para %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Olá,\n\ngostaria que você soubesse que %s compartilhou %s com você.\nVeja isto: %s\n\n",
+    "The share will expire on %s." : "O compartilhamento irá expirar em %s.",
+    "Cheers!" : "Saúde!",
+    "Internal Server Error" : "Erro Interno do Servidor",
+    "The server encountered an internal error and was unable to complete your request." : "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Entre em contato com o administrador do servidor se este erro reaparece várias vezes, por favor, inclua os detalhes técnicos abaixo em seu relatório.",
+    "More details can be found in the server log." : "Mais detalhes podem ser encontrados no log do servidor.",
+    "Technical details" : "Detalhes técnicos",
+    "Remote Address: %s" : "Endereço Remoto: %s",
+    "Request ID: %s" : "ID do Pedido: %s",
+    "Code: %s" : "Código: %s",
+    "Message: %s" : "Mensagem: %s",
+    "File: %s" : "Arquivo: %s",
+    "Line: %s" : "Linha: %s",
+    "Trace" : "Rastreamento",
+    "Security Warning" : "Aviso de Segurança",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Sua versão do PHP está vulnerável ao ataque NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, atualize sua instalação PHP para usar %s segurança.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
+    "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>",
+    "Password" : "Senha",
+    "Storage & database" : "Armazenamento & banco de dados",
+    "Data folder" : "Pasta de dados",
+    "Configure the database" : "Configurar o banco de dados",
+    "Only %s is available." : "Somente %s está disponível.",
+    "Database user" : "Usuário do banco de dados",
+    "Database password" : "Senha do banco de dados",
+    "Database name" : "Nome do banco de dados",
+    "Database tablespace" : "Espaço de tabela do banco de dados",
+    "Database host" : "Host do banco de dados",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "O SQLite será usado como banco de dados. Para grandes instalações nós recomendamos mudar isto.",
+    "Finish setup" : "Concluir configuração",
+    "Finishing …" : "Finalizando ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicação requer JavaScript para sua correta operação. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recerregue a página.",
+    "%s is available. Get more information on how to update." : "%s está disponível. Obtenha mais informações sobre como atualizar.",
+    "Log out" : "Sair",
+    "Server side authentication failed!" : "Autenticação do servidor falhou!",
+    "Please contact your administrator." : "Por favor, contate o administrador.",
+    "Forgot your password? Reset it!" : "Esqueceu sua senha? Redefini-la!",
+    "remember" : "lembrar",
+    "Log in" : "Fazer login",
+    "Alternative Logins" : "Logins Alternativos",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Olá,<br><br>só para seu conhecimento que %s compartilhou <strong>%s</strong> com você. <br><a href=\"%s\">Verificar!</a><br><br> ",
+    "This ownCloud instance is currently in single user mode." : "Nesta instância ownCloud está em modo de usuário único.",
+    "This means only administrators can use the instance." : "Isso significa que apenas os administradores podem usar esta instância.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte o seu administrador do sistema se esta mensagem persistir ou aparecer inesperadamente.",
+    "Thank you for your patience." : "Obrigado pela sua paciência.",
+    "You are accessing the server from an untrusted domain." : "Você está acessando o servidor a partir de um domínio não confiável.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor, contate o administrador. Se você é um administrador desta instância, configurre o \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
+    "Add \"%s\" as trusted domain" : "Adicionar \"%s\" como um domínio confiavel",
+    "%s will be updated to version %s." : "%s será atualizado para a versão %s.",
+    "The following apps will be disabled:" : "Os seguintes aplicativos serão desativados:",
+    "The theme %s has been disabled." : "O tema %s foi desativado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.",
+    "Start update" : "Iniciar atualização",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:",
+    "This %s instance is currently being updated, which may take a while." : "Esta instância %s está sendo atualizada, o que pode demorar um pouco.",
+    "This page will refresh itself when the %s instance is available again." : "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente."
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
new file mode 100644
index 00000000000..f3a23935723
--- /dev/null
+++ b/core/l10n/pt_BR.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Não foi possível enviar e-mail para os seguintes usuários: %s",
+    "Turned on maintenance mode" : "Ativar modo de manutenção",
+    "Turned off maintenance mode" : "Desligar o modo de manutenção",
+    "Updated database" : "Atualizar o banco de dados",
+    "Checked database schema update" : "Verificado atualização do esquema de banco de dados",
+    "Checked database schema update for apps" : "Verificar atualização do esquema de banco de dados para aplicativos",
+    "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s",
+    "Disabled incompatible apps: %s" : "Desabilitar aplicativos incompatíveis : %s",
+    "No image or file provided" : "Nenhuma imagem ou arquivo fornecido",
+    "Unknown filetype" : "Tipo de arquivo desconhecido",
+    "Invalid image" : "Imagem inválida",
+    "No temporary profile picture available, try again" : "Nenhuma imagem temporária disponível no perfil, tente novamente",
+    "No crop data provided" : "Nenhum dado para coleta foi fornecido",
+    "Sunday" : "Domingo",
+    "Monday" : "Segunda-feira",
+    "Tuesday" : "Terça-feira",
+    "Wednesday" : "Quarta-feira",
+    "Thursday" : "Quinta-feira",
+    "Friday" : "Sexta-feira",
+    "Saturday" : "Sábado",
+    "January" : "Janeiro",
+    "February" : "Fevereiro",
+    "March" : "Março",
+    "April" : "Abril",
+    "May" : "Maio",
+    "June" : "Junho",
+    "July" : "Julho",
+    "August" : "Agosto",
+    "September" : "Setembro",
+    "October" : "Outubro",
+    "November" : "Novembro",
+    "December" : "Dezembro",
+    "Settings" : "Configurações",
+    "File" : "Arquivo",
+    "Folder" : "Pasta",
+    "Image" : "Imagem",
+    "Audio" : "Audio",
+    "Saving..." : "Salvando...",
+    "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição. Por favor, contate o administrador.",
+    "The link to reset your password has been sent to your email. 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." : "O link para redefinir sua senha foi enviada para o seu e-mail. Se você não recebê-lo dentro de um período razoável de tempo, verifique suas pastas de spam/lixo. <br> Se ele não estiver lá, pergunte ao administrador do local.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Seus arquivos são criptografados. Se você não ativou a chave de recuperação, não haverá maneira de obter seus dados de volta após a sua senha ser redefinida. <br/> Se você não tem certeza do que fazer, por favor, contate o administrador antes de continuar. <br/> Você realmente deseja continuar?",
+    "I know what I'm doing" : "Eu sei o que estou fazendo",
+    "Reset password" : "Redefinir senha",
+    "Password can not be changed. Please contact your administrator." : "A senha não pode ser alterada. Por favor, contate o administrador.",
+    "No" : "Não",
+    "Yes" : "Sim",
+    "Choose" : "Escolher",
+    "Error loading file picker template: {error}" : "Erro no seletor de carregamento modelo de arquivos: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Erro no carregamento de modelo de mensagem: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflito de arquivo","{count} conflitos de arquivos"],
+    "One file conflict" : "Conflito em um arquivo",
+    "New Files" : "Novos Arquivos",
+    "Already existing files" : "Arquivos já existentes",
+    "Which files do you want to keep?" : "Qual arquivo você quer manter?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos os selecionados)",
+    "({count} selected)" : "({count} selecionados)",
+    "Error loading file exists template" : "Erro ao carregar arquivo existe modelo",
+    "Very weak password" : "Senha muito fraca",
+    "Weak password" : "Senha fraca",
+    "So-so password" : "Senha mais ou menos",
+    "Good password" : "Boa senha",
+    "Strong password" : "Senha forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Este servidor não tem conexão com a internet. Isso significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de 3ºs terceiros não funcionam. Acessar arquivos remotamente e envio de e-mails de notificação também não podem funcionar. Sugerimos permitir conexão com a internet para esse servidor, se você deseja ter todas as funcionalidades.",
+    "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor",
+    "Shared" : "Compartilhados",
+    "Shared with {recipients}" : "Compartilhado com {recipients}",
+    "Share" : "Compartilhar",
+    "Error" : "Erro",
+    "Error while sharing" : "Erro ao compartilhar",
+    "Error while unsharing" : "Erro ao descompartilhar",
+    "Error while changing permissions" : "Erro ao mudar permissões",
+    "Shared with you and the group {group} by {owner}" : "Compartilhado com você e com o grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartilhado com você por {owner}",
+    "Share with user or group …" : "Compartilhar com usuário ou grupo ...",
+    "Share link" : "Compartilhar link",
+    "The public link will expire no later than {days} days after it is created" : "O link público irá expirar não antes de {days} depois de ser criado",
+    "Password protect" : "Proteger com senha",
+    "Choose a password for the public link" : "Escolha uma senha para o link público",
+    "Allow Public Upload" : "Permitir Envio Público",
+    "Email link to person" : "Enviar link por e-mail",
+    "Send" : "Enviar",
+    "Set expiration date" : "Definir data de expiração",
+    "Expiration date" : "Data de expiração",
+    "Adding user..." : "Adicionando usuário...",
+    "group" : "grupo",
+    "Resharing is not allowed" : "Não é permitido re-compartilhar",
+    "Shared in {item} with {user}" : "Compartilhado em {item} com {user}",
+    "Unshare" : "Descompartilhar",
+    "notify by email" : "notificar por e-mail",
+    "can share" : "pode compartilhar",
+    "can edit" : "pode editar",
+    "access control" : "controle de acesso",
+    "create" : "criar",
+    "update" : "atualizar",
+    "delete" : "remover",
+    "Password protected" : "Protegido com senha",
+    "Error unsetting expiration date" : "Erro ao remover data de expiração",
+    "Error setting expiration date" : "Erro ao definir data de expiração",
+    "Sending ..." : "Enviando ...",
+    "Email sent" : "E-mail enviado",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "O tipo de objeto não foi especificado.",
+    "Enter new" : "Entrar uma nova",
+    "Delete" : "Eliminar",
+    "Add" : "Adicionar",
+    "Edit tags" : "Editar etiqueta",
+    "Error loading dialog template: {error}" : "Erro carregando diálogo de formatação: {error}",
+    "No tags selected for deletion." : "Nenhuma etiqueta selecionada para deleção.",
+    "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
+    "Please reload the page." : "Por favor recarregue a página",
+    "The update was unsuccessful." : "A atualização não foi bem sucedida.",
+    "The update was successful. Redirecting you to ownCloud now." : "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
+    "Couldn't reset password because the token is invalid" : "Não foi possível redefinir a senha porque o token é inválido",
+    "Couldn't send reset email. Please make sure your username is correct." : "Não foi possível enviar e-mail de redefinição. Verifique se o seu nome de usuário está correto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.",
+    "%s password reset" : "%s redefinir senha",
+    "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 por e-mail.",
+    "Username" : "Nome de usuário",
+    "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?" : "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
+    "Yes, I really want to reset my password now" : "Sim, realmente quero criar uma nova senha.",
+    "Reset" : "Resetar",
+    "New password" : "Nova senha",
+    "New Password" : "Nova Senha",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.",
+    "Personal" : "Pessoal",
+    "Users" : "Usuários",
+    "Apps" : "Aplicações",
+    "Admin" : "Admin",
+    "Help" : "Ajuda",
+    "Error loading tags" : " Erro carregando etiqueta",
+    "Tag already exists" : "Etiqueta já existe",
+    "Error deleting tag(s)" : "Erro deletando etiqueta(s)",
+    "Error tagging" : "Erro etiquetando",
+    "Error untagging" : "Erro retirando etiqueta",
+    "Error favoriting" : "Erro colocando nos favoritos",
+    "Error unfavoriting" : "Erro retirando do favoritos",
+    "Access forbidden" : "Acesso proibido",
+    "File not found" : "Arquivo não encontrado",
+    "The specified document has not been found on the server." : "O documento especificado não foi encontrado no servidor.",
+    "You can click here to return to %s." : "Você pode clicar aqui para retornar para %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Olá,\n\ngostaria que você soubesse que %s compartilhou %s com você.\nVeja isto: %s\n\n",
+    "The share will expire on %s." : "O compartilhamento irá expirar em %s.",
+    "Cheers!" : "Saúde!",
+    "Internal Server Error" : "Erro Interno do Servidor",
+    "The server encountered an internal error and was unable to complete your request." : "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Entre em contato com o administrador do servidor se este erro reaparece várias vezes, por favor, inclua os detalhes técnicos abaixo em seu relatório.",
+    "More details can be found in the server log." : "Mais detalhes podem ser encontrados no log do servidor.",
+    "Technical details" : "Detalhes técnicos",
+    "Remote Address: %s" : "Endereço Remoto: %s",
+    "Request ID: %s" : "ID do Pedido: %s",
+    "Code: %s" : "Código: %s",
+    "Message: %s" : "Mensagem: %s",
+    "File: %s" : "Arquivo: %s",
+    "Line: %s" : "Linha: %s",
+    "Trace" : "Rastreamento",
+    "Security Warning" : "Aviso de Segurança",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Sua versão do PHP está vulnerável ao ataque NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, atualize sua instalação PHP para usar %s segurança.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
+    "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>",
+    "Password" : "Senha",
+    "Storage & database" : "Armazenamento & banco de dados",
+    "Data folder" : "Pasta de dados",
+    "Configure the database" : "Configurar o banco de dados",
+    "Only %s is available." : "Somente %s está disponível.",
+    "Database user" : "Usuário do banco de dados",
+    "Database password" : "Senha do banco de dados",
+    "Database name" : "Nome do banco de dados",
+    "Database tablespace" : "Espaço de tabela do banco de dados",
+    "Database host" : "Host do banco de dados",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "O SQLite será usado como banco de dados. Para grandes instalações nós recomendamos mudar isto.",
+    "Finish setup" : "Concluir configuração",
+    "Finishing …" : "Finalizando ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicação requer JavaScript para sua correta operação. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recerregue a página.",
+    "%s is available. Get more information on how to update." : "%s está disponível. Obtenha mais informações sobre como atualizar.",
+    "Log out" : "Sair",
+    "Server side authentication failed!" : "Autenticação do servidor falhou!",
+    "Please contact your administrator." : "Por favor, contate o administrador.",
+    "Forgot your password? Reset it!" : "Esqueceu sua senha? Redefini-la!",
+    "remember" : "lembrar",
+    "Log in" : "Fazer login",
+    "Alternative Logins" : "Logins Alternativos",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Olá,<br><br>só para seu conhecimento que %s compartilhou <strong>%s</strong> com você. <br><a href=\"%s\">Verificar!</a><br><br> ",
+    "This ownCloud instance is currently in single user mode." : "Nesta instância ownCloud está em modo de usuário único.",
+    "This means only administrators can use the instance." : "Isso significa que apenas os administradores podem usar esta instância.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte o seu administrador do sistema se esta mensagem persistir ou aparecer inesperadamente.",
+    "Thank you for your patience." : "Obrigado pela sua paciência.",
+    "You are accessing the server from an untrusted domain." : "Você está acessando o servidor a partir de um domínio não confiável.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor, contate o administrador. Se você é um administrador desta instância, configurre o \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
+    "Add \"%s\" as trusted domain" : "Adicionar \"%s\" como um domínio confiavel",
+    "%s will be updated to version %s." : "%s será atualizado para a versão %s.",
+    "The following apps will be disabled:" : "Os seguintes aplicativos serão desativados:",
+    "The theme %s has been disabled." : "O tema %s foi desativado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.",
+    "Start update" : "Iniciar atualização",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:",
+    "This %s instance is currently being updated, which may take a while." : "Esta instância %s está sendo atualizada, o que pode demorar um pouco.",
+    "This page will refresh itself when the %s instance is available again." : "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente."
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
deleted file mode 100644
index 7d653d12dd4..00000000000
--- a/core/l10n/pt_BR.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Não foi possível enviar e-mail para os seguintes usuários: %s",
-"Turned on maintenance mode" => "Ativar modo de manutenção",
-"Turned off maintenance mode" => "Desligar o modo de manutenção",
-"Updated database" => "Atualizar o banco de dados",
-"Checked database schema update" => "Verificado atualização do esquema de banco de dados",
-"Checked database schema update for apps" => "Verificar atualização do esquema de banco de dados para aplicativos",
-"Updated \"%s\" to %s" => "Atualizado \"%s\" para %s",
-"Disabled incompatible apps: %s" => "Desabilitar aplicativos incompatíveis : %s",
-"No image or file provided" => "Nenhuma imagem ou arquivo fornecido",
-"Unknown filetype" => "Tipo de arquivo desconhecido",
-"Invalid image" => "Imagem inválida",
-"No temporary profile picture available, try again" => "Nenhuma imagem temporária disponível no perfil, tente novamente",
-"No crop data provided" => "Nenhum dado para coleta foi fornecido",
-"Sunday" => "Domingo",
-"Monday" => "Segunda-feira",
-"Tuesday" => "Terça-feira",
-"Wednesday" => "Quarta-feira",
-"Thursday" => "Quinta-feira",
-"Friday" => "Sexta-feira",
-"Saturday" => "Sábado",
-"January" => "Janeiro",
-"February" => "Fevereiro",
-"March" => "Março",
-"April" => "Abril",
-"May" => "Maio",
-"June" => "Junho",
-"July" => "Julho",
-"August" => "Agosto",
-"September" => "Setembro",
-"October" => "Outubro",
-"November" => "Novembro",
-"December" => "Dezembro",
-"Settings" => "Configurações",
-"File" => "Arquivo",
-"Folder" => "Pasta",
-"Image" => "Imagem",
-"Audio" => "Audio",
-"Saving..." => "Salvando...",
-"Couldn't send reset email. Please contact your administrator." => "Não foi possível enviar e-mail de redefinição. Por favor, contate o administrador.",
-"The link to reset your password has been sent to your email. 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." => "O link para redefinir sua senha foi enviada para o seu e-mail. Se você não recebê-lo dentro de um período razoável de tempo, verifique suas pastas de spam/lixo. <br> Se ele não estiver lá, pergunte ao administrador do local.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Seus arquivos são criptografados. Se você não ativou a chave de recuperação, não haverá maneira de obter seus dados de volta após a sua senha ser redefinida. <br/> Se você não tem certeza do que fazer, por favor, contate o administrador antes de continuar. <br/> Você realmente deseja continuar?",
-"I know what I'm doing" => "Eu sei o que estou fazendo",
-"Reset password" => "Redefinir senha",
-"Password can not be changed. Please contact your administrator." => "A senha não pode ser alterada. Por favor, contate o administrador.",
-"No" => "Não",
-"Yes" => "Sim",
-"Choose" => "Escolher",
-"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Erro no carregamento de modelo de mensagem: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de arquivo","{count} conflitos de arquivos"),
-"One file conflict" => "Conflito em um arquivo",
-"New Files" => "Novos Arquivos",
-"Already existing files" => "Arquivos já existentes",
-"Which files do you want to keep?" => "Qual arquivo você quer manter?",
-"If you select both versions, the copied file will have a number added to its name." => "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome.",
-"Cancel" => "Cancelar",
-"Continue" => "Continuar",
-"(all selected)" => "(todos os selecionados)",
-"({count} selected)" => "({count} selecionados)",
-"Error loading file exists template" => "Erro ao carregar arquivo existe modelo",
-"Very weak password" => "Senha muito fraca",
-"Weak password" => "Senha fraca",
-"So-so password" => "Senha mais ou menos",
-"Good password" => "Boa senha",
-"Strong password" => "Senha forte",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor não tem conexão com a internet. Isso significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de 3ºs terceiros não funcionam. Acessar arquivos remotamente e envio de e-mails de notificação também não podem funcionar. Sugerimos permitir conexão com a internet para esse servidor, se você deseja ter todas as funcionalidades.",
-"Error occurred while checking server setup" => "Erro ao verificar a configuração do servidor",
-"Shared" => "Compartilhados",
-"Shared with {recipients}" => "Compartilhado com {recipients}",
-"Share" => "Compartilhar",
-"Error" => "Erro",
-"Error while sharing" => "Erro ao compartilhar",
-"Error while unsharing" => "Erro ao descompartilhar",
-"Error while changing permissions" => "Erro ao mudar permissões",
-"Shared with you and the group {group} by {owner}" => "Compartilhado com você e com o grupo {group} por {owner}",
-"Shared with you by {owner}" => "Compartilhado com você por {owner}",
-"Share with user or group …" => "Compartilhar com usuário ou grupo ...",
-"Share link" => "Compartilhar link",
-"The public link will expire no later than {days} days after it is created" => "O link público irá expirar não antes de {days} depois de ser criado",
-"Password protect" => "Proteger com senha",
-"Choose a password for the public link" => "Escolha uma senha para o link público",
-"Allow Public Upload" => "Permitir Envio Público",
-"Email link to person" => "Enviar link por e-mail",
-"Send" => "Enviar",
-"Set expiration date" => "Definir data de expiração",
-"Expiration date" => "Data de expiração",
-"Adding user..." => "Adicionando usuário...",
-"group" => "grupo",
-"Resharing is not allowed" => "Não é permitido re-compartilhar",
-"Shared in {item} with {user}" => "Compartilhado em {item} com {user}",
-"Unshare" => "Descompartilhar",
-"notify by email" => "notificar por e-mail",
-"can share" => "pode compartilhar",
-"can edit" => "pode editar",
-"access control" => "controle de acesso",
-"create" => "criar",
-"update" => "atualizar",
-"delete" => "remover",
-"Password protected" => "Protegido com senha",
-"Error unsetting expiration date" => "Erro ao remover data de expiração",
-"Error setting expiration date" => "Erro ao definir data de expiração",
-"Sending ..." => "Enviando ...",
-"Email sent" => "E-mail enviado",
-"Warning" => "Aviso",
-"The object type is not specified." => "O tipo de objeto não foi especificado.",
-"Enter new" => "Entrar uma nova",
-"Delete" => "Eliminar",
-"Add" => "Adicionar",
-"Edit tags" => "Editar etiqueta",
-"Error loading dialog template: {error}" => "Erro carregando diálogo de formatação: {error}",
-"No tags selected for deletion." => "Nenhuma etiqueta selecionada para deleção.",
-"Updating {productName} to version {version}, this may take a while." => "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
-"Please reload the page." => "Por favor recarregue a página",
-"The update was unsuccessful." => "A atualização não foi bem sucedida.",
-"The update was successful. Redirecting you to ownCloud now." => "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
-"Couldn't reset password because the token is invalid" => "Não foi possível redefinir a senha porque o token é inválido",
-"Couldn't send reset email. Please make sure your username is correct." => "Não foi possível enviar e-mail de redefinição. Verifique se o seu nome de usuário está correto.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.",
-"%s password reset" => "%s redefinir senha",
-"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 por e-mail.",
-"Username" => "Nome de usuário",
-"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?" => "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
-"Yes, I really want to reset my password now" => "Sim, realmente quero criar uma nova senha.",
-"Reset" => "Resetar",
-"New password" => "Nova senha",
-"New Password" => "Nova Senha",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!",
-"For the best results, please consider using a GNU/Linux server instead." => "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.",
-"Personal" => "Pessoal",
-"Users" => "Usuários",
-"Apps" => "Aplicações",
-"Admin" => "Admin",
-"Help" => "Ajuda",
-"Error loading tags" => " Erro carregando etiqueta",
-"Tag already exists" => "Etiqueta já existe",
-"Error deleting tag(s)" => "Erro deletando etiqueta(s)",
-"Error tagging" => "Erro etiquetando",
-"Error untagging" => "Erro retirando etiqueta",
-"Error favoriting" => "Erro colocando nos favoritos",
-"Error unfavoriting" => "Erro retirando do favoritos",
-"Access forbidden" => "Acesso proibido",
-"File not found" => "Arquivo não encontrado",
-"The specified document has not been found on the server." => "O documento especificado não foi encontrado no servidor.",
-"You can click here to return to %s." => "Você pode clicar aqui para retornar para %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Olá,\n\ngostaria que você soubesse que %s compartilhou %s com você.\nVeja isto: %s\n\n",
-"The share will expire on %s." => "O compartilhamento irá expirar em %s.",
-"Cheers!" => "Saúde!",
-"Internal Server Error" => "Erro Interno do Servidor",
-"The server encountered an internal error and was unable to complete your request." => "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Entre em contato com o administrador do servidor se este erro reaparece várias vezes, por favor, inclua os detalhes técnicos abaixo em seu relatório.",
-"More details can be found in the server log." => "Mais detalhes podem ser encontrados no log do servidor.",
-"Technical details" => "Detalhes técnicos",
-"Remote Address: %s" => "Endereço Remoto: %s",
-"Request ID: %s" => "ID do Pedido: %s",
-"Code: %s" => "Código: %s",
-"Message: %s" => "Mensagem: %s",
-"File: %s" => "Arquivo: %s",
-"Line: %s" => "Linha: %s",
-"Trace" => "Rastreamento",
-"Security Warning" => "Aviso de Segurança",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sua versão do PHP está vulnerável ao ataque NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Por favor, atualize sua instalação PHP para usar %s segurança.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
-"Create an <strong>admin account</strong>" => "Criar uma <strong>conta de administrador</strong>",
-"Password" => "Senha",
-"Storage & database" => "Armazenamento & banco de dados",
-"Data folder" => "Pasta de dados",
-"Configure the database" => "Configurar o banco de dados",
-"Only %s is available." => "Somente %s está disponível.",
-"Database user" => "Usuário do banco de dados",
-"Database password" => "Senha do banco de dados",
-"Database name" => "Nome do banco de dados",
-"Database tablespace" => "Espaço de tabela do banco de dados",
-"Database host" => "Host do banco de dados",
-"SQLite will be used as database. For larger installations we recommend to change this." => "O SQLite será usado como banco de dados. Para grandes instalações nós recomendamos mudar isto.",
-"Finish setup" => "Concluir configuração",
-"Finishing …" => "Finalizando ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Esta aplicação requer JavaScript para sua correta operação. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recerregue a página.",
-"%s is available. Get more information on how to update." => "%s está disponível. Obtenha mais informações sobre como atualizar.",
-"Log out" => "Sair",
-"Server side authentication failed!" => "Autenticação do servidor falhou!",
-"Please contact your administrator." => "Por favor, contate o administrador.",
-"Forgot your password? Reset it!" => "Esqueceu sua senha? Redefini-la!",
-"remember" => "lembrar",
-"Log in" => "Fazer login",
-"Alternative Logins" => "Logins Alternativos",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Olá,<br><br>só para seu conhecimento que %s compartilhou <strong>%s</strong> com você. <br><a href=\"%s\">Verificar!</a><br><br> ",
-"This ownCloud instance is currently in single user mode." => "Nesta instância ownCloud está em modo de usuário único.",
-"This means only administrators can use the instance." => "Isso significa que apenas os administradores podem usar esta instância.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador do sistema se esta mensagem persistir ou aparecer inesperadamente.",
-"Thank you for your patience." => "Obrigado pela sua paciência.",
-"You are accessing the server from an untrusted domain." => "Você está acessando o servidor a partir de um domínio não confiável.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Por favor, contate o administrador. Se você é um administrador desta instância, configurre o \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
-"Add \"%s\" as trusted domain" => "Adicionar \"%s\" como um domínio confiavel",
-"%s will be updated to version %s." => "%s será atualizado para a versão %s.",
-"The following apps will be disabled:" => "Os seguintes aplicativos serão desativados:",
-"The theme %s has been disabled." => "O tema %s foi desativado.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.",
-"Start update" => "Iniciar atualização",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Para evitar tempos de espera com instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:",
-"This %s instance is currently being updated, which may take a while." => "Esta instância %s está sendo atualizada, o que pode demorar um pouco.",
-"This page will refresh itself when the %s instance is available again." => "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
new file mode 100644
index 00000000000..416a593cdcd
--- /dev/null
+++ b/core/l10n/pt_PT.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Não conseguiu enviar correio aos seguintes utilizadores: %s",
+    "Turned on maintenance mode" : "Activado o modo de manutenção",
+    "Turned off maintenance mode" : "Desactivado o modo de manutenção",
+    "Updated database" : "Base de dados actualizada",
+    "Checked database schema update" : "Atualização do esquema da base de dados verificada.",
+    "Checked database schema update for apps" : "Atualização do esquema da base de dados verificada.",
+    "Updated \"%s\" to %s" : "Actualizado \"%s\" para %s",
+    "Disabled incompatible apps: %s" : "Apps incompatíveis desativadas: %s",
+    "No image or file provided" : "Não foi selecionado nenhum ficheiro para importar",
+    "Unknown filetype" : "Ficheiro desconhecido",
+    "Invalid image" : "Imagem inválida",
+    "No temporary profile picture available, try again" : "Foto temporária de perfil indisponível, tente novamente",
+    "No crop data provided" : "Sem dados de corte fornecidos",
+    "Sunday" : "Domingo",
+    "Monday" : "Segunda",
+    "Tuesday" : "Terça",
+    "Wednesday" : "Quarta",
+    "Thursday" : "Quinta",
+    "Friday" : "Sexta",
+    "Saturday" : "Sábado",
+    "January" : "Janeiro",
+    "February" : "Fevereiro",
+    "March" : "Março",
+    "April" : "Abril",
+    "May" : "Maio",
+    "June" : "Junho",
+    "July" : "Julho",
+    "August" : "Agosto",
+    "September" : "Setembro",
+    "October" : "Outubro",
+    "November" : "Novembro",
+    "December" : "Dezembro",
+    "Settings" : "Configurações",
+    "File" : "Ficheiro",
+    "Folder" : "Pasta",
+    "Image" : "Imagem",
+    "Audio" : "Audio",
+    "Saving..." : "A guardar...",
+    "Couldn't send reset email. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
+    "The link to reset your password has been sent to your email. 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." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
+    "I know what I'm doing" : "Tenho a certeza",
+    "Reset password" : "Repor password",
+    "Password can not be changed. Please contact your administrator." : "A password não pode ser alterada. Contacte o seu administrador.",
+    "No" : "Não",
+    "Yes" : "Sim",
+    "Choose" : "Escolha",
+    "Error loading file picker template: {error}" : "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Erro ao carregar o template: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de ficheiro","{count} conflitos de ficheiro"],
+    "One file conflict" : "Um conflito no ficheiro",
+    "New Files" : "Ficheiros Novos",
+    "Already existing files" : "Ficheiro já existente",
+    "Which files do you want to keep?" : "Quais os ficheiros que pretende manter?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos seleccionados)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Erro ao carregar o modelo de existências do ficheiro",
+    "Very weak password" : "Password muito fraca",
+    "Weak password" : "Password fraca",
+    "So-so password" : "Password aceitável",
+    "Good password" : "Password Forte",
+    "Strong password" : "Password muito forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud.",
+    "Error occurred while checking server setup" : "Ocorreu um erro durante a verificação da configuração do servidor",
+    "Shared" : "Partilhado",
+    "Shared with {recipients}" : "Partilhado com {recipients}",
+    "Share" : "Partilhar",
+    "Error" : "Erro",
+    "Error while sharing" : "Erro ao partilhar",
+    "Error while unsharing" : "Erro ao deixar de partilhar",
+    "Error while changing permissions" : "Erro ao mudar permissões",
+    "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Partilhado consigo por {owner}",
+    "Share with user or group …" : "Partilhar com utilizador ou grupo...",
+    "Share link" : "Partilhar o link",
+    "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
+    "Password protect" : "Proteger com palavra-passe",
+    "Choose a password for the public link" : "Defina a palavra-passe para o link público",
+    "Allow Public Upload" : "Permitir Envios Públicos",
+    "Email link to person" : "Enviar o link por e-mail",
+    "Send" : "Enviar",
+    "Set expiration date" : "Especificar data de expiração",
+    "Expiration date" : "Data de expiração",
+    "Adding user..." : "A adicionar utilizador...",
+    "group" : "grupo",
+    "Resharing is not allowed" : "Não é permitido partilhar de novo",
+    "Shared in {item} with {user}" : "Partilhado em {item} com {user}",
+    "Unshare" : "Deixar de partilhar",
+    "notify by email" : "Notificar por email",
+    "can share" : "pode partilhar",
+    "can edit" : "pode editar",
+    "access control" : "Controlo de acesso",
+    "create" : "criar",
+    "update" : "actualizar",
+    "delete" : "apagar",
+    "Password protected" : "Protegido com palavra-passe",
+    "Error unsetting expiration date" : "Erro ao retirar a data de expiração",
+    "Error setting expiration date" : "Erro ao aplicar a data de expiração",
+    "Sending ..." : "A Enviar...",
+    "Email sent" : "E-mail enviado",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "O tipo de objecto não foi especificado",
+    "Enter new" : "Introduza novo",
+    "Delete" : "Eliminar",
+    "Add" : "Adicionar",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Erro ao carregar modelo de diálogo: {error}",
+    "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.",
+    "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
+    "Please reload the page." : "Por favor recarregue a página.",
+    "The update was unsuccessful." : "Não foi possível atualizar.",
+    "The update was successful. Redirecting you to ownCloud now." : "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
+    "Couldn't reset password because the token is invalid" : "É impossível efetuar reset à password. ",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ocorreu um problema com o envio do e-mail, por favor confirme o seu utilizador.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contacte o administrador.",
+    "%s password reset" : "%s reposição da password",
+    "Use the following link to reset your password: {link}" : "Use o seguinte endereço para repor a sua password: {link}",
+    "You will receive a link to reset your password via Email." : "Vai receber um endereço para repor a sua password",
+    "Username" : "Nome de utilizador",
+    "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?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
+    "Yes, I really want to reset my password now" : "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.",
+    "Reset" : "Repor",
+    "New password" : "Nova palavra-chave",
+    "New Password" : "Nova password",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
+    "Personal" : "Pessoal",
+    "Users" : "Utilizadores",
+    "Apps" : "Aplicações",
+    "Admin" : "Admin",
+    "Help" : "Ajuda",
+    "Error loading tags" : "Erro ao carregar etiquetas",
+    "Tag already exists" : "A etiqueta já existe",
+    "Error deleting tag(s)" : "Erro ao apagar etiqueta(s)",
+    "Error tagging" : "Erro ao etiquetar",
+    "Error untagging" : "Erro ao desetiquetar",
+    "Error favoriting" : "Erro a definir como favorito",
+    "Error unfavoriting" : "Erro a remover como favorito",
+    "Access forbidden" : "Acesso interdito",
+    "File not found" : "Ficheiro não encontrado",
+    "The specified document has not been found on the server." : "O documento especificado não foi encontrado no servidor.",
+    "You can click here to return to %s." : "Pode clicar aqui para retornar para %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Olá,\n\napenas para informar que %s partilhou »%s« consigo.\nConsulte aqui: %s\n",
+    "The share will expire on %s." : "Esta partilha vai expirar em %s.",
+    "Cheers!" : "Parabéns!",
+    "Internal Server Error" : "Erro Interno do Servidor",
+    "The server encountered an internal error and was unable to complete your request." : "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Entra em contacto com o administrador do servidor se este erro aparecer várias vezes, inclui também os detalhes técnicos abaixo no seu contacto.",
+    "More details can be found in the server log." : "Mais detalhes podem ser encontrados no log do servidor.",
+    "Technical details" : "Detalhes técnicos",
+    "Remote Address: %s" : "Endereço remoto: %s",
+    "Request ID: %s" : "ID do Pedido: %s",
+    "Code: %s" : "Código: %s",
+    "Message: %s" : "Mensagem: %s",
+    "File: %s" : "Ficheiro: %s",
+    "Line: %s" : "Linha: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Aviso de Segurança",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "A sua versão do PHP é vulnerável ao ataque Byte Null (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor atualize a sua versão PHP instalada para usar o %s com segurança.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
+    "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>",
+    "Password" : "Password",
+    "Storage & database" : "Armazenamento e base de dados",
+    "Data folder" : "Pasta de dados",
+    "Configure the database" : "Configure a base de dados",
+    "Only %s is available." : "Apenas %s está disponível.",
+    "Database user" : "Utilizador da base de dados",
+    "Database password" : "Password da base de dados",
+    "Database name" : "Nome da base de dados",
+    "Database tablespace" : "Tablespace da base de dados",
+    "Database host" : "Anfitrião da base de dados",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Será usado SQLite como base de dados. Para instalações maiores é recomendável a sua alteração.",
+    "Finish setup" : "Acabar instalação",
+    "Finishing …" : "A terminar...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicação requer JavaScript para functionar correctamente. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">active o JavaScript</a> e recarregue a página.",
+    "%s is available. Get more information on how to update." : "%s está disponível. Tenha mais informações como actualizar.",
+    "Log out" : "Sair",
+    "Server side authentication failed!" : "Autenticação do lado do servidor falhou!",
+    "Please contact your administrator." : "Por favor contacte o administrador.",
+    "Forgot your password? Reset it!" : "Esqueceu-se da password? Recupere-a!",
+    "remember" : "lembrar",
+    "Log in" : "Entrar",
+    "Alternative Logins" : "Contas de acesso alternativas",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Olá,<br><br>apenas para informar que %s partilhou <strong>%s</strong> consigo.<br><a href=\"%s\">Consulte aqui!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
+    "This means only administrators can use the instance." : "Isto significa que apenas os administradores podem usar a instância.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte o seu administrador de sistema se esta mensagem continuar a aparecer ou apareceu inesperadamente.",
+    "Thank you for your patience." : "Obrigado pela sua paciência.",
+    "You are accessing the server from an untrusted domain." : "Está a aceder ao servidor a partir de um domínio que não é de confiança.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte o seu administrador. Se é um administrador desta instância, configure as definições \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
+    "Add \"%s\" as trusted domain" : "Adicionar \"%s\" como um domínio de confiança",
+    "%s will be updated to version %s." : "O %s irá ser atualizado para a versão %s.",
+    "The following apps will be disabled:" : "As seguintes apps irão ser desativadas:",
+    "The theme %s has been disabled." : "O tema %s foi desativado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor garanta a cópia de segurança da base de dados e das pastas 'config' e 'data' antes de prosseguir.",
+    "Start update" : "Iniciar atualização",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso, executar o seguinte comando a partir do diretório de instalação:",
+    "This %s instance is currently being updated, which may take a while." : "Esta instância %s está actualmente a ser actualizada, poderá demorar algum tempo.",
+    "This page will refresh itself when the %s instance is available again." : "Esta página irá ser recarregada novamente quando a instância %s ficar novamente disponível."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
new file mode 100644
index 00000000000..5d2de169e32
--- /dev/null
+++ b/core/l10n/pt_PT.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Não conseguiu enviar correio aos seguintes utilizadores: %s",
+    "Turned on maintenance mode" : "Activado o modo de manutenção",
+    "Turned off maintenance mode" : "Desactivado o modo de manutenção",
+    "Updated database" : "Base de dados actualizada",
+    "Checked database schema update" : "Atualização do esquema da base de dados verificada.",
+    "Checked database schema update for apps" : "Atualização do esquema da base de dados verificada.",
+    "Updated \"%s\" to %s" : "Actualizado \"%s\" para %s",
+    "Disabled incompatible apps: %s" : "Apps incompatíveis desativadas: %s",
+    "No image or file provided" : "Não foi selecionado nenhum ficheiro para importar",
+    "Unknown filetype" : "Ficheiro desconhecido",
+    "Invalid image" : "Imagem inválida",
+    "No temporary profile picture available, try again" : "Foto temporária de perfil indisponível, tente novamente",
+    "No crop data provided" : "Sem dados de corte fornecidos",
+    "Sunday" : "Domingo",
+    "Monday" : "Segunda",
+    "Tuesday" : "Terça",
+    "Wednesday" : "Quarta",
+    "Thursday" : "Quinta",
+    "Friday" : "Sexta",
+    "Saturday" : "Sábado",
+    "January" : "Janeiro",
+    "February" : "Fevereiro",
+    "March" : "Março",
+    "April" : "Abril",
+    "May" : "Maio",
+    "June" : "Junho",
+    "July" : "Julho",
+    "August" : "Agosto",
+    "September" : "Setembro",
+    "October" : "Outubro",
+    "November" : "Novembro",
+    "December" : "Dezembro",
+    "Settings" : "Configurações",
+    "File" : "Ficheiro",
+    "Folder" : "Pasta",
+    "Image" : "Imagem",
+    "Audio" : "Audio",
+    "Saving..." : "A guardar...",
+    "Couldn't send reset email. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
+    "The link to reset your password has been sent to your email. 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." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
+    "I know what I'm doing" : "Tenho a certeza",
+    "Reset password" : "Repor password",
+    "Password can not be changed. Please contact your administrator." : "A password não pode ser alterada. Contacte o seu administrador.",
+    "No" : "Não",
+    "Yes" : "Sim",
+    "Choose" : "Escolha",
+    "Error loading file picker template: {error}" : "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Erro ao carregar o template: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de ficheiro","{count} conflitos de ficheiro"],
+    "One file conflict" : "Um conflito no ficheiro",
+    "New Files" : "Ficheiros Novos",
+    "Already existing files" : "Ficheiro já existente",
+    "Which files do you want to keep?" : "Quais os ficheiros que pretende manter?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos seleccionados)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Erro ao carregar o modelo de existências do ficheiro",
+    "Very weak password" : "Password muito fraca",
+    "Weak password" : "Password fraca",
+    "So-so password" : "Password aceitável",
+    "Good password" : "Password Forte",
+    "Strong password" : "Password muito forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud.",
+    "Error occurred while checking server setup" : "Ocorreu um erro durante a verificação da configuração do servidor",
+    "Shared" : "Partilhado",
+    "Shared with {recipients}" : "Partilhado com {recipients}",
+    "Share" : "Partilhar",
+    "Error" : "Erro",
+    "Error while sharing" : "Erro ao partilhar",
+    "Error while unsharing" : "Erro ao deixar de partilhar",
+    "Error while changing permissions" : "Erro ao mudar permissões",
+    "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Partilhado consigo por {owner}",
+    "Share with user or group …" : "Partilhar com utilizador ou grupo...",
+    "Share link" : "Partilhar o link",
+    "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
+    "Password protect" : "Proteger com palavra-passe",
+    "Choose a password for the public link" : "Defina a palavra-passe para o link público",
+    "Allow Public Upload" : "Permitir Envios Públicos",
+    "Email link to person" : "Enviar o link por e-mail",
+    "Send" : "Enviar",
+    "Set expiration date" : "Especificar data de expiração",
+    "Expiration date" : "Data de expiração",
+    "Adding user..." : "A adicionar utilizador...",
+    "group" : "grupo",
+    "Resharing is not allowed" : "Não é permitido partilhar de novo",
+    "Shared in {item} with {user}" : "Partilhado em {item} com {user}",
+    "Unshare" : "Deixar de partilhar",
+    "notify by email" : "Notificar por email",
+    "can share" : "pode partilhar",
+    "can edit" : "pode editar",
+    "access control" : "Controlo de acesso",
+    "create" : "criar",
+    "update" : "actualizar",
+    "delete" : "apagar",
+    "Password protected" : "Protegido com palavra-passe",
+    "Error unsetting expiration date" : "Erro ao retirar a data de expiração",
+    "Error setting expiration date" : "Erro ao aplicar a data de expiração",
+    "Sending ..." : "A Enviar...",
+    "Email sent" : "E-mail enviado",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "O tipo de objecto não foi especificado",
+    "Enter new" : "Introduza novo",
+    "Delete" : "Eliminar",
+    "Add" : "Adicionar",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Erro ao carregar modelo de diálogo: {error}",
+    "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.",
+    "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
+    "Please reload the page." : "Por favor recarregue a página.",
+    "The update was unsuccessful." : "Não foi possível atualizar.",
+    "The update was successful. Redirecting you to ownCloud now." : "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
+    "Couldn't reset password because the token is invalid" : "É impossível efetuar reset à password. ",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ocorreu um problema com o envio do e-mail, por favor confirme o seu utilizador.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contacte o administrador.",
+    "%s password reset" : "%s reposição da password",
+    "Use the following link to reset your password: {link}" : "Use o seguinte endereço para repor a sua password: {link}",
+    "You will receive a link to reset your password via Email." : "Vai receber um endereço para repor a sua password",
+    "Username" : "Nome de utilizador",
+    "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?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
+    "Yes, I really want to reset my password now" : "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.",
+    "Reset" : "Repor",
+    "New password" : "Nova palavra-chave",
+    "New Password" : "Nova password",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
+    "Personal" : "Pessoal",
+    "Users" : "Utilizadores",
+    "Apps" : "Aplicações",
+    "Admin" : "Admin",
+    "Help" : "Ajuda",
+    "Error loading tags" : "Erro ao carregar etiquetas",
+    "Tag already exists" : "A etiqueta já existe",
+    "Error deleting tag(s)" : "Erro ao apagar etiqueta(s)",
+    "Error tagging" : "Erro ao etiquetar",
+    "Error untagging" : "Erro ao desetiquetar",
+    "Error favoriting" : "Erro a definir como favorito",
+    "Error unfavoriting" : "Erro a remover como favorito",
+    "Access forbidden" : "Acesso interdito",
+    "File not found" : "Ficheiro não encontrado",
+    "The specified document has not been found on the server." : "O documento especificado não foi encontrado no servidor.",
+    "You can click here to return to %s." : "Pode clicar aqui para retornar para %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Olá,\n\napenas para informar que %s partilhou »%s« consigo.\nConsulte aqui: %s\n",
+    "The share will expire on %s." : "Esta partilha vai expirar em %s.",
+    "Cheers!" : "Parabéns!",
+    "Internal Server Error" : "Erro Interno do Servidor",
+    "The server encountered an internal error and was unable to complete your request." : "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Entra em contacto com o administrador do servidor se este erro aparecer várias vezes, inclui também os detalhes técnicos abaixo no seu contacto.",
+    "More details can be found in the server log." : "Mais detalhes podem ser encontrados no log do servidor.",
+    "Technical details" : "Detalhes técnicos",
+    "Remote Address: %s" : "Endereço remoto: %s",
+    "Request ID: %s" : "ID do Pedido: %s",
+    "Code: %s" : "Código: %s",
+    "Message: %s" : "Mensagem: %s",
+    "File: %s" : "Ficheiro: %s",
+    "Line: %s" : "Linha: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Aviso de Segurança",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "A sua versão do PHP é vulnerável ao ataque Byte Null (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor atualize a sua versão PHP instalada para usar o %s com segurança.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
+    "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>",
+    "Password" : "Password",
+    "Storage & database" : "Armazenamento e base de dados",
+    "Data folder" : "Pasta de dados",
+    "Configure the database" : "Configure a base de dados",
+    "Only %s is available." : "Apenas %s está disponível.",
+    "Database user" : "Utilizador da base de dados",
+    "Database password" : "Password da base de dados",
+    "Database name" : "Nome da base de dados",
+    "Database tablespace" : "Tablespace da base de dados",
+    "Database host" : "Anfitrião da base de dados",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Será usado SQLite como base de dados. Para instalações maiores é recomendável a sua alteração.",
+    "Finish setup" : "Acabar instalação",
+    "Finishing …" : "A terminar...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicação requer JavaScript para functionar correctamente. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">active o JavaScript</a> e recarregue a página.",
+    "%s is available. Get more information on how to update." : "%s está disponível. Tenha mais informações como actualizar.",
+    "Log out" : "Sair",
+    "Server side authentication failed!" : "Autenticação do lado do servidor falhou!",
+    "Please contact your administrator." : "Por favor contacte o administrador.",
+    "Forgot your password? Reset it!" : "Esqueceu-se da password? Recupere-a!",
+    "remember" : "lembrar",
+    "Log in" : "Entrar",
+    "Alternative Logins" : "Contas de acesso alternativas",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Olá,<br><br>apenas para informar que %s partilhou <strong>%s</strong> consigo.<br><a href=\"%s\">Consulte aqui!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
+    "This means only administrators can use the instance." : "Isto significa que apenas os administradores podem usar a instância.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte o seu administrador de sistema se esta mensagem continuar a aparecer ou apareceu inesperadamente.",
+    "Thank you for your patience." : "Obrigado pela sua paciência.",
+    "You are accessing the server from an untrusted domain." : "Está a aceder ao servidor a partir de um domínio que não é de confiança.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte o seu administrador. Se é um administrador desta instância, configure as definições \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
+    "Add \"%s\" as trusted domain" : "Adicionar \"%s\" como um domínio de confiança",
+    "%s will be updated to version %s." : "O %s irá ser atualizado para a versão %s.",
+    "The following apps will be disabled:" : "As seguintes apps irão ser desativadas:",
+    "The theme %s has been disabled." : "O tema %s foi desativado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor garanta a cópia de segurança da base de dados e das pastas 'config' e 'data' antes de prosseguir.",
+    "Start update" : "Iniciar atualização",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso, executar o seguinte comando a partir do diretório de instalação:",
+    "This %s instance is currently being updated, which may take a while." : "Esta instância %s está actualmente a ser actualizada, poderá demorar algum tempo.",
+    "This page will refresh itself when the %s instance is available again." : "Esta página irá ser recarregada novamente quando a instância %s ficar novamente disponível."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
deleted file mode 100644
index 229ecfbccb5..00000000000
--- a/core/l10n/pt_PT.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Não conseguiu enviar correio aos seguintes utilizadores: %s",
-"Turned on maintenance mode" => "Activado o modo de manutenção",
-"Turned off maintenance mode" => "Desactivado o modo de manutenção",
-"Updated database" => "Base de dados actualizada",
-"Checked database schema update" => "Atualização do esquema da base de dados verificada.",
-"Checked database schema update for apps" => "Atualização do esquema da base de dados verificada.",
-"Updated \"%s\" to %s" => "Actualizado \"%s\" para %s",
-"Disabled incompatible apps: %s" => "Apps incompatíveis desativadas: %s",
-"No image or file provided" => "Não foi selecionado nenhum ficheiro para importar",
-"Unknown filetype" => "Ficheiro desconhecido",
-"Invalid image" => "Imagem inválida",
-"No temporary profile picture available, try again" => "Foto temporária de perfil indisponível, tente novamente",
-"No crop data provided" => "Sem dados de corte fornecidos",
-"Sunday" => "Domingo",
-"Monday" => "Segunda",
-"Tuesday" => "Terça",
-"Wednesday" => "Quarta",
-"Thursday" => "Quinta",
-"Friday" => "Sexta",
-"Saturday" => "Sábado",
-"January" => "Janeiro",
-"February" => "Fevereiro",
-"March" => "Março",
-"April" => "Abril",
-"May" => "Maio",
-"June" => "Junho",
-"July" => "Julho",
-"August" => "Agosto",
-"September" => "Setembro",
-"October" => "Outubro",
-"November" => "Novembro",
-"December" => "Dezembro",
-"Settings" => "Configurações",
-"File" => "Ficheiro",
-"Folder" => "Pasta",
-"Image" => "Imagem",
-"Audio" => "Audio",
-"Saving..." => "A guardar...",
-"Couldn't send reset email. Please contact your administrator." => "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
-"The link to reset your password has been sent to your email. 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." => "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-"I know what I'm doing" => "Tenho a certeza",
-"Reset password" => "Repor password",
-"Password can not be changed. Please contact your administrator." => "A password não pode ser alterada. Contacte o seu administrador.",
-"No" => "Não",
-"Yes" => "Sim",
-"Choose" => "Escolha",
-"Error loading file picker template: {error}" => "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Erro ao carregar o template: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de ficheiro","{count} conflitos de ficheiro"),
-"One file conflict" => "Um conflito no ficheiro",
-"New Files" => "Ficheiros Novos",
-"Already existing files" => "Ficheiro já existente",
-"Which files do you want to keep?" => "Quais os ficheiros que pretende manter?",
-"If you select both versions, the copied file will have a number added to its name." => "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
-"Cancel" => "Cancelar",
-"Continue" => "Continuar",
-"(all selected)" => "(todos seleccionados)",
-"({count} selected)" => "({count} seleccionados)",
-"Error loading file exists template" => "Erro ao carregar o modelo de existências do ficheiro",
-"Very weak password" => "Password muito fraca",
-"Weak password" => "Password fraca",
-"So-so password" => "Password aceitável",
-"Good password" => "Password Forte",
-"Strong password" => "Password muito forte",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud.",
-"Error occurred while checking server setup" => "Ocorreu um erro durante a verificação da configuração do servidor",
-"Shared" => "Partilhado",
-"Shared with {recipients}" => "Partilhado com {recipients}",
-"Share" => "Partilhar",
-"Error" => "Erro",
-"Error while sharing" => "Erro ao partilhar",
-"Error while unsharing" => "Erro ao deixar de partilhar",
-"Error while changing permissions" => "Erro ao mudar permissões",
-"Shared with you and the group {group} by {owner}" => "Partilhado consigo e com o grupo {group} por {owner}",
-"Shared with you by {owner}" => "Partilhado consigo por {owner}",
-"Share with user or group …" => "Partilhar com utilizador ou grupo...",
-"Share link" => "Partilhar o link",
-"The public link will expire no later than {days} days after it is created" => "O link público expira, o mais tardar {days} dias após sua criação",
-"Password protect" => "Proteger com palavra-passe",
-"Choose a password for the public link" => "Defina a palavra-passe para o link público",
-"Allow Public Upload" => "Permitir Envios Públicos",
-"Email link to person" => "Enviar o link por e-mail",
-"Send" => "Enviar",
-"Set expiration date" => "Especificar data de expiração",
-"Expiration date" => "Data de expiração",
-"Adding user..." => "A adicionar utilizador...",
-"group" => "grupo",
-"Resharing is not allowed" => "Não é permitido partilhar de novo",
-"Shared in {item} with {user}" => "Partilhado em {item} com {user}",
-"Unshare" => "Deixar de partilhar",
-"notify by email" => "Notificar por email",
-"can share" => "pode partilhar",
-"can edit" => "pode editar",
-"access control" => "Controlo de acesso",
-"create" => "criar",
-"update" => "actualizar",
-"delete" => "apagar",
-"Password protected" => "Protegido com palavra-passe",
-"Error unsetting expiration date" => "Erro ao retirar a data de expiração",
-"Error setting expiration date" => "Erro ao aplicar a data de expiração",
-"Sending ..." => "A Enviar...",
-"Email sent" => "E-mail enviado",
-"Warning" => "Aviso",
-"The object type is not specified." => "O tipo de objecto não foi especificado",
-"Enter new" => "Introduza novo",
-"Delete" => "Eliminar",
-"Add" => "Adicionar",
-"Edit tags" => "Editar etiquetas",
-"Error loading dialog template: {error}" => "Erro ao carregar modelo de diálogo: {error}",
-"No tags selected for deletion." => "Não foram escolhidas etiquetas para apagar.",
-"Updating {productName} to version {version}, this may take a while." => "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
-"Please reload the page." => "Por favor recarregue a página.",
-"The update was unsuccessful." => "Não foi possível atualizar.",
-"The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
-"Couldn't reset password because the token is invalid" => "É impossível efetuar reset à password. ",
-"Couldn't send reset email. Please make sure your username is correct." => "Ocorreu um problema com o envio do e-mail, por favor confirme o seu utilizador.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Ocorreu um problema com o envio do e-mail, por favor contacte o administrador.",
-"%s password reset" => "%s reposição da password",
-"Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
-"You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
-"Username" => "Nome de utilizador",
-"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?" => "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-"Yes, I really want to reset my password now" => "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.",
-"Reset" => "Repor",
-"New password" => "Nova palavra-chave",
-"New Password" => "Nova password",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
-"For the best results, please consider using a GNU/Linux server instead." => "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
-"Personal" => "Pessoal",
-"Users" => "Utilizadores",
-"Apps" => "Aplicações",
-"Admin" => "Admin",
-"Help" => "Ajuda",
-"Error loading tags" => "Erro ao carregar etiquetas",
-"Tag already exists" => "A etiqueta já existe",
-"Error deleting tag(s)" => "Erro ao apagar etiqueta(s)",
-"Error tagging" => "Erro ao etiquetar",
-"Error untagging" => "Erro ao desetiquetar",
-"Error favoriting" => "Erro a definir como favorito",
-"Error unfavoriting" => "Erro a remover como favorito",
-"Access forbidden" => "Acesso interdito",
-"File not found" => "Ficheiro não encontrado",
-"The specified document has not been found on the server." => "O documento especificado não foi encontrado no servidor.",
-"You can click here to return to %s." => "Pode clicar aqui para retornar para %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Olá,\n\napenas para informar que %s partilhou »%s« consigo.\nConsulte aqui: %s\n",
-"The share will expire on %s." => "Esta partilha vai expirar em %s.",
-"Cheers!" => "Parabéns!",
-"Internal Server Error" => "Erro Interno do Servidor",
-"The server encountered an internal error and was unable to complete your request." => "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Entra em contacto com o administrador do servidor se este erro aparecer várias vezes, inclui também os detalhes técnicos abaixo no seu contacto.",
-"More details can be found in the server log." => "Mais detalhes podem ser encontrados no log do servidor.",
-"Technical details" => "Detalhes técnicos",
-"Remote Address: %s" => "Endereço remoto: %s",
-"Request ID: %s" => "ID do Pedido: %s",
-"Code: %s" => "Código: %s",
-"Message: %s" => "Mensagem: %s",
-"File: %s" => "Ficheiro: %s",
-"Line: %s" => "Linha: %s",
-"Trace" => "Trace",
-"Security Warning" => "Aviso de Segurança",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A sua versão do PHP é vulnerável ao ataque Byte Null (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Por favor atualize a sua versão PHP instalada para usar o %s com segurança.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
-"Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>",
-"Password" => "Password",
-"Storage & database" => "Armazenamento e base de dados",
-"Data folder" => "Pasta de dados",
-"Configure the database" => "Configure a base de dados",
-"Only %s is available." => "Apenas %s está disponível.",
-"Database user" => "Utilizador da base de dados",
-"Database password" => "Password da base de dados",
-"Database name" => "Nome da base de dados",
-"Database tablespace" => "Tablespace da base de dados",
-"Database host" => "Anfitrião da base de dados",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Será usado SQLite como base de dados. Para instalações maiores é recomendável a sua alteração.",
-"Finish setup" => "Acabar instalação",
-"Finishing …" => "A terminar...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Esta aplicação requer JavaScript para functionar correctamente. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">active o JavaScript</a> e recarregue a página.",
-"%s is available. Get more information on how to update." => "%s está disponível. Tenha mais informações como actualizar.",
-"Log out" => "Sair",
-"Server side authentication failed!" => "Autenticação do lado do servidor falhou!",
-"Please contact your administrator." => "Por favor contacte o administrador.",
-"Forgot your password? Reset it!" => "Esqueceu-se da password? Recupere-a!",
-"remember" => "lembrar",
-"Log in" => "Entrar",
-"Alternative Logins" => "Contas de acesso alternativas",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Olá,<br><br>apenas para informar que %s partilhou <strong>%s</strong> consigo.<br><a href=\"%s\">Consulte aqui!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
-"This means only administrators can use the instance." => "Isto significa que apenas os administradores podem usar a instância.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador de sistema se esta mensagem continuar a aparecer ou apareceu inesperadamente.",
-"Thank you for your patience." => "Obrigado pela sua paciência.",
-"You are accessing the server from an untrusted domain." => "Está a aceder ao servidor a partir de um domínio que não é de confiança.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Por favor contacte o seu administrador. Se é um administrador desta instância, configure as definições \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
-"Add \"%s\" as trusted domain" => "Adicionar \"%s\" como um domínio de confiança",
-"%s will be updated to version %s." => "O %s irá ser atualizado para a versão %s.",
-"The following apps will be disabled:" => "As seguintes apps irão ser desativadas:",
-"The theme %s has been disabled." => "O tema %s foi desativado.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Por favor garanta a cópia de segurança da base de dados e das pastas 'config' e 'data' antes de prosseguir.",
-"Start update" => "Iniciar atualização",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Para evitar tempos de espera com instalações maiores, você pode em vez disso, executar o seguinte comando a partir do diretório de instalação:",
-"This %s instance is currently being updated, which may take a while." => "Esta instância %s está actualmente a ser actualizada, poderá demorar algum tempo.",
-"This page will refresh itself when the %s instance is available again." => "Esta página irá ser recarregada novamente quando a instância %s ficar novamente disponível."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ro.js b/core/l10n/ro.js
new file mode 100644
index 00000000000..bf1eb72942f
--- /dev/null
+++ b/core/l10n/ro.js
@@ -0,0 +1,140 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nu s-a putut trimite mesajul către următorii utilizatori: %s",
+    "Turned on maintenance mode" : "Modul mentenanță a fost activat",
+    "Turned off maintenance mode" : "Modul mentenanță a fost dezactivat",
+    "Updated database" : "Bază de date actualizată",
+    "Disabled incompatible apps: %s" : "Aplicatii incompatibile oprite: %s",
+    "No image or file provided" : "Nu a fost furnizat vreo imagine sau fișier",
+    "Unknown filetype" : "Tip fișier necunoscut",
+    "Invalid image" : "Imagine invalidă",
+    "Sunday" : "Duminică",
+    "Monday" : "Luni",
+    "Tuesday" : "Marți",
+    "Wednesday" : "Miercuri",
+    "Thursday" : "Joi",
+    "Friday" : "Vineri",
+    "Saturday" : "Sâmbătă",
+    "January" : "Ianuarie",
+    "February" : "Februarie",
+    "March" : "Martie",
+    "April" : "Aprilie",
+    "May" : "Mai",
+    "June" : "Iunie",
+    "July" : "Iulie",
+    "August" : "August",
+    "September" : "Septembrie",
+    "October" : "Octombrie",
+    "November" : "Noiembrie",
+    "December" : "Decembrie",
+    "Settings" : "Setări",
+    "File" : "Fişier ",
+    "Folder" : "Dosar",
+    "Image" : "Imagine",
+    "Audio" : "Audio",
+    "Saving..." : "Se salvează...",
+    "I know what I'm doing" : "Eu știu ce fac",
+    "Reset password" : "Resetează parola",
+    "Password can not be changed. Please contact your administrator." : "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.",
+    "No" : "Nu",
+    "Yes" : "Da",
+    "Choose" : "Alege",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "One file conflict" : "Un conflict de fișier",
+    "New Files" : "Fișiere noi",
+    "Already existing files" : "Fișiere deja existente",
+    "Which files do you want to keep?" : "Ce fișiere vrei să păstrezi?",
+    "If you select both versions, the copied file will have a number added to its name." : "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa.",
+    "Cancel" : "Anulare",
+    "Continue" : "Continuă",
+    "({count} selected)" : "({count} selectate)",
+    "Very weak password" : "Parolă foarte slabă",
+    "Weak password" : "Parolă slabă",
+    "Good password" : "Parolă bună",
+    "Strong password" : "Parolă puternică",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
+    "Shared" : "Partajat",
+    "Shared with {recipients}" : "Partajat cu {recipients}",
+    "Share" : "Partajează",
+    "Error" : "Eroare",
+    "Error while sharing" : "Eroare la partajare",
+    "Error while unsharing" : "Eroare la anularea partajării",
+    "Error while changing permissions" : "Eroare la modificarea permisiunilor",
+    "Shared with you and the group {group} by {owner}" : "Distribuie cu tine si grupul {group} de {owner}",
+    "Shared with you by {owner}" : "Distribuie cu tine de {owner}",
+    "Password protect" : "Protejare cu parolă",
+    "Allow Public Upload" : "Permiteţi încărcarea publică.",
+    "Email link to person" : "Expediază legătura prin poșta electronică",
+    "Send" : "Expediază",
+    "Set expiration date" : "Specifică data expirării",
+    "Expiration date" : "Data expirării",
+    "group" : "grup",
+    "Resharing is not allowed" : "Repartajarea nu este permisă",
+    "Shared in {item} with {user}" : "Distribuie in {item} si {user}",
+    "Unshare" : "Anulare partajare",
+    "notify by email" : "notifică prin email",
+    "can share" : "se poate partaja",
+    "can edit" : "poate edita",
+    "access control" : "control acces",
+    "create" : "creare",
+    "update" : "actualizare",
+    "delete" : "ștergere",
+    "Password protected" : "Protejare cu parolă",
+    "Error unsetting expiration date" : "Eroare la anularea datei de expirare",
+    "Error setting expiration date" : "Eroare la specificarea datei de expirare",
+    "Sending ..." : "Se expediază...",
+    "Email sent" : "Mesajul a fost expediat",
+    "Warning" : "Atenție",
+    "The object type is not specified." : "Tipul obiectului nu este specificat.",
+    "Enter new" : "Introducere nou",
+    "Delete" : "Șterge",
+    "Add" : "Adaugă",
+    "Updating {productName} to version {version}, this may take a while." : "Se actualizează {productName} la versiunea {version}, poate dura câteva momente.",
+    "Please reload the page." : "Te rugăm să reîncarci pagina.",
+    "The update was unsuccessful." : "Actualizare eșuată.",
+    "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.",
+    "%s password reset" : "%s resetare parola",
+    "Use the following link to reset your password: {link}" : "Folosește următorul link pentru a reseta parola: {link}",
+    "You will receive a link to reset your password via Email." : "Vei primi un mesaj prin care vei putea reseta parola via email.",
+    "Username" : "Nume utilizator",
+    "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?" : "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
+    "Yes, I really want to reset my password now" : "Da, eu chiar doresc să îmi resetez parola acum",
+    "Reset" : "Resetare",
+    "New password" : "Noua parolă",
+    "New Password" : "Noua parolă",
+    "Personal" : "Personal",
+    "Users" : "Utilizatori",
+    "Apps" : "Aplicații",
+    "Admin" : "Administrator",
+    "Help" : "Ajutor",
+    "Access forbidden" : "Acces restricționat",
+    "The share will expire on %s." : "Partajarea va expira în data de %s.",
+    "Security Warning" : "Avertisment de securitate",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Versiunea dvs. PHP este vulnerabilă la un atac cu un octet NULL  (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Te rog actualizează versiunea PHP pentru a utiliza %s în mod securizat.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
+    "Create an <strong>admin account</strong>" : "Crează un <strong>cont de administrator</strong>",
+    "Password" : "Parolă",
+    "Storage & database" : "Stocare și baza de date",
+    "Data folder" : "Director date",
+    "Configure the database" : "Configurează baza de date",
+    "Database user" : "Utilizatorul bazei de date",
+    "Database password" : "Parola bazei de date",
+    "Database name" : "Numele bazei de date",
+    "Database tablespace" : "Tabela de spațiu a bazei de date",
+    "Database host" : "Bază date",
+    "Finish setup" : "Finalizează instalarea",
+    "%s is available. Get more information on how to update." : "%s este disponibil. Vezi mai multe informații despre procesul de actualizare.",
+    "Log out" : "Ieșire",
+    "Forgot your password? Reset it!" : "Ți-ai uitat parola? Resetează!",
+    "remember" : "amintește",
+    "Log in" : "Autentificare",
+    "Alternative Logins" : "Conectări alternative",
+    "Thank you for your patience." : "Îți mulțumim pentru răbrade.",
+    "%s will be updated to version %s." : "%s va fi actualizat la versiunea %s.",
+    "Start update" : "Începe actualizarea"
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/core/l10n/ro.json b/core/l10n/ro.json
new file mode 100644
index 00000000000..c8089bd5baf
--- /dev/null
+++ b/core/l10n/ro.json
@@ -0,0 +1,138 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nu s-a putut trimite mesajul către următorii utilizatori: %s",
+    "Turned on maintenance mode" : "Modul mentenanță a fost activat",
+    "Turned off maintenance mode" : "Modul mentenanță a fost dezactivat",
+    "Updated database" : "Bază de date actualizată",
+    "Disabled incompatible apps: %s" : "Aplicatii incompatibile oprite: %s",
+    "No image or file provided" : "Nu a fost furnizat vreo imagine sau fișier",
+    "Unknown filetype" : "Tip fișier necunoscut",
+    "Invalid image" : "Imagine invalidă",
+    "Sunday" : "Duminică",
+    "Monday" : "Luni",
+    "Tuesday" : "Marți",
+    "Wednesday" : "Miercuri",
+    "Thursday" : "Joi",
+    "Friday" : "Vineri",
+    "Saturday" : "Sâmbătă",
+    "January" : "Ianuarie",
+    "February" : "Februarie",
+    "March" : "Martie",
+    "April" : "Aprilie",
+    "May" : "Mai",
+    "June" : "Iunie",
+    "July" : "Iulie",
+    "August" : "August",
+    "September" : "Septembrie",
+    "October" : "Octombrie",
+    "November" : "Noiembrie",
+    "December" : "Decembrie",
+    "Settings" : "Setări",
+    "File" : "Fişier ",
+    "Folder" : "Dosar",
+    "Image" : "Imagine",
+    "Audio" : "Audio",
+    "Saving..." : "Se salvează...",
+    "I know what I'm doing" : "Eu știu ce fac",
+    "Reset password" : "Resetează parola",
+    "Password can not be changed. Please contact your administrator." : "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.",
+    "No" : "Nu",
+    "Yes" : "Da",
+    "Choose" : "Alege",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "One file conflict" : "Un conflict de fișier",
+    "New Files" : "Fișiere noi",
+    "Already existing files" : "Fișiere deja existente",
+    "Which files do you want to keep?" : "Ce fișiere vrei să păstrezi?",
+    "If you select both versions, the copied file will have a number added to its name." : "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa.",
+    "Cancel" : "Anulare",
+    "Continue" : "Continuă",
+    "({count} selected)" : "({count} selectate)",
+    "Very weak password" : "Parolă foarte slabă",
+    "Weak password" : "Parolă slabă",
+    "Good password" : "Parolă bună",
+    "Strong password" : "Parolă puternică",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
+    "Shared" : "Partajat",
+    "Shared with {recipients}" : "Partajat cu {recipients}",
+    "Share" : "Partajează",
+    "Error" : "Eroare",
+    "Error while sharing" : "Eroare la partajare",
+    "Error while unsharing" : "Eroare la anularea partajării",
+    "Error while changing permissions" : "Eroare la modificarea permisiunilor",
+    "Shared with you and the group {group} by {owner}" : "Distribuie cu tine si grupul {group} de {owner}",
+    "Shared with you by {owner}" : "Distribuie cu tine de {owner}",
+    "Password protect" : "Protejare cu parolă",
+    "Allow Public Upload" : "Permiteţi încărcarea publică.",
+    "Email link to person" : "Expediază legătura prin poșta electronică",
+    "Send" : "Expediază",
+    "Set expiration date" : "Specifică data expirării",
+    "Expiration date" : "Data expirării",
+    "group" : "grup",
+    "Resharing is not allowed" : "Repartajarea nu este permisă",
+    "Shared in {item} with {user}" : "Distribuie in {item} si {user}",
+    "Unshare" : "Anulare partajare",
+    "notify by email" : "notifică prin email",
+    "can share" : "se poate partaja",
+    "can edit" : "poate edita",
+    "access control" : "control acces",
+    "create" : "creare",
+    "update" : "actualizare",
+    "delete" : "ștergere",
+    "Password protected" : "Protejare cu parolă",
+    "Error unsetting expiration date" : "Eroare la anularea datei de expirare",
+    "Error setting expiration date" : "Eroare la specificarea datei de expirare",
+    "Sending ..." : "Se expediază...",
+    "Email sent" : "Mesajul a fost expediat",
+    "Warning" : "Atenție",
+    "The object type is not specified." : "Tipul obiectului nu este specificat.",
+    "Enter new" : "Introducere nou",
+    "Delete" : "Șterge",
+    "Add" : "Adaugă",
+    "Updating {productName} to version {version}, this may take a while." : "Se actualizează {productName} la versiunea {version}, poate dura câteva momente.",
+    "Please reload the page." : "Te rugăm să reîncarci pagina.",
+    "The update was unsuccessful." : "Actualizare eșuată.",
+    "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.",
+    "%s password reset" : "%s resetare parola",
+    "Use the following link to reset your password: {link}" : "Folosește următorul link pentru a reseta parola: {link}",
+    "You will receive a link to reset your password via Email." : "Vei primi un mesaj prin care vei putea reseta parola via email.",
+    "Username" : "Nume utilizator",
+    "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?" : "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
+    "Yes, I really want to reset my password now" : "Da, eu chiar doresc să îmi resetez parola acum",
+    "Reset" : "Resetare",
+    "New password" : "Noua parolă",
+    "New Password" : "Noua parolă",
+    "Personal" : "Personal",
+    "Users" : "Utilizatori",
+    "Apps" : "Aplicații",
+    "Admin" : "Administrator",
+    "Help" : "Ajutor",
+    "Access forbidden" : "Acces restricționat",
+    "The share will expire on %s." : "Partajarea va expira în data de %s.",
+    "Security Warning" : "Avertisment de securitate",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Versiunea dvs. PHP este vulnerabilă la un atac cu un octet NULL  (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Te rog actualizează versiunea PHP pentru a utiliza %s în mod securizat.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
+    "Create an <strong>admin account</strong>" : "Crează un <strong>cont de administrator</strong>",
+    "Password" : "Parolă",
+    "Storage & database" : "Stocare și baza de date",
+    "Data folder" : "Director date",
+    "Configure the database" : "Configurează baza de date",
+    "Database user" : "Utilizatorul bazei de date",
+    "Database password" : "Parola bazei de date",
+    "Database name" : "Numele bazei de date",
+    "Database tablespace" : "Tabela de spațiu a bazei de date",
+    "Database host" : "Bază date",
+    "Finish setup" : "Finalizează instalarea",
+    "%s is available. Get more information on how to update." : "%s este disponibil. Vezi mai multe informații despre procesul de actualizare.",
+    "Log out" : "Ieșire",
+    "Forgot your password? Reset it!" : "Ți-ai uitat parola? Resetează!",
+    "remember" : "amintește",
+    "Log in" : "Autentificare",
+    "Alternative Logins" : "Conectări alternative",
+    "Thank you for your patience." : "Îți mulțumim pentru răbrade.",
+    "%s will be updated to version %s." : "%s va fi actualizat la versiunea %s.",
+    "Start update" : "Începe actualizarea"
+},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
+}
\ No newline at end of file
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
deleted file mode 100644
index 591cd7e2850..00000000000
--- a/core/l10n/ro.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nu s-a putut trimite mesajul către următorii utilizatori: %s",
-"Turned on maintenance mode" => "Modul mentenanță a fost activat",
-"Turned off maintenance mode" => "Modul mentenanță a fost dezactivat",
-"Updated database" => "Bază de date actualizată",
-"Disabled incompatible apps: %s" => "Aplicatii incompatibile oprite: %s",
-"No image or file provided" => "Nu a fost furnizat vreo imagine sau fișier",
-"Unknown filetype" => "Tip fișier necunoscut",
-"Invalid image" => "Imagine invalidă",
-"Sunday" => "Duminică",
-"Monday" => "Luni",
-"Tuesday" => "Marți",
-"Wednesday" => "Miercuri",
-"Thursday" => "Joi",
-"Friday" => "Vineri",
-"Saturday" => "Sâmbătă",
-"January" => "Ianuarie",
-"February" => "Februarie",
-"March" => "Martie",
-"April" => "Aprilie",
-"May" => "Mai",
-"June" => "Iunie",
-"July" => "Iulie",
-"August" => "August",
-"September" => "Septembrie",
-"October" => "Octombrie",
-"November" => "Noiembrie",
-"December" => "Decembrie",
-"Settings" => "Setări",
-"File" => "Fişier ",
-"Folder" => "Dosar",
-"Image" => "Imagine",
-"Audio" => "Audio",
-"Saving..." => "Se salvează...",
-"I know what I'm doing" => "Eu știu ce fac",
-"Reset password" => "Resetează parola",
-"Password can not be changed. Please contact your administrator." => "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.",
-"No" => "Nu",
-"Yes" => "Da",
-"Choose" => "Alege",
-"Ok" => "Ok",
-"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
-"One file conflict" => "Un conflict de fișier",
-"New Files" => "Fișiere noi",
-"Already existing files" => "Fișiere deja existente",
-"Which files do you want to keep?" => "Ce fișiere vrei să păstrezi?",
-"If you select both versions, the copied file will have a number added to its name." => "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa.",
-"Cancel" => "Anulare",
-"Continue" => "Continuă",
-"({count} selected)" => "({count} selectate)",
-"Very weak password" => "Parolă foarte slabă",
-"Weak password" => "Parolă slabă",
-"Good password" => "Parolă bună",
-"Strong password" => "Parolă puternică",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
-"Shared" => "Partajat",
-"Shared with {recipients}" => "Partajat cu {recipients}",
-"Share" => "Partajează",
-"Error" => "Eroare",
-"Error while sharing" => "Eroare la partajare",
-"Error while unsharing" => "Eroare la anularea partajării",
-"Error while changing permissions" => "Eroare la modificarea permisiunilor",
-"Shared with you and the group {group} by {owner}" => "Distribuie cu tine si grupul {group} de {owner}",
-"Shared with you by {owner}" => "Distribuie cu tine de {owner}",
-"Password protect" => "Protejare cu parolă",
-"Allow Public Upload" => "Permiteţi încărcarea publică.",
-"Email link to person" => "Expediază legătura prin poșta electronică",
-"Send" => "Expediază",
-"Set expiration date" => "Specifică data expirării",
-"Expiration date" => "Data expirării",
-"group" => "grup",
-"Resharing is not allowed" => "Repartajarea nu este permisă",
-"Shared in {item} with {user}" => "Distribuie in {item} si {user}",
-"Unshare" => "Anulare partajare",
-"notify by email" => "notifică prin email",
-"can share" => "se poate partaja",
-"can edit" => "poate edita",
-"access control" => "control acces",
-"create" => "creare",
-"update" => "actualizare",
-"delete" => "ștergere",
-"Password protected" => "Protejare cu parolă",
-"Error unsetting expiration date" => "Eroare la anularea datei de expirare",
-"Error setting expiration date" => "Eroare la specificarea datei de expirare",
-"Sending ..." => "Se expediază...",
-"Email sent" => "Mesajul a fost expediat",
-"Warning" => "Atenție",
-"The object type is not specified." => "Tipul obiectului nu este specificat.",
-"Enter new" => "Introducere nou",
-"Delete" => "Șterge",
-"Add" => "Adaugă",
-"Updating {productName} to version {version}, this may take a while." => "Se actualizează {productName} la versiunea {version}, poate dura câteva momente.",
-"Please reload the page." => "Te rugăm să reîncarci pagina.",
-"The update was unsuccessful." => "Actualizare eșuată.",
-"The update was successful. Redirecting you to ownCloud now." => "Actualizare reușită. Ești redirecționat către ownCloud.",
-"%s password reset" => "%s resetare parola",
-"Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
-"You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email.",
-"Username" => "Nume utilizator",
-"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?" => "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
-"Yes, I really want to reset my password now" => "Da, eu chiar doresc să îmi resetez parola acum",
-"Reset" => "Resetare",
-"New password" => "Noua parolă",
-"New Password" => "Noua parolă",
-"Personal" => "Personal",
-"Users" => "Utilizatori",
-"Apps" => "Aplicații",
-"Admin" => "Administrator",
-"Help" => "Ajutor",
-"Access forbidden" => "Acces restricționat",
-"The share will expire on %s." => "Partajarea va expira în data de %s.",
-"Security Warning" => "Avertisment de securitate",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versiunea dvs. PHP este vulnerabilă la un atac cu un octet NULL  (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Te rog actualizează versiunea PHP pentru a utiliza %s în mod securizat.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
-"Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
-"Password" => "Parolă",
-"Storage & database" => "Stocare și baza de date",
-"Data folder" => "Director date",
-"Configure the database" => "Configurează baza de date",
-"Database user" => "Utilizatorul bazei de date",
-"Database password" => "Parola bazei de date",
-"Database name" => "Numele bazei de date",
-"Database tablespace" => "Tabela de spațiu a bazei de date",
-"Database host" => "Bază date",
-"Finish setup" => "Finalizează instalarea",
-"%s is available. Get more information on how to update." => "%s este disponibil. Vezi mai multe informații despre procesul de actualizare.",
-"Log out" => "Ieșire",
-"Forgot your password? Reset it!" => "Ți-ai uitat parola? Resetează!",
-"remember" => "amintește",
-"Log in" => "Autentificare",
-"Alternative Logins" => "Conectări alternative",
-"Thank you for your patience." => "Îți mulțumim pentru răbrade.",
-"%s will be updated to version %s." => "%s va fi actualizat la versiunea %s.",
-"Start update" => "Începe actualizarea"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
new file mode 100644
index 00000000000..2e3c566bf43
--- /dev/null
+++ b/core/l10n/ru.js
@@ -0,0 +1,211 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Невозможно отправить письмо следующим пользователям: %s",
+    "Turned on maintenance mode" : "Режим отладки включён",
+    "Turned off maintenance mode" : "Режим отладки отключён",
+    "Updated database" : "База данных обновлена",
+    "Checked database schema update" : "Проверено обновление схемы БД",
+    "Checked database schema update for apps" : "Проверено обновление схемы БД для приложений",
+    "Updated \"%s\" to %s" : "Обновлено \"%s\" до %s",
+    "Disabled incompatible apps: %s" : "Отключенные несовместимые приложения: %s",
+    "No image or file provided" : "Не указано изображение или файл",
+    "Unknown filetype" : "Неизвестный тип файла",
+    "Invalid image" : "Некорректное изображение",
+    "No temporary profile picture available, try again" : "Временная картинка профиля недоступна, повторите попытку",
+    "No crop data provided" : "Не указана информация о кадрировании",
+    "Sunday" : "Воскресенье",
+    "Monday" : "Понедельник",
+    "Tuesday" : "Вторник",
+    "Wednesday" : "Среда",
+    "Thursday" : "Четверг",
+    "Friday" : "Пятница",
+    "Saturday" : "Суббота",
+    "January" : "Январь",
+    "February" : "Февраль",
+    "March" : "Март",
+    "April" : "Апрель",
+    "May" : "Май",
+    "June" : "Июнь",
+    "July" : "Июль",
+    "August" : "Август",
+    "September" : "Сентябрь",
+    "October" : "Октябрь",
+    "November" : "Ноябрь",
+    "December" : "Декабрь",
+    "Settings" : "Настройки",
+    "File" : "Файл",
+    "Folder" : "Каталог",
+    "Image" : "Изображение",
+    "Audio" : "Аудио",
+    "Saving..." : "Сохранение...",
+    "Couldn't send reset email. Please contact your administrator." : "Не удалось отправить письмо для сброса пароля. Пожалуйста, свяжитесь с вашим администратором.",
+    "The link to reset your password has been sent to your email. 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>Если там письма со ссылкой нет, то обратитесь к локальному администратору.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к локальному администратору.<br />Вытдействительно хотите продолжить?",
+    "I know what I'm doing" : "Я понимаю, что делаю",
+    "Reset password" : "Сбросить пароль",
+    "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
+    "No" : "Нет",
+    "Yes" : "Да",
+    "Choose" : "Выбрать",
+    "Error loading file picker template: {error}" : "Ошибка при загрузке шаблона выбора файлов: {error}",
+    "Ok" : "Ок",
+    "Error loading message template: {error}" : "Ошибка загрузки шаблона сообщений: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"],
+    "One file conflict" : "Один конфликт в файлах",
+    "New Files" : "Новые файлы",
+    "Already existing files" : "Существующие файлы",
+    "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} выбрано)",
+    "Error loading file exists template" : "Ошибка при загрузке шаблона существующего файла",
+    "Very weak password" : "Очень слабый пароль",
+    "Weak password" : "Слабый пароль",
+    "So-so password" : "Так себе пароль",
+    "Good password" : "Хороший пароль",
+    "Strong password" : "Устойчивый к взлому пароль",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Веб-сервер до сих пор не настроен для возможности синхронизации файлов. Похоже что проблема в неисправности интерфейса WebDAV.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Этот сервер не имеет подключения к сети интернет. Это значит, что некоторые возможности, такие как подключение внешних дисков, уведомления об обновлениях или установка сторонних приложений – не работают. Удалённый доступ к файлам и отправка уведомлений по электронной почте вероятнее всего тоже не будут работать. Предлагаем включить соединение с интернетом для этого сервера, если Вы хотите иметь все возможности.",
+    "Error occurred while checking server setup" : "Произошла ошибка при проверке настройки сервера",
+    "Shared" : "Общие",
+    "Shared with {recipients}" : "Доступ открыт {recipients}",
+    "Share" : "Открыть доступ",
+    "Error" : "Ошибка",
+    "Error while sharing" : "Ошибка при открытии доступа",
+    "Error while unsharing" : "Ошибка при закрытии доступа",
+    "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" : "Поделиться ссылкой",
+    "The public link will expire no later than {days} days after it is created" : "Срок действия публичной ссылки истекает не позже чем через {days} дней, после её создания",
+    "Password protect" : "Защитить паролем",
+    "Choose a password for the public link" : "Выберите пароль для публичной ссылки",
+    "Allow Public Upload" : "Разрешить загрузку",
+    "Email link to person" : "Почтовая ссылка на персону",
+    "Send" : "Отправить",
+    "Set expiration date" : "Установить срок доступа",
+    "Expiration date" : "Дата окончания",
+    "Adding user..." : "Добавляем пользователя...",
+    "group" : "группа",
+    "Resharing is not allowed" : "Общий доступ не разрешен",
+    "Shared in {item} with {user}" : "Общий доступ к {item} с {user}",
+    "Unshare" : "Закрыть общий доступ",
+    "notify by email" : "уведомить по почте",
+    "can share" : "можно дать доступ",
+    "can edit" : "может редактировать",
+    "access control" : "контроль доступа",
+    "create" : "создать",
+    "update" : "обновить",
+    "delete" : "удалить",
+    "Password protected" : "Защищено паролем",
+    "Error unsetting expiration date" : "Ошибка при отмене срока доступа",
+    "Error setting expiration date" : "Ошибка при установке срока доступа",
+    "Sending ..." : "Отправляется ...",
+    "Email sent" : "Письмо отправлено",
+    "Warning" : "Предупреждение",
+    "The object type is not specified." : "Тип объекта не указан",
+    "Enter new" : "Ввести новое",
+    "Delete" : "Удалить",
+    "Add" : "Добавить",
+    "Edit tags" : "Изменить метки",
+    "Error loading dialog template: {error}" : "Ошибка загрузки шаблона диалога: {error}",
+    "No tags selected for deletion." : "Не выбраны метки для удаления.",
+    "Updating {productName} to version {version}, this may take a while." : "Обновление {productName} до версии {version}, пожалуйста, подождите.",
+    "Please reload the page." : "Пожалуйста, перезагрузите страницу.",
+    "The update was unsuccessful." : "Обновление не удалось.",
+    "The update was successful. Redirecting you to ownCloud now." : "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
+    "Couldn't reset password because the token is invalid" : "Невозможно сбросить пароль потому, что ключ неправильный",
+    "Couldn't send reset email. Please make sure your username is correct." : "Не удалось отправить письмо для сброса пароля. Пожалуйста, убедитесь в том, что ваше имя пользователя введено верно.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Невозможно отправить письмо для сброса пароля, т.к. у вашего аккаунта не прописан адрес почты. Пожалуйста, свяжитесь с администратором.",
+    "%s password reset" : "%s сброс пароля",
+    "Use the following link to reset your password: {link}" : "Используйте следующую ссылку чтобы сбросить пароль: {link}",
+    "You will receive a link to reset your password via Email." : "На ваш адрес 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" : "Да, я действительно хочу сбросить свой пароль",
+    "Reset" : "Сброс",
+    "New password" : "Новый пароль",
+    "New Password" : "Новый пароль",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.",
+    "Personal" : "Личное",
+    "Users" : "Пользователи",
+    "Apps" : "Приложения",
+    "Admin" : "Админпанель",
+    "Help" : "Помощь",
+    "Error loading tags" : "Ошибка загрузки меток",
+    "Tag already exists" : "Метка уже существует",
+    "Error deleting tag(s)" : "Ошибка удаления метки(ок)",
+    "Error tagging" : "Ошибка присваивания метки",
+    "Error untagging" : "Ошибка снятия метки",
+    "Error favoriting" : "Ошибка размещения в любимых",
+    "Error unfavoriting" : "Ошибка удаления из любимых",
+    "Access forbidden" : "Доступ запрещён",
+    "File not found" : "Файл не найден",
+    "The specified document has not been found on the server." : "Указанный документ не может быть найден на сервере.",
+    "You can click here to return to %s." : "Вы можете нажать здесь, чтобы вернуться в %s.",
+    "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!" : "Удачи!",
+    "The server encountered an internal error and was unable to complete your request." : "Сервер столкнулся с внутренней ошибкой и не смог закончить Ваш запрос.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Пожалуйста, свяжитесь с администратором сервера, если эта ошибка будет снова появляться, пожалуйста, прикрепите технические детали к своему сообщению.",
+    "More details can be found in the server log." : "Больше деталей может быть найдено в журнале сервера.",
+    "Technical details" : "Технические детали",
+    "Remote Address: %s" : "Удаленный Адрес: %s",
+    "Request ID: %s" : "ID Запроса: %s",
+    "Code: %s" : "Код: %s",
+    "Message: %s" : "Сообщение: %s",
+    "File: %s" : "Файл: %s",
+    "Line: %s" : "Линия: %s",
+    "Trace" : "След",
+    "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.",
+    "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 hrev=\"%s\"target=\"blank\">документацию</a>.",
+    "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>",
+    "Password" : "Пароль",
+    "Storage & database" : "Система хранения данных & база данных",
+    "Data folder" : "Директория с данными",
+    "Configure the database" : "Настройка базы данных",
+    "Only %s is available." : "Только %s доступно.",
+    "Database user" : "Пользователь базы данных",
+    "Database password" : "Пароль базы данных",
+    "Database name" : "Название базы данных",
+    "Database tablespace" : "Табличое пространство базы данных",
+    "Database host" : "Хост базы данных",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite будет использован в качестве базы данных. Мы рекомендуем изменить это для крупных установок.",
+    "Finish setup" : "Завершить установку",
+    "Finishing …" : "Завершаем...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Этому приложению нужен включенный Джаваскрипт. Пожалуйста, <a href=\"http://www.enable-javascript.com/ru/\" target=\"_blank\">включите Джаваскрипт</a> и перезагрузите страницу.",
+    "%s is available. Get more information on how to update." : "%s доступно. Получить дополнительную информацию о порядке обновления.",
+    "Log out" : "Выйти",
+    "Server side authentication failed!" : "Неудачная аутентификация с сервером!",
+    "Please contact your administrator." : "Пожалуйста, свяжитесь с вашим администратором.",
+    "Forgot your password? Reset it!" : "Забыли пароль? Сбросьте его!",
+    "remember" : "запомнить",
+    "Log in" : "Войти",
+    "Alternative Logins" : "Альтернативные имена пользователя",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здравствуйте,<br><br>%s предоставил Вам доступ к <strong>%s</strong>.<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." : "Спасибо за терпение.",
+    "You are accessing the server from an untrusted domain." : "Вы пытаетесь получить доступ к серверу с неподтверждённого домена.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Пожалуйста, свяжитесь с администратором. Если вы администратор этого хранилища, сконфигурируйте \"trusted_domain\" в config/config.php. Пример настройки можно найти в /config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, вы, будучи администратором, можете также внести домен в доверенные при помощи кнопки снизу.",
+    "Add \"%s\" as trusted domain" : "Добавить \"%s\" как доверенный домен",
+    "%s will be updated to version %s." : "%s будет обновлено до версии %s.",
+    "The following apps will be disabled:" : "Следующие приложения будут отключены:",
+    "The theme %s has been disabled." : "Тема %s была отключена.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Пожалуйста, перед тем, как продолжить, убедитесь в том, что вы сделали резервную копию базы данных, директории конфигурации и директории с данными.",
+    "Start update" : "Запустить обновление",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать задержек при больших объёмах, вы можете выполнить следующую команду в директории установки:",
+    "This %s instance is currently being updated, which may take a while." : "Этот экземпляр %s в данный момент обновляется, это может занять некоторое время.",
+    "This page will refresh itself when the %s instance is available again." : "Эта страница обновится, когда экземпляр %s станет снова доступным."
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
new file mode 100644
index 00000000000..719a0cc1027
--- /dev/null
+++ b/core/l10n/ru.json
@@ -0,0 +1,209 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Невозможно отправить письмо следующим пользователям: %s",
+    "Turned on maintenance mode" : "Режим отладки включён",
+    "Turned off maintenance mode" : "Режим отладки отключён",
+    "Updated database" : "База данных обновлена",
+    "Checked database schema update" : "Проверено обновление схемы БД",
+    "Checked database schema update for apps" : "Проверено обновление схемы БД для приложений",
+    "Updated \"%s\" to %s" : "Обновлено \"%s\" до %s",
+    "Disabled incompatible apps: %s" : "Отключенные несовместимые приложения: %s",
+    "No image or file provided" : "Не указано изображение или файл",
+    "Unknown filetype" : "Неизвестный тип файла",
+    "Invalid image" : "Некорректное изображение",
+    "No temporary profile picture available, try again" : "Временная картинка профиля недоступна, повторите попытку",
+    "No crop data provided" : "Не указана информация о кадрировании",
+    "Sunday" : "Воскресенье",
+    "Monday" : "Понедельник",
+    "Tuesday" : "Вторник",
+    "Wednesday" : "Среда",
+    "Thursday" : "Четверг",
+    "Friday" : "Пятница",
+    "Saturday" : "Суббота",
+    "January" : "Январь",
+    "February" : "Февраль",
+    "March" : "Март",
+    "April" : "Апрель",
+    "May" : "Май",
+    "June" : "Июнь",
+    "July" : "Июль",
+    "August" : "Август",
+    "September" : "Сентябрь",
+    "October" : "Октябрь",
+    "November" : "Ноябрь",
+    "December" : "Декабрь",
+    "Settings" : "Настройки",
+    "File" : "Файл",
+    "Folder" : "Каталог",
+    "Image" : "Изображение",
+    "Audio" : "Аудио",
+    "Saving..." : "Сохранение...",
+    "Couldn't send reset email. Please contact your administrator." : "Не удалось отправить письмо для сброса пароля. Пожалуйста, свяжитесь с вашим администратором.",
+    "The link to reset your password has been sent to your email. 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>Если там письма со ссылкой нет, то обратитесь к локальному администратору.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к локальному администратору.<br />Вытдействительно хотите продолжить?",
+    "I know what I'm doing" : "Я понимаю, что делаю",
+    "Reset password" : "Сбросить пароль",
+    "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
+    "No" : "Нет",
+    "Yes" : "Да",
+    "Choose" : "Выбрать",
+    "Error loading file picker template: {error}" : "Ошибка при загрузке шаблона выбора файлов: {error}",
+    "Ok" : "Ок",
+    "Error loading message template: {error}" : "Ошибка загрузки шаблона сообщений: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"],
+    "One file conflict" : "Один конфликт в файлах",
+    "New Files" : "Новые файлы",
+    "Already existing files" : "Существующие файлы",
+    "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} выбрано)",
+    "Error loading file exists template" : "Ошибка при загрузке шаблона существующего файла",
+    "Very weak password" : "Очень слабый пароль",
+    "Weak password" : "Слабый пароль",
+    "So-so password" : "Так себе пароль",
+    "Good password" : "Хороший пароль",
+    "Strong password" : "Устойчивый к взлому пароль",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Веб-сервер до сих пор не настроен для возможности синхронизации файлов. Похоже что проблема в неисправности интерфейса WebDAV.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Этот сервер не имеет подключения к сети интернет. Это значит, что некоторые возможности, такие как подключение внешних дисков, уведомления об обновлениях или установка сторонних приложений – не работают. Удалённый доступ к файлам и отправка уведомлений по электронной почте вероятнее всего тоже не будут работать. Предлагаем включить соединение с интернетом для этого сервера, если Вы хотите иметь все возможности.",
+    "Error occurred while checking server setup" : "Произошла ошибка при проверке настройки сервера",
+    "Shared" : "Общие",
+    "Shared with {recipients}" : "Доступ открыт {recipients}",
+    "Share" : "Открыть доступ",
+    "Error" : "Ошибка",
+    "Error while sharing" : "Ошибка при открытии доступа",
+    "Error while unsharing" : "Ошибка при закрытии доступа",
+    "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" : "Поделиться ссылкой",
+    "The public link will expire no later than {days} days after it is created" : "Срок действия публичной ссылки истекает не позже чем через {days} дней, после её создания",
+    "Password protect" : "Защитить паролем",
+    "Choose a password for the public link" : "Выберите пароль для публичной ссылки",
+    "Allow Public Upload" : "Разрешить загрузку",
+    "Email link to person" : "Почтовая ссылка на персону",
+    "Send" : "Отправить",
+    "Set expiration date" : "Установить срок доступа",
+    "Expiration date" : "Дата окончания",
+    "Adding user..." : "Добавляем пользователя...",
+    "group" : "группа",
+    "Resharing is not allowed" : "Общий доступ не разрешен",
+    "Shared in {item} with {user}" : "Общий доступ к {item} с {user}",
+    "Unshare" : "Закрыть общий доступ",
+    "notify by email" : "уведомить по почте",
+    "can share" : "можно дать доступ",
+    "can edit" : "может редактировать",
+    "access control" : "контроль доступа",
+    "create" : "создать",
+    "update" : "обновить",
+    "delete" : "удалить",
+    "Password protected" : "Защищено паролем",
+    "Error unsetting expiration date" : "Ошибка при отмене срока доступа",
+    "Error setting expiration date" : "Ошибка при установке срока доступа",
+    "Sending ..." : "Отправляется ...",
+    "Email sent" : "Письмо отправлено",
+    "Warning" : "Предупреждение",
+    "The object type is not specified." : "Тип объекта не указан",
+    "Enter new" : "Ввести новое",
+    "Delete" : "Удалить",
+    "Add" : "Добавить",
+    "Edit tags" : "Изменить метки",
+    "Error loading dialog template: {error}" : "Ошибка загрузки шаблона диалога: {error}",
+    "No tags selected for deletion." : "Не выбраны метки для удаления.",
+    "Updating {productName} to version {version}, this may take a while." : "Обновление {productName} до версии {version}, пожалуйста, подождите.",
+    "Please reload the page." : "Пожалуйста, перезагрузите страницу.",
+    "The update was unsuccessful." : "Обновление не удалось.",
+    "The update was successful. Redirecting you to ownCloud now." : "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
+    "Couldn't reset password because the token is invalid" : "Невозможно сбросить пароль потому, что ключ неправильный",
+    "Couldn't send reset email. Please make sure your username is correct." : "Не удалось отправить письмо для сброса пароля. Пожалуйста, убедитесь в том, что ваше имя пользователя введено верно.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Невозможно отправить письмо для сброса пароля, т.к. у вашего аккаунта не прописан адрес почты. Пожалуйста, свяжитесь с администратором.",
+    "%s password reset" : "%s сброс пароля",
+    "Use the following link to reset your password: {link}" : "Используйте следующую ссылку чтобы сбросить пароль: {link}",
+    "You will receive a link to reset your password via Email." : "На ваш адрес 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" : "Да, я действительно хочу сбросить свой пароль",
+    "Reset" : "Сброс",
+    "New password" : "Новый пароль",
+    "New Password" : "Новый пароль",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.",
+    "Personal" : "Личное",
+    "Users" : "Пользователи",
+    "Apps" : "Приложения",
+    "Admin" : "Админпанель",
+    "Help" : "Помощь",
+    "Error loading tags" : "Ошибка загрузки меток",
+    "Tag already exists" : "Метка уже существует",
+    "Error deleting tag(s)" : "Ошибка удаления метки(ок)",
+    "Error tagging" : "Ошибка присваивания метки",
+    "Error untagging" : "Ошибка снятия метки",
+    "Error favoriting" : "Ошибка размещения в любимых",
+    "Error unfavoriting" : "Ошибка удаления из любимых",
+    "Access forbidden" : "Доступ запрещён",
+    "File not found" : "Файл не найден",
+    "The specified document has not been found on the server." : "Указанный документ не может быть найден на сервере.",
+    "You can click here to return to %s." : "Вы можете нажать здесь, чтобы вернуться в %s.",
+    "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!" : "Удачи!",
+    "The server encountered an internal error and was unable to complete your request." : "Сервер столкнулся с внутренней ошибкой и не смог закончить Ваш запрос.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Пожалуйста, свяжитесь с администратором сервера, если эта ошибка будет снова появляться, пожалуйста, прикрепите технические детали к своему сообщению.",
+    "More details can be found in the server log." : "Больше деталей может быть найдено в журнале сервера.",
+    "Technical details" : "Технические детали",
+    "Remote Address: %s" : "Удаленный Адрес: %s",
+    "Request ID: %s" : "ID Запроса: %s",
+    "Code: %s" : "Код: %s",
+    "Message: %s" : "Сообщение: %s",
+    "File: %s" : "Файл: %s",
+    "Line: %s" : "Линия: %s",
+    "Trace" : "След",
+    "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.",
+    "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 hrev=\"%s\"target=\"blank\">документацию</a>.",
+    "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>",
+    "Password" : "Пароль",
+    "Storage & database" : "Система хранения данных & база данных",
+    "Data folder" : "Директория с данными",
+    "Configure the database" : "Настройка базы данных",
+    "Only %s is available." : "Только %s доступно.",
+    "Database user" : "Пользователь базы данных",
+    "Database password" : "Пароль базы данных",
+    "Database name" : "Название базы данных",
+    "Database tablespace" : "Табличое пространство базы данных",
+    "Database host" : "Хост базы данных",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite будет использован в качестве базы данных. Мы рекомендуем изменить это для крупных установок.",
+    "Finish setup" : "Завершить установку",
+    "Finishing …" : "Завершаем...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Этому приложению нужен включенный Джаваскрипт. Пожалуйста, <a href=\"http://www.enable-javascript.com/ru/\" target=\"_blank\">включите Джаваскрипт</a> и перезагрузите страницу.",
+    "%s is available. Get more information on how to update." : "%s доступно. Получить дополнительную информацию о порядке обновления.",
+    "Log out" : "Выйти",
+    "Server side authentication failed!" : "Неудачная аутентификация с сервером!",
+    "Please contact your administrator." : "Пожалуйста, свяжитесь с вашим администратором.",
+    "Forgot your password? Reset it!" : "Забыли пароль? Сбросьте его!",
+    "remember" : "запомнить",
+    "Log in" : "Войти",
+    "Alternative Logins" : "Альтернативные имена пользователя",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здравствуйте,<br><br>%s предоставил Вам доступ к <strong>%s</strong>.<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." : "Спасибо за терпение.",
+    "You are accessing the server from an untrusted domain." : "Вы пытаетесь получить доступ к серверу с неподтверждённого домена.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Пожалуйста, свяжитесь с администратором. Если вы администратор этого хранилища, сконфигурируйте \"trusted_domain\" в config/config.php. Пример настройки можно найти в /config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, вы, будучи администратором, можете также внести домен в доверенные при помощи кнопки снизу.",
+    "Add \"%s\" as trusted domain" : "Добавить \"%s\" как доверенный домен",
+    "%s will be updated to version %s." : "%s будет обновлено до версии %s.",
+    "The following apps will be disabled:" : "Следующие приложения будут отключены:",
+    "The theme %s has been disabled." : "Тема %s была отключена.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Пожалуйста, перед тем, как продолжить, убедитесь в том, что вы сделали резервную копию базы данных, директории конфигурации и директории с данными.",
+    "Start update" : "Запустить обновление",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать задержек при больших объёмах, вы можете выполнить следующую команду в директории установки:",
+    "This %s instance is currently being updated, which may take a while." : "Этот экземпляр %s в данный момент обновляется, это может занять некоторое время.",
+    "This page will refresh itself when the %s instance is available again." : "Эта страница обновится, когда экземпляр %s станет снова доступным."
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
deleted file mode 100644
index aef239fd288..00000000000
--- a/core/l10n/ru.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Невозможно отправить письмо следующим пользователям: %s",
-"Turned on maintenance mode" => "Режим отладки включён",
-"Turned off maintenance mode" => "Режим отладки отключён",
-"Updated database" => "База данных обновлена",
-"Checked database schema update" => "Проверено обновление схемы БД",
-"Checked database schema update for apps" => "Проверено обновление схемы БД для приложений",
-"Updated \"%s\" to %s" => "Обновлено \"%s\" до %s",
-"Disabled incompatible apps: %s" => "Отключенные несовместимые приложения: %s",
-"No image or file provided" => "Не указано изображение или файл",
-"Unknown filetype" => "Неизвестный тип файла",
-"Invalid image" => "Некорректное изображение",
-"No temporary profile picture available, try again" => "Временная картинка профиля недоступна, повторите попытку",
-"No crop data provided" => "Не указана информация о кадрировании",
-"Sunday" => "Воскресенье",
-"Monday" => "Понедельник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Среда",
-"Thursday" => "Четверг",
-"Friday" => "Пятница",
-"Saturday" => "Суббота",
-"January" => "Январь",
-"February" => "Февраль",
-"March" => "Март",
-"April" => "Апрель",
-"May" => "Май",
-"June" => "Июнь",
-"July" => "Июль",
-"August" => "Август",
-"September" => "Сентябрь",
-"October" => "Октябрь",
-"November" => "Ноябрь",
-"December" => "Декабрь",
-"Settings" => "Настройки",
-"File" => "Файл",
-"Folder" => "Каталог",
-"Image" => "Изображение",
-"Audio" => "Аудио",
-"Saving..." => "Сохранение...",
-"Couldn't send reset email. Please contact your administrator." => "Не удалось отправить письмо для сброса пароля. Пожалуйста, свяжитесь с вашим администратором.",
-"The link to reset your password has been sent to your email. 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>Если там письма со ссылкой нет, то обратитесь к локальному администратору.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к локальному администратору.<br />Вытдействительно хотите продолжить?",
-"I know what I'm doing" => "Я понимаю, что делаю",
-"Reset password" => "Сбросить пароль",
-"Password can not be changed. Please contact your administrator." => "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
-"No" => "Нет",
-"Yes" => "Да",
-"Choose" => "Выбрать",
-"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}",
-"Ok" => "Ок",
-"Error loading message template: {error}" => "Ошибка загрузки шаблона сообщений: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"),
-"One file conflict" => "Один конфликт в файлах",
-"New Files" => "Новые файлы",
-"Already existing files" => "Существующие файлы",
-"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} выбрано)",
-"Error loading file exists template" => "Ошибка при загрузке шаблона существующего файла",
-"Very weak password" => "Очень слабый пароль",
-"Weak password" => "Слабый пароль",
-"So-so password" => "Так себе пароль",
-"Good password" => "Хороший пароль",
-"Strong password" => "Устойчивый к взлому пароль",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Веб-сервер до сих пор не настроен для возможности синхронизации файлов. Похоже что проблема в неисправности интерфейса WebDAV.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Этот сервер не имеет подключения к сети интернет. Это значит, что некоторые возможности, такие как подключение внешних дисков, уведомления об обновлениях или установка сторонних приложений – не работают. Удалённый доступ к файлам и отправка уведомлений по электронной почте вероятнее всего тоже не будут работать. Предлагаем включить соединение с интернетом для этого сервера, если Вы хотите иметь все возможности.",
-"Error occurred while checking server setup" => "Произошла ошибка при проверке настройки сервера",
-"Shared" => "Общие",
-"Shared with {recipients}" => "Доступ открыт {recipients}",
-"Share" => "Открыть доступ",
-"Error" => "Ошибка",
-"Error while sharing" => "Ошибка при открытии доступа",
-"Error while unsharing" => "Ошибка при закрытии доступа",
-"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" => "Поделиться ссылкой",
-"The public link will expire no later than {days} days after it is created" => "Срок действия публичной ссылки истекает не позже чем через {days} дней, после её создания",
-"Password protect" => "Защитить паролем",
-"Choose a password for the public link" => "Выберите пароль для публичной ссылки",
-"Allow Public Upload" => "Разрешить загрузку",
-"Email link to person" => "Почтовая ссылка на персону",
-"Send" => "Отправить",
-"Set expiration date" => "Установить срок доступа",
-"Expiration date" => "Дата окончания",
-"Adding user..." => "Добавляем пользователя...",
-"group" => "группа",
-"Resharing is not allowed" => "Общий доступ не разрешен",
-"Shared in {item} with {user}" => "Общий доступ к {item} с {user}",
-"Unshare" => "Закрыть общий доступ",
-"notify by email" => "уведомить по почте",
-"can share" => "можно дать доступ",
-"can edit" => "может редактировать",
-"access control" => "контроль доступа",
-"create" => "создать",
-"update" => "обновить",
-"delete" => "удалить",
-"Password protected" => "Защищено паролем",
-"Error unsetting expiration date" => "Ошибка при отмене срока доступа",
-"Error setting expiration date" => "Ошибка при установке срока доступа",
-"Sending ..." => "Отправляется ...",
-"Email sent" => "Письмо отправлено",
-"Warning" => "Предупреждение",
-"The object type is not specified." => "Тип объекта не указан",
-"Enter new" => "Ввести новое",
-"Delete" => "Удалить",
-"Add" => "Добавить",
-"Edit tags" => "Изменить метки",
-"Error loading dialog template: {error}" => "Ошибка загрузки шаблона диалога: {error}",
-"No tags selected for deletion." => "Не выбраны метки для удаления.",
-"Updating {productName} to version {version}, this may take a while." => "Обновление {productName} до версии {version}, пожалуйста, подождите.",
-"Please reload the page." => "Пожалуйста, перезагрузите страницу.",
-"The update was unsuccessful." => "Обновление не удалось.",
-"The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
-"Couldn't reset password because the token is invalid" => "Невозможно сбросить пароль потому, что ключ неправильный",
-"Couldn't send reset email. Please make sure your username is correct." => "Не удалось отправить письмо для сброса пароля. Пожалуйста, убедитесь в том, что ваше имя пользователя введено верно.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Невозможно отправить письмо для сброса пароля, т.к. у вашего аккаунта не прописан адрес почты. Пожалуйста, свяжитесь с администратором.",
-"%s password reset" => "%s сброс пароля",
-"Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
-"You will receive a link to reset your password via Email." => "На ваш адрес 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" => "Да, я действительно хочу сбросить свой пароль",
-"Reset" => "Сброс",
-"New password" => "Новый пароль",
-"New Password" => "Новый пароль",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!",
-"For the best results, please consider using a GNU/Linux server instead." => "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.",
-"Personal" => "Личное",
-"Users" => "Пользователи",
-"Apps" => "Приложения",
-"Admin" => "Админпанель",
-"Help" => "Помощь",
-"Error loading tags" => "Ошибка загрузки меток",
-"Tag already exists" => "Метка уже существует",
-"Error deleting tag(s)" => "Ошибка удаления метки(ок)",
-"Error tagging" => "Ошибка присваивания метки",
-"Error untagging" => "Ошибка снятия метки",
-"Error favoriting" => "Ошибка размещения в любимых",
-"Error unfavoriting" => "Ошибка удаления из любимых",
-"Access forbidden" => "Доступ запрещён",
-"File not found" => "Файл не найден",
-"The specified document has not been found on the server." => "Указанный документ не может быть найден на сервере.",
-"You can click here to return to %s." => "Вы можете нажать здесь, чтобы вернуться в %s.",
-"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!" => "Удачи!",
-"Internal Server Error" => "Внутренняя ошибка сервера",
-"The server encountered an internal error and was unable to complete your request." => "Сервер столкнулся с внутренней ошибкой и не смог закончить Ваш запрос.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Пожалуйста, свяжитесь с администратором сервера, если эта ошибка будет снова появляться, пожалуйста, прикрепите технические детали к своему сообщению.",
-"More details can be found in the server log." => "Больше деталей может быть найдено в журнале сервера.",
-"Technical details" => "Технические детали",
-"Remote Address: %s" => "Удаленный Адрес: %s",
-"Request ID: %s" => "ID Запроса: %s",
-"Code: %s" => "Код: %s",
-"Message: %s" => "Сообщение: %s",
-"File: %s" => "Файл: %s",
-"Line: %s" => "Линия: %s",
-"Trace" => "След",
-"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.",
-"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 hrev=\"%s\"target=\"blank\">документацию</a>.",
-"Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
-"Password" => "Пароль",
-"Storage & database" => "Система хранения данных & база данных",
-"Data folder" => "Директория с данными",
-"Configure the database" => "Настройка базы данных",
-"Only %s is available." => "Только %s доступно.",
-"Database user" => "Пользователь базы данных",
-"Database password" => "Пароль базы данных",
-"Database name" => "Название базы данных",
-"Database tablespace" => "Табличое пространство базы данных",
-"Database host" => "Хост базы данных",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite будет использован в качестве базы данных. Мы рекомендуем изменить это для крупных установок.",
-"Finish setup" => "Завершить установку",
-"Finishing …" => "Завершаем...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Этому приложению нужен включенный Джаваскрипт. Пожалуйста, <a href=\"http://www.enable-javascript.com/ru/\" target=\"_blank\">включите Джаваскрипт</a> и перезагрузите страницу.",
-"%s is available. Get more information on how to update." => "%s доступно. Получить дополнительную информацию о порядке обновления.",
-"Log out" => "Выйти",
-"Server side authentication failed!" => "Неудачная аутентификация с сервером!",
-"Please contact your administrator." => "Пожалуйста, свяжитесь с вашим администратором.",
-"Forgot your password? Reset it!" => "Забыли пароль? Сбросьте его!",
-"remember" => "запомнить",
-"Log in" => "Войти",
-"Alternative Logins" => "Альтернативные имена пользователя",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Здравствуйте,<br><br>%s предоставил Вам доступ к <strong>%s</strong>.<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." => "Спасибо за терпение.",
-"You are accessing the server from an untrusted domain." => "Вы пытаетесь получить доступ к серверу с неподтверждённого домена.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Пожалуйста, свяжитесь с администратором. Если вы администратор этого хранилища, сконфигурируйте \"trusted_domain\" в config/config.php. Пример настройки можно найти в /config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "В зависимости от конфигурации, вы, будучи администратором, можете также внести домен в доверенные при помощи кнопки снизу.",
-"Add \"%s\" as trusted domain" => "Добавить \"%s\" как доверенный домен",
-"%s will be updated to version %s." => "%s будет обновлено до версии %s.",
-"The following apps will be disabled:" => "Следующие приложения будут отключены:",
-"The theme %s has been disabled." => "Тема %s была отключена.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Пожалуйста, перед тем, как продолжить, убедитесь в том, что вы сделали резервную копию базы данных, директории конфигурации и директории с данными.",
-"Start update" => "Запустить обновление",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Чтобы избежать задержек при больших объёмах, вы можете выполнить следующую команду в директории установки:",
-"This %s instance is currently being updated, which may take a while." => "Этот экземпляр %s в данный момент обновляется, это может занять некоторое время.",
-"This page will refresh itself when the %s instance is available again." => "Эта страница обновится, когда экземпляр %s станет снова доступным."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js
new file mode 100644
index 00000000000..63edcfb6065
--- /dev/null
+++ b/core/l10n/si_LK.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "ඉරිදා",
+    "Monday" : "සඳුදා",
+    "Tuesday" : "අඟහරුවාදා",
+    "Wednesday" : "බදාදා",
+    "Thursday" : "බ්‍රහස්පතින්දා",
+    "Friday" : "සිකුරාදා",
+    "Saturday" : "සෙනසුරාදා",
+    "January" : "ජනවාරි",
+    "February" : "පෙබරවාරි",
+    "March" : "මාර්තු",
+    "April" : "අප්‍රේල්",
+    "May" : "මැයි",
+    "June" : "ජූනි",
+    "July" : "ජූලි",
+    "August" : "අගෝස්තු",
+    "September" : "සැප්තැම්බර්",
+    "October" : "ඔක්තෝබර",
+    "November" : "නොවැම්බර්",
+    "December" : "දෙසැම්බර්",
+    "Settings" : "සිටුවම්",
+    "Folder" : "ෆෝල්ඩරය",
+    "Image" : "පින්තූරය",
+    "Saving..." : "සුරැකෙමින් පවතී...",
+    "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
+    "No" : "එපා",
+    "Yes" : "ඔව්",
+    "Choose" : "තෝරන්න",
+    "Ok" : "හරි",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "එපා",
+    "Share" : "බෙදා හදා ගන්න",
+    "Error" : "දෝෂයක්",
+    "Password protect" : "මුර පදයකින් ආරක්ශාකරන්න",
+    "Set expiration date" : "කල් ඉකුත් විමේ දිනය දමන්න",
+    "Expiration date" : "කල් ඉකුත් විමේ දිනය",
+    "group" : "කණ්ඩායම",
+    "Unshare" : "නොබෙදු",
+    "can edit" : "සංස්කරණය කළ හැක",
+    "access control" : "ප්‍රවේශ පාලනය",
+    "create" : "සදන්න",
+    "update" : "යාවත්කාලීන කරන්න",
+    "delete" : "මකන්න",
+    "Password protected" : "මුර පදයකින් ආරක්ශාකර ඇත",
+    "Error unsetting expiration date" : "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
+    "Error setting expiration date" : "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
+    "Warning" : "අවවාදය",
+    "Delete" : "මකා දමන්න",
+    "Add" : "එකතු කරන්න",
+    "You will receive a link to reset your password via Email." : "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
+    "Username" : "පරිශීලක නම",
+    "New password" : "නව මුරපදය",
+    "Personal" : "පෞද්ගලික",
+    "Users" : "පරිශීලකයන්",
+    "Apps" : "යෙදුම්",
+    "Admin" : "පරිපාලක",
+    "Help" : "උදව්",
+    "Access forbidden" : "ඇතුල් වීම තහනම්",
+    "Security Warning" : "ආරක්ෂක නිවේදනයක්",
+    "Password" : "මුර පදය",
+    "Data folder" : "දත්ත ෆෝල්ඩරය",
+    "Configure the database" : "දත්ත සමුදාය හැඩගැසීම",
+    "Database user" : "දත්තගබඩා භාවිතාකරු",
+    "Database password" : "දත්තගබඩාවේ මුරපදය",
+    "Database name" : "දත්තගබඩාවේ නම",
+    "Database host" : "දත්තගබඩා සේවාදායකයා",
+    "Finish setup" : "ස්ථාපනය කිරීම අවසන් කරන්න",
+    "Log out" : "නික්මීම",
+    "remember" : "මතක තබාගන්න",
+    "Log in" : "ප්‍රවේශවන්න"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json
new file mode 100644
index 00000000000..f04c86b9898
--- /dev/null
+++ b/core/l10n/si_LK.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Sunday" : "ඉරිදා",
+    "Monday" : "සඳුදා",
+    "Tuesday" : "අඟහරුවාදා",
+    "Wednesday" : "බදාදා",
+    "Thursday" : "බ්‍රහස්පතින්දා",
+    "Friday" : "සිකුරාදා",
+    "Saturday" : "සෙනසුරාදා",
+    "January" : "ජනවාරි",
+    "February" : "පෙබරවාරි",
+    "March" : "මාර්තු",
+    "April" : "අප්‍රේල්",
+    "May" : "මැයි",
+    "June" : "ජූනි",
+    "July" : "ජූලි",
+    "August" : "අගෝස්තු",
+    "September" : "සැප්තැම්බර්",
+    "October" : "ඔක්තෝබර",
+    "November" : "නොවැම්බර්",
+    "December" : "දෙසැම්බර්",
+    "Settings" : "සිටුවම්",
+    "Folder" : "ෆෝල්ඩරය",
+    "Image" : "පින්තූරය",
+    "Saving..." : "සුරැකෙමින් පවතී...",
+    "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
+    "No" : "එපා",
+    "Yes" : "ඔව්",
+    "Choose" : "තෝරන්න",
+    "Ok" : "හරි",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "එපා",
+    "Share" : "බෙදා හදා ගන්න",
+    "Error" : "දෝෂයක්",
+    "Password protect" : "මුර පදයකින් ආරක්ශාකරන්න",
+    "Set expiration date" : "කල් ඉකුත් විමේ දිනය දමන්න",
+    "Expiration date" : "කල් ඉකුත් විමේ දිනය",
+    "group" : "කණ්ඩායම",
+    "Unshare" : "නොබෙදු",
+    "can edit" : "සංස්කරණය කළ හැක",
+    "access control" : "ප්‍රවේශ පාලනය",
+    "create" : "සදන්න",
+    "update" : "යාවත්කාලීන කරන්න",
+    "delete" : "මකන්න",
+    "Password protected" : "මුර පදයකින් ආරක්ශාකර ඇත",
+    "Error unsetting expiration date" : "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
+    "Error setting expiration date" : "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
+    "Warning" : "අවවාදය",
+    "Delete" : "මකා දමන්න",
+    "Add" : "එකතු කරන්න",
+    "You will receive a link to reset your password via Email." : "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
+    "Username" : "පරිශීලක නම",
+    "New password" : "නව මුරපදය",
+    "Personal" : "පෞද්ගලික",
+    "Users" : "පරිශීලකයන්",
+    "Apps" : "යෙදුම්",
+    "Admin" : "පරිපාලක",
+    "Help" : "උදව්",
+    "Access forbidden" : "ඇතුල් වීම තහනම්",
+    "Security Warning" : "ආරක්ෂක නිවේදනයක්",
+    "Password" : "මුර පදය",
+    "Data folder" : "දත්ත ෆෝල්ඩරය",
+    "Configure the database" : "දත්ත සමුදාය හැඩගැසීම",
+    "Database user" : "දත්තගබඩා භාවිතාකරු",
+    "Database password" : "දත්තගබඩාවේ මුරපදය",
+    "Database name" : "දත්තගබඩාවේ නම",
+    "Database host" : "දත්තගබඩා සේවාදායකයා",
+    "Finish setup" : "ස්ථාපනය කිරීම අවසන් කරන්න",
+    "Log out" : "නික්මීම",
+    "remember" : "මතක තබාගන්න",
+    "Log in" : "ප්‍රවේශවන්න"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
deleted file mode 100644
index 57de60748e9..00000000000
--- a/core/l10n/si_LK.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "ඉරිදා",
-"Monday" => "සඳුදා",
-"Tuesday" => "අඟහරුවාදා",
-"Wednesday" => "බදාදා",
-"Thursday" => "බ්‍රහස්පතින්දා",
-"Friday" => "සිකුරාදා",
-"Saturday" => "සෙනසුරාදා",
-"January" => "ජනවාරි",
-"February" => "පෙබරවාරි",
-"March" => "මාර්තු",
-"April" => "අප්‍රේල්",
-"May" => "මැයි",
-"June" => "ජූනි",
-"July" => "ජූලි",
-"August" => "අගෝස්තු",
-"September" => "සැප්තැම්බර්",
-"October" => "ඔක්තෝබර",
-"November" => "නොවැම්බර්",
-"December" => "දෙසැම්බර්",
-"Settings" => "සිටුවම්",
-"Folder" => "ෆෝල්ඩරය",
-"Image" => "පින්තූරය",
-"Saving..." => "සුරැකෙමින් පවතී...",
-"Reset password" => "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
-"No" => "එපා",
-"Yes" => "ඔව්",
-"Choose" => "තෝරන්න",
-"Ok" => "හරි",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "එපා",
-"Share" => "බෙදා හදා ගන්න",
-"Error" => "දෝෂයක්",
-"Password protect" => "මුර පදයකින් ආරක්ශාකරන්න",
-"Set expiration date" => "කල් ඉකුත් විමේ දිනය දමන්න",
-"Expiration date" => "කල් ඉකුත් විමේ දිනය",
-"group" => "කණ්ඩායම",
-"Unshare" => "නොබෙදු",
-"can edit" => "සංස්කරණය කළ හැක",
-"access control" => "ප්‍රවේශ පාලනය",
-"create" => "සදන්න",
-"update" => "යාවත්කාලීන කරන්න",
-"delete" => "මකන්න",
-"Password protected" => "මුර පදයකින් ආරක්ශාකර ඇත",
-"Error unsetting expiration date" => "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
-"Error setting expiration date" => "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
-"Warning" => "අවවාදය",
-"Delete" => "මකා දමන්න",
-"Add" => "එකතු කරන්න",
-"You will receive a link to reset your password via Email." => "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
-"Username" => "පරිශීලක නම",
-"New password" => "නව මුරපදය",
-"Personal" => "පෞද්ගලික",
-"Users" => "පරිශීලකයන්",
-"Apps" => "යෙදුම්",
-"Admin" => "පරිපාලක",
-"Help" => "උදව්",
-"Access forbidden" => "ඇතුල් වීම තහනම්",
-"Security Warning" => "ආරක්ෂක නිවේදනයක්",
-"Password" => "මුර පදය",
-"Data folder" => "දත්ත ෆෝල්ඩරය",
-"Configure the database" => "දත්ත සමුදාය හැඩගැසීම",
-"Database user" => "දත්තගබඩා භාවිතාකරු",
-"Database password" => "දත්තගබඩාවේ මුරපදය",
-"Database name" => "දත්තගබඩාවේ නම",
-"Database host" => "දත්තගබඩා සේවාදායකයා",
-"Finish setup" => "ස්ථාපනය කිරීම අවසන් කරන්න",
-"Log out" => "නික්මීම",
-"remember" => "මතක තබාගන්න",
-"Log in" => "ප්‍රවේශවන්න"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
new file mode 100644
index 00000000000..10da03f7667
--- /dev/null
+++ b/core/l10n/sk_SK.js
@@ -0,0 +1,190 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nebolo možné odoslať email týmto používateľom: %s ",
+    "Turned on maintenance mode" : "Mód údržby je zapnutý",
+    "Turned off maintenance mode" : "Mód údržby e vypnutý",
+    "Updated database" : "Databáza je aktualizovaná",
+    "Checked database schema update" : "Skontrolovať aktualizáciu schémy databázy",
+    "Checked database schema update for apps" : "Aktualizácia schémy databázy aplikácií bola overená",
+    "Updated \"%s\" to %s" : "Aktualizované \"%s\" na %s",
+    "Disabled incompatible apps: %s" : "Zakázané nekompatibilné aplikácie: %s",
+    "No image or file provided" : "Obrázok alebo súbor nebol zadaný",
+    "Unknown filetype" : "Neznámy typ súboru",
+    "Invalid image" : "Chybný obrázok",
+    "No temporary profile picture available, try again" : "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu",
+    "No crop data provided" : "Dáta pre orezanie neboli zadané",
+    "Sunday" : "Nedeľa",
+    "Monday" : "Pondelok",
+    "Tuesday" : "Utorok",
+    "Wednesday" : "Streda",
+    "Thursday" : "Štvrtok",
+    "Friday" : "Piatok",
+    "Saturday" : "Sobota",
+    "January" : "Január",
+    "February" : "Február",
+    "March" : "Marec",
+    "April" : "Apríl",
+    "May" : "Máj",
+    "June" : "Jún",
+    "July" : "Júl",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Október",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Nastavenia",
+    "File" : "Súbor",
+    "Folder" : "Priečinok",
+    "Image" : "Obrázok",
+    "Audio" : "Zvuk",
+    "Saving..." : "Ukladám...",
+    "Couldn't send reset email. Please contact your administrator." : "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
+    "The link to reset your password has been sent to your email. 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." : "Odkaz na obnovu hesla bol odoslaný na váš email. Pokiaľ ho neobdržíte v primeranom čase, skontrolujte spam / priečinok nevyžiadanej pošty. <br> Ak tam nie je, kontaktujte svojho administrátora.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Súbory sú zašifrované. Ak ste nepovolili kľúč pre obnovenie, neexistuje žiadny spôsob, ako obnoviť vaše dáta po obnovení vášho hesla. <br /> Ak si nie ste istí čo urobiť, prosím skôr než budete pokračovať, obráťte sa na administrátora. <br /> Naozaj chcete pokračovať?",
+    "I know what I'm doing" : "Viem, čo robím",
+    "Reset password" : "Obnovenie hesla",
+    "Password can not be changed. Please contact your administrator." : "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.",
+    "No" : "Nie",
+    "Yes" : "Áno",
+    "Choose" : "Vybrať",
+    "Error loading file picker template: {error}" : "Chyba pri nahrávaní šablóny výberu súborov: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Chyba pri nahrávaní šablóny správy: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"],
+    "One file conflict" : "Jeden konflikt súboru",
+    "New Files" : "Nové súbory",
+    "Already existing files" : "Už existujúce súbory",
+    "Which files do you want to keep?" : "Ktoré súbory chcete ponechať?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo.",
+    "Cancel" : "Zrušiť",
+    "Continue" : "Pokračovať",
+    "(all selected)" : "(všetko vybrané)",
+    "({count} selected)" : "({count} vybraných)",
+    "Error loading file exists template" : "Chyba pri nahrávaní šablóny existencie súboru",
+    "Very weak password" : "Veľmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Priemerné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Server nemá funkčné pripojenie k internetu. Niektoré moduly ako napr. externé úložisko, oznámenie o dostupných aktualizáciách alebo inštalácia aplikácií tretích strán nebudú fungovať. Prístup k súborom z iných miest a odosielanie oznamovacích emailov tiež nemusí fungovať. Ak chcete využívať všetky vlastnosti ownCloudu, odporúčame povoliť pripojenie k internetu tomuto serveru.",
+    "Shared" : "Zdieľané",
+    "Shared with {recipients}" : "Zdieľa s {recipients}",
+    "Share" : "Zdieľať",
+    "Error" : "Chyba",
+    "Error while sharing" : "Chyba počas zdieľania",
+    "Error while unsharing" : "Chyba počas ukončenia zdieľania",
+    "Error while changing permissions" : "Chyba počas zmeny oprávnení",
+    "Shared with you and the group {group} by {owner}" : "Zdieľané s vami a so skupinou {group} používateľom {owner}",
+    "Shared with you by {owner}" : "Zdieľané s vami používateľom {owner}",
+    "Share with user or group …" : "Zdieľať s používateľom alebo skupinou ...",
+    "Share link" : "Zdieľať linku",
+    "The public link will expire no later than {days} days after it is created" : "Verejný odkaz nevyprší skôr než za {days} dní po vytvorení",
+    "Password protect" : "Chrániť heslom",
+    "Choose a password for the public link" : "Zadajte heslo pre tento verejný odkaz",
+    "Allow Public Upload" : "Povoliť verejné nahrávanie",
+    "Email link to person" : "Odoslať odkaz emailom",
+    "Send" : "Odoslať",
+    "Set expiration date" : "Nastaviť dátum expirácie",
+    "Expiration date" : "Dátum expirácie",
+    "group" : "skupina",
+    "Resharing is not allowed" : "Zdieľanie už zdieľanej položky nie je povolené",
+    "Shared in {item} with {user}" : "Zdieľané v {item} s {user}",
+    "Unshare" : "Zrušiť zdieľanie",
+    "notify by email" : "informovať emailom",
+    "can share" : "môže zdieľať",
+    "can edit" : "môže upraviť",
+    "access control" : "prístupové práva",
+    "create" : "vytvoriť",
+    "update" : "aktualizovať",
+    "delete" : "vymazať",
+    "Password protected" : "Chránené heslom",
+    "Error unsetting expiration date" : "Chyba pri odstraňovaní dátumu expirácie",
+    "Error setting expiration date" : "Chyba pri nastavení dátumu expirácie",
+    "Sending ..." : "Odosielam ...",
+    "Email sent" : "Email odoslaný",
+    "Warning" : "Varovanie",
+    "The object type is not specified." : "Nešpecifikovaný typ objektu.",
+    "Enter new" : "Zadať nový",
+    "Delete" : "Zmazať",
+    "Add" : "Pridať",
+    "Edit tags" : "Upraviť štítky",
+    "Error loading dialog template: {error}" : "Chyba pri načítaní šablóny dialógu: {error}",
+    "No tags selected for deletion." : "Nie sú vybraté štítky na zmazanie.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
+    "Please reload the page." : "Obnovte prosím stránku.",
+    "The update was unsuccessful." : "Aktualizácia zlyhala.",
+    "The update was successful. Redirecting you to ownCloud now." : "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.",
+    "Couldn't reset password because the token is invalid" : "Nemožno zmeniť heslo pre neplatnosť tokenu.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nemožno poslať email pre obnovu. Uistite sa, či vkladáte správne používateľské meno.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nemožno poslať email pre obnovu hesla, pretože pre tohoto používateľa nie je uvedená žiadna emailová adresa. Prosím, obráťte sa na administrátora.",
+    "%s password reset" : "reset hesla %s",
+    "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 emailom.",
+    "Username" : "Meno používateľa",
+    "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?" : "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
+    "Yes, I really want to reset my password now" : "Áno, želám si teraz obnoviť svoje heslo",
+    "Reset" : "Resetovať",
+    "New password" : "Nové heslo",
+    "New Password" : "Nové heslo",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
+    "Personal" : "Osobné",
+    "Users" : "Používatelia",
+    "Apps" : "Aplikácie",
+    "Admin" : "Administrácia",
+    "Help" : "Pomoc",
+    "Error loading tags" : "Chyba pri načítaní štítkov",
+    "Tag already exists" : "Štítok už existuje",
+    "Error deleting tag(s)" : "Chyba pri mazaní štítka(ov)",
+    "Error tagging" : "Chyba pri pridaní štítka",
+    "Error untagging" : "Chyba pri odobratí štítka",
+    "Error favoriting" : "Chyba pri pridaní do obľúbených",
+    "Error unfavoriting" : "Chyba pri odobratí z obľúbených",
+    "Access forbidden" : "Prístup odmietnutý",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n",
+    "The share will expire on %s." : "Zdieľanie vyprší %s.",
+    "Cheers!" : "Pekný deň!",
+    "Security Warning" : "Bezpečnostné varovanie",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
+    "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>",
+    "Password" : "Heslo",
+    "Storage & database" : "Úložislo & databáza",
+    "Data folder" : "Priečinok dát",
+    "Configure the database" : "Nastaviť databázu",
+    "Only %s is available." : "Len %s je dostupný.",
+    "Database user" : "Používateľ databázy",
+    "Database password" : "Heslo databázy",
+    "Database name" : "Meno databázy",
+    "Database tablespace" : "Tabuľkový priestor databázy",
+    "Database host" : "Server databázy",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Ako databáza bude použitá SQLite. Pri väčších inštaláciách odporúčame zmeniť na inú.",
+    "Finish setup" : "Dokončiť inštaláciu",
+    "Finishing …" : "Dokončujem...",
+    "%s is available. Get more information on how to update." : "%s je dostupná. Získajte viac informácií o postupe aktualizácie.",
+    "Log out" : "Odhlásiť",
+    "Server side authentication failed!" : "Autentifikácia na serveri zlyhala!",
+    "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.",
+    "Forgot your password? Reset it!" : "Zabudli ste heslo? Obnovte si ho!",
+    "remember" : "zapamätať",
+    "Log in" : "Prihlásiť sa",
+    "Alternative Logins" : "Alternatívne prihlásenie",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Táto inštancia ownCloudu je teraz v jednopoužívateľskom móde.",
+    "This means only administrators can use the instance." : "Len správca systému môže používať túto inštanciu.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.",
+    "Thank you for your patience." : "Ďakujeme za Vašu trpezlivosť.",
+    "You are accessing the server from an untrusted domain." : "Pristupujete na server v nedôveryhodnej doméne.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte administrátora. Ak ste administrátorom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
+    "Add \"%s\" as trusted domain" : "Pridať \"%s\" ako dôveryhodnú doménu",
+    "%s will be updated to version %s." : "%s bude zaktualizovaný na verziu %s.",
+    "The following apps will be disabled:" : "Tieto aplikácie budú zakázané:",
+    "The theme %s has been disabled." : "Téma %s bola zakázaná.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred vykonaním ďalšieho kroku sa presvedčte, že databáza, konfiguračný a dátový priečinok sú zazálohované.",
+    "Start update" : "Spustiť aktualizáciu"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
new file mode 100644
index 00000000000..0a964f375e4
--- /dev/null
+++ b/core/l10n/sk_SK.json
@@ -0,0 +1,188 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nebolo možné odoslať email týmto používateľom: %s ",
+    "Turned on maintenance mode" : "Mód údržby je zapnutý",
+    "Turned off maintenance mode" : "Mód údržby e vypnutý",
+    "Updated database" : "Databáza je aktualizovaná",
+    "Checked database schema update" : "Skontrolovať aktualizáciu schémy databázy",
+    "Checked database schema update for apps" : "Aktualizácia schémy databázy aplikácií bola overená",
+    "Updated \"%s\" to %s" : "Aktualizované \"%s\" na %s",
+    "Disabled incompatible apps: %s" : "Zakázané nekompatibilné aplikácie: %s",
+    "No image or file provided" : "Obrázok alebo súbor nebol zadaný",
+    "Unknown filetype" : "Neznámy typ súboru",
+    "Invalid image" : "Chybný obrázok",
+    "No temporary profile picture available, try again" : "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu",
+    "No crop data provided" : "Dáta pre orezanie neboli zadané",
+    "Sunday" : "Nedeľa",
+    "Monday" : "Pondelok",
+    "Tuesday" : "Utorok",
+    "Wednesday" : "Streda",
+    "Thursday" : "Štvrtok",
+    "Friday" : "Piatok",
+    "Saturday" : "Sobota",
+    "January" : "Január",
+    "February" : "Február",
+    "March" : "Marec",
+    "April" : "Apríl",
+    "May" : "Máj",
+    "June" : "Jún",
+    "July" : "Júl",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Október",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Nastavenia",
+    "File" : "Súbor",
+    "Folder" : "Priečinok",
+    "Image" : "Obrázok",
+    "Audio" : "Zvuk",
+    "Saving..." : "Ukladám...",
+    "Couldn't send reset email. Please contact your administrator." : "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
+    "The link to reset your password has been sent to your email. 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." : "Odkaz na obnovu hesla bol odoslaný na váš email. Pokiaľ ho neobdržíte v primeranom čase, skontrolujte spam / priečinok nevyžiadanej pošty. <br> Ak tam nie je, kontaktujte svojho administrátora.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Súbory sú zašifrované. Ak ste nepovolili kľúč pre obnovenie, neexistuje žiadny spôsob, ako obnoviť vaše dáta po obnovení vášho hesla. <br /> Ak si nie ste istí čo urobiť, prosím skôr než budete pokračovať, obráťte sa na administrátora. <br /> Naozaj chcete pokračovať?",
+    "I know what I'm doing" : "Viem, čo robím",
+    "Reset password" : "Obnovenie hesla",
+    "Password can not be changed. Please contact your administrator." : "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.",
+    "No" : "Nie",
+    "Yes" : "Áno",
+    "Choose" : "Vybrať",
+    "Error loading file picker template: {error}" : "Chyba pri nahrávaní šablóny výberu súborov: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Chyba pri nahrávaní šablóny správy: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"],
+    "One file conflict" : "Jeden konflikt súboru",
+    "New Files" : "Nové súbory",
+    "Already existing files" : "Už existujúce súbory",
+    "Which files do you want to keep?" : "Ktoré súbory chcete ponechať?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo.",
+    "Cancel" : "Zrušiť",
+    "Continue" : "Pokračovať",
+    "(all selected)" : "(všetko vybrané)",
+    "({count} selected)" : "({count} vybraných)",
+    "Error loading file exists template" : "Chyba pri nahrávaní šablóny existencie súboru",
+    "Very weak password" : "Veľmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Priemerné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Server nemá funkčné pripojenie k internetu. Niektoré moduly ako napr. externé úložisko, oznámenie o dostupných aktualizáciách alebo inštalácia aplikácií tretích strán nebudú fungovať. Prístup k súborom z iných miest a odosielanie oznamovacích emailov tiež nemusí fungovať. Ak chcete využívať všetky vlastnosti ownCloudu, odporúčame povoliť pripojenie k internetu tomuto serveru.",
+    "Shared" : "Zdieľané",
+    "Shared with {recipients}" : "Zdieľa s {recipients}",
+    "Share" : "Zdieľať",
+    "Error" : "Chyba",
+    "Error while sharing" : "Chyba počas zdieľania",
+    "Error while unsharing" : "Chyba počas ukončenia zdieľania",
+    "Error while changing permissions" : "Chyba počas zmeny oprávnení",
+    "Shared with you and the group {group} by {owner}" : "Zdieľané s vami a so skupinou {group} používateľom {owner}",
+    "Shared with you by {owner}" : "Zdieľané s vami používateľom {owner}",
+    "Share with user or group …" : "Zdieľať s používateľom alebo skupinou ...",
+    "Share link" : "Zdieľať linku",
+    "The public link will expire no later than {days} days after it is created" : "Verejný odkaz nevyprší skôr než za {days} dní po vytvorení",
+    "Password protect" : "Chrániť heslom",
+    "Choose a password for the public link" : "Zadajte heslo pre tento verejný odkaz",
+    "Allow Public Upload" : "Povoliť verejné nahrávanie",
+    "Email link to person" : "Odoslať odkaz emailom",
+    "Send" : "Odoslať",
+    "Set expiration date" : "Nastaviť dátum expirácie",
+    "Expiration date" : "Dátum expirácie",
+    "group" : "skupina",
+    "Resharing is not allowed" : "Zdieľanie už zdieľanej položky nie je povolené",
+    "Shared in {item} with {user}" : "Zdieľané v {item} s {user}",
+    "Unshare" : "Zrušiť zdieľanie",
+    "notify by email" : "informovať emailom",
+    "can share" : "môže zdieľať",
+    "can edit" : "môže upraviť",
+    "access control" : "prístupové práva",
+    "create" : "vytvoriť",
+    "update" : "aktualizovať",
+    "delete" : "vymazať",
+    "Password protected" : "Chránené heslom",
+    "Error unsetting expiration date" : "Chyba pri odstraňovaní dátumu expirácie",
+    "Error setting expiration date" : "Chyba pri nastavení dátumu expirácie",
+    "Sending ..." : "Odosielam ...",
+    "Email sent" : "Email odoslaný",
+    "Warning" : "Varovanie",
+    "The object type is not specified." : "Nešpecifikovaný typ objektu.",
+    "Enter new" : "Zadať nový",
+    "Delete" : "Zmazať",
+    "Add" : "Pridať",
+    "Edit tags" : "Upraviť štítky",
+    "Error loading dialog template: {error}" : "Chyba pri načítaní šablóny dialógu: {error}",
+    "No tags selected for deletion." : "Nie sú vybraté štítky na zmazanie.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
+    "Please reload the page." : "Obnovte prosím stránku.",
+    "The update was unsuccessful." : "Aktualizácia zlyhala.",
+    "The update was successful. Redirecting you to ownCloud now." : "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.",
+    "Couldn't reset password because the token is invalid" : "Nemožno zmeniť heslo pre neplatnosť tokenu.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nemožno poslať email pre obnovu. Uistite sa, či vkladáte správne používateľské meno.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nemožno poslať email pre obnovu hesla, pretože pre tohoto používateľa nie je uvedená žiadna emailová adresa. Prosím, obráťte sa na administrátora.",
+    "%s password reset" : "reset hesla %s",
+    "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 emailom.",
+    "Username" : "Meno používateľa",
+    "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?" : "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
+    "Yes, I really want to reset my password now" : "Áno, želám si teraz obnoviť svoje heslo",
+    "Reset" : "Resetovať",
+    "New password" : "Nové heslo",
+    "New Password" : "Nové heslo",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
+    "Personal" : "Osobné",
+    "Users" : "Používatelia",
+    "Apps" : "Aplikácie",
+    "Admin" : "Administrácia",
+    "Help" : "Pomoc",
+    "Error loading tags" : "Chyba pri načítaní štítkov",
+    "Tag already exists" : "Štítok už existuje",
+    "Error deleting tag(s)" : "Chyba pri mazaní štítka(ov)",
+    "Error tagging" : "Chyba pri pridaní štítka",
+    "Error untagging" : "Chyba pri odobratí štítka",
+    "Error favoriting" : "Chyba pri pridaní do obľúbených",
+    "Error unfavoriting" : "Chyba pri odobratí z obľúbených",
+    "Access forbidden" : "Prístup odmietnutý",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n",
+    "The share will expire on %s." : "Zdieľanie vyprší %s.",
+    "Cheers!" : "Pekný deň!",
+    "Security Warning" : "Bezpečnostné varovanie",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
+    "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>",
+    "Password" : "Heslo",
+    "Storage & database" : "Úložislo & databáza",
+    "Data folder" : "Priečinok dát",
+    "Configure the database" : "Nastaviť databázu",
+    "Only %s is available." : "Len %s je dostupný.",
+    "Database user" : "Používateľ databázy",
+    "Database password" : "Heslo databázy",
+    "Database name" : "Meno databázy",
+    "Database tablespace" : "Tabuľkový priestor databázy",
+    "Database host" : "Server databázy",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Ako databáza bude použitá SQLite. Pri väčších inštaláciách odporúčame zmeniť na inú.",
+    "Finish setup" : "Dokončiť inštaláciu",
+    "Finishing …" : "Dokončujem...",
+    "%s is available. Get more information on how to update." : "%s je dostupná. Získajte viac informácií o postupe aktualizácie.",
+    "Log out" : "Odhlásiť",
+    "Server side authentication failed!" : "Autentifikácia na serveri zlyhala!",
+    "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.",
+    "Forgot your password? Reset it!" : "Zabudli ste heslo? Obnovte si ho!",
+    "remember" : "zapamätať",
+    "Log in" : "Prihlásiť sa",
+    "Alternative Logins" : "Alternatívne prihlásenie",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Táto inštancia ownCloudu je teraz v jednopoužívateľskom móde.",
+    "This means only administrators can use the instance." : "Len správca systému môže používať túto inštanciu.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.",
+    "Thank you for your patience." : "Ďakujeme za Vašu trpezlivosť.",
+    "You are accessing the server from an untrusted domain." : "Pristupujete na server v nedôveryhodnej doméne.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte administrátora. Ak ste administrátorom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
+    "Add \"%s\" as trusted domain" : "Pridať \"%s\" ako dôveryhodnú doménu",
+    "%s will be updated to version %s." : "%s bude zaktualizovaný na verziu %s.",
+    "The following apps will be disabled:" : "Tieto aplikácie budú zakázané:",
+    "The theme %s has been disabled." : "Téma %s bola zakázaná.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred vykonaním ďalšieho kroku sa presvedčte, že databáza, konfiguračný a dátový priečinok sú zazálohované.",
+    "Start update" : "Spustiť aktualizáciu"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
deleted file mode 100644
index cae7bfd3a5a..00000000000
--- a/core/l10n/sk_SK.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nebolo možné odoslať email týmto používateľom: %s ",
-"Turned on maintenance mode" => "Mód údržby je zapnutý",
-"Turned off maintenance mode" => "Mód údržby e vypnutý",
-"Updated database" => "Databáza je aktualizovaná",
-"Checked database schema update" => "Skontrolovať aktualizáciu schémy databázy",
-"Checked database schema update for apps" => "Aktualizácia schémy databázy aplikácií bola overená",
-"Updated \"%s\" to %s" => "Aktualizované \"%s\" na %s",
-"Disabled incompatible apps: %s" => "Zakázané nekompatibilné aplikácie: %s",
-"No image or file provided" => "Obrázok alebo súbor nebol zadaný",
-"Unknown filetype" => "Neznámy typ súboru",
-"Invalid image" => "Chybný obrázok",
-"No temporary profile picture available, try again" => "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu",
-"No crop data provided" => "Dáta pre orezanie neboli zadané",
-"Sunday" => "Nedeľa",
-"Monday" => "Pondelok",
-"Tuesday" => "Utorok",
-"Wednesday" => "Streda",
-"Thursday" => "Štvrtok",
-"Friday" => "Piatok",
-"Saturday" => "Sobota",
-"January" => "Január",
-"February" => "Február",
-"March" => "Marec",
-"April" => "Apríl",
-"May" => "Máj",
-"June" => "Jún",
-"July" => "Júl",
-"August" => "August",
-"September" => "September",
-"October" => "Október",
-"November" => "November",
-"December" => "December",
-"Settings" => "Nastavenia",
-"File" => "Súbor",
-"Folder" => "Priečinok",
-"Image" => "Obrázok",
-"Audio" => "Zvuk",
-"Saving..." => "Ukladám...",
-"Couldn't send reset email. Please contact your administrator." => "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
-"The link to reset your password has been sent to your email. 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." => "Odkaz na obnovu hesla bol odoslaný na váš email. Pokiaľ ho neobdržíte v primeranom čase, skontrolujte spam / priečinok nevyžiadanej pošty. <br> Ak tam nie je, kontaktujte svojho administrátora.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Súbory sú zašifrované. Ak ste nepovolili kľúč pre obnovenie, neexistuje žiadny spôsob, ako obnoviť vaše dáta po obnovení vášho hesla. <br /> Ak si nie ste istí čo urobiť, prosím skôr než budete pokračovať, obráťte sa na administrátora. <br /> Naozaj chcete pokračovať?",
-"I know what I'm doing" => "Viem, čo robím",
-"Reset password" => "Obnovenie hesla",
-"Password can not be changed. Please contact your administrator." => "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.",
-"No" => "Nie",
-"Yes" => "Áno",
-"Choose" => "Vybrať",
-"Error loading file picker template: {error}" => "Chyba pri nahrávaní šablóny výberu súborov: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Chyba pri nahrávaní šablóny správy: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"),
-"One file conflict" => "Jeden konflikt súboru",
-"New Files" => "Nové súbory",
-"Already existing files" => "Už existujúce súbory",
-"Which files do you want to keep?" => "Ktoré súbory chcete ponechať?",
-"If you select both versions, the copied file will have a number added to its name." => "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo.",
-"Cancel" => "Zrušiť",
-"Continue" => "Pokračovať",
-"(all selected)" => "(všetko vybrané)",
-"({count} selected)" => "({count} vybraných)",
-"Error loading file exists template" => "Chyba pri nahrávaní šablóny existencie súboru",
-"Very weak password" => "Veľmi slabé heslo",
-"Weak password" => "Slabé heslo",
-"So-so password" => "Priemerné heslo",
-"Good password" => "Dobré heslo",
-"Strong password" => "Silné heslo",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Server nemá funkčné pripojenie k internetu. Niektoré moduly ako napr. externé úložisko, oznámenie o dostupných aktualizáciách alebo inštalácia aplikácií tretích strán nebudú fungovať. Prístup k súborom z iných miest a odosielanie oznamovacích emailov tiež nemusí fungovať. Ak chcete využívať všetky vlastnosti ownCloudu, odporúčame povoliť pripojenie k internetu tomuto serveru.",
-"Shared" => "Zdieľané",
-"Shared with {recipients}" => "Zdieľa s {recipients}",
-"Share" => "Zdieľať",
-"Error" => "Chyba",
-"Error while sharing" => "Chyba počas zdieľania",
-"Error while unsharing" => "Chyba počas ukončenia zdieľania",
-"Error while changing permissions" => "Chyba počas zmeny oprávnení",
-"Shared with you and the group {group} by {owner}" => "Zdieľané s vami a so skupinou {group} používateľom {owner}",
-"Shared with you by {owner}" => "Zdieľané s vami používateľom {owner}",
-"Share with user or group …" => "Zdieľať s používateľom alebo skupinou ...",
-"Share link" => "Zdieľať linku",
-"The public link will expire no later than {days} days after it is created" => "Verejný odkaz nevyprší skôr než za {days} dní po vytvorení",
-"Password protect" => "Chrániť heslom",
-"Choose a password for the public link" => "Zadajte heslo pre tento verejný odkaz",
-"Allow Public Upload" => "Povoliť verejné nahrávanie",
-"Email link to person" => "Odoslať odkaz emailom",
-"Send" => "Odoslať",
-"Set expiration date" => "Nastaviť dátum expirácie",
-"Expiration date" => "Dátum expirácie",
-"group" => "skupina",
-"Resharing is not allowed" => "Zdieľanie už zdieľanej položky nie je povolené",
-"Shared in {item} with {user}" => "Zdieľané v {item} s {user}",
-"Unshare" => "Zrušiť zdieľanie",
-"notify by email" => "informovať emailom",
-"can share" => "môže zdieľať",
-"can edit" => "môže upraviť",
-"access control" => "prístupové práva",
-"create" => "vytvoriť",
-"update" => "aktualizovať",
-"delete" => "vymazať",
-"Password protected" => "Chránené heslom",
-"Error unsetting expiration date" => "Chyba pri odstraňovaní dátumu expirácie",
-"Error setting expiration date" => "Chyba pri nastavení dátumu expirácie",
-"Sending ..." => "Odosielam ...",
-"Email sent" => "Email odoslaný",
-"Warning" => "Varovanie",
-"The object type is not specified." => "Nešpecifikovaný typ objektu.",
-"Enter new" => "Zadať nový",
-"Delete" => "Zmazať",
-"Add" => "Pridať",
-"Edit tags" => "Upraviť štítky",
-"Error loading dialog template: {error}" => "Chyba pri načítaní šablóny dialógu: {error}",
-"No tags selected for deletion." => "Nie sú vybraté štítky na zmazanie.",
-"Updating {productName} to version {version}, this may take a while." => "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
-"Please reload the page." => "Obnovte prosím stránku.",
-"The update was unsuccessful." => "Aktualizácia zlyhala.",
-"The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.",
-"Couldn't reset password because the token is invalid" => "Nemožno zmeniť heslo pre neplatnosť tokenu.",
-"Couldn't send reset email. Please make sure your username is correct." => "Nemožno poslať email pre obnovu. Uistite sa, či vkladáte správne používateľské meno.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Nemožno poslať email pre obnovu hesla, pretože pre tohoto používateľa nie je uvedená žiadna emailová adresa. Prosím, obráťte sa na administrátora.",
-"%s password reset" => "reset hesla %s",
-"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 emailom.",
-"Username" => "Meno používateľa",
-"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?" => "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
-"Yes, I really want to reset my password now" => "Áno, želám si teraz obnoviť svoje heslo",
-"Reset" => "Resetovať",
-"New password" => "Nové heslo",
-"New Password" => "Nové heslo",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
-"For the best results, please consider using a GNU/Linux server instead." => "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
-"Personal" => "Osobné",
-"Users" => "Používatelia",
-"Apps" => "Aplikácie",
-"Admin" => "Administrácia",
-"Help" => "Pomoc",
-"Error loading tags" => "Chyba pri načítaní štítkov",
-"Tag already exists" => "Štítok už existuje",
-"Error deleting tag(s)" => "Chyba pri mazaní štítka(ov)",
-"Error tagging" => "Chyba pri pridaní štítka",
-"Error untagging" => "Chyba pri odobratí štítka",
-"Error favoriting" => "Chyba pri pridaní do obľúbených",
-"Error unfavoriting" => "Chyba pri odobratí z obľúbených",
-"Access forbidden" => "Prístup odmietnutý",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n",
-"The share will expire on %s." => "Zdieľanie vyprší %s.",
-"Cheers!" => "Pekný deň!",
-"Security Warning" => "Bezpečnostné varovanie",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
-"Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
-"Password" => "Heslo",
-"Storage & database" => "Úložislo & databáza",
-"Data folder" => "Priečinok dát",
-"Configure the database" => "Nastaviť databázu",
-"Only %s is available." => "Len %s je dostupný.",
-"Database user" => "Používateľ databázy",
-"Database password" => "Heslo databázy",
-"Database name" => "Meno databázy",
-"Database tablespace" => "Tabuľkový priestor databázy",
-"Database host" => "Server databázy",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Ako databáza bude použitá SQLite. Pri väčších inštaláciách odporúčame zmeniť na inú.",
-"Finish setup" => "Dokončiť inštaláciu",
-"Finishing …" => "Dokončujem...",
-"%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií o postupe aktualizácie.",
-"Log out" => "Odhlásiť",
-"Server side authentication failed!" => "Autentifikácia na serveri zlyhala!",
-"Please contact your administrator." => "Kontaktujte prosím vášho administrátora.",
-"Forgot your password? Reset it!" => "Zabudli ste heslo? Obnovte si ho!",
-"remember" => "zapamätať",
-"Log in" => "Prihlásiť sa",
-"Alternative Logins" => "Alternatívne prihlásenie",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Táto inštancia ownCloudu je teraz v jednopoužívateľskom móde.",
-"This means only administrators can use the instance." => "Len správca systému môže používať túto inštanciu.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.",
-"Thank you for your patience." => "Ďakujeme za Vašu trpezlivosť.",
-"You are accessing the server from an untrusted domain." => "Pristupujete na server v nedôveryhodnej doméne.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Kontaktujte administrátora. Ak ste administrátorom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
-"Add \"%s\" as trusted domain" => "Pridať \"%s\" ako dôveryhodnú doménu",
-"%s will be updated to version %s." => "%s bude zaktualizovaný na verziu %s.",
-"The following apps will be disabled:" => "Tieto aplikácie budú zakázané:",
-"The theme %s has been disabled." => "Téma %s bola zakázaná.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Pred vykonaním ďalšieho kroku sa presvedčte, že databáza, konfiguračný a dátový priečinok sú zazálohované.",
-"Start update" => "Spustiť aktualizáciu"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
new file mode 100644
index 00000000000..d790db499fb
--- /dev/null
+++ b/core/l10n/sl.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Ni mogoče poslati sporočila za: %s",
+    "Turned on maintenance mode" : "Vzdrževalni način je omogočen",
+    "Turned off maintenance mode" : "Vzdrževalni način je onemogočen",
+    "Updated database" : "Posodobljena podatkovna zbirka",
+    "Checked database schema update" : "Izbrana posodobitev sheme podatkovne zbirke",
+    "Checked database schema update for apps" : "Izbrana posodobitev sheme podatkovne zbirke za programe",
+    "Updated \"%s\" to %s" : "Datoteka \"%s\" je posodobljena na %s",
+    "Disabled incompatible apps: %s" : "Onemogočeni neskladni programi: %s",
+    "No image or file provided" : "Ni podane datoteke ali slike",
+    "Unknown filetype" : "Neznana vrsta datoteke",
+    "Invalid image" : "Neveljavna slika",
+    "No temporary profile picture available, try again" : "Na voljo ni nobene začasne slike za profil. Poskusite znova.",
+    "No crop data provided" : "Ni podanih podatkov obreza",
+    "Sunday" : "nedelja",
+    "Monday" : "ponedeljek",
+    "Tuesday" : "torek",
+    "Wednesday" : "sreda",
+    "Thursday" : "četrtek",
+    "Friday" : "petek",
+    "Saturday" : "sobota",
+    "January" : "januar",
+    "February" : "februar",
+    "March" : "marec",
+    "April" : "april",
+    "May" : "maj",
+    "June" : "junij",
+    "July" : "julij",
+    "August" : "avgust",
+    "September" : "september",
+    "October" : "oktober",
+    "November" : "november",
+    "December" : "december",
+    "Settings" : "Nastavitve",
+    "File" : "Datoteka",
+    "Folder" : "Mapa",
+    "Image" : "Slika",
+    "Audio" : "Zvok",
+    "Saving..." : "Poteka shranjevanje ...",
+    "Couldn't send reset email. Please contact your administrator." : "Ni mogoče nastaviti elektronskega naslova za ponastavitev. Stopite v stik s skrbnikom sistema.",
+    "The link to reset your password has been sent to your email. 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." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
+    "I know what I'm doing" : "Vem, kaj delam!",
+    "Reset password" : "Ponastavi geslo",
+    "Password can not be changed. Please contact your administrator." : "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Izbor",
+    "Error loading file picker template: {error}" : "Napaka nalaganja predloge izbirnika datotek: {error}",
+    "Ok" : "V redu",
+    "Error loading message template: {error}" : "Napaka nalaganja predloge sporočil: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"],
+    "One file conflict" : "En spor datotek",
+    "New Files" : "Nove datoteke",
+    "Already existing files" : "Obstoječe datoteke",
+    "Which files do you want to keep?" : "Katare datoteke želite ohraniti?",
+    "If you select both versions, the copied file will have a number added to its name." : "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka.",
+    "Cancel" : "Prekliči",
+    "Continue" : "Nadaljuj",
+    "(all selected)" : "(vse izbrano)",
+    "({count} selected)" : "({count} izbranih)",
+    "Error loading file exists template" : "Napaka nalaganja predloge obstoječih datotek",
+    "Very weak password" : "Zelo šibko geslo",
+    "Weak password" : "Šibko geslo",
+    "So-so password" : "Slabo geslo",
+    "Good password" : "Dobro geslo",
+    "Strong password" : "Odlično geslo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev vmesnika WebDAV okvarjena.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Na voljo ni delujoče internetne povezave. To pomeni, da nekaterih možnosti, kot so priklapljanje zunanje shrambe, obveščanja o posodobitvah in nameščanje programov tretje roke ni podprto. Dostop do datotek z oddaljenih mest in pošiljanje obvestil preko elektronske pošte prav tako verjetno ne deluje. Za omogočanje vseh zmožnosti mora biti vzpostavljena tudi ustrezna internetna povezava.",
+    "Error occurred while checking server setup" : "Prišlo je do napake med preverjanjem nastavitev strežnika",
+    "Shared" : "V souporabi",
+    "Shared with {recipients}" : "V souporabi z {recipients}",
+    "Share" : "Souporaba",
+    "Error" : "Napaka",
+    "Error while sharing" : "Napaka med souporabo",
+    "Error while unsharing" : "Napaka med odstranjevanjem souporabe",
+    "Error while changing permissions" : "Napaka med spreminjanjem dovoljenj",
+    "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
+    "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.",
+    "Share with user or group …" : "Souporaba z uporabnikom ali skupino ...",
+    "Share link" : "Povezava za prejem",
+    "The public link will expire no later than {days} days after it is created" : "Javna povezava bo potekla {days} dni po ustvarjanju.",
+    "Password protect" : "Zaščiti z geslom",
+    "Choose a password for the public link" : "Izberite geslo za javno povezavo",
+    "Allow Public Upload" : "Dovoli javno pošiljanje na strežnik",
+    "Email link to person" : "Posreduj povezavo po elektronski pošti",
+    "Send" : "Pošlji",
+    "Set expiration date" : "Nastavi datum preteka",
+    "Expiration date" : "Datum preteka",
+    "Adding user..." : "Dodajanje uporabnika ...",
+    "group" : "skupina",
+    "Resharing is not allowed" : "Nadaljnja souporaba ni dovoljena",
+    "Shared in {item} with {user}" : "V souporabi v {item} z uporabnikom {user}",
+    "Unshare" : "Prekliči souporabo",
+    "notify by email" : "obvesti po elektronski pošti",
+    "can share" : "lahko omogoči souporabo",
+    "can edit" : "lahko ureja",
+    "access control" : "nadzor dostopa",
+    "create" : "ustvari",
+    "update" : "posodobi",
+    "delete" : "izbriše",
+    "Password protected" : "Zaščiteno z geslom",
+    "Error unsetting expiration date" : "Napaka brisanja datuma preteka",
+    "Error setting expiration date" : "Napaka nastavljanja datuma preteka",
+    "Sending ..." : "Pošiljanje ...",
+    "Email sent" : "Elektronska pošta je poslana",
+    "Warning" : "Opozorilo",
+    "The object type is not specified." : "Vrsta predmeta ni podana.",
+    "Enter new" : "Vnesite novo",
+    "Delete" : "Izbriši",
+    "Add" : "Dodaj",
+    "Edit tags" : "Uredi oznake",
+    "Error loading dialog template: {error}" : "Napaka nalaganja predloge pogovornega okna: {error}",
+    "No tags selected for deletion." : "Ni izbranih oznak za izbris.",
+    "Updating {productName} to version {version}, this may take a while." : "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.",
+    "Please reload the page." : "Stran je treba ponovno naložiti",
+    "The update was unsuccessful." : "Posodobitev je spodletela",
+    "The update was successful. Redirecting you to ownCloud now." : "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Ni mogoče ponastaviti gesla zaradi neustreznega žetona.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ni mogoče poslati elektronskega sporočila. Prepričajte se, da je uporabniško ime pravilno.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ni mogoče poslati elektronskega sporočila za ponastavitev gesla, ker ni navedenega elektronskega naslova. Stopite v stik s skrbnikom sistema.",
+    "%s password reset" : "Ponastavitev gesla %s",
+    "Use the following link to reset your password: {link}" : "Za ponastavitev gesla uporabite povezavo: {link}",
+    "You will receive a link to reset your password via Email." : "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
+    "Username" : "Uporabniško ime",
+    "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?" : "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?",
+    "Yes, I really want to reset my password now" : "Da, potrjujem ponastavitev gesla",
+    "Reset" : "Ponastavi",
+    "New password" : "Novo geslo",
+    "New Password" : "Novo geslo",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.",
+    "Personal" : "Osebno",
+    "Users" : "Uporabniki",
+    "Apps" : "Programi",
+    "Admin" : "Skrbništvo",
+    "Help" : "Pomoč",
+    "Error loading tags" : "Napaka nalaganja oznak",
+    "Tag already exists" : "Oznaka že obstaja",
+    "Error deleting tag(s)" : "Napaka brisanja oznak",
+    "Error tagging" : "Napaka označevanja",
+    "Error untagging" : "Napaka odstranjevanja oznak",
+    "Error favoriting" : "Napaka označevanja priljubljenosti",
+    "Error unfavoriting" : "Napaka odstranjevanja oznake priljubljenosti",
+    "Access forbidden" : "Dostop je prepovedan",
+    "File not found" : "Datoteke ni mogoče najti",
+    "The specified document has not been found on the server." : "Določenega dokumenta na strežniku ni mogoče najti.",
+    "You can click here to return to %s." : "S klikom na povezavo boste vrnjeni na %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Pozdravljeni,\n\noseba %s vam je omogočila souporabo %s.\nVir si lahko ogledate: %s\n\n",
+    "The share will expire on %s." : "Povezava souporabe bo potekla %s.",
+    "Cheers!" : "Na zdravje!",
+    "Internal Server Error" : "Notranja  napaka strežnika",
+    "The server encountered an internal error and was unable to complete your request." : "Prišlo je do notranje napake, zato ni mogoče končati zahteve.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Stopite v stik s skrbnikom sistema, če se napaka pojavlja pogosto. V poročilo vključite tudi tehnične podatke v dnevniški datoteki.",
+    "More details can be found in the server log." : "Več podrobnosti je zabeleženih v dnevniku strežnika.",
+    "Technical details" : "Tehnične podrobnosti",
+    "Remote Address: %s" : "Oddaljen naslov: %s",
+    "Request ID: %s" : "ID zahteve: %s",
+    "Code: %s" : "Koda: %s",
+    "Message: %s" : "Sporočilo: %s",
+    "File: %s" : "Datoteka: %s",
+    "Line: %s" : "Vrstica: %s",
+    "Trace" : "Sledenje povezav",
+    "Security Warning" : "Varnostno opozorilo",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Uporabljena različica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Za varno uporabo storitve %s, je treba posodobiti namestitev PHP",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
+    "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>",
+    "Password" : "Geslo",
+    "Storage & database" : "Shramba in podatkovna zbirka",
+    "Data folder" : "Podatkovna mapa",
+    "Configure the database" : "Nastavi podatkovno zbirko",
+    "Only %s is available." : "Le %s je na voljo.",
+    "Database user" : "Uporabnik podatkovne zbirke",
+    "Database password" : "Geslo podatkovne zbirke",
+    "Database name" : "Ime podatkovne zbirke",
+    "Database tablespace" : "Razpredelnica podatkovne zbirke",
+    "Database host" : "Gostitelj podatkovne zbirke",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Za podatkovno zbirko bo uporabljen SQLite. Za večje zbirke je priporočljivo to zamenjati.",
+    "Finish setup" : "Končaj nastavitev",
+    "Finishing …" : "Poteka zaključevanje opravila ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Program zahteva podporo JavaScript za pravilno delovanje. Omogočite <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript</a> in ponovno osvežite stran.",
+    "%s is available. Get more information on how to update." : "%s je na voljo. Pridobite več podrobnosti za posodobitev.",
+    "Log out" : "Odjava",
+    "Server side authentication failed!" : "Overitev s strežnika je spodletela!",
+    "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.",
+    "Forgot your password? Reset it!" : "Ali ste pozabili geslo? Ponastavite ga!",
+    "remember" : "zapomni si",
+    "Log in" : "Prijava",
+    "Alternative Logins" : "Druge prijavne možnosti",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Ta seja oblaka ownCloud je trenutno v načinu enega sočasnega uporabnika.",
+    "This means only administrators can use the instance." : "To pomeni, da lahko oblak uporabljajo le osebe s skrbniškimi dovoljenji.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Stopite v stik s skrbnikom sistema, če se bo sporočilo še naprej nepričakovano prikazovalo.",
+    "Thank you for your patience." : "Hvala za potrpežljivost!",
+    "You are accessing the server from an untrusted domain." : "Trenutno je vzpostavljena povezava s strežnikom preko ne-varne domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Stopite v stik s skrbnikom ali pa nastavite možnost \"varna_domena\" v datoteki config/config.php. Primer nastavitve je razložen v datoteki config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Glede na nastavitve bi lahko kot skrbnik uporabili spodnji gumb in domeno ročno določili kot varno.",
+    "Add \"%s\" as trusted domain" : "Dodaj \"%s\" kot varno domeno",
+    "%s will be updated to version %s." : "%s bo posodobljen na različico %s.",
+    "The following apps will be disabled:" : "Navedeni programi bodo onemogočeni:",
+    "The theme %s has been disabled." : "Tema %s je onemogočena za uporabo.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred nadaljevanjem se prepričajte se, da je ustvarjena varnostna kopija podatkovne zbirke, nastavitvenih datotek in podatkovne mape.",
+    "Start update" : "Začni posodobitev",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Za razreševanje časovnih zahtev večjih namestitev lahko uporabite ukaz iz namestitvene mape:",
+    "This %s instance is currently being updated, which may take a while." : "Povezava %s se posodablja. Opravilo je lahko dolgotrajno.",
+    "This page will refresh itself when the %s instance is available again." : "Stran bo osvežena ko bo %s spet na voljo."
+},
+"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
new file mode 100644
index 00000000000..17f5216d872
--- /dev/null
+++ b/core/l10n/sl.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Ni mogoče poslati sporočila za: %s",
+    "Turned on maintenance mode" : "Vzdrževalni način je omogočen",
+    "Turned off maintenance mode" : "Vzdrževalni način je onemogočen",
+    "Updated database" : "Posodobljena podatkovna zbirka",
+    "Checked database schema update" : "Izbrana posodobitev sheme podatkovne zbirke",
+    "Checked database schema update for apps" : "Izbrana posodobitev sheme podatkovne zbirke za programe",
+    "Updated \"%s\" to %s" : "Datoteka \"%s\" je posodobljena na %s",
+    "Disabled incompatible apps: %s" : "Onemogočeni neskladni programi: %s",
+    "No image or file provided" : "Ni podane datoteke ali slike",
+    "Unknown filetype" : "Neznana vrsta datoteke",
+    "Invalid image" : "Neveljavna slika",
+    "No temporary profile picture available, try again" : "Na voljo ni nobene začasne slike za profil. Poskusite znova.",
+    "No crop data provided" : "Ni podanih podatkov obreza",
+    "Sunday" : "nedelja",
+    "Monday" : "ponedeljek",
+    "Tuesday" : "torek",
+    "Wednesday" : "sreda",
+    "Thursday" : "četrtek",
+    "Friday" : "petek",
+    "Saturday" : "sobota",
+    "January" : "januar",
+    "February" : "februar",
+    "March" : "marec",
+    "April" : "april",
+    "May" : "maj",
+    "June" : "junij",
+    "July" : "julij",
+    "August" : "avgust",
+    "September" : "september",
+    "October" : "oktober",
+    "November" : "november",
+    "December" : "december",
+    "Settings" : "Nastavitve",
+    "File" : "Datoteka",
+    "Folder" : "Mapa",
+    "Image" : "Slika",
+    "Audio" : "Zvok",
+    "Saving..." : "Poteka shranjevanje ...",
+    "Couldn't send reset email. Please contact your administrator." : "Ni mogoče nastaviti elektronskega naslova za ponastavitev. Stopite v stik s skrbnikom sistema.",
+    "The link to reset your password has been sent to your email. 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." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
+    "I know what I'm doing" : "Vem, kaj delam!",
+    "Reset password" : "Ponastavi geslo",
+    "Password can not be changed. Please contact your administrator." : "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Izbor",
+    "Error loading file picker template: {error}" : "Napaka nalaganja predloge izbirnika datotek: {error}",
+    "Ok" : "V redu",
+    "Error loading message template: {error}" : "Napaka nalaganja predloge sporočil: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"],
+    "One file conflict" : "En spor datotek",
+    "New Files" : "Nove datoteke",
+    "Already existing files" : "Obstoječe datoteke",
+    "Which files do you want to keep?" : "Katare datoteke želite ohraniti?",
+    "If you select both versions, the copied file will have a number added to its name." : "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka.",
+    "Cancel" : "Prekliči",
+    "Continue" : "Nadaljuj",
+    "(all selected)" : "(vse izbrano)",
+    "({count} selected)" : "({count} izbranih)",
+    "Error loading file exists template" : "Napaka nalaganja predloge obstoječih datotek",
+    "Very weak password" : "Zelo šibko geslo",
+    "Weak password" : "Šibko geslo",
+    "So-so password" : "Slabo geslo",
+    "Good password" : "Dobro geslo",
+    "Strong password" : "Odlično geslo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev vmesnika WebDAV okvarjena.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Na voljo ni delujoče internetne povezave. To pomeni, da nekaterih možnosti, kot so priklapljanje zunanje shrambe, obveščanja o posodobitvah in nameščanje programov tretje roke ni podprto. Dostop do datotek z oddaljenih mest in pošiljanje obvestil preko elektronske pošte prav tako verjetno ne deluje. Za omogočanje vseh zmožnosti mora biti vzpostavljena tudi ustrezna internetna povezava.",
+    "Error occurred while checking server setup" : "Prišlo je do napake med preverjanjem nastavitev strežnika",
+    "Shared" : "V souporabi",
+    "Shared with {recipients}" : "V souporabi z {recipients}",
+    "Share" : "Souporaba",
+    "Error" : "Napaka",
+    "Error while sharing" : "Napaka med souporabo",
+    "Error while unsharing" : "Napaka med odstranjevanjem souporabe",
+    "Error while changing permissions" : "Napaka med spreminjanjem dovoljenj",
+    "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
+    "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.",
+    "Share with user or group …" : "Souporaba z uporabnikom ali skupino ...",
+    "Share link" : "Povezava za prejem",
+    "The public link will expire no later than {days} days after it is created" : "Javna povezava bo potekla {days} dni po ustvarjanju.",
+    "Password protect" : "Zaščiti z geslom",
+    "Choose a password for the public link" : "Izberite geslo za javno povezavo",
+    "Allow Public Upload" : "Dovoli javno pošiljanje na strežnik",
+    "Email link to person" : "Posreduj povezavo po elektronski pošti",
+    "Send" : "Pošlji",
+    "Set expiration date" : "Nastavi datum preteka",
+    "Expiration date" : "Datum preteka",
+    "Adding user..." : "Dodajanje uporabnika ...",
+    "group" : "skupina",
+    "Resharing is not allowed" : "Nadaljnja souporaba ni dovoljena",
+    "Shared in {item} with {user}" : "V souporabi v {item} z uporabnikom {user}",
+    "Unshare" : "Prekliči souporabo",
+    "notify by email" : "obvesti po elektronski pošti",
+    "can share" : "lahko omogoči souporabo",
+    "can edit" : "lahko ureja",
+    "access control" : "nadzor dostopa",
+    "create" : "ustvari",
+    "update" : "posodobi",
+    "delete" : "izbriše",
+    "Password protected" : "Zaščiteno z geslom",
+    "Error unsetting expiration date" : "Napaka brisanja datuma preteka",
+    "Error setting expiration date" : "Napaka nastavljanja datuma preteka",
+    "Sending ..." : "Pošiljanje ...",
+    "Email sent" : "Elektronska pošta je poslana",
+    "Warning" : "Opozorilo",
+    "The object type is not specified." : "Vrsta predmeta ni podana.",
+    "Enter new" : "Vnesite novo",
+    "Delete" : "Izbriši",
+    "Add" : "Dodaj",
+    "Edit tags" : "Uredi oznake",
+    "Error loading dialog template: {error}" : "Napaka nalaganja predloge pogovornega okna: {error}",
+    "No tags selected for deletion." : "Ni izbranih oznak za izbris.",
+    "Updating {productName} to version {version}, this may take a while." : "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.",
+    "Please reload the page." : "Stran je treba ponovno naložiti",
+    "The update was unsuccessful." : "Posodobitev je spodletela",
+    "The update was successful. Redirecting you to ownCloud now." : "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Ni mogoče ponastaviti gesla zaradi neustreznega žetona.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ni mogoče poslati elektronskega sporočila. Prepričajte se, da je uporabniško ime pravilno.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ni mogoče poslati elektronskega sporočila za ponastavitev gesla, ker ni navedenega elektronskega naslova. Stopite v stik s skrbnikom sistema.",
+    "%s password reset" : "Ponastavitev gesla %s",
+    "Use the following link to reset your password: {link}" : "Za ponastavitev gesla uporabite povezavo: {link}",
+    "You will receive a link to reset your password via Email." : "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
+    "Username" : "Uporabniško ime",
+    "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?" : "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?",
+    "Yes, I really want to reset my password now" : "Da, potrjujem ponastavitev gesla",
+    "Reset" : "Ponastavi",
+    "New password" : "Novo geslo",
+    "New Password" : "Novo geslo",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.",
+    "Personal" : "Osebno",
+    "Users" : "Uporabniki",
+    "Apps" : "Programi",
+    "Admin" : "Skrbništvo",
+    "Help" : "Pomoč",
+    "Error loading tags" : "Napaka nalaganja oznak",
+    "Tag already exists" : "Oznaka že obstaja",
+    "Error deleting tag(s)" : "Napaka brisanja oznak",
+    "Error tagging" : "Napaka označevanja",
+    "Error untagging" : "Napaka odstranjevanja oznak",
+    "Error favoriting" : "Napaka označevanja priljubljenosti",
+    "Error unfavoriting" : "Napaka odstranjevanja oznake priljubljenosti",
+    "Access forbidden" : "Dostop je prepovedan",
+    "File not found" : "Datoteke ni mogoče najti",
+    "The specified document has not been found on the server." : "Določenega dokumenta na strežniku ni mogoče najti.",
+    "You can click here to return to %s." : "S klikom na povezavo boste vrnjeni na %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Pozdravljeni,\n\noseba %s vam je omogočila souporabo %s.\nVir si lahko ogledate: %s\n\n",
+    "The share will expire on %s." : "Povezava souporabe bo potekla %s.",
+    "Cheers!" : "Na zdravje!",
+    "Internal Server Error" : "Notranja  napaka strežnika",
+    "The server encountered an internal error and was unable to complete your request." : "Prišlo je do notranje napake, zato ni mogoče končati zahteve.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Stopite v stik s skrbnikom sistema, če se napaka pojavlja pogosto. V poročilo vključite tudi tehnične podatke v dnevniški datoteki.",
+    "More details can be found in the server log." : "Več podrobnosti je zabeleženih v dnevniku strežnika.",
+    "Technical details" : "Tehnične podrobnosti",
+    "Remote Address: %s" : "Oddaljen naslov: %s",
+    "Request ID: %s" : "ID zahteve: %s",
+    "Code: %s" : "Koda: %s",
+    "Message: %s" : "Sporočilo: %s",
+    "File: %s" : "Datoteka: %s",
+    "Line: %s" : "Vrstica: %s",
+    "Trace" : "Sledenje povezav",
+    "Security Warning" : "Varnostno opozorilo",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Uporabljena različica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Za varno uporabo storitve %s, je treba posodobiti namestitev PHP",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
+    "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>",
+    "Password" : "Geslo",
+    "Storage & database" : "Shramba in podatkovna zbirka",
+    "Data folder" : "Podatkovna mapa",
+    "Configure the database" : "Nastavi podatkovno zbirko",
+    "Only %s is available." : "Le %s je na voljo.",
+    "Database user" : "Uporabnik podatkovne zbirke",
+    "Database password" : "Geslo podatkovne zbirke",
+    "Database name" : "Ime podatkovne zbirke",
+    "Database tablespace" : "Razpredelnica podatkovne zbirke",
+    "Database host" : "Gostitelj podatkovne zbirke",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Za podatkovno zbirko bo uporabljen SQLite. Za večje zbirke je priporočljivo to zamenjati.",
+    "Finish setup" : "Končaj nastavitev",
+    "Finishing …" : "Poteka zaključevanje opravila ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Program zahteva podporo JavaScript za pravilno delovanje. Omogočite <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript</a> in ponovno osvežite stran.",
+    "%s is available. Get more information on how to update." : "%s je na voljo. Pridobite več podrobnosti za posodobitev.",
+    "Log out" : "Odjava",
+    "Server side authentication failed!" : "Overitev s strežnika je spodletela!",
+    "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.",
+    "Forgot your password? Reset it!" : "Ali ste pozabili geslo? Ponastavite ga!",
+    "remember" : "zapomni si",
+    "Log in" : "Prijava",
+    "Alternative Logins" : "Druge prijavne možnosti",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Ta seja oblaka ownCloud je trenutno v načinu enega sočasnega uporabnika.",
+    "This means only administrators can use the instance." : "To pomeni, da lahko oblak uporabljajo le osebe s skrbniškimi dovoljenji.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Stopite v stik s skrbnikom sistema, če se bo sporočilo še naprej nepričakovano prikazovalo.",
+    "Thank you for your patience." : "Hvala za potrpežljivost!",
+    "You are accessing the server from an untrusted domain." : "Trenutno je vzpostavljena povezava s strežnikom preko ne-varne domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Stopite v stik s skrbnikom ali pa nastavite možnost \"varna_domena\" v datoteki config/config.php. Primer nastavitve je razložen v datoteki config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Glede na nastavitve bi lahko kot skrbnik uporabili spodnji gumb in domeno ročno določili kot varno.",
+    "Add \"%s\" as trusted domain" : "Dodaj \"%s\" kot varno domeno",
+    "%s will be updated to version %s." : "%s bo posodobljen na različico %s.",
+    "The following apps will be disabled:" : "Navedeni programi bodo onemogočeni:",
+    "The theme %s has been disabled." : "Tema %s je onemogočena za uporabo.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred nadaljevanjem se prepričajte se, da je ustvarjena varnostna kopija podatkovne zbirke, nastavitvenih datotek in podatkovne mape.",
+    "Start update" : "Začni posodobitev",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Za razreševanje časovnih zahtev večjih namestitev lahko uporabite ukaz iz namestitvene mape:",
+    "This %s instance is currently being updated, which may take a while." : "Povezava %s se posodablja. Opravilo je lahko dolgotrajno.",
+    "This page will refresh itself when the %s instance is available again." : "Stran bo osvežena ko bo %s spet na voljo."
+},"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
+}
\ No newline at end of file
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
deleted file mode 100644
index 20a8d9b8fc0..00000000000
--- a/core/l10n/sl.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Ni mogoče poslati sporočila za: %s",
-"Turned on maintenance mode" => "Vzdrževalni način je omogočen",
-"Turned off maintenance mode" => "Vzdrževalni način je onemogočen",
-"Updated database" => "Posodobljena podatkovna zbirka",
-"Checked database schema update" => "Izbrana posodobitev sheme podatkovne zbirke",
-"Checked database schema update for apps" => "Izbrana posodobitev sheme podatkovne zbirke za programe",
-"Updated \"%s\" to %s" => "Datoteka \"%s\" je posodobljena na %s",
-"Disabled incompatible apps: %s" => "Onemogočeni neskladni programi: %s",
-"No image or file provided" => "Ni podane datoteke ali slike",
-"Unknown filetype" => "Neznana vrsta datoteke",
-"Invalid image" => "Neveljavna slika",
-"No temporary profile picture available, try again" => "Na voljo ni nobene začasne slike za profil. Poskusite znova.",
-"No crop data provided" => "Ni podanih podatkov obreza",
-"Sunday" => "nedelja",
-"Monday" => "ponedeljek",
-"Tuesday" => "torek",
-"Wednesday" => "sreda",
-"Thursday" => "četrtek",
-"Friday" => "petek",
-"Saturday" => "sobota",
-"January" => "januar",
-"February" => "februar",
-"March" => "marec",
-"April" => "april",
-"May" => "maj",
-"June" => "junij",
-"July" => "julij",
-"August" => "avgust",
-"September" => "september",
-"October" => "oktober",
-"November" => "november",
-"December" => "december",
-"Settings" => "Nastavitve",
-"File" => "Datoteka",
-"Folder" => "Mapa",
-"Image" => "Slika",
-"Audio" => "Zvok",
-"Saving..." => "Poteka shranjevanje ...",
-"Couldn't send reset email. Please contact your administrator." => "Ni mogoče nastaviti elektronskega naslova za ponastavitev. Stopite v stik s skrbnikom sistema.",
-"The link to reset your password has been sent to your email. 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." => "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
-"I know what I'm doing" => "Vem, kaj delam!",
-"Reset password" => "Ponastavi geslo",
-"Password can not be changed. Please contact your administrator." => "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.",
-"No" => "Ne",
-"Yes" => "Da",
-"Choose" => "Izbor",
-"Error loading file picker template: {error}" => "Napaka nalaganja predloge izbirnika datotek: {error}",
-"Ok" => "V redu",
-"Error loading message template: {error}" => "Napaka nalaganja predloge sporočil: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"),
-"One file conflict" => "En spor datotek",
-"New Files" => "Nove datoteke",
-"Already existing files" => "Obstoječe datoteke",
-"Which files do you want to keep?" => "Katare datoteke želite ohraniti?",
-"If you select both versions, the copied file will have a number added to its name." => "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka.",
-"Cancel" => "Prekliči",
-"Continue" => "Nadaljuj",
-"(all selected)" => "(vse izbrano)",
-"({count} selected)" => "({count} izbranih)",
-"Error loading file exists template" => "Napaka nalaganja predloge obstoječih datotek",
-"Very weak password" => "Zelo šibko geslo",
-"Weak password" => "Šibko geslo",
-"So-so password" => "Slabo geslo",
-"Good password" => "Dobro geslo",
-"Strong password" => "Odlično geslo",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev vmesnika WebDAV okvarjena.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Na voljo ni delujoče internetne povezave. To pomeni, da nekaterih možnosti, kot so priklapljanje zunanje shrambe, obveščanja o posodobitvah in nameščanje programov tretje roke ni podprto. Dostop do datotek z oddaljenih mest in pošiljanje obvestil preko elektronske pošte prav tako verjetno ne deluje. Za omogočanje vseh zmožnosti mora biti vzpostavljena tudi ustrezna internetna povezava.",
-"Error occurred while checking server setup" => "Prišlo je do napake med preverjanjem nastavitev strežnika",
-"Shared" => "V souporabi",
-"Shared with {recipients}" => "V souporabi z {recipients}",
-"Share" => "Souporaba",
-"Error" => "Napaka",
-"Error while sharing" => "Napaka med souporabo",
-"Error while unsharing" => "Napaka med odstranjevanjem souporabe",
-"Error while changing permissions" => "Napaka med spreminjanjem dovoljenj",
-"Shared with you and the group {group} by {owner}" => "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
-"Shared with you by {owner}" => "V souporabi z vami. Lastnik je {owner}.",
-"Share with user or group …" => "Souporaba z uporabnikom ali skupino ...",
-"Share link" => "Povezava za prejem",
-"The public link will expire no later than {days} days after it is created" => "Javna povezava bo potekla {days} dni po ustvarjanju.",
-"Password protect" => "Zaščiti z geslom",
-"Choose a password for the public link" => "Izberite geslo za javno povezavo",
-"Allow Public Upload" => "Dovoli javno pošiljanje na strežnik",
-"Email link to person" => "Posreduj povezavo po elektronski pošti",
-"Send" => "Pošlji",
-"Set expiration date" => "Nastavi datum preteka",
-"Expiration date" => "Datum preteka",
-"Adding user..." => "Dodajanje uporabnika ...",
-"group" => "skupina",
-"Resharing is not allowed" => "Nadaljnja souporaba ni dovoljena",
-"Shared in {item} with {user}" => "V souporabi v {item} z uporabnikom {user}",
-"Unshare" => "Prekliči souporabo",
-"notify by email" => "obvesti po elektronski pošti",
-"can share" => "lahko omogoči souporabo",
-"can edit" => "lahko ureja",
-"access control" => "nadzor dostopa",
-"create" => "ustvari",
-"update" => "posodobi",
-"delete" => "izbriše",
-"Password protected" => "Zaščiteno z geslom",
-"Error unsetting expiration date" => "Napaka brisanja datuma preteka",
-"Error setting expiration date" => "Napaka nastavljanja datuma preteka",
-"Sending ..." => "Pošiljanje ...",
-"Email sent" => "Elektronska pošta je poslana",
-"Warning" => "Opozorilo",
-"The object type is not specified." => "Vrsta predmeta ni podana.",
-"Enter new" => "Vnesite novo",
-"Delete" => "Izbriši",
-"Add" => "Dodaj",
-"Edit tags" => "Uredi oznake",
-"Error loading dialog template: {error}" => "Napaka nalaganja predloge pogovornega okna: {error}",
-"No tags selected for deletion." => "Ni izbranih oznak za izbris.",
-"Updating {productName} to version {version}, this may take a while." => "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.",
-"Please reload the page." => "Stran je treba ponovno naložiti",
-"The update was unsuccessful." => "Posodobitev je spodletela",
-"The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
-"Couldn't reset password because the token is invalid" => "Ni mogoče ponastaviti gesla zaradi neustreznega žetona.",
-"Couldn't send reset email. Please make sure your username is correct." => "Ni mogoče poslati elektronskega sporočila. Prepričajte se, da je uporabniško ime pravilno.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Ni mogoče poslati elektronskega sporočila za ponastavitev gesla, ker ni navedenega elektronskega naslova. Stopite v stik s skrbnikom sistema.",
-"%s password reset" => "Ponastavitev gesla %s",
-"Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}",
-"You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
-"Username" => "Uporabniško ime",
-"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?" => "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?",
-"Yes, I really want to reset my password now" => "Da, potrjujem ponastavitev gesla",
-"Reset" => "Ponastavi",
-"New password" => "Novo geslo",
-"New Password" => "Novo geslo",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
-"For the best results, please consider using a GNU/Linux server instead." => "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.",
-"Personal" => "Osebno",
-"Users" => "Uporabniki",
-"Apps" => "Programi",
-"Admin" => "Skrbništvo",
-"Help" => "Pomoč",
-"Error loading tags" => "Napaka nalaganja oznak",
-"Tag already exists" => "Oznaka že obstaja",
-"Error deleting tag(s)" => "Napaka brisanja oznak",
-"Error tagging" => "Napaka označevanja",
-"Error untagging" => "Napaka odstranjevanja oznak",
-"Error favoriting" => "Napaka označevanja priljubljenosti",
-"Error unfavoriting" => "Napaka odstranjevanja oznake priljubljenosti",
-"Access forbidden" => "Dostop je prepovedan",
-"File not found" => "Datoteke ni mogoče najti",
-"The specified document has not been found on the server." => "Določenega dokumenta na strežniku ni mogoče najti.",
-"You can click here to return to %s." => "S klikom na povezavo boste vrnjeni na %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Pozdravljeni,\n\noseba %s vam je omogočila souporabo %s.\nVir si lahko ogledate: %s\n\n",
-"The share will expire on %s." => "Povezava souporabe bo potekla %s.",
-"Cheers!" => "Na zdravje!",
-"Internal Server Error" => "Notranja  napaka strežnika",
-"The server encountered an internal error and was unable to complete your request." => "Prišlo je do notranje napake, zato ni mogoče končati zahteve.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Stopite v stik s skrbnikom sistema, če se napaka pojavlja pogosto. V poročilo vključite tudi tehnične podatke v dnevniški datoteki.",
-"More details can be found in the server log." => "Več podrobnosti je zabeleženih v dnevniku strežnika.",
-"Technical details" => "Tehnične podrobnosti",
-"Remote Address: %s" => "Oddaljen naslov: %s",
-"Request ID: %s" => "ID zahteve: %s",
-"Code: %s" => "Koda: %s",
-"Message: %s" => "Sporočilo: %s",
-"File: %s" => "Datoteka: %s",
-"Line: %s" => "Vrstica: %s",
-"Trace" => "Sledenje povezav",
-"Security Warning" => "Varnostno opozorilo",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uporabljena različica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Za varno uporabo storitve %s, je treba posodobiti namestitev PHP",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
-"Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>",
-"Password" => "Geslo",
-"Storage & database" => "Shramba in podatkovna zbirka",
-"Data folder" => "Podatkovna mapa",
-"Configure the database" => "Nastavi podatkovno zbirko",
-"Only %s is available." => "Le %s je na voljo.",
-"Database user" => "Uporabnik podatkovne zbirke",
-"Database password" => "Geslo podatkovne zbirke",
-"Database name" => "Ime podatkovne zbirke",
-"Database tablespace" => "Razpredelnica podatkovne zbirke",
-"Database host" => "Gostitelj podatkovne zbirke",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Za podatkovno zbirko bo uporabljen SQLite. Za večje zbirke je priporočljivo to zamenjati.",
-"Finish setup" => "Končaj nastavitev",
-"Finishing …" => "Poteka zaključevanje opravila ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Program zahteva podporo JavaScript za pravilno delovanje. Omogočite <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript</a> in ponovno osvežite stran.",
-"%s is available. Get more information on how to update." => "%s je na voljo. Pridobite več podrobnosti za posodobitev.",
-"Log out" => "Odjava",
-"Server side authentication failed!" => "Overitev s strežnika je spodletela!",
-"Please contact your administrator." => "Stopite v stik s skrbnikom sistema.",
-"Forgot your password? Reset it!" => "Ali ste pozabili geslo? Ponastavite ga!",
-"remember" => "zapomni si",
-"Log in" => "Prijava",
-"Alternative Logins" => "Druge prijavne možnosti",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Ta seja oblaka ownCloud je trenutno v načinu enega sočasnega uporabnika.",
-"This means only administrators can use the instance." => "To pomeni, da lahko oblak uporabljajo le osebe s skrbniškimi dovoljenji.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Stopite v stik s skrbnikom sistema, če se bo sporočilo še naprej nepričakovano prikazovalo.",
-"Thank you for your patience." => "Hvala za potrpežljivost!",
-"You are accessing the server from an untrusted domain." => "Trenutno je vzpostavljena povezava s strežnikom preko ne-varne domene.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Stopite v stik s skrbnikom ali pa nastavite možnost \"varna_domena\" v datoteki config/config.php. Primer nastavitve je razložen v datoteki config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Glede na nastavitve bi lahko kot skrbnik uporabili spodnji gumb in domeno ročno določili kot varno.",
-"Add \"%s\" as trusted domain" => "Dodaj \"%s\" kot varno domeno",
-"%s will be updated to version %s." => "%s bo posodobljen na različico %s.",
-"The following apps will be disabled:" => "Navedeni programi bodo onemogočeni:",
-"The theme %s has been disabled." => "Tema %s je onemogočena za uporabo.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Pred nadaljevanjem se prepričajte se, da je ustvarjena varnostna kopija podatkovne zbirke, nastavitvenih datotek in podatkovne mape.",
-"Start update" => "Začni posodobitev",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Za razreševanje časovnih zahtev večjih namestitev lahko uporabite ukaz iz namestitvene mape:",
-"This %s instance is currently being updated, which may take a while." => "Povezava %s se posodablja. Opravilo je lahko dolgotrajno.",
-"This page will refresh itself when the %s instance is available again." => "Stran bo osvežena ko bo %s spet na voljo."
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
new file mode 100644
index 00000000000..525359304ed
--- /dev/null
+++ b/core/l10n/sq.js
@@ -0,0 +1,104 @@
+OC.L10N.register(
+    "core",
+    {
+    "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua",
+    "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua",
+    "Updated database" : "Database-i u azhurnua",
+    "Sunday" : "E djelë",
+    "Monday" : "E hënë",
+    "Tuesday" : "E martë",
+    "Wednesday" : "E mërkurë",
+    "Thursday" : "E enjte",
+    "Friday" : "E premte",
+    "Saturday" : "E shtunë",
+    "January" : "Janar",
+    "February" : "Shkurt",
+    "March" : "Mars",
+    "April" : "Prill",
+    "May" : "Maj",
+    "June" : "Qershor",
+    "July" : "Korrik",
+    "August" : "Gusht",
+    "September" : "Shtator",
+    "October" : "Tetor",
+    "November" : "Nëntor",
+    "December" : "Dhjetor",
+    "Settings" : "Parametra",
+    "Folder" : "Dosje",
+    "Saving..." : "Duke ruajtur...",
+    "Reset password" : "Rivendos kodin",
+    "No" : "Jo",
+    "Yes" : "Po",
+    "Choose" : "Zgjidh",
+    "Ok" : "Në rregull",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Anulo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web Serveri juaj nuk është konfigurar sic duhet në mënyre që të lejojë sinkronizimin e skedare pasi ndërfaqja WevDAV duket të jetë e demtuar.",
+    "Shared" : "Ndarë",
+    "Share" : "Nda",
+    "Error" : "Veprim i gabuar",
+    "Error while sharing" : "Veprim i gabuar gjatë ndarjes",
+    "Error while unsharing" : "Veprim i gabuar gjatë heqjes së ndarjes",
+    "Error while changing permissions" : "Veprim i gabuar gjatë ndryshimit të lejeve",
+    "Shared with you and the group {group} by {owner}" : "Ndarë me ju dhe me grupin {group} nga {owner}",
+    "Shared with you by {owner}" : "Ndarë me ju nga {owner}",
+    "Password protect" : "Mbro me kod",
+    "Allow Public Upload" : "Lejo Ngarkimin Publik",
+    "Email link to person" : "Dërgo email me lidhjen",
+    "Send" : "Dërgo",
+    "Set expiration date" : "Cakto datën e përfundimit",
+    "Expiration date" : "Data e përfundimit",
+    "group" : "grupi",
+    "Resharing is not allowed" : "Rindarja nuk lejohet",
+    "Shared in {item} with {user}" : "Ndarë në {item} me {user}",
+    "Unshare" : "Hiq ndarjen",
+    "can share" : "mund të ndajnë",
+    "can edit" : "mund të ndryshosh",
+    "access control" : "kontrollimi i hyrjeve",
+    "create" : "krijo",
+    "update" : "azhurno",
+    "delete" : "elimino",
+    "Password protected" : "Mbrojtur me kod",
+    "Error unsetting expiration date" : "Veprim i gabuar gjatë heqjes së datës së përfundimit",
+    "Error setting expiration date" : "Veprim i gabuar gjatë caktimit të datës së përfundimit",
+    "Sending ..." : "Duke dërguar...",
+    "Email sent" : "Email-i u dërgua",
+    "The object type is not specified." : "Nuk është specifikuar tipi i objektit.",
+    "Delete" : "Elimino",
+    "Add" : "Shto",
+    "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
+    "%s password reset" : "Kodi i %s -it u rivendos",
+    "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
+    "You will receive a link to reset your password via Email." : "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
+    "Username" : "Përdoruesi",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
+    "Yes, I really want to reset my password now" : "Po, dua ta rivendos kodin tani",
+    "New password" : "Kodi i ri",
+    "Personal" : "Personale",
+    "Users" : "Përdoruesit",
+    "Apps" : "App",
+    "Admin" : "Admin",
+    "Help" : "Ndihmë",
+    "Access forbidden" : "Ndalohet hyrja",
+    "Security Warning" : "Paralajmërim sigurie",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
+    "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>",
+    "Password" : "Kodi",
+    "Data folder" : "Emri i dosjes",
+    "Configure the database" : "Konfiguro database-in",
+    "Database user" : "Përdoruesi i database-it",
+    "Database password" : "Kodi i database-it",
+    "Database name" : "Emri i database-it",
+    "Database tablespace" : "Tablespace-i i database-it",
+    "Database host" : "Pozicioni (host) i database-it",
+    "Finish setup" : "Mbaro setup-in",
+    "%s is available. Get more information on how to update." : "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin.",
+    "Log out" : "Dalje",
+    "remember" : "kujto",
+    "Log in" : "Hyrje",
+    "Alternative Logins" : "Hyrje alternative"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
new file mode 100644
index 00000000000..d9850c8ab5a
--- /dev/null
+++ b/core/l10n/sq.json
@@ -0,0 +1,102 @@
+{ "translations": {
+    "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua",
+    "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua",
+    "Updated database" : "Database-i u azhurnua",
+    "Sunday" : "E djelë",
+    "Monday" : "E hënë",
+    "Tuesday" : "E martë",
+    "Wednesday" : "E mërkurë",
+    "Thursday" : "E enjte",
+    "Friday" : "E premte",
+    "Saturday" : "E shtunë",
+    "January" : "Janar",
+    "February" : "Shkurt",
+    "March" : "Mars",
+    "April" : "Prill",
+    "May" : "Maj",
+    "June" : "Qershor",
+    "July" : "Korrik",
+    "August" : "Gusht",
+    "September" : "Shtator",
+    "October" : "Tetor",
+    "November" : "Nëntor",
+    "December" : "Dhjetor",
+    "Settings" : "Parametra",
+    "Folder" : "Dosje",
+    "Saving..." : "Duke ruajtur...",
+    "Reset password" : "Rivendos kodin",
+    "No" : "Jo",
+    "Yes" : "Po",
+    "Choose" : "Zgjidh",
+    "Ok" : "Në rregull",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Anulo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web Serveri juaj nuk është konfigurar sic duhet në mënyre që të lejojë sinkronizimin e skedare pasi ndërfaqja WevDAV duket të jetë e demtuar.",
+    "Shared" : "Ndarë",
+    "Share" : "Nda",
+    "Error" : "Veprim i gabuar",
+    "Error while sharing" : "Veprim i gabuar gjatë ndarjes",
+    "Error while unsharing" : "Veprim i gabuar gjatë heqjes së ndarjes",
+    "Error while changing permissions" : "Veprim i gabuar gjatë ndryshimit të lejeve",
+    "Shared with you and the group {group} by {owner}" : "Ndarë me ju dhe me grupin {group} nga {owner}",
+    "Shared with you by {owner}" : "Ndarë me ju nga {owner}",
+    "Password protect" : "Mbro me kod",
+    "Allow Public Upload" : "Lejo Ngarkimin Publik",
+    "Email link to person" : "Dërgo email me lidhjen",
+    "Send" : "Dërgo",
+    "Set expiration date" : "Cakto datën e përfundimit",
+    "Expiration date" : "Data e përfundimit",
+    "group" : "grupi",
+    "Resharing is not allowed" : "Rindarja nuk lejohet",
+    "Shared in {item} with {user}" : "Ndarë në {item} me {user}",
+    "Unshare" : "Hiq ndarjen",
+    "can share" : "mund të ndajnë",
+    "can edit" : "mund të ndryshosh",
+    "access control" : "kontrollimi i hyrjeve",
+    "create" : "krijo",
+    "update" : "azhurno",
+    "delete" : "elimino",
+    "Password protected" : "Mbrojtur me kod",
+    "Error unsetting expiration date" : "Veprim i gabuar gjatë heqjes së datës së përfundimit",
+    "Error setting expiration date" : "Veprim i gabuar gjatë caktimit të datës së përfundimit",
+    "Sending ..." : "Duke dërguar...",
+    "Email sent" : "Email-i u dërgua",
+    "The object type is not specified." : "Nuk është specifikuar tipi i objektit.",
+    "Delete" : "Elimino",
+    "Add" : "Shto",
+    "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
+    "%s password reset" : "Kodi i %s -it u rivendos",
+    "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
+    "You will receive a link to reset your password via Email." : "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
+    "Username" : "Përdoruesi",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
+    "Yes, I really want to reset my password now" : "Po, dua ta rivendos kodin tani",
+    "New password" : "Kodi i ri",
+    "Personal" : "Personale",
+    "Users" : "Përdoruesit",
+    "Apps" : "App",
+    "Admin" : "Admin",
+    "Help" : "Ndihmë",
+    "Access forbidden" : "Ndalohet hyrja",
+    "Security Warning" : "Paralajmërim sigurie",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
+    "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>",
+    "Password" : "Kodi",
+    "Data folder" : "Emri i dosjes",
+    "Configure the database" : "Konfiguro database-in",
+    "Database user" : "Përdoruesi i database-it",
+    "Database password" : "Kodi i database-it",
+    "Database name" : "Emri i database-it",
+    "Database tablespace" : "Tablespace-i i database-it",
+    "Database host" : "Pozicioni (host) i database-it",
+    "Finish setup" : "Mbaro setup-in",
+    "%s is available. Get more information on how to update." : "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin.",
+    "Log out" : "Dalje",
+    "remember" : "kujto",
+    "Log in" : "Hyrje",
+    "Alternative Logins" : "Hyrje alternative"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
deleted file mode 100644
index 7ae33ee303d..00000000000
--- a/core/l10n/sq.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Turned on maintenance mode" => "Mënyra e mirëmbajtjes u aktivizua",
-"Turned off maintenance mode" => "Mënyra e mirëmbajtjes u çaktivizua",
-"Updated database" => "Database-i u azhurnua",
-"Sunday" => "E djelë",
-"Monday" => "E hënë",
-"Tuesday" => "E martë",
-"Wednesday" => "E mërkurë",
-"Thursday" => "E enjte",
-"Friday" => "E premte",
-"Saturday" => "E shtunë",
-"January" => "Janar",
-"February" => "Shkurt",
-"March" => "Mars",
-"April" => "Prill",
-"May" => "Maj",
-"June" => "Qershor",
-"July" => "Korrik",
-"August" => "Gusht",
-"September" => "Shtator",
-"October" => "Tetor",
-"November" => "Nëntor",
-"December" => "Dhjetor",
-"Settings" => "Parametra",
-"Folder" => "Dosje",
-"Saving..." => "Duke ruajtur...",
-"Reset password" => "Rivendos kodin",
-"No" => "Jo",
-"Yes" => "Po",
-"Choose" => "Zgjidh",
-"Ok" => "Në rregull",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Anulo",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web Serveri juaj nuk është konfigurar sic duhet në mënyre që të lejojë sinkronizimin e skedare pasi ndërfaqja WevDAV duket të jetë e demtuar.",
-"Shared" => "Ndarë",
-"Share" => "Nda",
-"Error" => "Veprim i gabuar",
-"Error while sharing" => "Veprim i gabuar gjatë ndarjes",
-"Error while unsharing" => "Veprim i gabuar gjatë heqjes së ndarjes",
-"Error while changing permissions" => "Veprim i gabuar gjatë ndryshimit të lejeve",
-"Shared with you and the group {group} by {owner}" => "Ndarë me ju dhe me grupin {group} nga {owner}",
-"Shared with you by {owner}" => "Ndarë me ju nga {owner}",
-"Password protect" => "Mbro me kod",
-"Allow Public Upload" => "Lejo Ngarkimin Publik",
-"Email link to person" => "Dërgo email me lidhjen",
-"Send" => "Dërgo",
-"Set expiration date" => "Cakto datën e përfundimit",
-"Expiration date" => "Data e përfundimit",
-"group" => "grupi",
-"Resharing is not allowed" => "Rindarja nuk lejohet",
-"Shared in {item} with {user}" => "Ndarë në {item} me {user}",
-"Unshare" => "Hiq ndarjen",
-"can share" => "mund të ndajnë",
-"can edit" => "mund të ndryshosh",
-"access control" => "kontrollimi i hyrjeve",
-"create" => "krijo",
-"update" => "azhurno",
-"delete" => "elimino",
-"Password protected" => "Mbrojtur me kod",
-"Error unsetting expiration date" => "Veprim i gabuar gjatë heqjes së datës së përfundimit",
-"Error setting expiration date" => "Veprim i gabuar gjatë caktimit të datës së përfundimit",
-"Sending ..." => "Duke dërguar...",
-"Email sent" => "Email-i u dërgua",
-"The object type is not specified." => "Nuk është specifikuar tipi i objektit.",
-"Delete" => "Elimino",
-"Add" => "Shto",
-"The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
-"%s password reset" => "Kodi i %s -it u rivendos",
-"Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
-"You will receive a link to reset your password via Email." => "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
-"Username" => "Përdoruesi",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
-"Yes, I really want to reset my password now" => "Po, dua ta rivendos kodin tani",
-"New password" => "Kodi i ri",
-"Personal" => "Personale",
-"Users" => "Përdoruesit",
-"Apps" => "App",
-"Admin" => "Admin",
-"Help" => "Ndihmë",
-"Access forbidden" => "Ndalohet hyrja",
-"Security Warning" => "Paralajmërim sigurie",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
-"Create an <strong>admin account</strong>" => "Krijo një <strong>llogari administruesi</strong>",
-"Password" => "Kodi",
-"Data folder" => "Emri i dosjes",
-"Configure the database" => "Konfiguro database-in",
-"Database user" => "Përdoruesi i database-it",
-"Database password" => "Kodi i database-it",
-"Database name" => "Emri i database-it",
-"Database tablespace" => "Tablespace-i i database-it",
-"Database host" => "Pozicioni (host) i database-it",
-"Finish setup" => "Mbaro setup-in",
-"%s is available. Get more information on how to update." => "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin.",
-"Log out" => "Dalje",
-"remember" => "kujto",
-"Log in" => "Hyrje",
-"Alternative Logins" => "Hyrje alternative"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
new file mode 100644
index 00000000000..f8576df9d50
--- /dev/null
+++ b/core/l10n/sr.js
@@ -0,0 +1,88 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Недеља",
+    "Monday" : "Понедељак",
+    "Tuesday" : "Уторак",
+    "Wednesday" : "Среда",
+    "Thursday" : "Четвртак",
+    "Friday" : "Петак",
+    "Saturday" : "Субота",
+    "January" : "Јануар",
+    "February" : "Фебруар",
+    "March" : "Март",
+    "April" : "Април",
+    "May" : "Мај",
+    "June" : "Јун",
+    "July" : "Јул",
+    "August" : "Август",
+    "September" : "Септембар",
+    "October" : "Октобар",
+    "November" : "Новембар",
+    "December" : "Децембар",
+    "Settings" : "Поставке",
+    "Folder" : "фасцикла",
+    "Saving..." : "Чување у току...",
+    "Reset password" : "Ресетуј лозинку",
+    "No" : "Не",
+    "Yes" : "Да",
+    "Choose" : "Одабери",
+    "Ok" : "У реду",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "Cancel" : "Откажи",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно.",
+    "Share" : "Дели",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка у дељењу",
+    "Error while unsharing" : "Грешка код искључења дељења",
+    "Error while changing permissions" : "Грешка код промене дозвола",
+    "Shared with you and the group {group} by {owner}" : "Дељено са вама и са групом {group}. Поделио {owner}.",
+    "Shared with you by {owner}" : "Поделио са вама {owner}",
+    "Password protect" : "Заштићено лозинком",
+    "Send" : "Пошаљи",
+    "Set expiration date" : "Постави датум истека",
+    "Expiration date" : "Датум истека",
+    "group" : "група",
+    "Resharing is not allowed" : "Поновно дељење није дозвољено",
+    "Shared in {item} with {user}" : "Подељено унутар {item} са {user}",
+    "Unshare" : "Укини дељење",
+    "can edit" : "може да мења",
+    "access control" : "права приступа",
+    "create" : "направи",
+    "update" : "ажурирај",
+    "delete" : "обриши",
+    "Password protected" : "Заштићено лозинком",
+    "Error unsetting expiration date" : "Грешка код поништавања датума истека",
+    "Error setting expiration date" : "Грешка код постављања датума истека",
+    "Sending ..." : "Шаљем...",
+    "Email sent" : "Порука је послата",
+    "Warning" : "Упозорење",
+    "The object type is not specified." : "Врста објекта није подешена.",
+    "Delete" : "Обриши",
+    "Add" : "Додај",
+    "Use the following link to reset your password: {link}" : "Овом везом ресетујте своју лозинку: {link}",
+    "You will receive a link to reset your password via Email." : "Добићете везу за ресетовање лозинке путем е-поште.",
+    "Username" : "Корисничко име",
+    "New password" : "Нова лозинка",
+    "Personal" : "Лично",
+    "Users" : "Корисници",
+    "Apps" : "Апликације",
+    "Admin" : "Администратор",
+    "Help" : "Помоћ",
+    "Access forbidden" : "Забрањен приступ",
+    "Security Warning" : "Сигурносно упозорење",
+    "Create an <strong>admin account</strong>" : "Направи <strong>административни налог</strong>",
+    "Password" : "Лозинка",
+    "Data folder" : "Фацикла података",
+    "Configure the database" : "Подешавање базе",
+    "Database user" : "Корисник базе",
+    "Database password" : "Лозинка базе",
+    "Database name" : "Име базе",
+    "Database tablespace" : "Радни простор базе података",
+    "Database host" : "Домаћин базе",
+    "Finish setup" : "Заврши подешавање",
+    "Log out" : "Одјава",
+    "remember" : "упамти",
+    "Log in" : "Пријава"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
new file mode 100644
index 00000000000..998deee1988
--- /dev/null
+++ b/core/l10n/sr.json
@@ -0,0 +1,86 @@
+{ "translations": {
+    "Sunday" : "Недеља",
+    "Monday" : "Понедељак",
+    "Tuesday" : "Уторак",
+    "Wednesday" : "Среда",
+    "Thursday" : "Четвртак",
+    "Friday" : "Петак",
+    "Saturday" : "Субота",
+    "January" : "Јануар",
+    "February" : "Фебруар",
+    "March" : "Март",
+    "April" : "Април",
+    "May" : "Мај",
+    "June" : "Јун",
+    "July" : "Јул",
+    "August" : "Август",
+    "September" : "Септембар",
+    "October" : "Октобар",
+    "November" : "Новембар",
+    "December" : "Децембар",
+    "Settings" : "Поставке",
+    "Folder" : "фасцикла",
+    "Saving..." : "Чување у току...",
+    "Reset password" : "Ресетуј лозинку",
+    "No" : "Не",
+    "Yes" : "Да",
+    "Choose" : "Одабери",
+    "Ok" : "У реду",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "Cancel" : "Откажи",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно.",
+    "Share" : "Дели",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка у дељењу",
+    "Error while unsharing" : "Грешка код искључења дељења",
+    "Error while changing permissions" : "Грешка код промене дозвола",
+    "Shared with you and the group {group} by {owner}" : "Дељено са вама и са групом {group}. Поделио {owner}.",
+    "Shared with you by {owner}" : "Поделио са вама {owner}",
+    "Password protect" : "Заштићено лозинком",
+    "Send" : "Пошаљи",
+    "Set expiration date" : "Постави датум истека",
+    "Expiration date" : "Датум истека",
+    "group" : "група",
+    "Resharing is not allowed" : "Поновно дељење није дозвољено",
+    "Shared in {item} with {user}" : "Подељено унутар {item} са {user}",
+    "Unshare" : "Укини дељење",
+    "can edit" : "може да мења",
+    "access control" : "права приступа",
+    "create" : "направи",
+    "update" : "ажурирај",
+    "delete" : "обриши",
+    "Password protected" : "Заштићено лозинком",
+    "Error unsetting expiration date" : "Грешка код поништавања датума истека",
+    "Error setting expiration date" : "Грешка код постављања датума истека",
+    "Sending ..." : "Шаљем...",
+    "Email sent" : "Порука је послата",
+    "Warning" : "Упозорење",
+    "The object type is not specified." : "Врста објекта није подешена.",
+    "Delete" : "Обриши",
+    "Add" : "Додај",
+    "Use the following link to reset your password: {link}" : "Овом везом ресетујте своју лозинку: {link}",
+    "You will receive a link to reset your password via Email." : "Добићете везу за ресетовање лозинке путем е-поште.",
+    "Username" : "Корисничко име",
+    "New password" : "Нова лозинка",
+    "Personal" : "Лично",
+    "Users" : "Корисници",
+    "Apps" : "Апликације",
+    "Admin" : "Администратор",
+    "Help" : "Помоћ",
+    "Access forbidden" : "Забрањен приступ",
+    "Security Warning" : "Сигурносно упозорење",
+    "Create an <strong>admin account</strong>" : "Направи <strong>административни налог</strong>",
+    "Password" : "Лозинка",
+    "Data folder" : "Фацикла података",
+    "Configure the database" : "Подешавање базе",
+    "Database user" : "Корисник базе",
+    "Database password" : "Лозинка базе",
+    "Database name" : "Име базе",
+    "Database tablespace" : "Радни простор базе података",
+    "Database host" : "Домаћин базе",
+    "Finish setup" : "Заврши подешавање",
+    "Log out" : "Одјава",
+    "remember" : "упамти",
+    "Log in" : "Пријава"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
deleted file mode 100644
index 2d994100867..00000000000
--- a/core/l10n/sr.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Недеља",
-"Monday" => "Понедељак",
-"Tuesday" => "Уторак",
-"Wednesday" => "Среда",
-"Thursday" => "Четвртак",
-"Friday" => "Петак",
-"Saturday" => "Субота",
-"January" => "Јануар",
-"February" => "Фебруар",
-"March" => "Март",
-"April" => "Април",
-"May" => "Мај",
-"June" => "Јун",
-"July" => "Јул",
-"August" => "Август",
-"September" => "Септембар",
-"October" => "Октобар",
-"November" => "Новембар",
-"December" => "Децембар",
-"Settings" => "Поставке",
-"Folder" => "фасцикла",
-"Saving..." => "Чување у току...",
-"Reset password" => "Ресетуј лозинку",
-"No" => "Не",
-"Yes" => "Да",
-"Choose" => "Одабери",
-"Ok" => "У реду",
-"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
-"Cancel" => "Откажи",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно.",
-"Share" => "Дели",
-"Error" => "Грешка",
-"Error while sharing" => "Грешка у дељењу",
-"Error while unsharing" => "Грешка код искључења дељења",
-"Error while changing permissions" => "Грешка код промене дозвола",
-"Shared with you and the group {group} by {owner}" => "Дељено са вама и са групом {group}. Поделио {owner}.",
-"Shared with you by {owner}" => "Поделио са вама {owner}",
-"Password protect" => "Заштићено лозинком",
-"Send" => "Пошаљи",
-"Set expiration date" => "Постави датум истека",
-"Expiration date" => "Датум истека",
-"group" => "група",
-"Resharing is not allowed" => "Поновно дељење није дозвољено",
-"Shared in {item} with {user}" => "Подељено унутар {item} са {user}",
-"Unshare" => "Укини дељење",
-"can edit" => "може да мења",
-"access control" => "права приступа",
-"create" => "направи",
-"update" => "ажурирај",
-"delete" => "обриши",
-"Password protected" => "Заштићено лозинком",
-"Error unsetting expiration date" => "Грешка код поништавања датума истека",
-"Error setting expiration date" => "Грешка код постављања датума истека",
-"Sending ..." => "Шаљем...",
-"Email sent" => "Порука је послата",
-"Warning" => "Упозорење",
-"The object type is not specified." => "Врста објекта није подешена.",
-"Delete" => "Обриши",
-"Add" => "Додај",
-"Use the following link to reset your password: {link}" => "Овом везом ресетујте своју лозинку: {link}",
-"You will receive a link to reset your password via Email." => "Добићете везу за ресетовање лозинке путем е-поште.",
-"Username" => "Корисничко име",
-"New password" => "Нова лозинка",
-"Personal" => "Лично",
-"Users" => "Корисници",
-"Apps" => "Апликације",
-"Admin" => "Администратор",
-"Help" => "Помоћ",
-"Access forbidden" => "Забрањен приступ",
-"Security Warning" => "Сигурносно упозорење",
-"Create an <strong>admin account</strong>" => "Направи <strong>административни налог</strong>",
-"Password" => "Лозинка",
-"Data folder" => "Фацикла података",
-"Configure the database" => "Подешавање базе",
-"Database user" => "Корисник базе",
-"Database password" => "Лозинка базе",
-"Database name" => "Име базе",
-"Database tablespace" => "Радни простор базе података",
-"Database host" => "Домаћин базе",
-"Finish setup" => "Заврши подешавање",
-"Log out" => "Одјава",
-"remember" => "упамти",
-"Log in" => "Пријава"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js
new file mode 100644
index 00000000000..9ea14c5db68
--- /dev/null
+++ b/core/l10n/sr@latin.js
@@ -0,0 +1,100 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Nedelja",
+    "Monday" : "Ponedeljak",
+    "Tuesday" : "Utorak",
+    "Wednesday" : "Sreda",
+    "Thursday" : "Četvrtak",
+    "Friday" : "Petak",
+    "Saturday" : "Subota",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mart",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Jun",
+    "July" : "Jul",
+    "August" : "Avgust",
+    "September" : "Septembar",
+    "October" : "Oktobar",
+    "November" : "Novembar",
+    "December" : "Decembar",
+    "Settings" : "Podešavanja",
+    "File" : "Fajl",
+    "Folder" : "Direktorijum",
+    "Image" : "Slika",
+    "I know what I'm doing" : "Znam šta radim",
+    "Reset password" : "Resetuj lozinku",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Izaberi",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "Cancel" : "Otkaži",
+    "Continue" : "Nastavi",
+    "Very weak password" : "Veoma slaba lozinka",
+    "Weak password" : "Slaba lozinka",
+    "So-so password" : "Osrednja lozinka",
+    "Good password" : "Dobra lozinka",
+    "Strong password" : "Jaka lozinka",
+    "Shared" : "Deljeno",
+    "Shared with {recipients}" : "Podeljeno sa {recipients}",
+    "Share" : "Podeli",
+    "Error" : "Greška",
+    "Error while sharing" : "Greška pri deljenju",
+    "Error while unsharing" : "Greška u uklanjanju deljenja",
+    "Error while changing permissions" : "Greška u promeni dozvola",
+    "Shared with you and the group {group} by {owner}" : "{owner} podelio sa Vama i grupom {group} ",
+    "Shared with you by {owner}" : "Sa vama podelio {owner}",
+    "Password protect" : "Zaštita lozinkom",
+    "Email link to person" : "Pošalji link e-mailom",
+    "Send" : "Pošalji",
+    "Set expiration date" : "Datum isteka",
+    "Expiration date" : "Datum isteka",
+    "Resharing is not allowed" : "Dalje deljenje nije dozvoljeno",
+    "Shared in {item} with {user}" : "Deljeno u {item} sa {user}",
+    "Unshare" : "Ukljoni deljenje",
+    "can edit" : "dozvoljene izmene",
+    "access control" : "kontrola pristupa",
+    "create" : "napravi",
+    "update" : "ažuriranje",
+    "delete" : "brisanje",
+    "Password protected" : "Zaštćeno lozinkom",
+    "Error unsetting expiration date" : "Greška u uklanjanju datuma isteka",
+    "Error setting expiration date" : "Greška u postavljanju datuma isteka",
+    "Sending ..." : "Slanje...",
+    "Email sent" : "Email poslat",
+    "Warning" : "Upozorenje",
+    "The object type is not specified." : "Tip objekta nije zadan.",
+    "Delete" : "Obriši",
+    "Add" : "Dodaj",
+    "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
+    "Use the following link to reset your password: {link}" : "Koristite sledeći link za reset lozinke: {link}",
+    "You will receive a link to reset your password via Email." : "Dobićete vezu za resetovanje lozinke putem e-pošte.",
+    "Username" : "Korisničko ime",
+    "New password" : "Nova lozinka",
+    "Personal" : "Lično",
+    "Users" : "Korisnici",
+    "Apps" : "Programi",
+    "Admin" : "Adninistracija",
+    "Help" : "Pomoć",
+    "Access forbidden" : "Pristup zabranjen",
+    "Security Warning" : "Bezbednosno upozorenje",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je ranjiva na ",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
+    "Create an <strong>admin account</strong>" : "Napravi <strong>administrativni nalog</strong>",
+    "Password" : "Lozinka",
+    "Data folder" : "Fascikla podataka",
+    "Configure the database" : "Podešavanje baze",
+    "Database user" : "Korisnik baze",
+    "Database password" : "Lozinka baze",
+    "Database name" : "Ime baze",
+    "Database tablespace" : "tablespace baze",
+    "Database host" : "Domaćin baze",
+    "Finish setup" : "Završi podešavanje",
+    "Log out" : "Odjava",
+    "remember" : "upamti",
+    "Log in" : "Prijavi se"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json
new file mode 100644
index 00000000000..aea1e83a2ed
--- /dev/null
+++ b/core/l10n/sr@latin.json
@@ -0,0 +1,98 @@
+{ "translations": {
+    "Sunday" : "Nedelja",
+    "Monday" : "Ponedeljak",
+    "Tuesday" : "Utorak",
+    "Wednesday" : "Sreda",
+    "Thursday" : "Četvrtak",
+    "Friday" : "Petak",
+    "Saturday" : "Subota",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mart",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Jun",
+    "July" : "Jul",
+    "August" : "Avgust",
+    "September" : "Septembar",
+    "October" : "Oktobar",
+    "November" : "Novembar",
+    "December" : "Decembar",
+    "Settings" : "Podešavanja",
+    "File" : "Fajl",
+    "Folder" : "Direktorijum",
+    "Image" : "Slika",
+    "I know what I'm doing" : "Znam šta radim",
+    "Reset password" : "Resetuj lozinku",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Izaberi",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "Cancel" : "Otkaži",
+    "Continue" : "Nastavi",
+    "Very weak password" : "Veoma slaba lozinka",
+    "Weak password" : "Slaba lozinka",
+    "So-so password" : "Osrednja lozinka",
+    "Good password" : "Dobra lozinka",
+    "Strong password" : "Jaka lozinka",
+    "Shared" : "Deljeno",
+    "Shared with {recipients}" : "Podeljeno sa {recipients}",
+    "Share" : "Podeli",
+    "Error" : "Greška",
+    "Error while sharing" : "Greška pri deljenju",
+    "Error while unsharing" : "Greška u uklanjanju deljenja",
+    "Error while changing permissions" : "Greška u promeni dozvola",
+    "Shared with you and the group {group} by {owner}" : "{owner} podelio sa Vama i grupom {group} ",
+    "Shared with you by {owner}" : "Sa vama podelio {owner}",
+    "Password protect" : "Zaštita lozinkom",
+    "Email link to person" : "Pošalji link e-mailom",
+    "Send" : "Pošalji",
+    "Set expiration date" : "Datum isteka",
+    "Expiration date" : "Datum isteka",
+    "Resharing is not allowed" : "Dalje deljenje nije dozvoljeno",
+    "Shared in {item} with {user}" : "Deljeno u {item} sa {user}",
+    "Unshare" : "Ukljoni deljenje",
+    "can edit" : "dozvoljene izmene",
+    "access control" : "kontrola pristupa",
+    "create" : "napravi",
+    "update" : "ažuriranje",
+    "delete" : "brisanje",
+    "Password protected" : "Zaštćeno lozinkom",
+    "Error unsetting expiration date" : "Greška u uklanjanju datuma isteka",
+    "Error setting expiration date" : "Greška u postavljanju datuma isteka",
+    "Sending ..." : "Slanje...",
+    "Email sent" : "Email poslat",
+    "Warning" : "Upozorenje",
+    "The object type is not specified." : "Tip objekta nije zadan.",
+    "Delete" : "Obriši",
+    "Add" : "Dodaj",
+    "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
+    "Use the following link to reset your password: {link}" : "Koristite sledeći link za reset lozinke: {link}",
+    "You will receive a link to reset your password via Email." : "Dobićete vezu za resetovanje lozinke putem e-pošte.",
+    "Username" : "Korisničko ime",
+    "New password" : "Nova lozinka",
+    "Personal" : "Lično",
+    "Users" : "Korisnici",
+    "Apps" : "Programi",
+    "Admin" : "Adninistracija",
+    "Help" : "Pomoć",
+    "Access forbidden" : "Pristup zabranjen",
+    "Security Warning" : "Bezbednosno upozorenje",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je ranjiva na ",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
+    "Create an <strong>admin account</strong>" : "Napravi <strong>administrativni nalog</strong>",
+    "Password" : "Lozinka",
+    "Data folder" : "Fascikla podataka",
+    "Configure the database" : "Podešavanje baze",
+    "Database user" : "Korisnik baze",
+    "Database password" : "Lozinka baze",
+    "Database name" : "Ime baze",
+    "Database tablespace" : "tablespace baze",
+    "Database host" : "Domaćin baze",
+    "Finish setup" : "Završi podešavanje",
+    "Log out" : "Odjava",
+    "remember" : "upamti",
+    "Log in" : "Prijavi se"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
deleted file mode 100644
index 28009eccb0d..00000000000
--- a/core/l10n/sr@latin.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Nedelja",
-"Monday" => "Ponedeljak",
-"Tuesday" => "Utorak",
-"Wednesday" => "Sreda",
-"Thursday" => "Četvrtak",
-"Friday" => "Petak",
-"Saturday" => "Subota",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mart",
-"April" => "April",
-"May" => "Maj",
-"June" => "Jun",
-"July" => "Jul",
-"August" => "Avgust",
-"September" => "Septembar",
-"October" => "Oktobar",
-"November" => "Novembar",
-"December" => "Decembar",
-"Settings" => "Podešavanja",
-"File" => "Fajl",
-"Folder" => "Direktorijum",
-"Image" => "Slika",
-"I know what I'm doing" => "Znam šta radim",
-"Reset password" => "Resetuj lozinku",
-"No" => "Ne",
-"Yes" => "Da",
-"Choose" => "Izaberi",
-"Ok" => "Ok",
-"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
-"Cancel" => "Otkaži",
-"Continue" => "Nastavi",
-"Very weak password" => "Veoma slaba lozinka",
-"Weak password" => "Slaba lozinka",
-"So-so password" => "Osrednja lozinka",
-"Good password" => "Dobra lozinka",
-"Strong password" => "Jaka lozinka",
-"Shared" => "Deljeno",
-"Shared with {recipients}" => "Podeljeno sa {recipients}",
-"Share" => "Podeli",
-"Error" => "Greška",
-"Error while sharing" => "Greška pri deljenju",
-"Error while unsharing" => "Greška u uklanjanju deljenja",
-"Error while changing permissions" => "Greška u promeni dozvola",
-"Shared with you and the group {group} by {owner}" => "{owner} podelio sa Vama i grupom {group} ",
-"Shared with you by {owner}" => "Sa vama podelio {owner}",
-"Password protect" => "Zaštita lozinkom",
-"Email link to person" => "Pošalji link e-mailom",
-"Send" => "Pošalji",
-"Set expiration date" => "Datum isteka",
-"Expiration date" => "Datum isteka",
-"Resharing is not allowed" => "Dalje deljenje nije dozvoljeno",
-"Shared in {item} with {user}" => "Deljeno u {item} sa {user}",
-"Unshare" => "Ukljoni deljenje",
-"can edit" => "dozvoljene izmene",
-"access control" => "kontrola pristupa",
-"create" => "napravi",
-"update" => "ažuriranje",
-"delete" => "brisanje",
-"Password protected" => "Zaštćeno lozinkom",
-"Error unsetting expiration date" => "Greška u uklanjanju datuma isteka",
-"Error setting expiration date" => "Greška u postavljanju datuma isteka",
-"Sending ..." => "Slanje...",
-"Email sent" => "Email poslat",
-"Warning" => "Upozorenje",
-"The object type is not specified." => "Tip objekta nije zadan.",
-"Delete" => "Obriši",
-"Add" => "Dodaj",
-"The update was successful. Redirecting you to ownCloud now." => "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
-"Use the following link to reset your password: {link}" => "Koristite sledeći link za reset lozinke: {link}",
-"You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
-"Username" => "Korisničko ime",
-"New password" => "Nova lozinka",
-"Personal" => "Lično",
-"Users" => "Korisnici",
-"Apps" => "Programi",
-"Admin" => "Adninistracija",
-"Help" => "Pomoć",
-"Access forbidden" => "Pristup zabranjen",
-"Security Warning" => "Bezbednosno upozorenje",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Vaša PHP verzija je ranjiva na ",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
-"Create an <strong>admin account</strong>" => "Napravi <strong>administrativni nalog</strong>",
-"Password" => "Lozinka",
-"Data folder" => "Fascikla podataka",
-"Configure the database" => "Podešavanje baze",
-"Database user" => "Korisnik baze",
-"Database password" => "Lozinka baze",
-"Database name" => "Ime baze",
-"Database tablespace" => "tablespace baze",
-"Database host" => "Domaćin baze",
-"Finish setup" => "Završi podešavanje",
-"Log out" => "Odjava",
-"remember" => "upamti",
-"Log in" => "Prijavi se"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/su.js b/core/l10n/su.js
new file mode 100644
index 00000000000..87077ecad97
--- /dev/null
+++ b/core/l10n/su.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/su.json b/core/l10n/su.json
new file mode 100644
index 00000000000..c499f696550
--- /dev/null
+++ b/core/l10n/su.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/su.php b/core/l10n/su.php
deleted file mode 100644
index 1191769faa7..00000000000
--- a/core/l10n/su.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
new file mode 100644
index 00000000000..634e9c6bc22
--- /dev/null
+++ b/core/l10n/sv.js
@@ -0,0 +1,192 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Gick inte att skicka e-post till följande användare: %s",
+    "Turned on maintenance mode" : "Aktiverade underhållsläge",
+    "Turned off maintenance mode" : "Deaktiverade underhållsläge",
+    "Updated database" : "Uppdaterade databasen",
+    "Updated \"%s\" to %s" : "Uppdaterade \"%s\" till %s",
+    "Disabled incompatible apps: %s" : "Inaktiverade inkompatibla appar: %s",
+    "No image or file provided" : "Ingen bild eller fil har tillhandahållits",
+    "Unknown filetype" : "Okänd filtyp",
+    "Invalid image" : "Ogiltig bild",
+    "No temporary profile picture available, try again" : "Ingen temporär profilbild finns tillgänglig, försök igen",
+    "No crop data provided" : "Ingen beskärdata har angivits",
+    "Sunday" : "Söndag",
+    "Monday" : "Måndag",
+    "Tuesday" : "Tisdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Lördag",
+    "January" : "Januari",
+    "February" : "Februari",
+    "March" : "Mars",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "Augusti",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Inställningar",
+    "File" : "Fil",
+    "Folder" : "Mapp",
+    "Image" : "Bild",
+    "Audio" : "Ljud",
+    "Saving..." : "Sparar...",
+    "Couldn't send reset email. Please contact your administrator." : "Kunde inte skicka återställningsmail. Vänligen kontakta din administratör.",
+    "The link to reset your password has been sent to your email. 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." : "Länken för att återställa ditt lösenord har skickats till din e-mail. Om du inte mottar något inom kort, kontrollera spam/skräpkorgen.<br>Om det inte finns något där, vänligen kontakta din lokala administratör.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dina filer är krypterade. Om du inte angett någon återställningsnyckel, kommer det att vara omöjligt att få tillbaka dina data efter att lösenordet är återställt..<br />Om du är osäker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter.<br />Är du verkligen helt säker på att du vill fortsätta?",
+    "I know what I'm doing" : "Jag är säker på vad jag gör",
+    "Reset password" : "Återställ lösenordet",
+    "Password can not be changed. Please contact your administrator." : "Lösenordet kan inte ändras. Vänligen kontakta din administratör.",
+    "No" : "Nej",
+    "Yes" : "Ja",
+    "Choose" : "Välj",
+    "Error loading file picker template: {error}" : "Fel uppstod för filväljarmall: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Fel uppstod under inläsningen av meddelandemallen: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"],
+    "One file conflict" : "En filkonflikt",
+    "New Files" : "Nya filer",
+    "Already existing files" : "Filer som redan existerar",
+    "Which files do you want to keep?" : "Vilken fil vill du behålla?",
+    "If you select both versions, the copied file will have a number added to its name." : "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet.",
+    "Cancel" : "Avbryt",
+    "Continue" : "Fortsätt",
+    "(all selected)" : "(Alla valda)",
+    "({count} selected)" : "({count} valda)",
+    "Error loading file exists template" : "Fel uppstod filmall existerar",
+    "Very weak password" : "Väldigt svagt lösenord",
+    "Weak password" : "Svagt lösenord",
+    "So-so password" : "Okej lösenord",
+    "Good password" : "Bra lösenord",
+    "Strong password" : "Starkt lösenord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Servern har ingen fungerande internetanslutning. Detta innebär att en del av de funktioner som montering av extern lagring, notifieringar om uppdateringar eller installation av 3: e part appar inte fungerar. Åtkomst till filer och skicka e-postmeddelanden fungerar troligen inte heller. Vi rekommenderar starkt att aktivera en internetuppkoppling för denna server om du vill ha alla funktioner.",
+    "Error occurred while checking server setup" : "Ett fel inträffade när en kontroll utav servens setup gjordes",
+    "Shared" : "Delad",
+    "Shared with {recipients}" : "Delad med {recipients}",
+    "Share" : "Dela",
+    "Error" : "Fel",
+    "Error while sharing" : "Fel vid delning",
+    "Error while unsharing" : "Fel när delning skulle avslutas",
+    "Error while changing permissions" : "Fel vid ändring av rättigheter",
+    "Shared with you and the group {group} by {owner}" : "Delad med dig och gruppen {group} av {owner}",
+    "Shared with you by {owner}" : "Delad med dig av {owner}",
+    "Share with user or group …" : "Dela med användare eller grupp...",
+    "Share link" : "Dela länk",
+    "The public link will expire no later than {days} days after it is created" : "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
+    "Password protect" : "Lösenordsskydda",
+    "Choose a password for the public link" : "Välj ett lösenord för den publika länken",
+    "Allow Public Upload" : "Tillåt publik uppladdning",
+    "Email link to person" : "E-posta länk till person",
+    "Send" : "Skicka",
+    "Set expiration date" : "Sätt utgångsdatum",
+    "Expiration date" : "Utgångsdatum",
+    "Adding user..." : "Lägger till användare...",
+    "group" : "Grupp",
+    "Resharing is not allowed" : "Dela vidare är inte tillåtet",
+    "Shared in {item} with {user}" : "Delad i {item} med {user}",
+    "Unshare" : "Sluta dela",
+    "notify by email" : "informera via e-post",
+    "can share" : "får dela",
+    "can edit" : "kan redigera",
+    "access control" : "åtkomstkontroll",
+    "create" : "skapa",
+    "update" : "uppdatera",
+    "delete" : "radera",
+    "Password protected" : "Lösenordsskyddad",
+    "Error unsetting expiration date" : "Fel vid borttagning av utgångsdatum",
+    "Error setting expiration date" : "Fel vid sättning av utgångsdatum",
+    "Sending ..." : "Skickar ...",
+    "Email sent" : "E-post skickat",
+    "Warning" : "Varning",
+    "The object type is not specified." : "Objekttypen är inte specificerad.",
+    "Enter new" : "Skriv nytt",
+    "Delete" : "Radera",
+    "Add" : "Lägg till",
+    "Edit tags" : "Editera taggar",
+    "Error loading dialog template: {error}" : "Fel under laddning utav dialog mall: {fel}",
+    "No tags selected for deletion." : "Inga taggar valda för borttagning.",
+    "Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
+    "Please reload the page." : "Vänligen ladda om sidan.",
+    "The update was unsuccessful." : "Uppdateringen misslyckades.",
+    "The update was successful. Redirecting you to ownCloud now." : "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
+    "Couldn't reset password because the token is invalid" : "Kunde inte återställa lösenordet på grund av felaktig token",
+    "Couldn't send reset email. Please make sure your username is correct." : "Kunde inte skicka återställningsmail. Vänligen kontrollera att ditt användarnamn är korrekt.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka något återställningsmail därför att det inte finns någon e-mailadress kopplad till detta användarnamn. Vänligen kontakta din administratör.",
+    "%s password reset" : "%s återställ lösenord",
+    "Use the following link to reset your password: {link}" : "Använd följande länk för att återställa lösenordet: {link}",
+    "You will receive a link to reset your password via Email." : "Du får en länk att återställa ditt lösenord via e-post.",
+    "Username" : "Användarnamn",
+    "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?" : "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?",
+    "Yes, I really want to reset my password now" : "Ja, jag vill verkligen återställa mitt lösenord nu",
+    "Reset" : "Återställ",
+    "New password" : "Nytt lösenord",
+    "New Password" : "Nytt lösenord",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
+    "For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.",
+    "Personal" : "Personligt",
+    "Users" : "Användare",
+    "Apps" : "Program",
+    "Admin" : "Admin",
+    "Help" : "Hjälp",
+    "Error loading tags" : "Fel vid laddning utav taggar",
+    "Tag already exists" : "Tagg existerar redan",
+    "Error deleting tag(s)" : "Fel vid borttagning utav tagg(ar)",
+    "Error tagging" : "Fel taggning",
+    "Error untagging" : "Fel av taggning",
+    "Error favoriting" : "Fel favorisering",
+    "Error unfavoriting" : "Fel av favorisering ",
+    "Access forbidden" : "Åtkomst förbjuden",
+    "File not found" : "Filen kunde inte hittas",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej där!,\n\nVi vill bara meddela att %s delade %s med dig.\nTitta på den här: %s\n\n",
+    "The share will expire on %s." : "Utdelningen kommer att upphöra %s.",
+    "Cheers!" : "Ha de fint!",
+    "Security Warning" : "Säkerhetsvarning",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Din version av PHP är sårbar för NULL byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Var god uppdatera din PHP-installation för att använda %s säkert.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
+    "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>",
+    "Password" : "Lösenord",
+    "Storage & database" : "Lagring & databas",
+    "Data folder" : "Datamapp",
+    "Configure the database" : "Konfigurera databasen",
+    "Only %s is available." : "Endast %s är tillgänglig.",
+    "Database user" : "Databasanvändare",
+    "Database password" : "Lösenord till databasen",
+    "Database name" : "Databasnamn",
+    "Database tablespace" : "Databas tabellutrymme",
+    "Database host" : "Databasserver",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite kommer att användas som databas. För större installationer rekommenderar vi att du ändrar databastyp.",
+    "Finish setup" : "Avsluta installation",
+    "Finishing …" : "Avslutar ...",
+    "%s is available. Get more information on how to update." : "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.",
+    "Log out" : "Logga ut",
+    "Server side authentication failed!" : "Servern misslyckades med autentisering!",
+    "Please contact your administrator." : "Kontakta din administratör.",
+    "Forgot your password? Reset it!" : "Glömt ditt lösenord? Återställ det!",
+    "remember" : "kom ihåg",
+    "Log in" : "Logga in",
+    "Alternative Logins" : "Alternativa inloggningar",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Denna ownCloud instans är för närvarande i enanvändarläge",
+    "This means only administrators can use the instance." : "Detta betyder att endast administartörer kan använda instansen.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Hör av dig till din system administratör ifall detta meddelande fortsätter eller visas oväntat.",
+    "Thank you for your patience." : "Tack för ditt tålamod.",
+    "You are accessing the server from an untrusted domain." : "Du ansluter till servern från en osäker domän.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vänligen kontakta din administratör. Om du är en administratör, konfigurera inställningen \"trusted_domain\" i  config/config.php. En exempelkonfiguration finns i tillgänglig i config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Beroende på din konfiguartion, så finns det möjlighet att du som administratör kan använda knappen nedan för att verifiera på denna domän.",
+    "Add \"%s\" as trusted domain" : "Lägg till \"%s\" som en trusted domain",
+    "%s will be updated to version %s." : "%s kommer att uppdateras till version %s.",
+    "The following apps will be disabled:" : "Följande appar kommer att inaktiveras:",
+    "The theme %s has been disabled." : "Temat  %s har blivit inaktiverat.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Vänligen säkerställ att en säkerhetskopia har gjorts av databasen, konfigurations- och datamappen innan du fortsätter.",
+    "Start update" : "Starta uppdateringen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
new file mode 100644
index 00000000000..a7108b44fcd
--- /dev/null
+++ b/core/l10n/sv.json
@@ -0,0 +1,190 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Gick inte att skicka e-post till följande användare: %s",
+    "Turned on maintenance mode" : "Aktiverade underhållsläge",
+    "Turned off maintenance mode" : "Deaktiverade underhållsläge",
+    "Updated database" : "Uppdaterade databasen",
+    "Updated \"%s\" to %s" : "Uppdaterade \"%s\" till %s",
+    "Disabled incompatible apps: %s" : "Inaktiverade inkompatibla appar: %s",
+    "No image or file provided" : "Ingen bild eller fil har tillhandahållits",
+    "Unknown filetype" : "Okänd filtyp",
+    "Invalid image" : "Ogiltig bild",
+    "No temporary profile picture available, try again" : "Ingen temporär profilbild finns tillgänglig, försök igen",
+    "No crop data provided" : "Ingen beskärdata har angivits",
+    "Sunday" : "Söndag",
+    "Monday" : "Måndag",
+    "Tuesday" : "Tisdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Lördag",
+    "January" : "Januari",
+    "February" : "Februari",
+    "March" : "Mars",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "Augusti",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Inställningar",
+    "File" : "Fil",
+    "Folder" : "Mapp",
+    "Image" : "Bild",
+    "Audio" : "Ljud",
+    "Saving..." : "Sparar...",
+    "Couldn't send reset email. Please contact your administrator." : "Kunde inte skicka återställningsmail. Vänligen kontakta din administratör.",
+    "The link to reset your password has been sent to your email. 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." : "Länken för att återställa ditt lösenord har skickats till din e-mail. Om du inte mottar något inom kort, kontrollera spam/skräpkorgen.<br>Om det inte finns något där, vänligen kontakta din lokala administratör.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dina filer är krypterade. Om du inte angett någon återställningsnyckel, kommer det att vara omöjligt att få tillbaka dina data efter att lösenordet är återställt..<br />Om du är osäker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter.<br />Är du verkligen helt säker på att du vill fortsätta?",
+    "I know what I'm doing" : "Jag är säker på vad jag gör",
+    "Reset password" : "Återställ lösenordet",
+    "Password can not be changed. Please contact your administrator." : "Lösenordet kan inte ändras. Vänligen kontakta din administratör.",
+    "No" : "Nej",
+    "Yes" : "Ja",
+    "Choose" : "Välj",
+    "Error loading file picker template: {error}" : "Fel uppstod för filväljarmall: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Fel uppstod under inläsningen av meddelandemallen: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"],
+    "One file conflict" : "En filkonflikt",
+    "New Files" : "Nya filer",
+    "Already existing files" : "Filer som redan existerar",
+    "Which files do you want to keep?" : "Vilken fil vill du behålla?",
+    "If you select both versions, the copied file will have a number added to its name." : "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet.",
+    "Cancel" : "Avbryt",
+    "Continue" : "Fortsätt",
+    "(all selected)" : "(Alla valda)",
+    "({count} selected)" : "({count} valda)",
+    "Error loading file exists template" : "Fel uppstod filmall existerar",
+    "Very weak password" : "Väldigt svagt lösenord",
+    "Weak password" : "Svagt lösenord",
+    "So-so password" : "Okej lösenord",
+    "Good password" : "Bra lösenord",
+    "Strong password" : "Starkt lösenord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Servern har ingen fungerande internetanslutning. Detta innebär att en del av de funktioner som montering av extern lagring, notifieringar om uppdateringar eller installation av 3: e part appar inte fungerar. Åtkomst till filer och skicka e-postmeddelanden fungerar troligen inte heller. Vi rekommenderar starkt att aktivera en internetuppkoppling för denna server om du vill ha alla funktioner.",
+    "Error occurred while checking server setup" : "Ett fel inträffade när en kontroll utav servens setup gjordes",
+    "Shared" : "Delad",
+    "Shared with {recipients}" : "Delad med {recipients}",
+    "Share" : "Dela",
+    "Error" : "Fel",
+    "Error while sharing" : "Fel vid delning",
+    "Error while unsharing" : "Fel när delning skulle avslutas",
+    "Error while changing permissions" : "Fel vid ändring av rättigheter",
+    "Shared with you and the group {group} by {owner}" : "Delad med dig och gruppen {group} av {owner}",
+    "Shared with you by {owner}" : "Delad med dig av {owner}",
+    "Share with user or group …" : "Dela med användare eller grupp...",
+    "Share link" : "Dela länk",
+    "The public link will expire no later than {days} days after it is created" : "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
+    "Password protect" : "Lösenordsskydda",
+    "Choose a password for the public link" : "Välj ett lösenord för den publika länken",
+    "Allow Public Upload" : "Tillåt publik uppladdning",
+    "Email link to person" : "E-posta länk till person",
+    "Send" : "Skicka",
+    "Set expiration date" : "Sätt utgångsdatum",
+    "Expiration date" : "Utgångsdatum",
+    "Adding user..." : "Lägger till användare...",
+    "group" : "Grupp",
+    "Resharing is not allowed" : "Dela vidare är inte tillåtet",
+    "Shared in {item} with {user}" : "Delad i {item} med {user}",
+    "Unshare" : "Sluta dela",
+    "notify by email" : "informera via e-post",
+    "can share" : "får dela",
+    "can edit" : "kan redigera",
+    "access control" : "åtkomstkontroll",
+    "create" : "skapa",
+    "update" : "uppdatera",
+    "delete" : "radera",
+    "Password protected" : "Lösenordsskyddad",
+    "Error unsetting expiration date" : "Fel vid borttagning av utgångsdatum",
+    "Error setting expiration date" : "Fel vid sättning av utgångsdatum",
+    "Sending ..." : "Skickar ...",
+    "Email sent" : "E-post skickat",
+    "Warning" : "Varning",
+    "The object type is not specified." : "Objekttypen är inte specificerad.",
+    "Enter new" : "Skriv nytt",
+    "Delete" : "Radera",
+    "Add" : "Lägg till",
+    "Edit tags" : "Editera taggar",
+    "Error loading dialog template: {error}" : "Fel under laddning utav dialog mall: {fel}",
+    "No tags selected for deletion." : "Inga taggar valda för borttagning.",
+    "Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
+    "Please reload the page." : "Vänligen ladda om sidan.",
+    "The update was unsuccessful." : "Uppdateringen misslyckades.",
+    "The update was successful. Redirecting you to ownCloud now." : "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
+    "Couldn't reset password because the token is invalid" : "Kunde inte återställa lösenordet på grund av felaktig token",
+    "Couldn't send reset email. Please make sure your username is correct." : "Kunde inte skicka återställningsmail. Vänligen kontrollera att ditt användarnamn är korrekt.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka något återställningsmail därför att det inte finns någon e-mailadress kopplad till detta användarnamn. Vänligen kontakta din administratör.",
+    "%s password reset" : "%s återställ lösenord",
+    "Use the following link to reset your password: {link}" : "Använd följande länk för att återställa lösenordet: {link}",
+    "You will receive a link to reset your password via Email." : "Du får en länk att återställa ditt lösenord via e-post.",
+    "Username" : "Användarnamn",
+    "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?" : "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?",
+    "Yes, I really want to reset my password now" : "Ja, jag vill verkligen återställa mitt lösenord nu",
+    "Reset" : "Återställ",
+    "New password" : "Nytt lösenord",
+    "New Password" : "Nytt lösenord",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
+    "For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.",
+    "Personal" : "Personligt",
+    "Users" : "Användare",
+    "Apps" : "Program",
+    "Admin" : "Admin",
+    "Help" : "Hjälp",
+    "Error loading tags" : "Fel vid laddning utav taggar",
+    "Tag already exists" : "Tagg existerar redan",
+    "Error deleting tag(s)" : "Fel vid borttagning utav tagg(ar)",
+    "Error tagging" : "Fel taggning",
+    "Error untagging" : "Fel av taggning",
+    "Error favoriting" : "Fel favorisering",
+    "Error unfavoriting" : "Fel av favorisering ",
+    "Access forbidden" : "Åtkomst förbjuden",
+    "File not found" : "Filen kunde inte hittas",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej där!,\n\nVi vill bara meddela att %s delade %s med dig.\nTitta på den här: %s\n\n",
+    "The share will expire on %s." : "Utdelningen kommer att upphöra %s.",
+    "Cheers!" : "Ha de fint!",
+    "Security Warning" : "Säkerhetsvarning",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Din version av PHP är sårbar för NULL byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Var god uppdatera din PHP-installation för att använda %s säkert.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
+    "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>",
+    "Password" : "Lösenord",
+    "Storage & database" : "Lagring & databas",
+    "Data folder" : "Datamapp",
+    "Configure the database" : "Konfigurera databasen",
+    "Only %s is available." : "Endast %s är tillgänglig.",
+    "Database user" : "Databasanvändare",
+    "Database password" : "Lösenord till databasen",
+    "Database name" : "Databasnamn",
+    "Database tablespace" : "Databas tabellutrymme",
+    "Database host" : "Databasserver",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite kommer att användas som databas. För större installationer rekommenderar vi att du ändrar databastyp.",
+    "Finish setup" : "Avsluta installation",
+    "Finishing …" : "Avslutar ...",
+    "%s is available. Get more information on how to update." : "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.",
+    "Log out" : "Logga ut",
+    "Server side authentication failed!" : "Servern misslyckades med autentisering!",
+    "Please contact your administrator." : "Kontakta din administratör.",
+    "Forgot your password? Reset it!" : "Glömt ditt lösenord? Återställ det!",
+    "remember" : "kom ihåg",
+    "Log in" : "Logga in",
+    "Alternative Logins" : "Alternativa inloggningar",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Denna ownCloud instans är för närvarande i enanvändarläge",
+    "This means only administrators can use the instance." : "Detta betyder att endast administartörer kan använda instansen.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Hör av dig till din system administratör ifall detta meddelande fortsätter eller visas oväntat.",
+    "Thank you for your patience." : "Tack för ditt tålamod.",
+    "You are accessing the server from an untrusted domain." : "Du ansluter till servern från en osäker domän.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vänligen kontakta din administratör. Om du är en administratör, konfigurera inställningen \"trusted_domain\" i  config/config.php. En exempelkonfiguration finns i tillgänglig i config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Beroende på din konfiguartion, så finns det möjlighet att du som administratör kan använda knappen nedan för att verifiera på denna domän.",
+    "Add \"%s\" as trusted domain" : "Lägg till \"%s\" som en trusted domain",
+    "%s will be updated to version %s." : "%s kommer att uppdateras till version %s.",
+    "The following apps will be disabled:" : "Följande appar kommer att inaktiveras:",
+    "The theme %s has been disabled." : "Temat  %s har blivit inaktiverat.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Vänligen säkerställ att en säkerhetskopia har gjorts av databasen, konfigurations- och datamappen innan du fortsätter.",
+    "Start update" : "Starta uppdateringen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
deleted file mode 100644
index 389fbd15758..00000000000
--- a/core/l10n/sv.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Gick inte att skicka e-post till följande användare: %s",
-"Turned on maintenance mode" => "Aktiverade underhållsläge",
-"Turned off maintenance mode" => "Deaktiverade underhållsläge",
-"Updated database" => "Uppdaterade databasen",
-"Updated \"%s\" to %s" => "Uppdaterade \"%s\" till %s",
-"Disabled incompatible apps: %s" => "Inaktiverade inkompatibla appar: %s",
-"No image or file provided" => "Ingen bild eller fil har tillhandahållits",
-"Unknown filetype" => "Okänd filtyp",
-"Invalid image" => "Ogiltig bild",
-"No temporary profile picture available, try again" => "Ingen temporär profilbild finns tillgänglig, försök igen",
-"No crop data provided" => "Ingen beskärdata har angivits",
-"Sunday" => "Söndag",
-"Monday" => "Måndag",
-"Tuesday" => "Tisdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Lördag",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Mars",
-"April" => "April",
-"May" => "Maj",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "Augusti",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "December",
-"Settings" => "Inställningar",
-"File" => "Fil",
-"Folder" => "Mapp",
-"Image" => "Bild",
-"Audio" => "Ljud",
-"Saving..." => "Sparar...",
-"Couldn't send reset email. Please contact your administrator." => "Kunde inte skicka återställningsmail. Vänligen kontakta din administratör.",
-"The link to reset your password has been sent to your email. 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." => "Länken för att återställa ditt lösenord har skickats till din e-mail. Om du inte mottar något inom kort, kontrollera spam/skräpkorgen.<br>Om det inte finns något där, vänligen kontakta din lokala administratör.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Dina filer är krypterade. Om du inte angett någon återställningsnyckel, kommer det att vara omöjligt att få tillbaka dina data efter att lösenordet är återställt..<br />Om du är osäker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter.<br />Är du verkligen helt säker på att du vill fortsätta?",
-"I know what I'm doing" => "Jag är säker på vad jag gör",
-"Reset password" => "Återställ lösenordet",
-"Password can not be changed. Please contact your administrator." => "Lösenordet kan inte ändras. Vänligen kontakta din administratör.",
-"No" => "Nej",
-"Yes" => "Ja",
-"Choose" => "Välj",
-"Error loading file picker template: {error}" => "Fel uppstod för filväljarmall: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Fel uppstod under inläsningen av meddelandemallen: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
-"One file conflict" => "En filkonflikt",
-"New Files" => "Nya filer",
-"Already existing files" => "Filer som redan existerar",
-"Which files do you want to keep?" => "Vilken fil vill du behålla?",
-"If you select both versions, the copied file will have a number added to its name." => "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet.",
-"Cancel" => "Avbryt",
-"Continue" => "Fortsätt",
-"(all selected)" => "(Alla valda)",
-"({count} selected)" => "({count} valda)",
-"Error loading file exists template" => "Fel uppstod filmall existerar",
-"Very weak password" => "Väldigt svagt lösenord",
-"Weak password" => "Svagt lösenord",
-"So-so password" => "Okej lösenord",
-"Good password" => "Bra lösenord",
-"Strong password" => "Starkt lösenord",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Servern har ingen fungerande internetanslutning. Detta innebär att en del av de funktioner som montering av extern lagring, notifieringar om uppdateringar eller installation av 3: e part appar inte fungerar. Åtkomst till filer och skicka e-postmeddelanden fungerar troligen inte heller. Vi rekommenderar starkt att aktivera en internetuppkoppling för denna server om du vill ha alla funktioner.",
-"Error occurred while checking server setup" => "Ett fel inträffade när en kontroll utav servens setup gjordes",
-"Shared" => "Delad",
-"Shared with {recipients}" => "Delad med {recipients}",
-"Share" => "Dela",
-"Error" => "Fel",
-"Error while sharing" => "Fel vid delning",
-"Error while unsharing" => "Fel när delning skulle avslutas",
-"Error while changing permissions" => "Fel vid ändring av rättigheter",
-"Shared with you and the group {group} by {owner}" => "Delad med dig och gruppen {group} av {owner}",
-"Shared with you by {owner}" => "Delad med dig av {owner}",
-"Share with user or group …" => "Dela med användare eller grupp...",
-"Share link" => "Dela länk",
-"The public link will expire no later than {days} days after it is created" => "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
-"Password protect" => "Lösenordsskydda",
-"Choose a password for the public link" => "Välj ett lösenord för den publika länken",
-"Allow Public Upload" => "Tillåt publik uppladdning",
-"Email link to person" => "E-posta länk till person",
-"Send" => "Skicka",
-"Set expiration date" => "Sätt utgångsdatum",
-"Expiration date" => "Utgångsdatum",
-"Adding user..." => "Lägger till användare...",
-"group" => "Grupp",
-"Resharing is not allowed" => "Dela vidare är inte tillåtet",
-"Shared in {item} with {user}" => "Delad i {item} med {user}",
-"Unshare" => "Sluta dela",
-"notify by email" => "informera via e-post",
-"can share" => "får dela",
-"can edit" => "kan redigera",
-"access control" => "åtkomstkontroll",
-"create" => "skapa",
-"update" => "uppdatera",
-"delete" => "radera",
-"Password protected" => "Lösenordsskyddad",
-"Error unsetting expiration date" => "Fel vid borttagning av utgångsdatum",
-"Error setting expiration date" => "Fel vid sättning av utgångsdatum",
-"Sending ..." => "Skickar ...",
-"Email sent" => "E-post skickat",
-"Warning" => "Varning",
-"The object type is not specified." => "Objekttypen är inte specificerad.",
-"Enter new" => "Skriv nytt",
-"Delete" => "Radera",
-"Add" => "Lägg till",
-"Edit tags" => "Editera taggar",
-"Error loading dialog template: {error}" => "Fel under laddning utav dialog mall: {fel}",
-"No tags selected for deletion." => "Inga taggar valda för borttagning.",
-"Updating {productName} to version {version}, this may take a while." => "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
-"Please reload the page." => "Vänligen ladda om sidan.",
-"The update was unsuccessful." => "Uppdateringen misslyckades.",
-"The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
-"Couldn't reset password because the token is invalid" => "Kunde inte återställa lösenordet på grund av felaktig token",
-"Couldn't send reset email. Please make sure your username is correct." => "Kunde inte skicka återställningsmail. Vänligen kontrollera att ditt användarnamn är korrekt.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Kunde inte skicka något återställningsmail därför att det inte finns någon e-mailadress kopplad till detta användarnamn. Vänligen kontakta din administratör.",
-"%s password reset" => "%s återställ lösenord",
-"Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
-"You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
-"Username" => "Användarnamn",
-"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?" => "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?",
-"Yes, I really want to reset my password now" => "Ja, jag vill verkligen återställa mitt lösenord nu",
-"Reset" => "Återställ",
-"New password" => "Nytt lösenord",
-"New Password" => "Nytt lösenord",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
-"For the best results, please consider using a GNU/Linux server instead." => "För bästa resultat, överväg att använda en GNU/Linux server istället.",
-"Personal" => "Personligt",
-"Users" => "Användare",
-"Apps" => "Program",
-"Admin" => "Admin",
-"Help" => "Hjälp",
-"Error loading tags" => "Fel vid laddning utav taggar",
-"Tag already exists" => "Tagg existerar redan",
-"Error deleting tag(s)" => "Fel vid borttagning utav tagg(ar)",
-"Error tagging" => "Fel taggning",
-"Error untagging" => "Fel av taggning",
-"Error favoriting" => "Fel favorisering",
-"Error unfavoriting" => "Fel av favorisering ",
-"Access forbidden" => "Åtkomst förbjuden",
-"File not found" => "Filen kunde inte hittas",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej där!,\n\nVi vill bara meddela att %s delade %s med dig.\nTitta på den här: %s\n\n",
-"The share will expire on %s." => "Utdelningen kommer att upphöra %s.",
-"Cheers!" => "Ha de fint!",
-"Security Warning" => "Säkerhetsvarning",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din version av PHP är sårbar för NULL byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Var god uppdatera din PHP-installation för att använda %s säkert.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
-"Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
-"Password" => "Lösenord",
-"Storage & database" => "Lagring & databas",
-"Data folder" => "Datamapp",
-"Configure the database" => "Konfigurera databasen",
-"Only %s is available." => "Endast %s är tillgänglig.",
-"Database user" => "Databasanvändare",
-"Database password" => "Lösenord till databasen",
-"Database name" => "Databasnamn",
-"Database tablespace" => "Databas tabellutrymme",
-"Database host" => "Databasserver",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite kommer att användas som databas. För större installationer rekommenderar vi att du ändrar databastyp.",
-"Finish setup" => "Avsluta installation",
-"Finishing …" => "Avslutar ...",
-"%s is available. Get more information on how to update." => "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.",
-"Log out" => "Logga ut",
-"Server side authentication failed!" => "Servern misslyckades med autentisering!",
-"Please contact your administrator." => "Kontakta din administratör.",
-"Forgot your password? Reset it!" => "Glömt ditt lösenord? Återställ det!",
-"remember" => "kom ihåg",
-"Log in" => "Logga in",
-"Alternative Logins" => "Alternativa inloggningar",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Denna ownCloud instans är för närvarande i enanvändarläge",
-"This means only administrators can use the instance." => "Detta betyder att endast administartörer kan använda instansen.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Hör av dig till din system administratör ifall detta meddelande fortsätter eller visas oväntat.",
-"Thank you for your patience." => "Tack för ditt tålamod.",
-"You are accessing the server from an untrusted domain." => "Du ansluter till servern från en osäker domän.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Vänligen kontakta din administratör. Om du är en administratör, konfigurera inställningen \"trusted_domain\" i  config/config.php. En exempelkonfiguration finns i tillgänglig i config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Beroende på din konfiguartion, så finns det möjlighet att du som administratör kan använda knappen nedan för att verifiera på denna domän.",
-"Add \"%s\" as trusted domain" => "Lägg till \"%s\" som en trusted domain",
-"%s will be updated to version %s." => "%s kommer att uppdateras till version %s.",
-"The following apps will be disabled:" => "Följande appar kommer att inaktiveras:",
-"The theme %s has been disabled." => "Temat  %s har blivit inaktiverat.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Vänligen säkerställ att en säkerhetskopia har gjorts av databasen, konfigurations- och datamappen innan du fortsätter.",
-"Start update" => "Starta uppdateringen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sw_KE.js b/core/l10n/sw_KE.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/sw_KE.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/sw_KE.json b/core/l10n/sw_KE.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/sw_KE.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/sw_KE.php b/core/l10n/sw_KE.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/sw_KE.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ta_IN.js b/core/l10n/ta_IN.js
new file mode 100644
index 00000000000..eaa7584de0e
--- /dev/null
+++ b/core/l10n/ta_IN.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "core",
+    {
+    "Settings" : "அமைப்புகள்",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Send" : "அனுப்பவும்"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ta_IN.json b/core/l10n/ta_IN.json
new file mode 100644
index 00000000000..0bfa5f4eed1
--- /dev/null
+++ b/core/l10n/ta_IN.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Settings" : "அமைப்புகள்",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Send" : "அனுப்பவும்"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ta_IN.php b/core/l10n/ta_IN.php
deleted file mode 100644
index f363cf0c9bf..00000000000
--- a/core/l10n/ta_IN.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Settings" => "அமைப்புகள்",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Send" => "அனுப்பவும்"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js
new file mode 100644
index 00000000000..af71be68cfa
--- /dev/null
+++ b/core/l10n/ta_LK.js
@@ -0,0 +1,84 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "ஞாயிற்றுக்கிழமை",
+    "Monday" : "திங்கட்கிழமை",
+    "Tuesday" : "செவ்வாய்க்கிழமை",
+    "Wednesday" : "புதன்கிழமை",
+    "Thursday" : "வியாழக்கிழமை",
+    "Friday" : "வெள்ளிக்கிழமை",
+    "Saturday" : "சனிக்கிழமை",
+    "January" : "தை",
+    "February" : "மாசி",
+    "March" : "பங்குனி",
+    "April" : "சித்திரை",
+    "May" : "வைகாசி",
+    "June" : "ஆனி",
+    "July" : "ஆடி",
+    "August" : "ஆவணி",
+    "September" : "புரட்டாசி",
+    "October" : "ஐப்பசி",
+    "November" : "கார்த்திகை",
+    "December" : "மார்கழி",
+    "Settings" : "அமைப்புகள்",
+    "Folder" : "கோப்புறை",
+    "Saving..." : "சேமிக்கப்படுகிறது...",
+    "Reset password" : "மீளமைத்த கடவுச்சொல்",
+    "No" : "இல்லை",
+    "Yes" : "ஆம்",
+    "Choose" : "தெரிவுசெய்க ",
+    "Ok" : "சரி",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "இரத்து செய்க",
+    "Share" : "பகிர்வு",
+    "Error" : "வழு",
+    "Error while sharing" : "பகிரும் போதான வழு",
+    "Error while unsharing" : "பகிராமல் உள்ளப்போதான வழு",
+    "Error while changing permissions" : "அனுமதிகள் மாறும்போதான வழு",
+    "Shared with you and the group {group} by {owner}" : "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
+    "Shared with you by {owner}" : "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
+    "Password protect" : "கடவுச்சொல்லை பாதுகாத்தல்",
+    "Set expiration date" : "காலாவதி தேதியை குறிப்பிடுக",
+    "Expiration date" : "காலவதியாகும் திகதி",
+    "group" : "குழு",
+    "Resharing is not allowed" : "மீள்பகிர்வதற்கு அனுமதி இல்லை ",
+    "Shared in {item} with {user}" : "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது",
+    "Unshare" : "பகிரப்படாதது",
+    "can edit" : "தொகுக்க முடியும்",
+    "access control" : "கட்டுப்பாடான அணுகல்",
+    "create" : "உருவவாக்கல்",
+    "update" : "இற்றைப்படுத்தல்",
+    "delete" : "நீக்குக",
+    "Password protected" : "கடவுச்சொல் பாதுகாக்கப்பட்டது",
+    "Error unsetting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு",
+    "Error setting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
+    "Warning" : "எச்சரிக்கை",
+    "The object type is not specified." : "பொருள் வகை குறிப்பிடப்படவில்லை.",
+    "Delete" : "நீக்குக",
+    "Add" : "சேர்க்க",
+    "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
+    "You will receive a link to reset your password via Email." : "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
+    "Username" : "பயனாளர் பெயர்",
+    "New password" : "புதிய கடவுச்சொல்",
+    "Personal" : "தனிப்பட்ட",
+    "Users" : "பயனாளர்",
+    "Apps" : "செயலிகள்",
+    "Admin" : "நிர்வாகம்",
+    "Help" : "உதவி",
+    "Access forbidden" : "அணுக தடை",
+    "Security Warning" : "பாதுகாப்பு எச்சரிக்கை",
+    "Create an <strong>admin account</strong>" : "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
+    "Password" : "கடவுச்சொல்",
+    "Data folder" : "தரவு கோப்புறை",
+    "Configure the database" : "தரவுத்தளத்தை தகவமைக்க",
+    "Database user" : "தரவுத்தள பயனாளர்",
+    "Database password" : "தரவுத்தள கடவுச்சொல்",
+    "Database name" : "தரவுத்தள பெயர்",
+    "Database tablespace" : "தரவுத்தள அட்டவணை",
+    "Database host" : "தரவுத்தள ஓம்புனர்",
+    "Finish setup" : "அமைப்பை முடிக்க",
+    "Log out" : "விடுபதிகை செய்க",
+    "remember" : "ஞாபகப்படுத்துக",
+    "Log in" : "புகுபதிகை"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json
new file mode 100644
index 00000000000..079bdb64147
--- /dev/null
+++ b/core/l10n/ta_LK.json
@@ -0,0 +1,82 @@
+{ "translations": {
+    "Sunday" : "ஞாயிற்றுக்கிழமை",
+    "Monday" : "திங்கட்கிழமை",
+    "Tuesday" : "செவ்வாய்க்கிழமை",
+    "Wednesday" : "புதன்கிழமை",
+    "Thursday" : "வியாழக்கிழமை",
+    "Friday" : "வெள்ளிக்கிழமை",
+    "Saturday" : "சனிக்கிழமை",
+    "January" : "தை",
+    "February" : "மாசி",
+    "March" : "பங்குனி",
+    "April" : "சித்திரை",
+    "May" : "வைகாசி",
+    "June" : "ஆனி",
+    "July" : "ஆடி",
+    "August" : "ஆவணி",
+    "September" : "புரட்டாசி",
+    "October" : "ஐப்பசி",
+    "November" : "கார்த்திகை",
+    "December" : "மார்கழி",
+    "Settings" : "அமைப்புகள்",
+    "Folder" : "கோப்புறை",
+    "Saving..." : "சேமிக்கப்படுகிறது...",
+    "Reset password" : "மீளமைத்த கடவுச்சொல்",
+    "No" : "இல்லை",
+    "Yes" : "ஆம்",
+    "Choose" : "தெரிவுசெய்க ",
+    "Ok" : "சரி",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "இரத்து செய்க",
+    "Share" : "பகிர்வு",
+    "Error" : "வழு",
+    "Error while sharing" : "பகிரும் போதான வழு",
+    "Error while unsharing" : "பகிராமல் உள்ளப்போதான வழு",
+    "Error while changing permissions" : "அனுமதிகள் மாறும்போதான வழு",
+    "Shared with you and the group {group} by {owner}" : "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
+    "Shared with you by {owner}" : "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
+    "Password protect" : "கடவுச்சொல்லை பாதுகாத்தல்",
+    "Set expiration date" : "காலாவதி தேதியை குறிப்பிடுக",
+    "Expiration date" : "காலவதியாகும் திகதி",
+    "group" : "குழு",
+    "Resharing is not allowed" : "மீள்பகிர்வதற்கு அனுமதி இல்லை ",
+    "Shared in {item} with {user}" : "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது",
+    "Unshare" : "பகிரப்படாதது",
+    "can edit" : "தொகுக்க முடியும்",
+    "access control" : "கட்டுப்பாடான அணுகல்",
+    "create" : "உருவவாக்கல்",
+    "update" : "இற்றைப்படுத்தல்",
+    "delete" : "நீக்குக",
+    "Password protected" : "கடவுச்சொல் பாதுகாக்கப்பட்டது",
+    "Error unsetting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு",
+    "Error setting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
+    "Warning" : "எச்சரிக்கை",
+    "The object type is not specified." : "பொருள் வகை குறிப்பிடப்படவில்லை.",
+    "Delete" : "நீக்குக",
+    "Add" : "சேர்க்க",
+    "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
+    "You will receive a link to reset your password via Email." : "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
+    "Username" : "பயனாளர் பெயர்",
+    "New password" : "புதிய கடவுச்சொல்",
+    "Personal" : "தனிப்பட்ட",
+    "Users" : "பயனாளர்",
+    "Apps" : "செயலிகள்",
+    "Admin" : "நிர்வாகம்",
+    "Help" : "உதவி",
+    "Access forbidden" : "அணுக தடை",
+    "Security Warning" : "பாதுகாப்பு எச்சரிக்கை",
+    "Create an <strong>admin account</strong>" : "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
+    "Password" : "கடவுச்சொல்",
+    "Data folder" : "தரவு கோப்புறை",
+    "Configure the database" : "தரவுத்தளத்தை தகவமைக்க",
+    "Database user" : "தரவுத்தள பயனாளர்",
+    "Database password" : "தரவுத்தள கடவுச்சொல்",
+    "Database name" : "தரவுத்தள பெயர்",
+    "Database tablespace" : "தரவுத்தள அட்டவணை",
+    "Database host" : "தரவுத்தள ஓம்புனர்",
+    "Finish setup" : "அமைப்பை முடிக்க",
+    "Log out" : "விடுபதிகை செய்க",
+    "remember" : "ஞாபகப்படுத்துக",
+    "Log in" : "புகுபதிகை"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
deleted file mode 100644
index 30262c1fbf8..00000000000
--- a/core/l10n/ta_LK.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "ஞாயிற்றுக்கிழமை",
-"Monday" => "திங்கட்கிழமை",
-"Tuesday" => "செவ்வாய்க்கிழமை",
-"Wednesday" => "புதன்கிழமை",
-"Thursday" => "வியாழக்கிழமை",
-"Friday" => "வெள்ளிக்கிழமை",
-"Saturday" => "சனிக்கிழமை",
-"January" => "தை",
-"February" => "மாசி",
-"March" => "பங்குனி",
-"April" => "சித்திரை",
-"May" => "வைகாசி",
-"June" => "ஆனி",
-"July" => "ஆடி",
-"August" => "ஆவணி",
-"September" => "புரட்டாசி",
-"October" => "ஐப்பசி",
-"November" => "கார்த்திகை",
-"December" => "மார்கழி",
-"Settings" => "அமைப்புகள்",
-"Folder" => "கோப்புறை",
-"Saving..." => "சேமிக்கப்படுகிறது...",
-"Reset password" => "மீளமைத்த கடவுச்சொல்",
-"No" => "இல்லை",
-"Yes" => "ஆம்",
-"Choose" => "தெரிவுசெய்க ",
-"Ok" => "சரி",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "இரத்து செய்க",
-"Share" => "பகிர்வு",
-"Error" => "வழு",
-"Error while sharing" => "பகிரும் போதான வழு",
-"Error while unsharing" => "பகிராமல் உள்ளப்போதான வழு",
-"Error while changing permissions" => "அனுமதிகள் மாறும்போதான வழு",
-"Shared with you and the group {group} by {owner}" => "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
-"Shared with you by {owner}" => "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
-"Password protect" => "கடவுச்சொல்லை பாதுகாத்தல்",
-"Set expiration date" => "காலாவதி தேதியை குறிப்பிடுக",
-"Expiration date" => "காலவதியாகும் திகதி",
-"group" => "குழு",
-"Resharing is not allowed" => "மீள்பகிர்வதற்கு அனுமதி இல்லை ",
-"Shared in {item} with {user}" => "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது",
-"Unshare" => "பகிரப்படாதது",
-"can edit" => "தொகுக்க முடியும்",
-"access control" => "கட்டுப்பாடான அணுகல்",
-"create" => "உருவவாக்கல்",
-"update" => "இற்றைப்படுத்தல்",
-"delete" => "நீக்குக",
-"Password protected" => "கடவுச்சொல் பாதுகாக்கப்பட்டது",
-"Error unsetting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு",
-"Error setting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
-"Warning" => "எச்சரிக்கை",
-"The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.",
-"Delete" => "நீக்குக",
-"Add" => "சேர்க்க",
-"Use the following link to reset your password: {link}" => "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
-"You will receive a link to reset your password via Email." => "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
-"Username" => "பயனாளர் பெயர்",
-"New password" => "புதிய கடவுச்சொல்",
-"Personal" => "தனிப்பட்ட",
-"Users" => "பயனாளர்",
-"Apps" => "செயலிகள்",
-"Admin" => "நிர்வாகம்",
-"Help" => "உதவி",
-"Access forbidden" => "அணுக தடை",
-"Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
-"Create an <strong>admin account</strong>" => "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
-"Password" => "கடவுச்சொல்",
-"Data folder" => "தரவு கோப்புறை",
-"Configure the database" => "தரவுத்தளத்தை தகவமைக்க",
-"Database user" => "தரவுத்தள பயனாளர்",
-"Database password" => "தரவுத்தள கடவுச்சொல்",
-"Database name" => "தரவுத்தள பெயர்",
-"Database tablespace" => "தரவுத்தள அட்டவணை",
-"Database host" => "தரவுத்தள ஓம்புனர்",
-"Finish setup" => "அமைப்பை முடிக்க",
-"Log out" => "விடுபதிகை செய்க",
-"remember" => "ஞாபகப்படுத்துக",
-"Log in" => "புகுபதிகை"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/te.js b/core/l10n/te.js
new file mode 100644
index 00000000000..e6490dc40f7
--- /dev/null
+++ b/core/l10n/te.js
@@ -0,0 +1,46 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "ఆదివారం",
+    "Monday" : "సోమవారం",
+    "Tuesday" : "మంగళవారం",
+    "Wednesday" : "బుధవారం",
+    "Thursday" : "గురువారం",
+    "Friday" : "శుక్రవారం",
+    "Saturday" : "శనివారం",
+    "January" : "జనవరి",
+    "February" : "ఫిబ్రవరి",
+    "March" : "మార్చి",
+    "April" : "ఏప్రిల్",
+    "May" : "మే",
+    "June" : "జూన్",
+    "July" : "జూలై",
+    "August" : "ఆగస్ట్",
+    "September" : "సెప్టెంబర్",
+    "October" : "అక్టోబర్",
+    "November" : "నవంబర్",
+    "December" : "డిసెంబర్",
+    "Settings" : "అమరికలు",
+    "Folder" : "సంచయం",
+    "No" : "కాదు",
+    "Yes" : "అవును",
+    "Ok" : "సరే",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "రద్దుచేయి",
+    "Continue" : "కొనసాగించు",
+    "Error" : "పొరపాటు",
+    "Send" : "పంపించు",
+    "Expiration date" : "కాలం చెల్లు తేదీ",
+    "delete" : "తొలగించు",
+    "Warning" : "హెచ్చరిక",
+    "Delete" : "తొలగించు",
+    "Add" : "చేర్చు",
+    "Username" : "వాడుకరి పేరు",
+    "New password" : "కొత్త సంకేతపదం",
+    "Personal" : "వ్యక్తిగతం",
+    "Users" : "వాడుకరులు",
+    "Help" : "సహాయం",
+    "Password" : "సంకేతపదం",
+    "Log out" : "నిష్క్రమించు"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/te.json b/core/l10n/te.json
new file mode 100644
index 00000000000..e3bd9a50496
--- /dev/null
+++ b/core/l10n/te.json
@@ -0,0 +1,44 @@
+{ "translations": {
+    "Sunday" : "ఆదివారం",
+    "Monday" : "సోమవారం",
+    "Tuesday" : "మంగళవారం",
+    "Wednesday" : "బుధవారం",
+    "Thursday" : "గురువారం",
+    "Friday" : "శుక్రవారం",
+    "Saturday" : "శనివారం",
+    "January" : "జనవరి",
+    "February" : "ఫిబ్రవరి",
+    "March" : "మార్చి",
+    "April" : "ఏప్రిల్",
+    "May" : "మే",
+    "June" : "జూన్",
+    "July" : "జూలై",
+    "August" : "ఆగస్ట్",
+    "September" : "సెప్టెంబర్",
+    "October" : "అక్టోబర్",
+    "November" : "నవంబర్",
+    "December" : "డిసెంబర్",
+    "Settings" : "అమరికలు",
+    "Folder" : "సంచయం",
+    "No" : "కాదు",
+    "Yes" : "అవును",
+    "Ok" : "సరే",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "రద్దుచేయి",
+    "Continue" : "కొనసాగించు",
+    "Error" : "పొరపాటు",
+    "Send" : "పంపించు",
+    "Expiration date" : "కాలం చెల్లు తేదీ",
+    "delete" : "తొలగించు",
+    "Warning" : "హెచ్చరిక",
+    "Delete" : "తొలగించు",
+    "Add" : "చేర్చు",
+    "Username" : "వాడుకరి పేరు",
+    "New password" : "కొత్త సంకేతపదం",
+    "Personal" : "వ్యక్తిగతం",
+    "Users" : "వాడుకరులు",
+    "Help" : "సహాయం",
+    "Password" : "సంకేతపదం",
+    "Log out" : "నిష్క్రమించు"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/te.php b/core/l10n/te.php
deleted file mode 100644
index c8b742c8c90..00000000000
--- a/core/l10n/te.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "ఆదివారం",
-"Monday" => "సోమవారం",
-"Tuesday" => "మంగళవారం",
-"Wednesday" => "బుధవారం",
-"Thursday" => "గురువారం",
-"Friday" => "శుక్రవారం",
-"Saturday" => "శనివారం",
-"January" => "జనవరి",
-"February" => "ఫిబ్రవరి",
-"March" => "మార్చి",
-"April" => "ఏప్రిల్",
-"May" => "మే",
-"June" => "జూన్",
-"July" => "జూలై",
-"August" => "ఆగస్ట్",
-"September" => "సెప్టెంబర్",
-"October" => "అక్టోబర్",
-"November" => "నవంబర్",
-"December" => "డిసెంబర్",
-"Settings" => "అమరికలు",
-"Folder" => "సంచయం",
-"No" => "కాదు",
-"Yes" => "అవును",
-"Ok" => "సరే",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "రద్దుచేయి",
-"Continue" => "కొనసాగించు",
-"Error" => "పొరపాటు",
-"Send" => "పంపించు",
-"Expiration date" => "కాలం చెల్లు తేదీ",
-"delete" => "తొలగించు",
-"Warning" => "హెచ్చరిక",
-"Delete" => "తొలగించు",
-"Add" => "చేర్చు",
-"Username" => "వాడుకరి పేరు",
-"New password" => "కొత్త సంకేతపదం",
-"Personal" => "వ్యక్తిగతం",
-"Users" => "వాడుకరులు",
-"Help" => "సహాయం",
-"Password" => "సంకేతపదం",
-"Log out" => "నిష్క్రమించు"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/tg_TJ.js b/core/l10n/tg_TJ.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/tg_TJ.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/tg_TJ.json b/core/l10n/tg_TJ.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/tg_TJ.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/tg_TJ.php b/core/l10n/tg_TJ.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/tg_TJ.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
new file mode 100644
index 00000000000..25203866731
--- /dev/null
+++ b/core/l10n/th_TH.js
@@ -0,0 +1,93 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "วันอาทิตย์",
+    "Monday" : "วันจันทร์",
+    "Tuesday" : "วันอังคาร",
+    "Wednesday" : "วันพุธ",
+    "Thursday" : "วันพฤหัสบดี",
+    "Friday" : "วันศุกร์",
+    "Saturday" : "วันเสาร์",
+    "January" : "มกราคม",
+    "February" : "กุมภาพันธ์",
+    "March" : "มีนาคม",
+    "April" : "เมษายน",
+    "May" : "พฤษภาคม",
+    "June" : "มิถุนายน",
+    "July" : "กรกฏาคม",
+    "August" : "สิงหาคม",
+    "September" : "กันยายน",
+    "October" : "ตุลาคม",
+    "November" : "พฤศจิกายน",
+    "December" : "ธันวาคม",
+    "Settings" : "ตั้งค่า",
+    "Folder" : "แฟ้มเอกสาร",
+    "Image" : "รูปภาพ",
+    "Saving..." : "กำลังบันทึกข้อมูล...",
+    "Reset password" : "เปลี่ยนรหัสผ่าน",
+    "No" : "ไม่ตกลง",
+    "Yes" : "ตกลง",
+    "Choose" : "เลือก",
+    "Ok" : "ตกลง",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "New Files" : "ไฟล์ใหม่",
+    "Cancel" : "ยกเลิก",
+    "Shared" : "แชร์แล้ว",
+    "Share" : "แชร์",
+    "Error" : "ข้อผิดพลาด",
+    "Error while sharing" : "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล",
+    "Error while unsharing" : "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล",
+    "Error while changing permissions" : "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน",
+    "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
+    "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}",
+    "Password protect" : "ใส่รหัสผ่านไว้",
+    "Email link to person" : "ส่งลิงก์ให้ทางอีเมล",
+    "Send" : "ส่ง",
+    "Set expiration date" : "กำหนดวันที่หมดอายุ",
+    "Expiration date" : "วันที่หมดอายุ",
+    "group" : "กลุ่มผู้ใช้งาน",
+    "Resharing is not allowed" : "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้",
+    "Shared in {item} with {user}" : "ได้แชร์ {item} ให้กับ {user}",
+    "Unshare" : "ยกเลิกการแชร์",
+    "can share" : "สามารถแชร์ได้",
+    "can edit" : "สามารถแก้ไข",
+    "access control" : "ระดับควบคุมการเข้าใช้งาน",
+    "create" : "สร้าง",
+    "update" : "อัพเดท",
+    "delete" : "ลบ",
+    "Password protected" : "ใส่รหัสผ่านไว้",
+    "Error unsetting expiration date" : "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ",
+    "Error setting expiration date" : "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
+    "Sending ..." : "กำลังส่ง...",
+    "Email sent" : "ส่งอีเมล์แล้ว",
+    "Warning" : "คำเตือน",
+    "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
+    "Delete" : "ลบ",
+    "Add" : "เพิ่ม",
+    "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
+    "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
+    "You will receive a link to reset your password via Email." : "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "New password" : "รหัสผ่านใหม่",
+    "Personal" : "ส่วนตัว",
+    "Users" : "ผู้ใช้งาน",
+    "Apps" : "แอปฯ",
+    "Admin" : "ผู้ดูแล",
+    "Help" : "ช่วยเหลือ",
+    "Access forbidden" : "การเข้าถึงถูกหวงห้าม",
+    "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
+    "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
+    "Password" : "รหัสผ่าน",
+    "Data folder" : "โฟลเดอร์เก็บข้อมูล",
+    "Configure the database" : "กำหนดค่าฐานข้อมูล",
+    "Database user" : "ชื่อผู้ใช้งานฐานข้อมูล",
+    "Database password" : "รหัสผ่านฐานข้อมูล",
+    "Database name" : "ชื่อฐานข้อมูล",
+    "Database tablespace" : "พื้นที่ตารางในฐานข้อมูล",
+    "Database host" : "Database host",
+    "Finish setup" : "ติดตั้งเรียบร้อยแล้ว",
+    "Log out" : "ออกจากระบบ",
+    "remember" : "จำรหัสผ่าน",
+    "Log in" : "เข้าสู่ระบบ"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
new file mode 100644
index 00000000000..94c2c6f0c62
--- /dev/null
+++ b/core/l10n/th_TH.json
@@ -0,0 +1,91 @@
+{ "translations": {
+    "Sunday" : "วันอาทิตย์",
+    "Monday" : "วันจันทร์",
+    "Tuesday" : "วันอังคาร",
+    "Wednesday" : "วันพุธ",
+    "Thursday" : "วันพฤหัสบดี",
+    "Friday" : "วันศุกร์",
+    "Saturday" : "วันเสาร์",
+    "January" : "มกราคม",
+    "February" : "กุมภาพันธ์",
+    "March" : "มีนาคม",
+    "April" : "เมษายน",
+    "May" : "พฤษภาคม",
+    "June" : "มิถุนายน",
+    "July" : "กรกฏาคม",
+    "August" : "สิงหาคม",
+    "September" : "กันยายน",
+    "October" : "ตุลาคม",
+    "November" : "พฤศจิกายน",
+    "December" : "ธันวาคม",
+    "Settings" : "ตั้งค่า",
+    "Folder" : "แฟ้มเอกสาร",
+    "Image" : "รูปภาพ",
+    "Saving..." : "กำลังบันทึกข้อมูล...",
+    "Reset password" : "เปลี่ยนรหัสผ่าน",
+    "No" : "ไม่ตกลง",
+    "Yes" : "ตกลง",
+    "Choose" : "เลือก",
+    "Ok" : "ตกลง",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "New Files" : "ไฟล์ใหม่",
+    "Cancel" : "ยกเลิก",
+    "Shared" : "แชร์แล้ว",
+    "Share" : "แชร์",
+    "Error" : "ข้อผิดพลาด",
+    "Error while sharing" : "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล",
+    "Error while unsharing" : "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล",
+    "Error while changing permissions" : "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน",
+    "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
+    "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}",
+    "Password protect" : "ใส่รหัสผ่านไว้",
+    "Email link to person" : "ส่งลิงก์ให้ทางอีเมล",
+    "Send" : "ส่ง",
+    "Set expiration date" : "กำหนดวันที่หมดอายุ",
+    "Expiration date" : "วันที่หมดอายุ",
+    "group" : "กลุ่มผู้ใช้งาน",
+    "Resharing is not allowed" : "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้",
+    "Shared in {item} with {user}" : "ได้แชร์ {item} ให้กับ {user}",
+    "Unshare" : "ยกเลิกการแชร์",
+    "can share" : "สามารถแชร์ได้",
+    "can edit" : "สามารถแก้ไข",
+    "access control" : "ระดับควบคุมการเข้าใช้งาน",
+    "create" : "สร้าง",
+    "update" : "อัพเดท",
+    "delete" : "ลบ",
+    "Password protected" : "ใส่รหัสผ่านไว้",
+    "Error unsetting expiration date" : "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ",
+    "Error setting expiration date" : "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
+    "Sending ..." : "กำลังส่ง...",
+    "Email sent" : "ส่งอีเมล์แล้ว",
+    "Warning" : "คำเตือน",
+    "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
+    "Delete" : "ลบ",
+    "Add" : "เพิ่ม",
+    "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
+    "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
+    "You will receive a link to reset your password via Email." : "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "New password" : "รหัสผ่านใหม่",
+    "Personal" : "ส่วนตัว",
+    "Users" : "ผู้ใช้งาน",
+    "Apps" : "แอปฯ",
+    "Admin" : "ผู้ดูแล",
+    "Help" : "ช่วยเหลือ",
+    "Access forbidden" : "การเข้าถึงถูกหวงห้าม",
+    "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
+    "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
+    "Password" : "รหัสผ่าน",
+    "Data folder" : "โฟลเดอร์เก็บข้อมูล",
+    "Configure the database" : "กำหนดค่าฐานข้อมูล",
+    "Database user" : "ชื่อผู้ใช้งานฐานข้อมูล",
+    "Database password" : "รหัสผ่านฐานข้อมูล",
+    "Database name" : "ชื่อฐานข้อมูล",
+    "Database tablespace" : "พื้นที่ตารางในฐานข้อมูล",
+    "Database host" : "Database host",
+    "Finish setup" : "ติดตั้งเรียบร้อยแล้ว",
+    "Log out" : "ออกจากระบบ",
+    "remember" : "จำรหัสผ่าน",
+    "Log in" : "เข้าสู่ระบบ"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
deleted file mode 100644
index c27fbe4c335..00000000000
--- a/core/l10n/th_TH.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "วันอาทิตย์",
-"Monday" => "วันจันทร์",
-"Tuesday" => "วันอังคาร",
-"Wednesday" => "วันพุธ",
-"Thursday" => "วันพฤหัสบดี",
-"Friday" => "วันศุกร์",
-"Saturday" => "วันเสาร์",
-"January" => "มกราคม",
-"February" => "กุมภาพันธ์",
-"March" => "มีนาคม",
-"April" => "เมษายน",
-"May" => "พฤษภาคม",
-"June" => "มิถุนายน",
-"July" => "กรกฏาคม",
-"August" => "สิงหาคม",
-"September" => "กันยายน",
-"October" => "ตุลาคม",
-"November" => "พฤศจิกายน",
-"December" => "ธันวาคม",
-"Settings" => "ตั้งค่า",
-"Folder" => "แฟ้มเอกสาร",
-"Image" => "รูปภาพ",
-"Saving..." => "กำลังบันทึกข้อมูล...",
-"Reset password" => "เปลี่ยนรหัสผ่าน",
-"No" => "ไม่ตกลง",
-"Yes" => "ตกลง",
-"Choose" => "เลือก",
-"Ok" => "ตกลง",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"New Files" => "ไฟล์ใหม่",
-"Cancel" => "ยกเลิก",
-"Shared" => "แชร์แล้ว",
-"Share" => "แชร์",
-"Error" => "ข้อผิดพลาด",
-"Error while sharing" => "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล",
-"Error while unsharing" => "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล",
-"Error while changing permissions" => "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน",
-"Shared with you and the group {group} by {owner}" => "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
-"Shared with you by {owner}" => "ถูกแชร์ให้กับคุณโดย {owner}",
-"Password protect" => "ใส่รหัสผ่านไว้",
-"Email link to person" => "ส่งลิงก์ให้ทางอีเมล",
-"Send" => "ส่ง",
-"Set expiration date" => "กำหนดวันที่หมดอายุ",
-"Expiration date" => "วันที่หมดอายุ",
-"group" => "กลุ่มผู้ใช้งาน",
-"Resharing is not allowed" => "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้",
-"Shared in {item} with {user}" => "ได้แชร์ {item} ให้กับ {user}",
-"Unshare" => "ยกเลิกการแชร์",
-"can share" => "สามารถแชร์ได้",
-"can edit" => "สามารถแก้ไข",
-"access control" => "ระดับควบคุมการเข้าใช้งาน",
-"create" => "สร้าง",
-"update" => "อัพเดท",
-"delete" => "ลบ",
-"Password protected" => "ใส่รหัสผ่านไว้",
-"Error unsetting expiration date" => "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ",
-"Error setting expiration date" => "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
-"Sending ..." => "กำลังส่ง...",
-"Email sent" => "ส่งอีเมล์แล้ว",
-"Warning" => "คำเตือน",
-"The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ",
-"Delete" => "ลบ",
-"Add" => "เพิ่ม",
-"The update was successful. Redirecting you to ownCloud now." => "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
-"Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
-"You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
-"Username" => "ชื่อผู้ใช้งาน",
-"New password" => "รหัสผ่านใหม่",
-"Personal" => "ส่วนตัว",
-"Users" => "ผู้ใช้งาน",
-"Apps" => "แอปฯ",
-"Admin" => "ผู้ดูแล",
-"Help" => "ช่วยเหลือ",
-"Access forbidden" => "การเข้าถึงถูกหวงห้าม",
-"Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
-"Create an <strong>admin account</strong>" => "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
-"Password" => "รหัสผ่าน",
-"Data folder" => "โฟลเดอร์เก็บข้อมูล",
-"Configure the database" => "กำหนดค่าฐานข้อมูล",
-"Database user" => "ชื่อผู้ใช้งานฐานข้อมูล",
-"Database password" => "รหัสผ่านฐานข้อมูล",
-"Database name" => "ชื่อฐานข้อมูล",
-"Database tablespace" => "พื้นที่ตารางในฐานข้อมูล",
-"Database host" => "Database host",
-"Finish setup" => "ติดตั้งเรียบร้อยแล้ว",
-"Log out" => "ออกจากระบบ",
-"remember" => "จำรหัสผ่าน",
-"Log in" => "เข้าสู่ระบบ"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/tl_PH.js b/core/l10n/tl_PH.js
new file mode 100644
index 00000000000..bc4e6c6bc64
--- /dev/null
+++ b/core/l10n/tl_PH.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/tl_PH.json b/core/l10n/tl_PH.json
new file mode 100644
index 00000000000..4ebc0d2d45d
--- /dev/null
+++ b/core/l10n/tl_PH.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/tl_PH.php b/core/l10n/tl_PH.php
deleted file mode 100644
index e012fb1656e..00000000000
--- a/core/l10n/tl_PH.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
new file mode 100644
index 00000000000..607d766c3fa
--- /dev/null
+++ b/core/l10n/tr.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Şu kullanıcılara posta gönderilemedi: %s",
+    "Turned on maintenance mode" : "Bakım kipi etkinleştirildi",
+    "Turned off maintenance mode" : "Bakım kipi kapatıldı",
+    "Updated database" : "Veritabanı güncellendi",
+    "Checked database schema update" : "Veritabanı şema güncellemesi denetlendi",
+    "Checked database schema update for apps" : "Uygulamalar için veritabanı şema güncellemesi denetlendi",
+    "Updated \"%s\" to %s" : "\"%s\", %s sürümüne güncellendi",
+    "Disabled incompatible apps: %s" : "Uyumsuz uygulamalar devre dışı bırakıldı: %s",
+    "No image or file provided" : "Resim veya dosya belirtilmedi",
+    "Unknown filetype" : "Bilinmeyen dosya türü",
+    "Invalid image" : "Geçersiz resim",
+    "No temporary profile picture available, try again" : "Kullanılabilir geçici profil resmi yok, tekrar deneyin",
+    "No crop data provided" : "Kesme verisi sağlanmamış",
+    "Sunday" : "Pazar",
+    "Monday" : "Pazartesi",
+    "Tuesday" : "Salı",
+    "Wednesday" : "Çarşamba",
+    "Thursday" : "Perşembe",
+    "Friday" : "Cuma",
+    "Saturday" : "Cumartesi",
+    "January" : "Ocak",
+    "February" : "Şubat",
+    "March" : "Mart",
+    "April" : "Nisan",
+    "May" : "Mayıs",
+    "June" : "Haziran",
+    "July" : "Temmuz",
+    "August" : "Ağustos",
+    "September" : "Eylül",
+    "October" : "Ekim",
+    "November" : "Kasım",
+    "December" : "Aralık",
+    "Settings" : "Ayarlar",
+    "File" : "Dosya",
+    "Folder" : "Klasör",
+    "Image" : "Resim",
+    "Audio" : "Ses",
+    "Saving..." : "Kaydediliyor...",
+    "Couldn't send reset email. Please contact your administrator." : "Sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
+    "The link to reset your password has been sent to your email. 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. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
+    "I know what I'm doing" : "Ne yaptığımı biliyorum",
+    "Reset password" : "Parolayı sıfırla",
+    "Password can not be changed. Please contact your administrator." : "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.",
+    "No" : "Hayır",
+    "Yes" : "Evet",
+    "Choose" : "Seç",
+    "Error loading file picker template: {error}" : "Dosya seçici şablonu yüklenirken hata: {error}",
+    "Ok" : "Tamam",
+    "Error loading message template: {error}" : "İleti şablonu yüklenirken hata: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} dosya çakışması","{count} dosya çakışması"],
+    "One file conflict" : "Bir dosya çakışması",
+    "New Files" : "Yeni Dosyalar",
+    "Already existing files" : "Zaten mevcut olan dosyalar",
+    "Which files do you want to keep?" : "Hangi dosyaları saklamak istiyorsunuz?",
+    "If you select both versions, the copied file will have a number added to its name." : "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir.",
+    "Cancel" : "İptal",
+    "Continue" : "Devam et",
+    "(all selected)" : "(tümü seçildi)",
+    "({count} selected)" : "({count} seçildi)",
+    "Error loading file exists template" : "Dosya mevcut şablonu yüklenirken hata",
+    "Very weak password" : "Çok güçsüz parola",
+    "Weak password" : "Güçsüz parola",
+    "So-so password" : "Normal parola",
+    "Good password" : "İyi parola",
+    "Strong password" : "Güçlü parola",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web sunucunuz dosya eşitlemesine izin vermek üzere düzgün bir şekilde yapılandırılmamış. WebDAV arayüzü sorunlu görünüyor.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depolama alanı bağlama, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacağı anlamına gelmektedir. Uzaktan dosyalara erişim ve e-posta ile bildirim gönderme de çalışmayacaktır. Eğer bu özelliklerin tamamını kullanmak istiyorsanız, sunucu için internet bağlantısını etkinleştirmenizi öneriyoruz.",
+    "Error occurred while checking server setup" : "Sunucu yapılandırması denetlenirken hata oluştu",
+    "Shared" : "Paylaşılan",
+    "Shared with {recipients}" : "{recipients} ile paylaşılmış",
+    "Share" : "Paylaş",
+    "Error" : "Hata",
+    "Error while sharing" : "Paylaşım sırasında hata",
+    "Error while unsharing" : "Paylaşım iptal edilirken hata",
+    "Error while changing permissions" : "İzinleri değiştirirken hata",
+    "Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaştırılmış",
+    "Shared with you by {owner}" : "{owner} tarafından sizinle paylaşıldı",
+    "Share with user or group …" : "Kullanıcı veya grup ile paylaş...",
+    "Share link" : "Paylaşma bağlantısı",
+    "The public link will expire no later than {days} days after it is created" : "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek",
+    "Password protect" : "Parola koruması",
+    "Choose a password for the public link" : "Herkese açık bağlantı için bir parola seçin",
+    "Allow Public Upload" : "Herkes Tarafından Gönderime İzin Ver",
+    "Email link to person" : "Bağlantıyı e-posta ile gönder",
+    "Send" : "Gönder",
+    "Set expiration date" : "Son kullanma tarihini ayarla",
+    "Expiration date" : "Son kullanım tarihi",
+    "Adding user..." : "Kullanıcı ekleniyor...",
+    "group" : "grup",
+    "Resharing is not allowed" : "Tekrar paylaşmaya izin verilmiyor",
+    "Shared in {item} with {user}" : "{item} içinde {user} ile paylaşılanlar",
+    "Unshare" : "Paylaşmayı Kaldır",
+    "notify by email" : "e-posta ile bildir",
+    "can share" : "paylaşabilir",
+    "can edit" : "düzenleyebilir",
+    "access control" : "erişim kontrolü",
+    "create" : "oluştur",
+    "update" : "güncelle",
+    "delete" : "sil",
+    "Password protected" : "Parola korumalı",
+    "Error unsetting expiration date" : "Son kullanma tarihi kaldırma hatası",
+    "Error setting expiration date" : "Son kullanma tarihi ayarlama hatası",
+    "Sending ..." : "Gönderiliyor...",
+    "Email sent" : "E-posta gönderildi",
+    "Warning" : "Uyarı",
+    "The object type is not specified." : "Nesne türü belirtilmemiş.",
+    "Enter new" : "Yeni girin",
+    "Delete" : "Sil",
+    "Add" : "Ekle",
+    "Edit tags" : "Etiketleri düzenle",
+    "Error loading dialog template: {error}" : "İletişim şablonu yüklenirken hata: {error}",
+    "No tags selected for deletion." : "Silmek için bir etiket seçilmedi.",
+    "Updating {productName} to version {version}, this may take a while." : "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.",
+    "Please reload the page." : "Lütfen sayfayı yeniden yükleyin.",
+    "The update was unsuccessful." : "Güncelleme başarısız oldu.",
+    "The update was successful. Redirecting you to ownCloud now." : "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.",
+    "Couldn't reset password because the token is invalid" : "Belirteç geçersiz olduğundan parola sıfırlanamadı",
+    "Couldn't send reset email. Please make sure your username is correct." : "Sıfırlama e-postası gönderilemedi. Lütfen kullanıcı adınızın doğru olduğundan emin olun.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Sıfırlama e-postası, bu kullanıcı için bir e-posta adresi olmadığından gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
+    "%s password reset" : "%s parola sıfırlama",
+    "Use the following link to reset your password: {link}" : "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}",
+    "You will receive a link to reset your password via Email." : "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.",
+    "Username" : "Kullanıcı Adı",
+    "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?" : "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?",
+    "Yes, I really want to reset my password now" : "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum",
+    "Reset" : "Sıfırla",
+    "New password" : "Yeni parola",
+    "New Password" : "Yeni Parola",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!",
+    "For the best results, please consider using a GNU/Linux server instead." : "En iyi sonuçlar için GNU/Linux sunucusu kullanın.",
+    "Personal" : "Kişisel",
+    "Users" : "Kullanıcılar",
+    "Apps" : "Uygulamalar",
+    "Admin" : "Yönetici",
+    "Help" : "Yardım",
+    "Error loading tags" : "Etiketler yüklenirken hata",
+    "Tag already exists" : "Etiket zaten mevcut",
+    "Error deleting tag(s)" : "Etiket(ler) silinirken hata",
+    "Error tagging" : "Etiketleme hatası",
+    "Error untagging" : "Etiket kaldırma hatası",
+    "Error favoriting" : "Beğenilirken hata",
+    "Error unfavoriting" : "Beğeniden kaldırılırken hata",
+    "Access forbidden" : "Erişim yasak",
+    "File not found" : "Dosya bulunamadı",
+    "The specified document has not been found on the server." : "Belirtilen dosya sunucuda bulunamadı.",
+    "You can click here to return to %s." : "%s ana sayfasına dönmek için buraya tıklayabilirsiniz.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Merhaba,\n\nSadece %s sizinle %s paylaşımını yaptığını bildiriyoruz.\nBuradan bakabilirsiniz: %s\n\n",
+    "The share will expire on %s." : "Bu paylaşım %s tarihinde sona erecek.",
+    "Cheers!" : "Hoşça kalın!",
+    "Internal Server Error" : "Dahili Sunucu Hatası",
+    "The server encountered an internal error and was unable to complete your request." : "Sunucu dahili bir hatayla karşılaştı ve isteğinizi tamamlayamadı.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Eğer bu hata birden çok kez oluştuysa, lütfen sunucu yöneticisine aşağıdaki teknik ayrıntılar ile birlikte iletişime geçin.",
+    "More details can be found in the server log." : "Daha fazla ayrıntı sunucu günlüğünde bulanabilir.",
+    "Technical details" : "Teknik ayrıntılar",
+    "Remote Address: %s" : "Uzak Adres: %s",
+    "Request ID: %s" : "İstek Kimliği: %s",
+    "Code: %s" : "Kod: %s",
+    "Message: %s" : "Mesaj: %s",
+    "File: %s" : "Dosya: %s",
+    "Line: %s" : "Satır: %s",
+    "Trace" : "İz",
+    "Security Warning" : "Güvenlik Uyarısı",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "%s yazılımını güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
+    "Create an <strong>admin account</strong>" : "Bir <strong>yönetici hesabı</strong> oluşturun",
+    "Password" : "Parola",
+    "Storage & database" : "Depolama ve veritabanı",
+    "Data folder" : "Veri klasörü",
+    "Configure the database" : "Veritabanını yapılandır",
+    "Only %s is available." : "Sadece %s kullanılabilir.",
+    "Database user" : "Veritabanı kullanıcı adı",
+    "Database password" : "Veritabanı parolası",
+    "Database name" : "Veritabanı adı",
+    "Database tablespace" : "Veritabanı tablo alanı",
+    "Database host" : "Veritabanı sunucusu",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Veritabanı olarak SQLite kullanılacak. Daha büyük kurulumlar için bunu değiştirmenizi öneririz.",
+    "Finish setup" : "Kurulumu tamamla",
+    "Finishing …" : "Tamamlanıyor ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Uygulama, doğru çalışabilmesi için JavaScript gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve sayfayı yeniden yükleyin.",
+    "%s is available. Get more information on how to update." : "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
+    "Log out" : "Çıkış yap",
+    "Server side authentication failed!" : "Sunucu taraflı yetkilendirme başarısız!",
+    "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
+    "Forgot your password? Reset it!" : "Parolanızı mı unuttunuz? Sıfırlayın!",
+    "remember" : "hatırla",
+    "Log in" : "Giriş yap",
+    "Alternative Logins" : "Alternatif Girişler",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Merhaba, <br><br>%s kullanıcısının sizinle <strong>%s</strong> paylaşımında bulunduğunu bildirmek istedik.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Bu ownCloud örneği şu anda tek kullanıcı kipinde.",
+    "This means only administrators can use the instance." : "Bu, örneği sadece yöneticiler kullanabilir demektir.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Eğer bu ileti görünmeye devam ederse veya beklenmedik şekilde ortaya çıkmışsa sistem yöneticinizle iletişime geçin.",
+    "Thank you for your patience." : "Sabrınız için teşekkür ederiz.",
+    "You are accessing the server from an untrusted domain." : "Sunucuya güvenilmeyen bir alan adından ulaşıyorsunuz.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Yapılandırmanıza bağlı olarak, bir yönetici olarak bu alan adına güvenmek için aşağıdaki düğmeyi de kullanabilirsiniz.",
+    "Add \"%s\" as trusted domain" : "\"%s\" alan adını güvenilir olarak ekle",
+    "%s will be updated to version %s." : "%s, %s sürümüne güncellenecek.",
+    "The following apps will be disabled:" : "Aşağıdaki uygulamalar devre dışı bırakılacak:",
+    "The theme %s has been disabled." : "%s teması devre dışı bırakıldı.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Devam etmeden önce lütfen veritabanının, yapılandırma ve veri klasörlerinin yedeklenmiş olduğundan emin olun.",
+    "Start update" : "Güncellemeyi başlat",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Daha büyük kurulumlarda zaman aşımlarının önüne geçmek için, kurulum dizininizden aşağıdaki komutu da çalıştırabilirsiniz:",
+    "This %s instance is currently being updated, which may take a while." : "Bu %s örneği şu anda güncelleniyor, bu biraz zaman alabilir.",
+    "This page will refresh itself when the %s instance is available again." : "Bu sayfa, %s örneği tekrar kullanılabilir olduğunda kendini yenileyecektir."
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
new file mode 100644
index 00000000000..51e08e3c722
--- /dev/null
+++ b/core/l10n/tr.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Şu kullanıcılara posta gönderilemedi: %s",
+    "Turned on maintenance mode" : "Bakım kipi etkinleştirildi",
+    "Turned off maintenance mode" : "Bakım kipi kapatıldı",
+    "Updated database" : "Veritabanı güncellendi",
+    "Checked database schema update" : "Veritabanı şema güncellemesi denetlendi",
+    "Checked database schema update for apps" : "Uygulamalar için veritabanı şema güncellemesi denetlendi",
+    "Updated \"%s\" to %s" : "\"%s\", %s sürümüne güncellendi",
+    "Disabled incompatible apps: %s" : "Uyumsuz uygulamalar devre dışı bırakıldı: %s",
+    "No image or file provided" : "Resim veya dosya belirtilmedi",
+    "Unknown filetype" : "Bilinmeyen dosya türü",
+    "Invalid image" : "Geçersiz resim",
+    "No temporary profile picture available, try again" : "Kullanılabilir geçici profil resmi yok, tekrar deneyin",
+    "No crop data provided" : "Kesme verisi sağlanmamış",
+    "Sunday" : "Pazar",
+    "Monday" : "Pazartesi",
+    "Tuesday" : "Salı",
+    "Wednesday" : "Çarşamba",
+    "Thursday" : "Perşembe",
+    "Friday" : "Cuma",
+    "Saturday" : "Cumartesi",
+    "January" : "Ocak",
+    "February" : "Şubat",
+    "March" : "Mart",
+    "April" : "Nisan",
+    "May" : "Mayıs",
+    "June" : "Haziran",
+    "July" : "Temmuz",
+    "August" : "Ağustos",
+    "September" : "Eylül",
+    "October" : "Ekim",
+    "November" : "Kasım",
+    "December" : "Aralık",
+    "Settings" : "Ayarlar",
+    "File" : "Dosya",
+    "Folder" : "Klasör",
+    "Image" : "Resim",
+    "Audio" : "Ses",
+    "Saving..." : "Kaydediliyor...",
+    "Couldn't send reset email. Please contact your administrator." : "Sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
+    "The link to reset your password has been sent to your email. 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. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
+    "I know what I'm doing" : "Ne yaptığımı biliyorum",
+    "Reset password" : "Parolayı sıfırla",
+    "Password can not be changed. Please contact your administrator." : "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.",
+    "No" : "Hayır",
+    "Yes" : "Evet",
+    "Choose" : "Seç",
+    "Error loading file picker template: {error}" : "Dosya seçici şablonu yüklenirken hata: {error}",
+    "Ok" : "Tamam",
+    "Error loading message template: {error}" : "İleti şablonu yüklenirken hata: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} dosya çakışması","{count} dosya çakışması"],
+    "One file conflict" : "Bir dosya çakışması",
+    "New Files" : "Yeni Dosyalar",
+    "Already existing files" : "Zaten mevcut olan dosyalar",
+    "Which files do you want to keep?" : "Hangi dosyaları saklamak istiyorsunuz?",
+    "If you select both versions, the copied file will have a number added to its name." : "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir.",
+    "Cancel" : "İptal",
+    "Continue" : "Devam et",
+    "(all selected)" : "(tümü seçildi)",
+    "({count} selected)" : "({count} seçildi)",
+    "Error loading file exists template" : "Dosya mevcut şablonu yüklenirken hata",
+    "Very weak password" : "Çok güçsüz parola",
+    "Weak password" : "Güçsüz parola",
+    "So-so password" : "Normal parola",
+    "Good password" : "İyi parola",
+    "Strong password" : "Güçlü parola",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web sunucunuz dosya eşitlemesine izin vermek üzere düzgün bir şekilde yapılandırılmamış. WebDAV arayüzü sorunlu görünüyor.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depolama alanı bağlama, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacağı anlamına gelmektedir. Uzaktan dosyalara erişim ve e-posta ile bildirim gönderme de çalışmayacaktır. Eğer bu özelliklerin tamamını kullanmak istiyorsanız, sunucu için internet bağlantısını etkinleştirmenizi öneriyoruz.",
+    "Error occurred while checking server setup" : "Sunucu yapılandırması denetlenirken hata oluştu",
+    "Shared" : "Paylaşılan",
+    "Shared with {recipients}" : "{recipients} ile paylaşılmış",
+    "Share" : "Paylaş",
+    "Error" : "Hata",
+    "Error while sharing" : "Paylaşım sırasında hata",
+    "Error while unsharing" : "Paylaşım iptal edilirken hata",
+    "Error while changing permissions" : "İzinleri değiştirirken hata",
+    "Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaştırılmış",
+    "Shared with you by {owner}" : "{owner} tarafından sizinle paylaşıldı",
+    "Share with user or group …" : "Kullanıcı veya grup ile paylaş...",
+    "Share link" : "Paylaşma bağlantısı",
+    "The public link will expire no later than {days} days after it is created" : "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek",
+    "Password protect" : "Parola koruması",
+    "Choose a password for the public link" : "Herkese açık bağlantı için bir parola seçin",
+    "Allow Public Upload" : "Herkes Tarafından Gönderime İzin Ver",
+    "Email link to person" : "Bağlantıyı e-posta ile gönder",
+    "Send" : "Gönder",
+    "Set expiration date" : "Son kullanma tarihini ayarla",
+    "Expiration date" : "Son kullanım tarihi",
+    "Adding user..." : "Kullanıcı ekleniyor...",
+    "group" : "grup",
+    "Resharing is not allowed" : "Tekrar paylaşmaya izin verilmiyor",
+    "Shared in {item} with {user}" : "{item} içinde {user} ile paylaşılanlar",
+    "Unshare" : "Paylaşmayı Kaldır",
+    "notify by email" : "e-posta ile bildir",
+    "can share" : "paylaşabilir",
+    "can edit" : "düzenleyebilir",
+    "access control" : "erişim kontrolü",
+    "create" : "oluştur",
+    "update" : "güncelle",
+    "delete" : "sil",
+    "Password protected" : "Parola korumalı",
+    "Error unsetting expiration date" : "Son kullanma tarihi kaldırma hatası",
+    "Error setting expiration date" : "Son kullanma tarihi ayarlama hatası",
+    "Sending ..." : "Gönderiliyor...",
+    "Email sent" : "E-posta gönderildi",
+    "Warning" : "Uyarı",
+    "The object type is not specified." : "Nesne türü belirtilmemiş.",
+    "Enter new" : "Yeni girin",
+    "Delete" : "Sil",
+    "Add" : "Ekle",
+    "Edit tags" : "Etiketleri düzenle",
+    "Error loading dialog template: {error}" : "İletişim şablonu yüklenirken hata: {error}",
+    "No tags selected for deletion." : "Silmek için bir etiket seçilmedi.",
+    "Updating {productName} to version {version}, this may take a while." : "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.",
+    "Please reload the page." : "Lütfen sayfayı yeniden yükleyin.",
+    "The update was unsuccessful." : "Güncelleme başarısız oldu.",
+    "The update was successful. Redirecting you to ownCloud now." : "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.",
+    "Couldn't reset password because the token is invalid" : "Belirteç geçersiz olduğundan parola sıfırlanamadı",
+    "Couldn't send reset email. Please make sure your username is correct." : "Sıfırlama e-postası gönderilemedi. Lütfen kullanıcı adınızın doğru olduğundan emin olun.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Sıfırlama e-postası, bu kullanıcı için bir e-posta adresi olmadığından gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
+    "%s password reset" : "%s parola sıfırlama",
+    "Use the following link to reset your password: {link}" : "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}",
+    "You will receive a link to reset your password via Email." : "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.",
+    "Username" : "Kullanıcı Adı",
+    "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?" : "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?",
+    "Yes, I really want to reset my password now" : "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum",
+    "Reset" : "Sıfırla",
+    "New password" : "Yeni parola",
+    "New Password" : "Yeni Parola",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!",
+    "For the best results, please consider using a GNU/Linux server instead." : "En iyi sonuçlar için GNU/Linux sunucusu kullanın.",
+    "Personal" : "Kişisel",
+    "Users" : "Kullanıcılar",
+    "Apps" : "Uygulamalar",
+    "Admin" : "Yönetici",
+    "Help" : "Yardım",
+    "Error loading tags" : "Etiketler yüklenirken hata",
+    "Tag already exists" : "Etiket zaten mevcut",
+    "Error deleting tag(s)" : "Etiket(ler) silinirken hata",
+    "Error tagging" : "Etiketleme hatası",
+    "Error untagging" : "Etiket kaldırma hatası",
+    "Error favoriting" : "Beğenilirken hata",
+    "Error unfavoriting" : "Beğeniden kaldırılırken hata",
+    "Access forbidden" : "Erişim yasak",
+    "File not found" : "Dosya bulunamadı",
+    "The specified document has not been found on the server." : "Belirtilen dosya sunucuda bulunamadı.",
+    "You can click here to return to %s." : "%s ana sayfasına dönmek için buraya tıklayabilirsiniz.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Merhaba,\n\nSadece %s sizinle %s paylaşımını yaptığını bildiriyoruz.\nBuradan bakabilirsiniz: %s\n\n",
+    "The share will expire on %s." : "Bu paylaşım %s tarihinde sona erecek.",
+    "Cheers!" : "Hoşça kalın!",
+    "Internal Server Error" : "Dahili Sunucu Hatası",
+    "The server encountered an internal error and was unable to complete your request." : "Sunucu dahili bir hatayla karşılaştı ve isteğinizi tamamlayamadı.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Eğer bu hata birden çok kez oluştuysa, lütfen sunucu yöneticisine aşağıdaki teknik ayrıntılar ile birlikte iletişime geçin.",
+    "More details can be found in the server log." : "Daha fazla ayrıntı sunucu günlüğünde bulanabilir.",
+    "Technical details" : "Teknik ayrıntılar",
+    "Remote Address: %s" : "Uzak Adres: %s",
+    "Request ID: %s" : "İstek Kimliği: %s",
+    "Code: %s" : "Kod: %s",
+    "Message: %s" : "Mesaj: %s",
+    "File: %s" : "Dosya: %s",
+    "Line: %s" : "Satır: %s",
+    "Trace" : "İz",
+    "Security Warning" : "Güvenlik Uyarısı",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "%s yazılımını güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
+    "Create an <strong>admin account</strong>" : "Bir <strong>yönetici hesabı</strong> oluşturun",
+    "Password" : "Parola",
+    "Storage & database" : "Depolama ve veritabanı",
+    "Data folder" : "Veri klasörü",
+    "Configure the database" : "Veritabanını yapılandır",
+    "Only %s is available." : "Sadece %s kullanılabilir.",
+    "Database user" : "Veritabanı kullanıcı adı",
+    "Database password" : "Veritabanı parolası",
+    "Database name" : "Veritabanı adı",
+    "Database tablespace" : "Veritabanı tablo alanı",
+    "Database host" : "Veritabanı sunucusu",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Veritabanı olarak SQLite kullanılacak. Daha büyük kurulumlar için bunu değiştirmenizi öneririz.",
+    "Finish setup" : "Kurulumu tamamla",
+    "Finishing …" : "Tamamlanıyor ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Uygulama, doğru çalışabilmesi için JavaScript gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve sayfayı yeniden yükleyin.",
+    "%s is available. Get more information on how to update." : "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
+    "Log out" : "Çıkış yap",
+    "Server side authentication failed!" : "Sunucu taraflı yetkilendirme başarısız!",
+    "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
+    "Forgot your password? Reset it!" : "Parolanızı mı unuttunuz? Sıfırlayın!",
+    "remember" : "hatırla",
+    "Log in" : "Giriş yap",
+    "Alternative Logins" : "Alternatif Girişler",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Merhaba, <br><br>%s kullanıcısının sizinle <strong>%s</strong> paylaşımında bulunduğunu bildirmek istedik.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Bu ownCloud örneği şu anda tek kullanıcı kipinde.",
+    "This means only administrators can use the instance." : "Bu, örneği sadece yöneticiler kullanabilir demektir.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Eğer bu ileti görünmeye devam ederse veya beklenmedik şekilde ortaya çıkmışsa sistem yöneticinizle iletişime geçin.",
+    "Thank you for your patience." : "Sabrınız için teşekkür ederiz.",
+    "You are accessing the server from an untrusted domain." : "Sunucuya güvenilmeyen bir alan adından ulaşıyorsunuz.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Yapılandırmanıza bağlı olarak, bir yönetici olarak bu alan adına güvenmek için aşağıdaki düğmeyi de kullanabilirsiniz.",
+    "Add \"%s\" as trusted domain" : "\"%s\" alan adını güvenilir olarak ekle",
+    "%s will be updated to version %s." : "%s, %s sürümüne güncellenecek.",
+    "The following apps will be disabled:" : "Aşağıdaki uygulamalar devre dışı bırakılacak:",
+    "The theme %s has been disabled." : "%s teması devre dışı bırakıldı.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Devam etmeden önce lütfen veritabanının, yapılandırma ve veri klasörlerinin yedeklenmiş olduğundan emin olun.",
+    "Start update" : "Güncellemeyi başlat",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Daha büyük kurulumlarda zaman aşımlarının önüne geçmek için, kurulum dizininizden aşağıdaki komutu da çalıştırabilirsiniz:",
+    "This %s instance is currently being updated, which may take a while." : "Bu %s örneği şu anda güncelleniyor, bu biraz zaman alabilir.",
+    "This page will refresh itself when the %s instance is available again." : "Bu sayfa, %s örneği tekrar kullanılabilir olduğunda kendini yenileyecektir."
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
deleted file mode 100644
index 7a1def5d18b..00000000000
--- a/core/l10n/tr.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Şu kullanıcılara posta gönderilemedi: %s",
-"Turned on maintenance mode" => "Bakım kipi etkinleştirildi",
-"Turned off maintenance mode" => "Bakım kipi kapatıldı",
-"Updated database" => "Veritabanı güncellendi",
-"Checked database schema update" => "Veritabanı şema güncellemesi denetlendi",
-"Checked database schema update for apps" => "Uygulamalar için veritabanı şema güncellemesi denetlendi",
-"Updated \"%s\" to %s" => "\"%s\", %s sürümüne güncellendi",
-"Disabled incompatible apps: %s" => "Uyumsuz uygulamalar devre dışı bırakıldı: %s",
-"No image or file provided" => "Resim veya dosya belirtilmedi",
-"Unknown filetype" => "Bilinmeyen dosya türü",
-"Invalid image" => "Geçersiz resim",
-"No temporary profile picture available, try again" => "Kullanılabilir geçici profil resmi yok, tekrar deneyin",
-"No crop data provided" => "Kesme verisi sağlanmamış",
-"Sunday" => "Pazar",
-"Monday" => "Pazartesi",
-"Tuesday" => "Salı",
-"Wednesday" => "Çarşamba",
-"Thursday" => "Perşembe",
-"Friday" => "Cuma",
-"Saturday" => "Cumartesi",
-"January" => "Ocak",
-"February" => "Şubat",
-"March" => "Mart",
-"April" => "Nisan",
-"May" => "Mayıs",
-"June" => "Haziran",
-"July" => "Temmuz",
-"August" => "Ağustos",
-"September" => "Eylül",
-"October" => "Ekim",
-"November" => "Kasım",
-"December" => "Aralık",
-"Settings" => "Ayarlar",
-"File" => "Dosya",
-"Folder" => "Klasör",
-"Image" => "Resim",
-"Audio" => "Ses",
-"Saving..." => "Kaydediliyor...",
-"Couldn't send reset email. Please contact your administrator." => "Sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
-"The link to reset your password has been sent to your email. 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. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
-"I know what I'm doing" => "Ne yaptığımı biliyorum",
-"Reset password" => "Parolayı sıfırla",
-"Password can not be changed. Please contact your administrator." => "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.",
-"No" => "Hayır",
-"Yes" => "Evet",
-"Choose" => "Seç",
-"Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}",
-"Ok" => "Tamam",
-"Error loading message template: {error}" => "İleti şablonu yüklenirken hata: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} dosya çakışması","{count} dosya çakışması"),
-"One file conflict" => "Bir dosya çakışması",
-"New Files" => "Yeni Dosyalar",
-"Already existing files" => "Zaten mevcut olan dosyalar",
-"Which files do you want to keep?" => "Hangi dosyaları saklamak istiyorsunuz?",
-"If you select both versions, the copied file will have a number added to its name." => "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir.",
-"Cancel" => "İptal",
-"Continue" => "Devam et",
-"(all selected)" => "(tümü seçildi)",
-"({count} selected)" => "({count} seçildi)",
-"Error loading file exists template" => "Dosya mevcut şablonu yüklenirken hata",
-"Very weak password" => "Çok güçsüz parola",
-"Weak password" => "Güçsüz parola",
-"So-so password" => "Normal parola",
-"Good password" => "İyi parola",
-"Strong password" => "Güçlü parola",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya eşitlemesine izin vermek üzere düzgün bir şekilde yapılandırılmamış. WebDAV arayüzü sorunlu görünüyor.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depolama alanı bağlama, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacağı anlamına gelmektedir. Uzaktan dosyalara erişim ve e-posta ile bildirim gönderme de çalışmayacaktır. Eğer bu özelliklerin tamamını kullanmak istiyorsanız, sunucu için internet bağlantısını etkinleştirmenizi öneriyoruz.",
-"Error occurred while checking server setup" => "Sunucu yapılandırması denetlenirken hata oluştu",
-"Shared" => "Paylaşılan",
-"Shared with {recipients}" => "{recipients} ile paylaşılmış",
-"Share" => "Paylaş",
-"Error" => "Hata",
-"Error while sharing" => "Paylaşım sırasında hata",
-"Error while unsharing" => "Paylaşım iptal edilirken hata",
-"Error while changing permissions" => "İzinleri değiştirirken hata",
-"Shared with you and the group {group} by {owner}" => "{owner} tarafından sizinle ve {group} ile paylaştırılmış",
-"Shared with you by {owner}" => "{owner} tarafından sizinle paylaşıldı",
-"Share with user or group …" => "Kullanıcı veya grup ile paylaş...",
-"Share link" => "Paylaşma bağlantısı",
-"The public link will expire no later than {days} days after it is created" => "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek",
-"Password protect" => "Parola koruması",
-"Choose a password for the public link" => "Herkese açık bağlantı için bir parola seçin",
-"Allow Public Upload" => "Herkes Tarafından Gönderime İzin Ver",
-"Email link to person" => "Bağlantıyı e-posta ile gönder",
-"Send" => "Gönder",
-"Set expiration date" => "Son kullanma tarihini ayarla",
-"Expiration date" => "Son kullanım tarihi",
-"Adding user..." => "Kullanıcı ekleniyor...",
-"group" => "grup",
-"Resharing is not allowed" => "Tekrar paylaşmaya izin verilmiyor",
-"Shared in {item} with {user}" => "{item} içinde {user} ile paylaşılanlar",
-"Unshare" => "Paylaşmayı Kaldır",
-"notify by email" => "e-posta ile bildir",
-"can share" => "paylaşabilir",
-"can edit" => "düzenleyebilir",
-"access control" => "erişim kontrolü",
-"create" => "oluştur",
-"update" => "güncelle",
-"delete" => "sil",
-"Password protected" => "Parola korumalı",
-"Error unsetting expiration date" => "Son kullanma tarihi kaldırma hatası",
-"Error setting expiration date" => "Son kullanma tarihi ayarlama hatası",
-"Sending ..." => "Gönderiliyor...",
-"Email sent" => "E-posta gönderildi",
-"Warning" => "Uyarı",
-"The object type is not specified." => "Nesne türü belirtilmemiş.",
-"Enter new" => "Yeni girin",
-"Delete" => "Sil",
-"Add" => "Ekle",
-"Edit tags" => "Etiketleri düzenle",
-"Error loading dialog template: {error}" => "İletişim şablonu yüklenirken hata: {error}",
-"No tags selected for deletion." => "Silmek için bir etiket seçilmedi.",
-"Updating {productName} to version {version}, this may take a while." => "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.",
-"Please reload the page." => "Lütfen sayfayı yeniden yükleyin.",
-"The update was unsuccessful." => "Güncelleme başarısız oldu.",
-"The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.",
-"Couldn't reset password because the token is invalid" => "Belirteç geçersiz olduğundan parola sıfırlanamadı",
-"Couldn't send reset email. Please make sure your username is correct." => "Sıfırlama e-postası gönderilemedi. Lütfen kullanıcı adınızın doğru olduğundan emin olun.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Sıfırlama e-postası, bu kullanıcı için bir e-posta adresi olmadığından gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
-"%s password reset" => "%s parola sıfırlama",
-"Use the following link to reset your password: {link}" => "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}",
-"You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.",
-"Username" => "Kullanıcı Adı",
-"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?" => "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?",
-"Yes, I really want to reset my password now" => "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum",
-"Reset" => "Sıfırla",
-"New password" => "Yeni parola",
-"New Password" => "Yeni Parola",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!",
-"For the best results, please consider using a GNU/Linux server instead." => "En iyi sonuçlar için GNU/Linux sunucusu kullanın.",
-"Personal" => "Kişisel",
-"Users" => "Kullanıcılar",
-"Apps" => "Uygulamalar",
-"Admin" => "Yönetici",
-"Help" => "Yardım",
-"Error loading tags" => "Etiketler yüklenirken hata",
-"Tag already exists" => "Etiket zaten mevcut",
-"Error deleting tag(s)" => "Etiket(ler) silinirken hata",
-"Error tagging" => "Etiketleme hatası",
-"Error untagging" => "Etiket kaldırma hatası",
-"Error favoriting" => "Beğenilirken hata",
-"Error unfavoriting" => "Beğeniden kaldırılırken hata",
-"Access forbidden" => "Erişim yasak",
-"File not found" => "Dosya bulunamadı",
-"The specified document has not been found on the server." => "Belirtilen dosya sunucuda bulunamadı.",
-"You can click here to return to %s." => "%s ana sayfasına dönmek için buraya tıklayabilirsiniz.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Merhaba,\n\nSadece %s sizinle %s paylaşımını yaptığını bildiriyoruz.\nBuradan bakabilirsiniz: %s\n\n",
-"The share will expire on %s." => "Bu paylaşım %s tarihinde sona erecek.",
-"Cheers!" => "Hoşça kalın!",
-"Internal Server Error" => "Dahili Sunucu Hatası",
-"The server encountered an internal error and was unable to complete your request." => "Sunucu dahili bir hatayla karşılaştı ve isteğinizi tamamlayamadı.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Eğer bu hata birden çok kez oluştuysa, lütfen sunucu yöneticisine aşağıdaki teknik ayrıntılar ile birlikte iletişime geçin.",
-"More details can be found in the server log." => "Daha fazla ayrıntı sunucu günlüğünde bulanabilir.",
-"Technical details" => "Teknik ayrıntılar",
-"Remote Address: %s" => "Uzak Adres: %s",
-"Request ID: %s" => "İstek Kimliği: %s",
-"Code: %s" => "Kod: %s",
-"Message: %s" => "Mesaj: %s",
-"File: %s" => "Dosya: %s",
-"Line: %s" => "Satır: %s",
-"Trace" => "İz",
-"Security Warning" => "Güvenlik Uyarısı",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "%s yazılımını güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
-"Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
-"Password" => "Parola",
-"Storage & database" => "Depolama ve veritabanı",
-"Data folder" => "Veri klasörü",
-"Configure the database" => "Veritabanını yapılandır",
-"Only %s is available." => "Sadece %s kullanılabilir.",
-"Database user" => "Veritabanı kullanıcı adı",
-"Database password" => "Veritabanı parolası",
-"Database name" => "Veritabanı adı",
-"Database tablespace" => "Veritabanı tablo alanı",
-"Database host" => "Veritabanı sunucusu",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Veritabanı olarak SQLite kullanılacak. Daha büyük kurulumlar için bunu değiştirmenizi öneririz.",
-"Finish setup" => "Kurulumu tamamla",
-"Finishing …" => "Tamamlanıyor ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Uygulama, doğru çalışabilmesi için JavaScript gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve sayfayı yeniden yükleyin.",
-"%s is available. Get more information on how to update." => "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
-"Log out" => "Çıkış yap",
-"Server side authentication failed!" => "Sunucu taraflı yetkilendirme başarısız!",
-"Please contact your administrator." => "Lütfen sistem yöneticiniz ile iletişime geçin.",
-"Forgot your password? Reset it!" => "Parolanızı mı unuttunuz? Sıfırlayın!",
-"remember" => "hatırla",
-"Log in" => "Giriş yap",
-"Alternative Logins" => "Alternatif Girişler",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Merhaba, <br><br>%s kullanıcısının sizinle <strong>%s</strong> paylaşımında bulunduğunu bildirmek istedik.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Bu ownCloud örneği şu anda tek kullanıcı kipinde.",
-"This means only administrators can use the instance." => "Bu, örneği sadece yöneticiler kullanabilir demektir.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Eğer bu ileti görünmeye devam ederse veya beklenmedik şekilde ortaya çıkmışsa sistem yöneticinizle iletişime geçin.",
-"Thank you for your patience." => "Sabrınız için teşekkür ederiz.",
-"You are accessing the server from an untrusted domain." => "Sunucuya güvenilmeyen bir alan adından ulaşıyorsunuz.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Yapılandırmanıza bağlı olarak, bir yönetici olarak bu alan adına güvenmek için aşağıdaki düğmeyi de kullanabilirsiniz.",
-"Add \"%s\" as trusted domain" => "\"%s\" alan adını güvenilir olarak ekle",
-"%s will be updated to version %s." => "%s, %s sürümüne güncellenecek.",
-"The following apps will be disabled:" => "Aşağıdaki uygulamalar devre dışı bırakılacak:",
-"The theme %s has been disabled." => "%s teması devre dışı bırakıldı.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Devam etmeden önce lütfen veritabanının, yapılandırma ve veri klasörlerinin yedeklenmiş olduğundan emin olun.",
-"Start update" => "Güncellemeyi başlat",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Daha büyük kurulumlarda zaman aşımlarının önüne geçmek için, kurulum dizininizden aşağıdaki komutu da çalıştırabilirsiniz:",
-"This %s instance is currently being updated, which may take a while." => "Bu %s örneği şu anda güncelleniyor, bu biraz zaman alabilir.",
-"This page will refresh itself when the %s instance is available again." => "Bu sayfa, %s örneği tekrar kullanılabilir olduğunda kendini yenileyecektir."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/tzm.js b/core/l10n/tzm.js
new file mode 100644
index 00000000000..e7a57a1ef8a
--- /dev/null
+++ b/core/l10n/tzm.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;");
diff --git a/core/l10n/tzm.json b/core/l10n/tzm.json
new file mode 100644
index 00000000000..653f556ff14
--- /dev/null
+++ b/core/l10n/tzm.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/core/l10n/tzm.php b/core/l10n/tzm.php
deleted file mode 100644
index 63fd3b90a53..00000000000
--- a/core/l10n/tzm.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;";
diff --git a/core/l10n/ug.js b/core/l10n/ug.js
new file mode 100644
index 00000000000..5895d94b3e5
--- /dev/null
+++ b/core/l10n/ug.js
@@ -0,0 +1,52 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "يەكشەنبە",
+    "Monday" : "دۈشەنبە",
+    "Tuesday" : "سەيشەنبە",
+    "Wednesday" : "چارشەنبە",
+    "Thursday" : "پەيشەنبە",
+    "Friday" : "جۈمە",
+    "Saturday" : "شەنبە",
+    "January" : "قەھرىتان",
+    "February" : "ھۇت",
+    "March" : "نەۋرۇز",
+    "April" : "ئۇمۇت",
+    "May" : "باھار",
+    "June" : "سەپەر",
+    "July" : "چىللە",
+    "August" : "تومۇز",
+    "September" : "مىزان",
+    "October" : "ئوغۇز",
+    "November" : "ئوغلاق",
+    "December" : "كۆنەك",
+    "Settings" : "تەڭشەكلەر",
+    "Folder" : "قىسقۇچ",
+    "Saving..." : "ساقلاۋاتىدۇ…",
+    "No" : "ياق",
+    "Yes" : "ھەئە",
+    "Ok" : "جەزملە",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "ۋاز كەچ",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.",
+    "Share" : "ھەمبەھىر",
+    "Error" : "خاتالىق",
+    "Send" : "يوللا",
+    "group" : "گۇرۇپپا",
+    "Unshare" : "ھەمبەھىرلىمە",
+    "delete" : "ئۆچۈر",
+    "Warning" : "ئاگاھلاندۇرۇش",
+    "Delete" : "ئۆچۈر",
+    "Add" : "قوش",
+    "Username" : "ئىشلەتكۈچى ئاتى",
+    "New password" : "يېڭى ئىم",
+    "Personal" : "شەخسىي",
+    "Users" : "ئىشلەتكۈچىلەر",
+    "Apps" : "ئەپلەر",
+    "Help" : "ياردەم",
+    "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
+    "Password" : "ئىم",
+    "Finish setup" : "تەڭشەك تامام",
+    "Log out" : "تىزىمدىن چىق"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/ug.json b/core/l10n/ug.json
new file mode 100644
index 00000000000..e253d465ab7
--- /dev/null
+++ b/core/l10n/ug.json
@@ -0,0 +1,50 @@
+{ "translations": {
+    "Sunday" : "يەكشەنبە",
+    "Monday" : "دۈشەنبە",
+    "Tuesday" : "سەيشەنبە",
+    "Wednesday" : "چارشەنبە",
+    "Thursday" : "پەيشەنبە",
+    "Friday" : "جۈمە",
+    "Saturday" : "شەنبە",
+    "January" : "قەھرىتان",
+    "February" : "ھۇت",
+    "March" : "نەۋرۇز",
+    "April" : "ئۇمۇت",
+    "May" : "باھار",
+    "June" : "سەپەر",
+    "July" : "چىللە",
+    "August" : "تومۇز",
+    "September" : "مىزان",
+    "October" : "ئوغۇز",
+    "November" : "ئوغلاق",
+    "December" : "كۆنەك",
+    "Settings" : "تەڭشەكلەر",
+    "Folder" : "قىسقۇچ",
+    "Saving..." : "ساقلاۋاتىدۇ…",
+    "No" : "ياق",
+    "Yes" : "ھەئە",
+    "Ok" : "جەزملە",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "ۋاز كەچ",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.",
+    "Share" : "ھەمبەھىر",
+    "Error" : "خاتالىق",
+    "Send" : "يوللا",
+    "group" : "گۇرۇپپا",
+    "Unshare" : "ھەمبەھىرلىمە",
+    "delete" : "ئۆچۈر",
+    "Warning" : "ئاگاھلاندۇرۇش",
+    "Delete" : "ئۆچۈر",
+    "Add" : "قوش",
+    "Username" : "ئىشلەتكۈچى ئاتى",
+    "New password" : "يېڭى ئىم",
+    "Personal" : "شەخسىي",
+    "Users" : "ئىشلەتكۈچىلەر",
+    "Apps" : "ئەپلەر",
+    "Help" : "ياردەم",
+    "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
+    "Password" : "ئىم",
+    "Finish setup" : "تەڭشەك تامام",
+    "Log out" : "تىزىمدىن چىق"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
deleted file mode 100644
index 418563352bd..00000000000
--- a/core/l10n/ug.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "يەكشەنبە",
-"Monday" => "دۈشەنبە",
-"Tuesday" => "سەيشەنبە",
-"Wednesday" => "چارشەنبە",
-"Thursday" => "پەيشەنبە",
-"Friday" => "جۈمە",
-"Saturday" => "شەنبە",
-"January" => "قەھرىتان",
-"February" => "ھۇت",
-"March" => "نەۋرۇز",
-"April" => "ئۇمۇت",
-"May" => "باھار",
-"June" => "سەپەر",
-"July" => "چىللە",
-"August" => "تومۇز",
-"September" => "مىزان",
-"October" => "ئوغۇز",
-"November" => "ئوغلاق",
-"December" => "كۆنەك",
-"Settings" => "تەڭشەكلەر",
-"Folder" => "قىسقۇچ",
-"Saving..." => "ساقلاۋاتىدۇ…",
-"No" => "ياق",
-"Yes" => "ھەئە",
-"Ok" => "جەزملە",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"Cancel" => "ۋاز كەچ",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.",
-"Share" => "ھەمبەھىر",
-"Error" => "خاتالىق",
-"Send" => "يوللا",
-"group" => "گۇرۇپپا",
-"Unshare" => "ھەمبەھىرلىمە",
-"delete" => "ئۆچۈر",
-"Warning" => "ئاگاھلاندۇرۇش",
-"Delete" => "ئۆچۈر",
-"Add" => "قوش",
-"Username" => "ئىشلەتكۈچى ئاتى",
-"New password" => "يېڭى ئىم",
-"Personal" => "شەخسىي",
-"Users" => "ئىشلەتكۈچىلەر",
-"Apps" => "ئەپلەر",
-"Help" => "ياردەم",
-"Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
-"Password" => "ئىم",
-"Finish setup" => "تەڭشەك تامام",
-"Log out" => "تىزىمدىن چىق"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
new file mode 100644
index 00000000000..4f3e9c2cba5
--- /dev/null
+++ b/core/l10n/uk.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Неможливо надіслати пошту наступним користувачам: %s ",
+    "Turned on maintenance mode" : "Увімкнено захищений режим",
+    "Turned off maintenance mode" : "Вимкнено захищений режим",
+    "Updated database" : "Базу даних оновлено",
+    "Checked database schema update" : "Перевірено оновлення схеми бази даних",
+    "Checked database schema update for apps" : "Перевірено оновлення схеми бази даних для додатків",
+    "Updated \"%s\" to %s" : "Оновлено \"%s\" до %s",
+    "Disabled incompatible apps: %s" : "Вимкнені несумісні додатки: %s",
+    "No image or file provided" : "Немає наданого зображення або файлу",
+    "Unknown filetype" : "Невідомий тип файлу",
+    "Invalid image" : "Невірне зображення",
+    "No temporary profile picture available, try again" : "Немає доступного тимчасового профілю для малюнків, спробуйте ще раз",
+    "No crop data provided" : "Немає інформації щодо обрізки даних",
+    "Sunday" : "Неділя",
+    "Monday" : "Понеділок",
+    "Tuesday" : "Вівторок",
+    "Wednesday" : "Середа",
+    "Thursday" : "Четвер",
+    "Friday" : "П'ятниця",
+    "Saturday" : "Субота",
+    "January" : "Січень",
+    "February" : "Лютий",
+    "March" : "Березень",
+    "April" : "Квітень",
+    "May" : "Травень",
+    "June" : "Червень",
+    "July" : "Липень",
+    "August" : "Серпень",
+    "September" : "Вересень",
+    "October" : "Жовтень",
+    "November" : "Листопад",
+    "December" : "Грудень",
+    "Settings" : "Налаштування",
+    "File" : "Файл",
+    "Folder" : "Тека",
+    "Image" : "Зображення",
+    "Audio" : "Аудіо",
+    "Saving..." : "Зберігаю...",
+    "Couldn't send reset email. Please contact your administrator." : "Не можу надіслати email для скидання. Будь ласка, зверніться до вашого адміністратора.",
+    "The link to reset your password has been sent to your email. 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>Якщо і там немає, спитайте вашого місцевого адміністратора.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?",
+    "I know what I'm doing" : "Я знаю що роблю",
+    "Reset password" : "Скинути пароль",
+    "Password can not be changed. Please contact your administrator." : "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора",
+    "No" : "Ні",
+    "Yes" : "Так",
+    "Choose" : "Обрати",
+    "Error loading file picker template: {error}" : "Помилка при завантаженні шаблону вибору: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Помилка при завантаженні шаблону повідомлення: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"],
+    "One file conflict" : "Один файловий конфлікт",
+    "New Files" : "Нових Файлів",
+    "Already existing files" : "Файли що вже існують",
+    "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} вибрано)",
+    "Error loading file exists template" : "Помилка при завантаженні файлу існуючого шаблону",
+    "Very weak password" : "Дуже слабкий пароль",
+    "Weak password" : "Слабкий пароль",
+    "So-so password" : "Такий собі пароль",
+    "Good password" : "Добрий пароль",
+    "Strong password" : "Надійний пароль",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Цей сервер не має під'єднання до Інтернету. Це означає, що деякі функції, такі як монтування зовнішніх сховищ, повідомлення про оновлення або встановлення допоміжних програм не будуть працювати. Віддалений доступ до файлів та надсилання повідомлень електронною поштою також може не працювати. Ми пропонуємо увімкнути під'єднання до Інтернету для даного сервера, якщо ви хочете мати всі можливості ownCloud.",
+    "Error occurred while checking server setup" : "При перевірці налаштувань серверу сталася помилка",
+    "Shared" : "Опубліковано",
+    "Shared with {recipients}" : "Опубліковано для {recipients}",
+    "Share" : "Поділитися",
+    "Error" : "Помилка",
+    "Error while sharing" : "Помилка під час публікації",
+    "Error while unsharing" : "Помилка під час відміни публікації",
+    "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" : "Опублікувати посилання",
+    "The public link will expire no later than {days} days after it is created" : "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення",
+    "Password protect" : "Захистити паролем",
+    "Choose a password for the public link" : "Оберіть пароль для опублікованого посилання",
+    "Allow Public Upload" : "Дозволити Публічне Завантаження",
+    "Email link to person" : "Ел. пошта належить Пану",
+    "Send" : "Надіслати",
+    "Set expiration date" : "Встановити термін дії",
+    "Expiration date" : "Термін дії",
+    "Adding user..." : "Додавання користувача...",
+    "group" : "група",
+    "Resharing is not allowed" : "Пере-публікація не дозволяється",
+    "Shared in {item} with {user}" : "Опубліковано {item} для {user}",
+    "Unshare" : "Закрити доступ",
+    "notify by email" : "повідомити по Email",
+    "can share" : "можна поділитися",
+    "can edit" : "може редагувати",
+    "access control" : "контроль доступу",
+    "create" : "створити",
+    "update" : "оновити",
+    "delete" : "видалити",
+    "Password protected" : "Захищено паролем",
+    "Error unsetting expiration date" : "Помилка при відміні терміна дії",
+    "Error setting expiration date" : "Помилка при встановленні терміна дії",
+    "Sending ..." : "Надсилання...",
+    "Email sent" : "Ел. пошта надіслана",
+    "Warning" : "Попередження",
+    "The object type is not specified." : "Не визначено тип об'єкту.",
+    "Enter new" : "Введіть новий",
+    "Delete" : "Видалити",
+    "Add" : "Додати",
+    "Edit tags" : "Редагувати теги",
+    "Error loading dialog template: {error}" : "Помилка при завантаженні шаблону діалогу: {error}",
+    "No tags selected for deletion." : "Жодних тегів не обрано для видалення.",
+    "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.",
+    "Please reload the page." : "Будь ласка, перезавантажте сторінку.",
+    "The update was unsuccessful." : "Оновлення завершилось невдачею.",
+    "The update was successful. Redirecting you to ownCloud now." : "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Неможливо скинути пароль, бо маркер є недійсним",
+    "Couldn't send reset email. Please make sure your username is correct." : "Не вдалося відправити скидання паролю. Будь ласка, переконайтеся, що ваше ім'я користувача є правильним.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Не вдалося відправити скидання паролю, тому що немає адреси електронної пошти для цього користувача. Будь ласка, зверніться до адміністратора.",
+    "%s password reset" : "%s пароль скинуто",
+    "Use the following link to reset your password: {link}" : "Використовуйте наступне посилання для скидання пароля: {link}",
+    "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" : "Так, я справді бажаю скинути мій пароль зараз",
+    "Reset" : "Перевстановити",
+    "New password" : "Новий пароль",
+    "New Password" : "Новий пароль",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Для кращих результатів розгляньте можливість використання GNU/Linux серверу",
+    "Personal" : "Особисте",
+    "Users" : "Користувачі",
+    "Apps" : "Додатки",
+    "Admin" : "Адмін",
+    "Help" : "Допомога",
+    "Error loading tags" : "Помилка завантаження тегів.",
+    "Tag already exists" : "Тег вже існує",
+    "Error deleting tag(s)" : "Помилка видалення тегу(ів)",
+    "Error tagging" : "Помилка встановлення тегів",
+    "Error untagging" : "Помилка зняття тегів",
+    "Error favoriting" : "Помилка позначення улюблених",
+    "Error unfavoriting" : "Помилка зняття позначки улюблених",
+    "Access forbidden" : "Доступ заборонено",
+    "File not found" : "Файл не знайдено",
+    "The specified document has not been found on the server." : "Не вдалось знайти вказаний документ на сервері.",
+    "You can click here to return to %s." : "Ви можете натиснути тут для повернення до %s.",
+    "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!" : "Будьмо!",
+    "Internal Server Error" : "Внутрішня помилка серверу",
+    "The server encountered an internal error and was unable to complete your request." : "На сервері сталася внутрішня помилка, тому він не зміг виконати ваш запит.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Будь ласка, зверніться до адміністратора сервера, якщо ця помилка з'являється кілька разів, будь ласка, вкажіть технічні подробиці нижче в звіті.",
+    "More details can be found in the server log." : "Більше деталей може бути в журналі серверу.",
+    "Technical details" : "Технічні деталі",
+    "Remote Address: %s" : "Віддалена Адреса: %s",
+    "Request ID: %s" : "Запит ID: %s",
+    "Code: %s" : "Код: %s",
+    "Message: %s" : "Повідомлення: %s",
+    "File: %s" : "Файл: %s",
+    "Line: %s" : "Рядок: %s",
+    "Trace" : "Трасування",
+    "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 безпеки.",
+    "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>.",
+    "Create an <strong>admin account</strong>" : "Створити <strong>обліковий запис адміністратора</strong>",
+    "Password" : "Пароль",
+    "Storage & database" : "Сховище і база даних",
+    "Data folder" : "Каталог даних",
+    "Configure the database" : "Налаштування бази даних",
+    "Only %s is available." : "Тільки %s доступно.",
+    "Database user" : "Користувач бази даних",
+    "Database password" : "Пароль для бази даних",
+    "Database name" : "Назва бази даних",
+    "Database tablespace" : "Таблиця бази даних",
+    "Database host" : "Хост бази даних",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Ви використовуете SQLite для вашої бази даних. Для більш навантажених серверів, ми рекомендуемо змінити це.",
+    "Finish setup" : "Завершити налаштування",
+    "Finishing …" : "Завершується ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Для цього додатка потрібна наявність Java для коректної роботи. Будь ласка, <a href=\"http://enable-javascript.com/\" target=\"_blank\"> увімкніть JavaScript </a> і перезавантажте сторінку.",
+    "%s is available. Get more information on how to update." : "%s доступний. Отримай більше інформації про те, як оновити.",
+    "Log out" : "Вихід",
+    "Server side authentication failed!" : "Помилка аутентифікації на боці Сервера !",
+    "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.",
+    "Forgot your password? Reset it!" : "Забули ваш пароль? Скиньте його!",
+    "remember" : "запам'ятати",
+    "Log in" : "Вхід",
+    "Alternative Logins" : "Альтернативні Логіни",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> 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." : "Дякуємо за ваше терпіння.",
+    "You are accessing the server from an untrusted domain." : "Ви зайшли на сервер з ненадійного домену.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Будь ласка, зверніться до адміністратора. Якщо ви є адміністратором цього серверу, ви можете налаштувати опцію \"trusted_domain\" в конфігураційному файлі config/config.php. Приклад конфігурації знаходится в файлі config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Залежно від конфігурації Ви як адміністратор можете додати цей домен у список довірених, використовуйте кнопку нижче.",
+    "Add \"%s\" as trusted domain" : "Додати \"%s\" як довірений",
+    "%s will be updated to version %s." : "%s буде оновлено до версії %s.",
+    "The following apps will be disabled:" : "Наступні додатки будуть відключені:",
+    "The theme %s has been disabled." : "Тему %s було вимкнено.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перш ніж продовжити, будь ласка, переконайтеся, що база даних, папка конфігурації і папка даних були дубльовані.",
+    "Start update" : "Почати оновлення",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Щоб уникнути великих таймаутів з більш тяжкими встановленнями, ви можете виконати наступну команду відносно директорії встановлення:",
+    "This %s instance is currently being updated, which may take a while." : "Цей %s екземпляр нині оновлюється, що може зайняти деякий час.",
+    "This page will refresh itself when the %s instance is available again." : "Ця сторінка автоматично перезавантажиться коли екземпляр %s стане знову доступний."
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
new file mode 100644
index 00000000000..d6b2b9dbc24
--- /dev/null
+++ b/core/l10n/uk.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Неможливо надіслати пошту наступним користувачам: %s ",
+    "Turned on maintenance mode" : "Увімкнено захищений режим",
+    "Turned off maintenance mode" : "Вимкнено захищений режим",
+    "Updated database" : "Базу даних оновлено",
+    "Checked database schema update" : "Перевірено оновлення схеми бази даних",
+    "Checked database schema update for apps" : "Перевірено оновлення схеми бази даних для додатків",
+    "Updated \"%s\" to %s" : "Оновлено \"%s\" до %s",
+    "Disabled incompatible apps: %s" : "Вимкнені несумісні додатки: %s",
+    "No image or file provided" : "Немає наданого зображення або файлу",
+    "Unknown filetype" : "Невідомий тип файлу",
+    "Invalid image" : "Невірне зображення",
+    "No temporary profile picture available, try again" : "Немає доступного тимчасового профілю для малюнків, спробуйте ще раз",
+    "No crop data provided" : "Немає інформації щодо обрізки даних",
+    "Sunday" : "Неділя",
+    "Monday" : "Понеділок",
+    "Tuesday" : "Вівторок",
+    "Wednesday" : "Середа",
+    "Thursday" : "Четвер",
+    "Friday" : "П'ятниця",
+    "Saturday" : "Субота",
+    "January" : "Січень",
+    "February" : "Лютий",
+    "March" : "Березень",
+    "April" : "Квітень",
+    "May" : "Травень",
+    "June" : "Червень",
+    "July" : "Липень",
+    "August" : "Серпень",
+    "September" : "Вересень",
+    "October" : "Жовтень",
+    "November" : "Листопад",
+    "December" : "Грудень",
+    "Settings" : "Налаштування",
+    "File" : "Файл",
+    "Folder" : "Тека",
+    "Image" : "Зображення",
+    "Audio" : "Аудіо",
+    "Saving..." : "Зберігаю...",
+    "Couldn't send reset email. Please contact your administrator." : "Не можу надіслати email для скидання. Будь ласка, зверніться до вашого адміністратора.",
+    "The link to reset your password has been sent to your email. 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>Якщо і там немає, спитайте вашого місцевого адміністратора.",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?",
+    "I know what I'm doing" : "Я знаю що роблю",
+    "Reset password" : "Скинути пароль",
+    "Password can not be changed. Please contact your administrator." : "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора",
+    "No" : "Ні",
+    "Yes" : "Так",
+    "Choose" : "Обрати",
+    "Error loading file picker template: {error}" : "Помилка при завантаженні шаблону вибору: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Помилка при завантаженні шаблону повідомлення: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"],
+    "One file conflict" : "Один файловий конфлікт",
+    "New Files" : "Нових Файлів",
+    "Already existing files" : "Файли що вже існують",
+    "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} вибрано)",
+    "Error loading file exists template" : "Помилка при завантаженні файлу існуючого шаблону",
+    "Very weak password" : "Дуже слабкий пароль",
+    "Weak password" : "Слабкий пароль",
+    "So-so password" : "Такий собі пароль",
+    "Good password" : "Добрий пароль",
+    "Strong password" : "Надійний пароль",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Цей сервер не має під'єднання до Інтернету. Це означає, що деякі функції, такі як монтування зовнішніх сховищ, повідомлення про оновлення або встановлення допоміжних програм не будуть працювати. Віддалений доступ до файлів та надсилання повідомлень електронною поштою також може не працювати. Ми пропонуємо увімкнути під'єднання до Інтернету для даного сервера, якщо ви хочете мати всі можливості ownCloud.",
+    "Error occurred while checking server setup" : "При перевірці налаштувань серверу сталася помилка",
+    "Shared" : "Опубліковано",
+    "Shared with {recipients}" : "Опубліковано для {recipients}",
+    "Share" : "Поділитися",
+    "Error" : "Помилка",
+    "Error while sharing" : "Помилка під час публікації",
+    "Error while unsharing" : "Помилка під час відміни публікації",
+    "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" : "Опублікувати посилання",
+    "The public link will expire no later than {days} days after it is created" : "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення",
+    "Password protect" : "Захистити паролем",
+    "Choose a password for the public link" : "Оберіть пароль для опублікованого посилання",
+    "Allow Public Upload" : "Дозволити Публічне Завантаження",
+    "Email link to person" : "Ел. пошта належить Пану",
+    "Send" : "Надіслати",
+    "Set expiration date" : "Встановити термін дії",
+    "Expiration date" : "Термін дії",
+    "Adding user..." : "Додавання користувача...",
+    "group" : "група",
+    "Resharing is not allowed" : "Пере-публікація не дозволяється",
+    "Shared in {item} with {user}" : "Опубліковано {item} для {user}",
+    "Unshare" : "Закрити доступ",
+    "notify by email" : "повідомити по Email",
+    "can share" : "можна поділитися",
+    "can edit" : "може редагувати",
+    "access control" : "контроль доступу",
+    "create" : "створити",
+    "update" : "оновити",
+    "delete" : "видалити",
+    "Password protected" : "Захищено паролем",
+    "Error unsetting expiration date" : "Помилка при відміні терміна дії",
+    "Error setting expiration date" : "Помилка при встановленні терміна дії",
+    "Sending ..." : "Надсилання...",
+    "Email sent" : "Ел. пошта надіслана",
+    "Warning" : "Попередження",
+    "The object type is not specified." : "Не визначено тип об'єкту.",
+    "Enter new" : "Введіть новий",
+    "Delete" : "Видалити",
+    "Add" : "Додати",
+    "Edit tags" : "Редагувати теги",
+    "Error loading dialog template: {error}" : "Помилка при завантаженні шаблону діалогу: {error}",
+    "No tags selected for deletion." : "Жодних тегів не обрано для видалення.",
+    "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.",
+    "Please reload the page." : "Будь ласка, перезавантажте сторінку.",
+    "The update was unsuccessful." : "Оновлення завершилось невдачею.",
+    "The update was successful. Redirecting you to ownCloud now." : "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Неможливо скинути пароль, бо маркер є недійсним",
+    "Couldn't send reset email. Please make sure your username is correct." : "Не вдалося відправити скидання паролю. Будь ласка, переконайтеся, що ваше ім'я користувача є правильним.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Не вдалося відправити скидання паролю, тому що немає адреси електронної пошти для цього користувача. Будь ласка, зверніться до адміністратора.",
+    "%s password reset" : "%s пароль скинуто",
+    "Use the following link to reset your password: {link}" : "Використовуйте наступне посилання для скидання пароля: {link}",
+    "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" : "Так, я справді бажаю скинути мій пароль зараз",
+    "Reset" : "Перевстановити",
+    "New password" : "Новий пароль",
+    "New Password" : "Новий пароль",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Для кращих результатів розгляньте можливість використання GNU/Linux серверу",
+    "Personal" : "Особисте",
+    "Users" : "Користувачі",
+    "Apps" : "Додатки",
+    "Admin" : "Адмін",
+    "Help" : "Допомога",
+    "Error loading tags" : "Помилка завантаження тегів.",
+    "Tag already exists" : "Тег вже існує",
+    "Error deleting tag(s)" : "Помилка видалення тегу(ів)",
+    "Error tagging" : "Помилка встановлення тегів",
+    "Error untagging" : "Помилка зняття тегів",
+    "Error favoriting" : "Помилка позначення улюблених",
+    "Error unfavoriting" : "Помилка зняття позначки улюблених",
+    "Access forbidden" : "Доступ заборонено",
+    "File not found" : "Файл не знайдено",
+    "The specified document has not been found on the server." : "Не вдалось знайти вказаний документ на сервері.",
+    "You can click here to return to %s." : "Ви можете натиснути тут для повернення до %s.",
+    "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!" : "Будьмо!",
+    "Internal Server Error" : "Внутрішня помилка серверу",
+    "The server encountered an internal error and was unable to complete your request." : "На сервері сталася внутрішня помилка, тому він не зміг виконати ваш запит.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Будь ласка, зверніться до адміністратора сервера, якщо ця помилка з'являється кілька разів, будь ласка, вкажіть технічні подробиці нижче в звіті.",
+    "More details can be found in the server log." : "Більше деталей може бути в журналі серверу.",
+    "Technical details" : "Технічні деталі",
+    "Remote Address: %s" : "Віддалена Адреса: %s",
+    "Request ID: %s" : "Запит ID: %s",
+    "Code: %s" : "Код: %s",
+    "Message: %s" : "Повідомлення: %s",
+    "File: %s" : "Файл: %s",
+    "Line: %s" : "Рядок: %s",
+    "Trace" : "Трасування",
+    "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 безпеки.",
+    "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>.",
+    "Create an <strong>admin account</strong>" : "Створити <strong>обліковий запис адміністратора</strong>",
+    "Password" : "Пароль",
+    "Storage & database" : "Сховище і база даних",
+    "Data folder" : "Каталог даних",
+    "Configure the database" : "Налаштування бази даних",
+    "Only %s is available." : "Тільки %s доступно.",
+    "Database user" : "Користувач бази даних",
+    "Database password" : "Пароль для бази даних",
+    "Database name" : "Назва бази даних",
+    "Database tablespace" : "Таблиця бази даних",
+    "Database host" : "Хост бази даних",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Ви використовуете SQLite для вашої бази даних. Для більш навантажених серверів, ми рекомендуемо змінити це.",
+    "Finish setup" : "Завершити налаштування",
+    "Finishing …" : "Завершується ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Для цього додатка потрібна наявність Java для коректної роботи. Будь ласка, <a href=\"http://enable-javascript.com/\" target=\"_blank\"> увімкніть JavaScript </a> і перезавантажте сторінку.",
+    "%s is available. Get more information on how to update." : "%s доступний. Отримай більше інформації про те, як оновити.",
+    "Log out" : "Вихід",
+    "Server side authentication failed!" : "Помилка аутентифікації на боці Сервера !",
+    "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.",
+    "Forgot your password? Reset it!" : "Забули ваш пароль? Скиньте його!",
+    "remember" : "запам'ятати",
+    "Log in" : "Вхід",
+    "Alternative Logins" : "Альтернативні Логіни",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> 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." : "Дякуємо за ваше терпіння.",
+    "You are accessing the server from an untrusted domain." : "Ви зайшли на сервер з ненадійного домену.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Будь ласка, зверніться до адміністратора. Якщо ви є адміністратором цього серверу, ви можете налаштувати опцію \"trusted_domain\" в конфігураційному файлі config/config.php. Приклад конфігурації знаходится в файлі config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Залежно від конфігурації Ви як адміністратор можете додати цей домен у список довірених, використовуйте кнопку нижче.",
+    "Add \"%s\" as trusted domain" : "Додати \"%s\" як довірений",
+    "%s will be updated to version %s." : "%s буде оновлено до версії %s.",
+    "The following apps will be disabled:" : "Наступні додатки будуть відключені:",
+    "The theme %s has been disabled." : "Тему %s було вимкнено.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перш ніж продовжити, будь ласка, переконайтеся, що база даних, папка конфігурації і папка даних були дубльовані.",
+    "Start update" : "Почати оновлення",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Щоб уникнути великих таймаутів з більш тяжкими встановленнями, ви можете виконати наступну команду відносно директорії встановлення:",
+    "This %s instance is currently being updated, which may take a while." : "Цей %s екземпляр нині оновлюється, що може зайняти деякий час.",
+    "This page will refresh itself when the %s instance is available again." : "Ця сторінка автоматично перезавантажиться коли екземпляр %s стане знову доступний."
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
deleted file mode 100644
index 591198fd7d9..00000000000
--- a/core/l10n/uk.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Неможливо надіслати пошту наступним користувачам: %s ",
-"Turned on maintenance mode" => "Увімкнено захищений режим",
-"Turned off maintenance mode" => "Вимкнено захищений режим",
-"Updated database" => "Базу даних оновлено",
-"Checked database schema update" => "Перевірено оновлення схеми бази даних",
-"Checked database schema update for apps" => "Перевірено оновлення схеми бази даних для додатків",
-"Updated \"%s\" to %s" => "Оновлено \"%s\" до %s",
-"Disabled incompatible apps: %s" => "Вимкнені несумісні додатки: %s",
-"No image or file provided" => "Немає наданого зображення або файлу",
-"Unknown filetype" => "Невідомий тип файлу",
-"Invalid image" => "Невірне зображення",
-"No temporary profile picture available, try again" => "Немає доступного тимчасового профілю для малюнків, спробуйте ще раз",
-"No crop data provided" => "Немає інформації щодо обрізки даних",
-"Sunday" => "Неділя",
-"Monday" => "Понеділок",
-"Tuesday" => "Вівторок",
-"Wednesday" => "Середа",
-"Thursday" => "Четвер",
-"Friday" => "П'ятниця",
-"Saturday" => "Субота",
-"January" => "Січень",
-"February" => "Лютий",
-"March" => "Березень",
-"April" => "Квітень",
-"May" => "Травень",
-"June" => "Червень",
-"July" => "Липень",
-"August" => "Серпень",
-"September" => "Вересень",
-"October" => "Жовтень",
-"November" => "Листопад",
-"December" => "Грудень",
-"Settings" => "Налаштування",
-"File" => "Файл",
-"Folder" => "Тека",
-"Image" => "Зображення",
-"Audio" => "Аудіо",
-"Saving..." => "Зберігаю...",
-"Couldn't send reset email. Please contact your administrator." => "Не можу надіслати email для скидання. Будь ласка, зверніться до вашого адміністратора.",
-"The link to reset your password has been sent to your email. 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>Якщо і там немає, спитайте вашого місцевого адміністратора.",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?",
-"I know what I'm doing" => "Я знаю що роблю",
-"Reset password" => "Скинути пароль",
-"Password can not be changed. Please contact your administrator." => "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора",
-"No" => "Ні",
-"Yes" => "Так",
-"Choose" => "Обрати",
-"Error loading file picker template: {error}" => "Помилка при завантаженні шаблону вибору: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Помилка при завантаженні шаблону повідомлення: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"),
-"One file conflict" => "Один файловий конфлікт",
-"New Files" => "Нових Файлів",
-"Already existing files" => "Файли що вже існують",
-"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} вибрано)",
-"Error loading file exists template" => "Помилка при завантаженні файлу існуючого шаблону",
-"Very weak password" => "Дуже слабкий пароль",
-"Weak password" => "Слабкий пароль",
-"So-so password" => "Такий собі пароль",
-"Good password" => "Добрий пароль",
-"Strong password" => "Надійний пароль",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Цей сервер не має під'єднання до Інтернету. Це означає, що деякі функції, такі як монтування зовнішніх сховищ, повідомлення про оновлення або встановлення допоміжних програм не будуть працювати. Віддалений доступ до файлів та надсилання повідомлень електронною поштою також може не працювати. Ми пропонуємо увімкнути під'єднання до Інтернету для даного сервера, якщо ви хочете мати всі можливості ownCloud.",
-"Error occurred while checking server setup" => "При перевірці налаштувань серверу сталася помилка",
-"Shared" => "Опубліковано",
-"Shared with {recipients}" => "Опубліковано для {recipients}",
-"Share" => "Поділитися",
-"Error" => "Помилка",
-"Error while sharing" => "Помилка під час публікації",
-"Error while unsharing" => "Помилка під час відміни публікації",
-"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" => "Опублікувати посилання",
-"The public link will expire no later than {days} days after it is created" => "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення",
-"Password protect" => "Захистити паролем",
-"Choose a password for the public link" => "Оберіть пароль для опублікованого посилання",
-"Allow Public Upload" => "Дозволити Публічне Завантаження",
-"Email link to person" => "Ел. пошта належить Пану",
-"Send" => "Надіслати",
-"Set expiration date" => "Встановити термін дії",
-"Expiration date" => "Термін дії",
-"Adding user..." => "Додавання користувача...",
-"group" => "група",
-"Resharing is not allowed" => "Пере-публікація не дозволяється",
-"Shared in {item} with {user}" => "Опубліковано {item} для {user}",
-"Unshare" => "Закрити доступ",
-"notify by email" => "повідомити по Email",
-"can share" => "можна поділитися",
-"can edit" => "може редагувати",
-"access control" => "контроль доступу",
-"create" => "створити",
-"update" => "оновити",
-"delete" => "видалити",
-"Password protected" => "Захищено паролем",
-"Error unsetting expiration date" => "Помилка при відміні терміна дії",
-"Error setting expiration date" => "Помилка при встановленні терміна дії",
-"Sending ..." => "Надсилання...",
-"Email sent" => "Ел. пошта надіслана",
-"Warning" => "Попередження",
-"The object type is not specified." => "Не визначено тип об'єкту.",
-"Enter new" => "Введіть новий",
-"Delete" => "Видалити",
-"Add" => "Додати",
-"Edit tags" => "Редагувати теги",
-"Error loading dialog template: {error}" => "Помилка при завантаженні шаблону діалогу: {error}",
-"No tags selected for deletion." => "Жодних тегів не обрано для видалення.",
-"Updating {productName} to version {version}, this may take a while." => "Оновлення {productName} до версії {version}, це може займати деякий час.",
-"Please reload the page." => "Будь ласка, перезавантажте сторінку.",
-"The update was unsuccessful." => "Оновлення завершилось невдачею.",
-"The update was successful. Redirecting you to ownCloud now." => "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud.",
-"Couldn't reset password because the token is invalid" => "Неможливо скинути пароль, бо маркер є недійсним",
-"Couldn't send reset email. Please make sure your username is correct." => "Не вдалося відправити скидання паролю. Будь ласка, переконайтеся, що ваше ім'я користувача є правильним.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Не вдалося відправити скидання паролю, тому що немає адреси електронної пошти для цього користувача. Будь ласка, зверніться до адміністратора.",
-"%s password reset" => "%s пароль скинуто",
-"Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}",
-"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" => "Так, я справді бажаю скинути мій пароль зараз",
-"Reset" => "Перевстановити",
-"New password" => "Новий пароль",
-"New Password" => "Новий пароль",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!",
-"For the best results, please consider using a GNU/Linux server instead." => "Для кращих результатів розгляньте можливість використання GNU/Linux серверу",
-"Personal" => "Особисте",
-"Users" => "Користувачі",
-"Apps" => "Додатки",
-"Admin" => "Адмін",
-"Help" => "Допомога",
-"Error loading tags" => "Помилка завантаження тегів.",
-"Tag already exists" => "Тег вже існує",
-"Error deleting tag(s)" => "Помилка видалення тегу(ів)",
-"Error tagging" => "Помилка встановлення тегів",
-"Error untagging" => "Помилка зняття тегів",
-"Error favoriting" => "Помилка позначення улюблених",
-"Error unfavoriting" => "Помилка зняття позначки улюблених",
-"Access forbidden" => "Доступ заборонено",
-"File not found" => "Файл не знайдено",
-"The specified document has not been found on the server." => "Не вдалось знайти вказаний документ на сервері.",
-"You can click here to return to %s." => "Ви можете натиснути тут для повернення до %s.",
-"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!" => "Будьмо!",
-"Internal Server Error" => "Внутрішня помилка серверу",
-"The server encountered an internal error and was unable to complete your request." => "На сервері сталася внутрішня помилка, тому він не зміг виконати ваш запит.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Будь ласка, зверніться до адміністратора сервера, якщо ця помилка з'являється кілька разів, будь ласка, вкажіть технічні подробиці нижче в звіті.",
-"More details can be found in the server log." => "Більше деталей може бути в журналі серверу.",
-"Technical details" => "Технічні деталі",
-"Remote Address: %s" => "Віддалена Адреса: %s",
-"Request ID: %s" => "Запит ID: %s",
-"Code: %s" => "Код: %s",
-"Message: %s" => "Повідомлення: %s",
-"File: %s" => "Файл: %s",
-"Line: %s" => "Рядок: %s",
-"Trace" => "Трасування",
-"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 безпеки.",
-"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>.",
-"Create an <strong>admin account</strong>" => "Створити <strong>обліковий запис адміністратора</strong>",
-"Password" => "Пароль",
-"Storage & database" => "Сховище і база даних",
-"Data folder" => "Каталог даних",
-"Configure the database" => "Налаштування бази даних",
-"Only %s is available." => "Тільки %s доступно.",
-"Database user" => "Користувач бази даних",
-"Database password" => "Пароль для бази даних",
-"Database name" => "Назва бази даних",
-"Database tablespace" => "Таблиця бази даних",
-"Database host" => "Хост бази даних",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Ви використовуете SQLite для вашої бази даних. Для більш навантажених серверів, ми рекомендуемо змінити це.",
-"Finish setup" => "Завершити налаштування",
-"Finishing …" => "Завершується ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Для цього додатка потрібна наявність Java для коректної роботи. Будь ласка, <a href=\"http://enable-javascript.com/\" target=\"_blank\"> увімкніть JavaScript </a> і перезавантажте сторінку.",
-"%s is available. Get more information on how to update." => "%s доступний. Отримай більше інформації про те, як оновити.",
-"Log out" => "Вихід",
-"Server side authentication failed!" => "Помилка аутентифікації на боці Сервера !",
-"Please contact your administrator." => "Будь ласка, зверніться до вашого Адміністратора.",
-"Forgot your password? Reset it!" => "Забули ваш пароль? Скиньте його!",
-"remember" => "запам'ятати",
-"Log in" => "Вхід",
-"Alternative Logins" => "Альтернативні Логіни",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> 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." => "Дякуємо за ваше терпіння.",
-"You are accessing the server from an untrusted domain." => "Ви зайшли на сервер з ненадійного домену.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Будь ласка, зверніться до адміністратора. Якщо ви є адміністратором цього серверу, ви можете налаштувати опцію \"trusted_domain\" в конфігураційному файлі config/config.php. Приклад конфігурації знаходится в файлі config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Залежно від конфігурації Ви як адміністратор можете додати цей домен у список довірених, використовуйте кнопку нижче.",
-"Add \"%s\" as trusted domain" => "Додати \"%s\" як довірений",
-"%s will be updated to version %s." => "%s буде оновлено до версії %s.",
-"The following apps will be disabled:" => "Наступні додатки будуть відключені:",
-"The theme %s has been disabled." => "Тему %s було вимкнено.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Перш ніж продовжити, будь ласка, переконайтеся, що база даних, папка конфігурації і папка даних були дубльовані.",
-"Start update" => "Почати оновлення",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Щоб уникнути великих таймаутів з більш тяжкими встановленнями, ви можете виконати наступну команду відносно директорії встановлення:",
-"This %s instance is currently being updated, which may take a while." => "Цей %s екземпляр нині оновлюється, що може зайняти деякий час.",
-"This page will refresh itself when the %s instance is available again." => "Ця сторінка автоматично перезавантажиться коли екземпляр %s стане знову доступний."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/ur_PK.js b/core/l10n/ur_PK.js
new file mode 100644
index 00000000000..bd8a3bba292
--- /dev/null
+++ b/core/l10n/ur_PK.js
@@ -0,0 +1,127 @@
+OC.L10N.register(
+    "core",
+    {
+    "Turned on maintenance mode" : "بحالی موڈ چالو ہے",
+    "Turned off maintenance mode" : "بحالی موڈ بند ہے",
+    "Updated database" : "اپ ڈیٹ ہوئ ڈیٹا بیس",
+    "No image or file provided" : "کوئی تصویر یا فائل فراہم نہیں",
+    "Unknown filetype" : "غیر معرروف قسم کی فائل",
+    "Invalid image" : "غلط تصویر",
+    "No crop data provided" : "کوئی کروپ ڈیٹا ميسر نہیں ",
+    "Sunday" : "اتوار",
+    "Monday" : "سوموار",
+    "Tuesday" : "منگل",
+    "Wednesday" : "بدھ",
+    "Thursday" : "جمعرات",
+    "Friday" : "جمعہ",
+    "Saturday" : "ہفتہ",
+    "January" : "جنوری",
+    "February" : "فرورئ",
+    "March" : "مارچ",
+    "April" : "اپریل",
+    "May" : "مئی",
+    "June" : "جون",
+    "July" : "جولائی",
+    "August" : "اگست",
+    "September" : "ستمبر",
+    "October" : "اکتوبر",
+    "November" : "نومبر",
+    "December" : "دسمبر",
+    "Settings" : "ترتیبات",
+    "Saving..." : "محفوظ ھو رہا ہے ...",
+    "Reset password" : "ری سیٹ پاسورڈ",
+    "No" : "نہیں",
+    "Yes" : "ہاں",
+    "Choose" : "منتخب کریں",
+    "Ok" : "اوکے",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{گنتی} فائل متصادم ","{گنتی} فائل متصادم "],
+    "One file conflict" : "اایک فائل متصادم ہے",
+    "New Files" : "جدید فائلیں",
+    "Already existing files" : "پہلے سے موجودجدید فائلیں",
+    "Which files do you want to keep?" : "آپ کون سی فائلیں رکھنا چاہتے ہیں  ؟",
+    "Cancel" : "منسوخ کریں",
+    "Continue" : "جاری",
+    "(all selected)" : "(سب منتخب شدہ)",
+    "({count} selected)" : "({گنتی} منتخب شدہ)",
+    "Very weak password" : "بہت کمزور پاسورڈ",
+    "Weak password" : "کمزور پاسورڈ",
+    "So-so password" : "نص نص پاسورڈ",
+    "Good password" : "اچھا پاسورڈ",
+    "Strong password" : "مضبوط پاسورڈ",
+    "Shared" : "اشتراک شدہ",
+    "Share" : "اشتراک",
+    "Error" : "خرابی",
+    "Error while sharing" : "اشتراک کے دوران خرابی ",
+    "Error while unsharing" : "اشترک ختم کرنے کے دوران خرابی",
+    "Error while changing permissions" : "اختیارات کو تبدیل کرنے کے دوران  خرابی ",
+    "Shared with you and the group {group} by {owner}" : "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
+    "Shared with you by {owner}" : "اشتراک شدہ آپ سے{مالک}",
+    "Share with user or group …" : "صارف یا مجموعہ کے ساتھ اشتراک کریں ...",
+    "Share link" : "اشتراک لنک",
+    "Password protect" : "محفوظ پاسورڈ",
+    "Choose a password for the public link" : "عوامی لنک کے لئےپاس ورڈ منتخب کریں",
+    "Allow Public Upload" : "پبلک اپ لوڈ کرنے کی اجازت دیں",
+    "Email link to person" : "شحص کے لیے ای میل لنک",
+    "Send" : "بھجیں",
+    "Set expiration date" : "تاریخ معیاد سیٹ کریں",
+    "Expiration date" : "تاریخ معیاد",
+    "group" : "مجموعہ",
+    "Resharing is not allowed" : "دوبارہ اشتراک کی اجازت نہیں",
+    "Shared in {item} with {user}" : "شراکت میں {آئٹم}اور {مستخدم}",
+    "Unshare" : "شئیرنگ ختم کریں",
+    "notify by email" : "ای میل کے ذریعے مطلع کریں",
+    "can edit" : "تبدیل کر سکے ھیں",
+    "access control" : "اسیس کنٹرول",
+    "create" : "نیا بنائیں",
+    "update" : "اپ ڈیٹ",
+    "delete" : "ختم کریں",
+    "Password protected" : "پاسورڈ سے محفوظ کیا گیا ہے",
+    "Error unsetting expiration date" : "خرابی غیر تصحیح تاریخ معیاد",
+    "Error setting expiration date" : "خرابی  تصحیح تاریخ معیاد",
+    "Sending ..." : "ارسال ہو رہا ھے",
+    "Email sent" : "ارسال شدہ ای میل ",
+    "Warning" : "انتباہ",
+    "The object type is not specified." : "اس چیز کی قسم کی وضاحت نہیں",
+    "Enter new" : "جدید درج کریں",
+    "Delete" : "حذف کریں",
+    "Add" : "شامل کریں",
+    "Edit tags" : "ترمیم ٹیگز",
+    "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
+    "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
+    "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
+    "You will receive a link to reset your password via Email." : "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
+    "Username" : "یوزر نیم",
+    "Yes, I really want to reset my password now" : "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں",
+    "Reset" : "ری سیٹ",
+    "New password" : "نیا پاسورڈ",
+    "Personal" : "شخصی",
+    "Users" : "صارفین",
+    "Apps" : "ایپز",
+    "Admin" : "ایڈمن",
+    "Help" : "مدد",
+    "Access forbidden" : "رسائ منقطع ہے",
+    "Cheers!" : "واہ!",
+    "Security Warning" : "حفاظتی انتباہ",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "آپ کا پی ایچ پی ورین نل بائٹ کے حملے کے خطرے سے دوچار  ہے (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : " براہ مہربانی %s کو بحفاظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے",
+    "Create an <strong>admin account</strong>" : "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
+    "Password" : "پاسورڈ",
+    "Storage & database" : "ذخیرہ اور ڈیٹا بیس",
+    "Data folder" : "ڈیٹا فولڈر",
+    "Configure the database" : "ڈیٹا بیس کونفگر کریں",
+    "Database user" : "ڈیٹابیس یوزر",
+    "Database password" : "ڈیٹابیس پاسورڈ",
+    "Database name" : "ڈیٹابیس کا نام",
+    "Database tablespace" : "ڈیٹابیس ٹیبل سپیس",
+    "Database host" : "ڈیٹابیس ہوسٹ",
+    "Finish setup" : "سیٹ اپ ختم کریں",
+    "Finishing …" : "تکمیل ...",
+    "%s is available. Get more information on how to update." : "%s دستیاب ہے. اپ ڈیٹ کرنے کے  بارے میں مزید معلومات حاصل کریں.",
+    "Log out" : "لاگ آؤٹ",
+    "remember" : "یاد رکھیں",
+    "Log in" : "لاگ ان",
+    "Alternative Logins" : "متبادل لاگ ان ",
+    "Thank you for your patience." : "آپ کے صبر کا شکریہ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ur_PK.json b/core/l10n/ur_PK.json
new file mode 100644
index 00000000000..d4477e742ec
--- /dev/null
+++ b/core/l10n/ur_PK.json
@@ -0,0 +1,125 @@
+{ "translations": {
+    "Turned on maintenance mode" : "بحالی موڈ چالو ہے",
+    "Turned off maintenance mode" : "بحالی موڈ بند ہے",
+    "Updated database" : "اپ ڈیٹ ہوئ ڈیٹا بیس",
+    "No image or file provided" : "کوئی تصویر یا فائل فراہم نہیں",
+    "Unknown filetype" : "غیر معرروف قسم کی فائل",
+    "Invalid image" : "غلط تصویر",
+    "No crop data provided" : "کوئی کروپ ڈیٹا ميسر نہیں ",
+    "Sunday" : "اتوار",
+    "Monday" : "سوموار",
+    "Tuesday" : "منگل",
+    "Wednesday" : "بدھ",
+    "Thursday" : "جمعرات",
+    "Friday" : "جمعہ",
+    "Saturday" : "ہفتہ",
+    "January" : "جنوری",
+    "February" : "فرورئ",
+    "March" : "مارچ",
+    "April" : "اپریل",
+    "May" : "مئی",
+    "June" : "جون",
+    "July" : "جولائی",
+    "August" : "اگست",
+    "September" : "ستمبر",
+    "October" : "اکتوبر",
+    "November" : "نومبر",
+    "December" : "دسمبر",
+    "Settings" : "ترتیبات",
+    "Saving..." : "محفوظ ھو رہا ہے ...",
+    "Reset password" : "ری سیٹ پاسورڈ",
+    "No" : "نہیں",
+    "Yes" : "ہاں",
+    "Choose" : "منتخب کریں",
+    "Ok" : "اوکے",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{گنتی} فائل متصادم ","{گنتی} فائل متصادم "],
+    "One file conflict" : "اایک فائل متصادم ہے",
+    "New Files" : "جدید فائلیں",
+    "Already existing files" : "پہلے سے موجودجدید فائلیں",
+    "Which files do you want to keep?" : "آپ کون سی فائلیں رکھنا چاہتے ہیں  ؟",
+    "Cancel" : "منسوخ کریں",
+    "Continue" : "جاری",
+    "(all selected)" : "(سب منتخب شدہ)",
+    "({count} selected)" : "({گنتی} منتخب شدہ)",
+    "Very weak password" : "بہت کمزور پاسورڈ",
+    "Weak password" : "کمزور پاسورڈ",
+    "So-so password" : "نص نص پاسورڈ",
+    "Good password" : "اچھا پاسورڈ",
+    "Strong password" : "مضبوط پاسورڈ",
+    "Shared" : "اشتراک شدہ",
+    "Share" : "اشتراک",
+    "Error" : "خرابی",
+    "Error while sharing" : "اشتراک کے دوران خرابی ",
+    "Error while unsharing" : "اشترک ختم کرنے کے دوران خرابی",
+    "Error while changing permissions" : "اختیارات کو تبدیل کرنے کے دوران  خرابی ",
+    "Shared with you and the group {group} by {owner}" : "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
+    "Shared with you by {owner}" : "اشتراک شدہ آپ سے{مالک}",
+    "Share with user or group …" : "صارف یا مجموعہ کے ساتھ اشتراک کریں ...",
+    "Share link" : "اشتراک لنک",
+    "Password protect" : "محفوظ پاسورڈ",
+    "Choose a password for the public link" : "عوامی لنک کے لئےپاس ورڈ منتخب کریں",
+    "Allow Public Upload" : "پبلک اپ لوڈ کرنے کی اجازت دیں",
+    "Email link to person" : "شحص کے لیے ای میل لنک",
+    "Send" : "بھجیں",
+    "Set expiration date" : "تاریخ معیاد سیٹ کریں",
+    "Expiration date" : "تاریخ معیاد",
+    "group" : "مجموعہ",
+    "Resharing is not allowed" : "دوبارہ اشتراک کی اجازت نہیں",
+    "Shared in {item} with {user}" : "شراکت میں {آئٹم}اور {مستخدم}",
+    "Unshare" : "شئیرنگ ختم کریں",
+    "notify by email" : "ای میل کے ذریعے مطلع کریں",
+    "can edit" : "تبدیل کر سکے ھیں",
+    "access control" : "اسیس کنٹرول",
+    "create" : "نیا بنائیں",
+    "update" : "اپ ڈیٹ",
+    "delete" : "ختم کریں",
+    "Password protected" : "پاسورڈ سے محفوظ کیا گیا ہے",
+    "Error unsetting expiration date" : "خرابی غیر تصحیح تاریخ معیاد",
+    "Error setting expiration date" : "خرابی  تصحیح تاریخ معیاد",
+    "Sending ..." : "ارسال ہو رہا ھے",
+    "Email sent" : "ارسال شدہ ای میل ",
+    "Warning" : "انتباہ",
+    "The object type is not specified." : "اس چیز کی قسم کی وضاحت نہیں",
+    "Enter new" : "جدید درج کریں",
+    "Delete" : "حذف کریں",
+    "Add" : "شامل کریں",
+    "Edit tags" : "ترمیم ٹیگز",
+    "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
+    "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
+    "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
+    "You will receive a link to reset your password via Email." : "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
+    "Username" : "یوزر نیم",
+    "Yes, I really want to reset my password now" : "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں",
+    "Reset" : "ری سیٹ",
+    "New password" : "نیا پاسورڈ",
+    "Personal" : "شخصی",
+    "Users" : "صارفین",
+    "Apps" : "ایپز",
+    "Admin" : "ایڈمن",
+    "Help" : "مدد",
+    "Access forbidden" : "رسائ منقطع ہے",
+    "Cheers!" : "واہ!",
+    "Security Warning" : "حفاظتی انتباہ",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "آپ کا پی ایچ پی ورین نل بائٹ کے حملے کے خطرے سے دوچار  ہے (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : " براہ مہربانی %s کو بحفاظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے",
+    "Create an <strong>admin account</strong>" : "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
+    "Password" : "پاسورڈ",
+    "Storage & database" : "ذخیرہ اور ڈیٹا بیس",
+    "Data folder" : "ڈیٹا فولڈر",
+    "Configure the database" : "ڈیٹا بیس کونفگر کریں",
+    "Database user" : "ڈیٹابیس یوزر",
+    "Database password" : "ڈیٹابیس پاسورڈ",
+    "Database name" : "ڈیٹابیس کا نام",
+    "Database tablespace" : "ڈیٹابیس ٹیبل سپیس",
+    "Database host" : "ڈیٹابیس ہوسٹ",
+    "Finish setup" : "سیٹ اپ ختم کریں",
+    "Finishing …" : "تکمیل ...",
+    "%s is available. Get more information on how to update." : "%s دستیاب ہے. اپ ڈیٹ کرنے کے  بارے میں مزید معلومات حاصل کریں.",
+    "Log out" : "لاگ آؤٹ",
+    "remember" : "یاد رکھیں",
+    "Log in" : "لاگ ان",
+    "Alternative Logins" : "متبادل لاگ ان ",
+    "Thank you for your patience." : "آپ کے صبر کا شکریہ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
deleted file mode 100644
index fa7fcbcf6db..00000000000
--- a/core/l10n/ur_PK.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Turned on maintenance mode" => "بحالی موڈ چالو ہے",
-"Turned off maintenance mode" => "بحالی موڈ بند ہے",
-"Updated database" => "اپ ڈیٹ ہوئ ڈیٹا بیس",
-"No image or file provided" => "کوئی تصویر یا فائل فراہم نہیں",
-"Unknown filetype" => "غیر معرروف قسم کی فائل",
-"Invalid image" => "غلط تصویر",
-"No crop data provided" => "کوئی کروپ ڈیٹا ميسر نہیں ",
-"Sunday" => "اتوار",
-"Monday" => "سوموار",
-"Tuesday" => "منگل",
-"Wednesday" => "بدھ",
-"Thursday" => "جمعرات",
-"Friday" => "جمعہ",
-"Saturday" => "ہفتہ",
-"January" => "جنوری",
-"February" => "فرورئ",
-"March" => "مارچ",
-"April" => "اپریل",
-"May" => "مئی",
-"June" => "جون",
-"July" => "جولائی",
-"August" => "اگست",
-"September" => "ستمبر",
-"October" => "اکتوبر",
-"November" => "نومبر",
-"December" => "دسمبر",
-"Settings" => "ترتیبات",
-"Saving..." => "محفوظ ھو رہا ہے ...",
-"Reset password" => "ری سیٹ پاسورڈ",
-"No" => "نہیں",
-"Yes" => "ہاں",
-"Choose" => "منتخب کریں",
-"Ok" => "اوکے",
-"_{count} file conflict_::_{count} file conflicts_" => array("{گنتی} فائل متصادم ","{گنتی} فائل متصادم "),
-"One file conflict" => "اایک فائل متصادم ہے",
-"New Files" => "جدید فائلیں",
-"Already existing files" => "پہلے سے موجودجدید فائلیں",
-"Which files do you want to keep?" => "آپ کون سی فائلیں رکھنا چاہتے ہیں  ؟",
-"Cancel" => "منسوخ کریں",
-"Continue" => "جاری",
-"(all selected)" => "(سب منتخب شدہ)",
-"({count} selected)" => "({گنتی} منتخب شدہ)",
-"Very weak password" => "بہت کمزور پاسورڈ",
-"Weak password" => "کمزور پاسورڈ",
-"So-so password" => "نص نص پاسورڈ",
-"Good password" => "اچھا پاسورڈ",
-"Strong password" => "مضبوط پاسورڈ",
-"Shared" => "اشتراک شدہ",
-"Share" => "اشتراک",
-"Error" => "خرابی",
-"Error while sharing" => "اشتراک کے دوران خرابی ",
-"Error while unsharing" => "اشترک ختم کرنے کے دوران خرابی",
-"Error while changing permissions" => "اختیارات کو تبدیل کرنے کے دوران  خرابی ",
-"Shared with you and the group {group} by {owner}" => "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
-"Shared with you by {owner}" => "اشتراک شدہ آپ سے{مالک}",
-"Share with user or group …" => "صارف یا مجموعہ کے ساتھ اشتراک کریں ...",
-"Share link" => "اشتراک لنک",
-"Password protect" => "محفوظ پاسورڈ",
-"Choose a password for the public link" => "عوامی لنک کے لئےپاس ورڈ منتخب کریں",
-"Allow Public Upload" => "پبلک اپ لوڈ کرنے کی اجازت دیں",
-"Email link to person" => "شحص کے لیے ای میل لنک",
-"Send" => "بھجیں",
-"Set expiration date" => "تاریخ معیاد سیٹ کریں",
-"Expiration date" => "تاریخ معیاد",
-"group" => "مجموعہ",
-"Resharing is not allowed" => "دوبارہ اشتراک کی اجازت نہیں",
-"Shared in {item} with {user}" => "شراکت میں {آئٹم}اور {مستخدم}",
-"Unshare" => "شئیرنگ ختم کریں",
-"notify by email" => "ای میل کے ذریعے مطلع کریں",
-"can edit" => "تبدیل کر سکے ھیں",
-"access control" => "اسیس کنٹرول",
-"create" => "نیا بنائیں",
-"update" => "اپ ڈیٹ",
-"delete" => "ختم کریں",
-"Password protected" => "پاسورڈ سے محفوظ کیا گیا ہے",
-"Error unsetting expiration date" => "خرابی غیر تصحیح تاریخ معیاد",
-"Error setting expiration date" => "خرابی  تصحیح تاریخ معیاد",
-"Sending ..." => "ارسال ہو رہا ھے",
-"Email sent" => "ارسال شدہ ای میل ",
-"Warning" => "انتباہ",
-"The object type is not specified." => "اس چیز کی قسم کی وضاحت نہیں",
-"Enter new" => "جدید درج کریں",
-"Delete" => "حذف کریں",
-"Add" => "شامل کریں",
-"Edit tags" => "ترمیم ٹیگز",
-"Please reload the page." => "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
-"The update was successful. Redirecting you to ownCloud now." => "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
-"Use the following link to reset your password: {link}" => "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
-"You will receive a link to reset your password via Email." => "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
-"Username" => "یوزر نیم",
-"Yes, I really want to reset my password now" => "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں",
-"Reset" => "ری سیٹ",
-"New password" => "نیا پاسورڈ",
-"Personal" => "شخصی",
-"Users" => "صارفین",
-"Apps" => "ایپز",
-"Admin" => "ایڈمن",
-"Help" => "مدد",
-"Access forbidden" => "رسائ منقطع ہے",
-"Cheers!" => "واہ!",
-"Security Warning" => "حفاظتی انتباہ",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "آپ کا پی ایچ پی ورین نل بائٹ کے حملے کے خطرے سے دوچار  ہے (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => " براہ مہربانی %s کو بحفاظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے",
-"Create an <strong>admin account</strong>" => "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
-"Password" => "پاسورڈ",
-"Storage & database" => "ذخیرہ اور ڈیٹا بیس",
-"Data folder" => "ڈیٹا فولڈر",
-"Configure the database" => "ڈیٹا بیس کونفگر کریں",
-"Database user" => "ڈیٹابیس یوزر",
-"Database password" => "ڈیٹابیس پاسورڈ",
-"Database name" => "ڈیٹابیس کا نام",
-"Database tablespace" => "ڈیٹابیس ٹیبل سپیس",
-"Database host" => "ڈیٹابیس ہوسٹ",
-"Finish setup" => "سیٹ اپ ختم کریں",
-"Finishing …" => "تکمیل ...",
-"%s is available. Get more information on how to update." => "%s دستیاب ہے. اپ ڈیٹ کرنے کے  بارے میں مزید معلومات حاصل کریں.",
-"Log out" => "لاگ آؤٹ",
-"remember" => "یاد رکھیں",
-"Log in" => "لاگ ان",
-"Alternative Logins" => "متبادل لاگ ان ",
-"Thank you for your patience." => "آپ کے صبر کا شکریہ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/uz.js b/core/l10n/uz.js
new file mode 100644
index 00000000000..87077ecad97
--- /dev/null
+++ b/core/l10n/uz.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/uz.json b/core/l10n/uz.json
new file mode 100644
index 00000000000..c499f696550
--- /dev/null
+++ b/core/l10n/uz.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/uz.php b/core/l10n/uz.php
deleted file mode 100644
index 1191769faa7..00000000000
--- a/core/l10n/uz.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/vi.js b/core/l10n/vi.js
new file mode 100644
index 00000000000..76ad5232fd6
--- /dev/null
+++ b/core/l10n/vi.js
@@ -0,0 +1,144 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Không thể gửi thư cho người dùng: %s",
+    "Turned on maintenance mode" : "Bật chế độ bảo trì",
+    "Turned off maintenance mode" : "Tắt chế độ bảo trì",
+    "Updated database" : "Cơ sở dữ liệu đã được cập nhật",
+    "No image or file provided" : "Không có hình ảnh hoặc tập tin được cung cấp",
+    "Unknown filetype" : "Không biết kiểu tập tin",
+    "Invalid image" : "Hình ảnh không hợp lệ",
+    "No temporary profile picture available, try again" : "Ảnh cá nhân tạm thời không có giá trị, hãy thử lại",
+    "No crop data provided" : "Không có dữ liệu nguồn được cung cấp",
+    "Sunday" : "Chủ nhật",
+    "Monday" : "Thứ 2",
+    "Tuesday" : "Thứ 3",
+    "Wednesday" : "Thứ 4",
+    "Thursday" : "Thứ 5",
+    "Friday" : "Thứ ",
+    "Saturday" : "Thứ 7",
+    "January" : "Tháng 1",
+    "February" : "Tháng 2",
+    "March" : "Tháng 3",
+    "April" : "Tháng 4",
+    "May" : "Tháng 5",
+    "June" : "Tháng 6",
+    "July" : "Tháng 7",
+    "August" : "Tháng 8",
+    "September" : "Tháng 9",
+    "October" : "Tháng 10",
+    "November" : "Tháng 11",
+    "December" : "Tháng 12",
+    "Settings" : "Cài đặt",
+    "Folder" : "Thư mục",
+    "Saving..." : "Đang lưu...",
+    "Reset password" : "Khôi phục mật khẩu",
+    "No" : "Không",
+    "Yes" : "Có",
+    "Choose" : "Chọn",
+    "Error loading file picker template: {error}" : "Lỗi khi tải mẫu tập tin picker: {error}",
+    "Ok" : "Đồng ý",
+    "Error loading message template: {error}" : "Lỗi khi tải mẫu thông điệp: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} tập tin xung đột"],
+    "One file conflict" : "Một tập tin xung đột",
+    "New Files" : "File mới",
+    "Which files do you want to keep?" : "Bạn muốn tiếp tục với những tập tin nào?",
+    "If you select both versions, the copied file will have a number added to its name." : "Nếu bạn chọn cả hai phiên bản, tập tin được sao chép sẽ được đánh thêm số vào tên của nó.",
+    "Cancel" : "Hủy",
+    "Continue" : "Tiếp tục",
+    "(all selected)" : "(Tất cả các lựa chọn)",
+    "({count} selected)" : "({count} được chọn)",
+    "Error loading file exists template" : "Lỗi khi tải tập tin mẫu đã tồn tại",
+    "Shared" : "Được chia sẻ",
+    "Share" : "Chia sẻ",
+    "Error" : "Lỗi",
+    "Error while sharing" : "Lỗi trong quá trình chia sẻ",
+    "Error while unsharing" : "Lỗi trong quá trình gỡ chia sẻ",
+    "Error while changing permissions" : "Lỗi trong quá trình phân quyền",
+    "Shared with you and the group {group} by {owner}" : "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
+    "Shared with you by {owner}" : "Đã được chia sẽ bởi {owner}",
+    "Share with user or group …" : "Chia sẻ với người dùng hoặc nhóm",
+    "Share link" : "Chia sẻ liên kết",
+    "Password protect" : "Mật khẩu bảo vệ",
+    "Allow Public Upload" : "Cho phép công khai tập tin tải lên",
+    "Email link to person" : "Liên kết email tới cá nhân",
+    "Send" : "Gởi",
+    "Set expiration date" : "Đặt ngày kết thúc",
+    "Expiration date" : "Ngày kết thúc",
+    "group" : "nhóm",
+    "Resharing is not allowed" : "Chia sẻ lại không được cho phép",
+    "Shared in {item} with {user}" : "Đã được chia sẽ trong {item} với {user}",
+    "Unshare" : "Bỏ chia sẻ",
+    "notify by email" : "Thông báo qua email",
+    "can share" : "có thể chia sẽ",
+    "can edit" : "có thể chỉnh sửa",
+    "access control" : "quản lý truy cập",
+    "create" : "tạo",
+    "update" : "cập nhật",
+    "delete" : "xóa",
+    "Password protected" : "Mật khẩu bảo vệ",
+    "Error unsetting expiration date" : "Lỗi không thiết lập ngày kết thúc",
+    "Error setting expiration date" : "Lỗi cấu hình ngày kết thúc",
+    "Sending ..." : "Đang gởi ...",
+    "Email sent" : "Email đã được gửi",
+    "Warning" : "Cảnh báo",
+    "The object type is not specified." : "Loại đối tượng không được chỉ định.",
+    "Enter new" : "Nhập mới",
+    "Delete" : "Xóa",
+    "Add" : "Thêm",
+    "Edit tags" : "Sửa thẻ",
+    "Error loading dialog template: {error}" : "Lỗi khi tải mẫu hội thoại: {error}",
+    "No tags selected for deletion." : "Không có thẻ nào được chọn để xóa",
+    "Please reload the page." : "Vui lòng tải lại trang.",
+    "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
+    "%s password reset" : "%s thiết lập lại mật khẩu",
+    "Use the following link to reset your password: {link}" : "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
+    "You will receive a link to reset your password via Email." : "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
+    "Username" : "Tên đăng nhập",
+    "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?" : "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?",
+    "Yes, I really want to reset my password now" : "Vâng, tôi muốn thiết lập lại mật khẩu ngay.",
+    "Reset" : "Khởi động lại",
+    "New password" : "Mật khẩu mới",
+    "Personal" : "Cá nhân",
+    "Users" : "Người dùng",
+    "Apps" : "Ứng dụng",
+    "Admin" : "Quản trị",
+    "Help" : "Giúp đỡ",
+    "Error loading tags" : "Lỗi khi tải thẻ",
+    "Tag already exists" : "Thẻ đã tồn tại",
+    "Error deleting tag(s)" : "Lỗi khi xóa (nhiều)thẻ",
+    "Error tagging" : "Lỗi gắn thẻ",
+    "Error untagging" : "Lỗi không gắn thẻ",
+    "Access forbidden" : "Truy cập bị cấm",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Xin chào,\n\nbáo cho bạn biết rằng %s đã chia sẽ %s với bạn.\nXem nó: %s\n\n",
+    "The share will expire on %s." : "Chia sẻ này sẽ hết hiệu lực vào %s.",
+    "Cheers!" : "Chúc mừng!",
+    "Security Warning" : "Cảnh bảo bảo mật",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Vui lòng cập nhật bản cài đặt PHP để sử dụng %s một cách an toàn.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
+    "Create an <strong>admin account</strong>" : "Tạo một <strong>tài khoản quản trị</strong>",
+    "Password" : "Mật khẩu",
+    "Data folder" : "Thư mục dữ liệu",
+    "Configure the database" : "Cấu hình cơ sở dữ liệu",
+    "Database user" : "Người dùng cơ sở dữ liệu",
+    "Database password" : "Mật khẩu cơ sở dữ liệu",
+    "Database name" : "Tên cơ sở dữ liệu",
+    "Database tablespace" : "Cơ sở dữ liệu tablespace",
+    "Database host" : "Database host",
+    "Finish setup" : "Cài đặt hoàn tất",
+    "Finishing …" : "Đang hoàn thành ...",
+    "%s is available. Get more information on how to update." : "%s còn trống. Xem thêm thông tin cách cập nhật.",
+    "Log out" : "Đăng xuất",
+    "Server side authentication failed!" : "Xác thực phía máy chủ không thành công!",
+    "Please contact your administrator." : "Vui lòng liên hệ với quản trị viên.",
+    "remember" : "ghi nhớ",
+    "Log in" : "Đăng nhập",
+    "Alternative Logins" : "Đăng nhập khác",
+    "This ownCloud instance is currently in single user mode." : "OwnCloud trong trường hợp này đang ở chế độ người dùng duy nhất.",
+    "This means only administrators can use the instance." : "Điều này có nghĩa chỉ có người quản trị có thể sử dụng trong trường hợp này.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Liên hệ với người quản trị nếu lỗi này vẫn tồn tại hoặc xuất hiện bất ngờ.",
+    "Thank you for your patience." : "Cảm ơn sự kiên nhẫn của bạn."
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/vi.json b/core/l10n/vi.json
new file mode 100644
index 00000000000..befec743e03
--- /dev/null
+++ b/core/l10n/vi.json
@@ -0,0 +1,142 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Không thể gửi thư cho người dùng: %s",
+    "Turned on maintenance mode" : "Bật chế độ bảo trì",
+    "Turned off maintenance mode" : "Tắt chế độ bảo trì",
+    "Updated database" : "Cơ sở dữ liệu đã được cập nhật",
+    "No image or file provided" : "Không có hình ảnh hoặc tập tin được cung cấp",
+    "Unknown filetype" : "Không biết kiểu tập tin",
+    "Invalid image" : "Hình ảnh không hợp lệ",
+    "No temporary profile picture available, try again" : "Ảnh cá nhân tạm thời không có giá trị, hãy thử lại",
+    "No crop data provided" : "Không có dữ liệu nguồn được cung cấp",
+    "Sunday" : "Chủ nhật",
+    "Monday" : "Thứ 2",
+    "Tuesday" : "Thứ 3",
+    "Wednesday" : "Thứ 4",
+    "Thursday" : "Thứ 5",
+    "Friday" : "Thứ ",
+    "Saturday" : "Thứ 7",
+    "January" : "Tháng 1",
+    "February" : "Tháng 2",
+    "March" : "Tháng 3",
+    "April" : "Tháng 4",
+    "May" : "Tháng 5",
+    "June" : "Tháng 6",
+    "July" : "Tháng 7",
+    "August" : "Tháng 8",
+    "September" : "Tháng 9",
+    "October" : "Tháng 10",
+    "November" : "Tháng 11",
+    "December" : "Tháng 12",
+    "Settings" : "Cài đặt",
+    "Folder" : "Thư mục",
+    "Saving..." : "Đang lưu...",
+    "Reset password" : "Khôi phục mật khẩu",
+    "No" : "Không",
+    "Yes" : "Có",
+    "Choose" : "Chọn",
+    "Error loading file picker template: {error}" : "Lỗi khi tải mẫu tập tin picker: {error}",
+    "Ok" : "Đồng ý",
+    "Error loading message template: {error}" : "Lỗi khi tải mẫu thông điệp: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} tập tin xung đột"],
+    "One file conflict" : "Một tập tin xung đột",
+    "New Files" : "File mới",
+    "Which files do you want to keep?" : "Bạn muốn tiếp tục với những tập tin nào?",
+    "If you select both versions, the copied file will have a number added to its name." : "Nếu bạn chọn cả hai phiên bản, tập tin được sao chép sẽ được đánh thêm số vào tên của nó.",
+    "Cancel" : "Hủy",
+    "Continue" : "Tiếp tục",
+    "(all selected)" : "(Tất cả các lựa chọn)",
+    "({count} selected)" : "({count} được chọn)",
+    "Error loading file exists template" : "Lỗi khi tải tập tin mẫu đã tồn tại",
+    "Shared" : "Được chia sẻ",
+    "Share" : "Chia sẻ",
+    "Error" : "Lỗi",
+    "Error while sharing" : "Lỗi trong quá trình chia sẻ",
+    "Error while unsharing" : "Lỗi trong quá trình gỡ chia sẻ",
+    "Error while changing permissions" : "Lỗi trong quá trình phân quyền",
+    "Shared with you and the group {group} by {owner}" : "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
+    "Shared with you by {owner}" : "Đã được chia sẽ bởi {owner}",
+    "Share with user or group …" : "Chia sẻ với người dùng hoặc nhóm",
+    "Share link" : "Chia sẻ liên kết",
+    "Password protect" : "Mật khẩu bảo vệ",
+    "Allow Public Upload" : "Cho phép công khai tập tin tải lên",
+    "Email link to person" : "Liên kết email tới cá nhân",
+    "Send" : "Gởi",
+    "Set expiration date" : "Đặt ngày kết thúc",
+    "Expiration date" : "Ngày kết thúc",
+    "group" : "nhóm",
+    "Resharing is not allowed" : "Chia sẻ lại không được cho phép",
+    "Shared in {item} with {user}" : "Đã được chia sẽ trong {item} với {user}",
+    "Unshare" : "Bỏ chia sẻ",
+    "notify by email" : "Thông báo qua email",
+    "can share" : "có thể chia sẽ",
+    "can edit" : "có thể chỉnh sửa",
+    "access control" : "quản lý truy cập",
+    "create" : "tạo",
+    "update" : "cập nhật",
+    "delete" : "xóa",
+    "Password protected" : "Mật khẩu bảo vệ",
+    "Error unsetting expiration date" : "Lỗi không thiết lập ngày kết thúc",
+    "Error setting expiration date" : "Lỗi cấu hình ngày kết thúc",
+    "Sending ..." : "Đang gởi ...",
+    "Email sent" : "Email đã được gửi",
+    "Warning" : "Cảnh báo",
+    "The object type is not specified." : "Loại đối tượng không được chỉ định.",
+    "Enter new" : "Nhập mới",
+    "Delete" : "Xóa",
+    "Add" : "Thêm",
+    "Edit tags" : "Sửa thẻ",
+    "Error loading dialog template: {error}" : "Lỗi khi tải mẫu hội thoại: {error}",
+    "No tags selected for deletion." : "Không có thẻ nào được chọn để xóa",
+    "Please reload the page." : "Vui lòng tải lại trang.",
+    "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
+    "%s password reset" : "%s thiết lập lại mật khẩu",
+    "Use the following link to reset your password: {link}" : "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
+    "You will receive a link to reset your password via Email." : "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
+    "Username" : "Tên đăng nhập",
+    "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?" : "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?",
+    "Yes, I really want to reset my password now" : "Vâng, tôi muốn thiết lập lại mật khẩu ngay.",
+    "Reset" : "Khởi động lại",
+    "New password" : "Mật khẩu mới",
+    "Personal" : "Cá nhân",
+    "Users" : "Người dùng",
+    "Apps" : "Ứng dụng",
+    "Admin" : "Quản trị",
+    "Help" : "Giúp đỡ",
+    "Error loading tags" : "Lỗi khi tải thẻ",
+    "Tag already exists" : "Thẻ đã tồn tại",
+    "Error deleting tag(s)" : "Lỗi khi xóa (nhiều)thẻ",
+    "Error tagging" : "Lỗi gắn thẻ",
+    "Error untagging" : "Lỗi không gắn thẻ",
+    "Access forbidden" : "Truy cập bị cấm",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Xin chào,\n\nbáo cho bạn biết rằng %s đã chia sẽ %s với bạn.\nXem nó: %s\n\n",
+    "The share will expire on %s." : "Chia sẻ này sẽ hết hiệu lực vào %s.",
+    "Cheers!" : "Chúc mừng!",
+    "Security Warning" : "Cảnh bảo bảo mật",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Vui lòng cập nhật bản cài đặt PHP để sử dụng %s một cách an toàn.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
+    "Create an <strong>admin account</strong>" : "Tạo một <strong>tài khoản quản trị</strong>",
+    "Password" : "Mật khẩu",
+    "Data folder" : "Thư mục dữ liệu",
+    "Configure the database" : "Cấu hình cơ sở dữ liệu",
+    "Database user" : "Người dùng cơ sở dữ liệu",
+    "Database password" : "Mật khẩu cơ sở dữ liệu",
+    "Database name" : "Tên cơ sở dữ liệu",
+    "Database tablespace" : "Cơ sở dữ liệu tablespace",
+    "Database host" : "Database host",
+    "Finish setup" : "Cài đặt hoàn tất",
+    "Finishing …" : "Đang hoàn thành ...",
+    "%s is available. Get more information on how to update." : "%s còn trống. Xem thêm thông tin cách cập nhật.",
+    "Log out" : "Đăng xuất",
+    "Server side authentication failed!" : "Xác thực phía máy chủ không thành công!",
+    "Please contact your administrator." : "Vui lòng liên hệ với quản trị viên.",
+    "remember" : "ghi nhớ",
+    "Log in" : "Đăng nhập",
+    "Alternative Logins" : "Đăng nhập khác",
+    "This ownCloud instance is currently in single user mode." : "OwnCloud trong trường hợp này đang ở chế độ người dùng duy nhất.",
+    "This means only administrators can use the instance." : "Điều này có nghĩa chỉ có người quản trị có thể sử dụng trong trường hợp này.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Liên hệ với người quản trị nếu lỗi này vẫn tồn tại hoặc xuất hiện bất ngờ.",
+    "Thank you for your patience." : "Cảm ơn sự kiên nhẫn của bạn."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
deleted file mode 100644
index 255cff617d5..00000000000
--- a/core/l10n/vi.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Không thể gửi thư cho người dùng: %s",
-"Turned on maintenance mode" => "Bật chế độ bảo trì",
-"Turned off maintenance mode" => "Tắt chế độ bảo trì",
-"Updated database" => "Cơ sở dữ liệu đã được cập nhật",
-"No image or file provided" => "Không có hình ảnh hoặc tập tin được cung cấp",
-"Unknown filetype" => "Không biết kiểu tập tin",
-"Invalid image" => "Hình ảnh không hợp lệ",
-"No temporary profile picture available, try again" => "Ảnh cá nhân tạm thời không có giá trị, hãy thử lại",
-"No crop data provided" => "Không có dữ liệu nguồn được cung cấp",
-"Sunday" => "Chủ nhật",
-"Monday" => "Thứ 2",
-"Tuesday" => "Thứ 3",
-"Wednesday" => "Thứ 4",
-"Thursday" => "Thứ 5",
-"Friday" => "Thứ ",
-"Saturday" => "Thứ 7",
-"January" => "Tháng 1",
-"February" => "Tháng 2",
-"March" => "Tháng 3",
-"April" => "Tháng 4",
-"May" => "Tháng 5",
-"June" => "Tháng 6",
-"July" => "Tháng 7",
-"August" => "Tháng 8",
-"September" => "Tháng 9",
-"October" => "Tháng 10",
-"November" => "Tháng 11",
-"December" => "Tháng 12",
-"Settings" => "Cài đặt",
-"Folder" => "Thư mục",
-"Saving..." => "Đang lưu...",
-"Reset password" => "Khôi phục mật khẩu",
-"No" => "Không",
-"Yes" => "Có",
-"Choose" => "Chọn",
-"Error loading file picker template: {error}" => "Lỗi khi tải mẫu tập tin picker: {error}",
-"Ok" => "Đồng ý",
-"Error loading message template: {error}" => "Lỗi khi tải mẫu thông điệp: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} tập tin xung đột"),
-"One file conflict" => "Một tập tin xung đột",
-"New Files" => "File mới",
-"Which files do you want to keep?" => "Bạn muốn tiếp tục với những tập tin nào?",
-"If you select both versions, the copied file will have a number added to its name." => "Nếu bạn chọn cả hai phiên bản, tập tin được sao chép sẽ được đánh thêm số vào tên của nó.",
-"Cancel" => "Hủy",
-"Continue" => "Tiếp tục",
-"(all selected)" => "(Tất cả các lựa chọn)",
-"({count} selected)" => "({count} được chọn)",
-"Error loading file exists template" => "Lỗi khi tải tập tin mẫu đã tồn tại",
-"Shared" => "Được chia sẻ",
-"Share" => "Chia sẻ",
-"Error" => "Lỗi",
-"Error while sharing" => "Lỗi trong quá trình chia sẻ",
-"Error while unsharing" => "Lỗi trong quá trình gỡ chia sẻ",
-"Error while changing permissions" => "Lỗi trong quá trình phân quyền",
-"Shared with you and the group {group} by {owner}" => "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
-"Shared with you by {owner}" => "Đã được chia sẽ bởi {owner}",
-"Share with user or group …" => "Chia sẻ với người dùng hoặc nhóm",
-"Share link" => "Chia sẻ liên kết",
-"Password protect" => "Mật khẩu bảo vệ",
-"Allow Public Upload" => "Cho phép công khai tập tin tải lên",
-"Email link to person" => "Liên kết email tới cá nhân",
-"Send" => "Gởi",
-"Set expiration date" => "Đặt ngày kết thúc",
-"Expiration date" => "Ngày kết thúc",
-"group" => "nhóm",
-"Resharing is not allowed" => "Chia sẻ lại không được cho phép",
-"Shared in {item} with {user}" => "Đã được chia sẽ trong {item} với {user}",
-"Unshare" => "Bỏ chia sẻ",
-"notify by email" => "Thông báo qua email",
-"can share" => "có thể chia sẽ",
-"can edit" => "có thể chỉnh sửa",
-"access control" => "quản lý truy cập",
-"create" => "tạo",
-"update" => "cập nhật",
-"delete" => "xóa",
-"Password protected" => "Mật khẩu bảo vệ",
-"Error unsetting expiration date" => "Lỗi không thiết lập ngày kết thúc",
-"Error setting expiration date" => "Lỗi cấu hình ngày kết thúc",
-"Sending ..." => "Đang gởi ...",
-"Email sent" => "Email đã được gửi",
-"Warning" => "Cảnh báo",
-"The object type is not specified." => "Loại đối tượng không được chỉ định.",
-"Enter new" => "Nhập mới",
-"Delete" => "Xóa",
-"Add" => "Thêm",
-"Edit tags" => "Sửa thẻ",
-"Error loading dialog template: {error}" => "Lỗi khi tải mẫu hội thoại: {error}",
-"No tags selected for deletion." => "Không có thẻ nào được chọn để xóa",
-"Please reload the page." => "Vui lòng tải lại trang.",
-"The update was successful. Redirecting you to ownCloud now." => "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
-"%s password reset" => "%s thiết lập lại mật khẩu",
-"Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
-"You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
-"Username" => "Tên đăng nhập",
-"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?" => "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?",
-"Yes, I really want to reset my password now" => "Vâng, tôi muốn thiết lập lại mật khẩu ngay.",
-"Reset" => "Khởi động lại",
-"New password" => "Mật khẩu mới",
-"Personal" => "Cá nhân",
-"Users" => "Người dùng",
-"Apps" => "Ứng dụng",
-"Admin" => "Quản trị",
-"Help" => "Giúp đỡ",
-"Error loading tags" => "Lỗi khi tải thẻ",
-"Tag already exists" => "Thẻ đã tồn tại",
-"Error deleting tag(s)" => "Lỗi khi xóa (nhiều)thẻ",
-"Error tagging" => "Lỗi gắn thẻ",
-"Error untagging" => "Lỗi không gắn thẻ",
-"Access forbidden" => "Truy cập bị cấm",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Xin chào,\n\nbáo cho bạn biết rằng %s đã chia sẽ %s với bạn.\nXem nó: %s\n\n",
-"The share will expire on %s." => "Chia sẻ này sẽ hết hiệu lực vào %s.",
-"Cheers!" => "Chúc mừng!",
-"Security Warning" => "Cảnh bảo bảo mật",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Vui lòng cập nhật bản cài đặt PHP để sử dụng %s một cách an toàn.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
-"Create an <strong>admin account</strong>" => "Tạo một <strong>tài khoản quản trị</strong>",
-"Password" => "Mật khẩu",
-"Data folder" => "Thư mục dữ liệu",
-"Configure the database" => "Cấu hình cơ sở dữ liệu",
-"Database user" => "Người dùng cơ sở dữ liệu",
-"Database password" => "Mật khẩu cơ sở dữ liệu",
-"Database name" => "Tên cơ sở dữ liệu",
-"Database tablespace" => "Cơ sở dữ liệu tablespace",
-"Database host" => "Database host",
-"Finish setup" => "Cài đặt hoàn tất",
-"Finishing …" => "Đang hoàn thành ...",
-"%s is available. Get more information on how to update." => "%s còn trống. Xem thêm thông tin cách cập nhật.",
-"Log out" => "Đăng xuất",
-"Server side authentication failed!" => "Xác thực phía máy chủ không thành công!",
-"Please contact your administrator." => "Vui lòng liên hệ với quản trị viên.",
-"remember" => "ghi nhớ",
-"Log in" => "Đăng nhập",
-"Alternative Logins" => "Đăng nhập khác",
-"This ownCloud instance is currently in single user mode." => "OwnCloud trong trường hợp này đang ở chế độ người dùng duy nhất.",
-"This means only administrators can use the instance." => "Điều này có nghĩa chỉ có người quản trị có thể sử dụng trong trường hợp này.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Liên hệ với người quản trị nếu lỗi này vẫn tồn tại hoặc xuất hiện bất ngờ.",
-"Thank you for your patience." => "Cảm ơn sự kiên nhẫn của bạn."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
new file mode 100644
index 00000000000..6037208c8a8
--- /dev/null
+++ b/core/l10n/zh_CN.js
@@ -0,0 +1,211 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "发送失败，用户如下: %s ",
+    "Turned on maintenance mode" : "启用维护模式",
+    "Turned off maintenance mode" : "关闭维护模式",
+    "Updated database" : "数据库已更新",
+    "Checked database schema update" : "已经检查数据库架构更新",
+    "Checked database schema update for apps" : "已经检查数据库架构更新",
+    "Updated \"%s\" to %s" : "更新 \"%s\" 为 %s",
+    "Disabled incompatible apps: %s" : "禁用不兼容应用：%s",
+    "No image or file provided" : "没有提供图片或文件",
+    "Unknown filetype" : "未知的文件类型",
+    "Invalid image" : "无效的图像",
+    "No temporary profile picture available, try again" : "没有临时概览页图片可用，请重试",
+    "No crop data provided" : "没有提供相应数据",
+    "Sunday" : "星期日",
+    "Monday" : "星期一",
+    "Tuesday" : "星期二",
+    "Wednesday" : "星期三",
+    "Thursday" : "星期四",
+    "Friday" : "星期五",
+    "Saturday" : "星期六",
+    "January" : "一月",
+    "February" : "二月",
+    "March" : "三月",
+    "April" : "四月",
+    "May" : "五月",
+    "June" : "六月",
+    "July" : "七月",
+    "August" : "八月",
+    "September" : "九月",
+    "October" : "十月",
+    "November" : "十一月",
+    "December" : "十二月",
+    "Settings" : "设置",
+    "File" : "文件",
+    "Folder" : "文件夹",
+    "Image" : "图像",
+    "Audio" : "声音",
+    "Saving..." : "保存中",
+    "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件，请联系管理员。",
+    "The link to reset your password has been sent to your email. 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>如果未能收到邮件请联系管理员。",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？",
+    "I know what I'm doing" : "我知道我在做什么",
+    "Reset password" : "重置密码",
+    "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。",
+    "No" : "否",
+    "Yes" : "是",
+    "Choose" : "选择(&C)...",
+    "Error loading file picker template: {error}" : "加载文件分拣模板出错: {error}",
+    "Ok" : "好",
+    "Error loading message template: {error}" : "加载消息模板出错: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} 个文件冲突"],
+    "One file conflict" : "1个文件冲突",
+    "New Files" : "新文件",
+    "Already existing files" : "已经存在的文件",
+    "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}个)",
+    "Error loading file exists template" : "加载文件存在性模板失败",
+    "Very weak password" : "非常弱的密码",
+    "Weak password" : "弱密码",
+    "So-so password" : "一般强度的密码",
+    "Good password" : "较强的密码",
+    "Strong password" : "强密码",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
+    "Error occurred while checking server setup" : "当检查服务器启动时出错",
+    "Shared" : "已共享",
+    "Shared with {recipients}" : "由{recipients}分享",
+    "Share" : "分享",
+    "Error" : "错误",
+    "Error while sharing" : "共享时出错",
+    "Error while unsharing" : "取消共享时出错",
+    "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" : "分享链接",
+    "The public link will expire no later than {days} days after it is created" : "这个共享链接将在创建后 {days} 天失效",
+    "Password protect" : "密码保护",
+    "Choose a password for the public link" : "为共享链接设置密码",
+    "Allow Public Upload" : "允许公开上传",
+    "Email link to person" : "发送链接到个人",
+    "Send" : "发送",
+    "Set expiration date" : "设置过期日期",
+    "Expiration date" : "过期日期",
+    "Adding user..." : "添加用户中...",
+    "group" : "组",
+    "Resharing is not allowed" : "不允许二次共享",
+    "Shared in {item} with {user}" : "在 {item} 与 {user} 共享。",
+    "Unshare" : "取消共享",
+    "notify by email" : "以邮件通知",
+    "can share" : "可共享",
+    "can edit" : "可以修改",
+    "access control" : "访问控制",
+    "create" : "创建",
+    "update" : "更新",
+    "delete" : "删除",
+    "Password protected" : "密码已受保护",
+    "Error unsetting expiration date" : "取消设置过期日期时出错",
+    "Error setting expiration date" : "设置过期日期时出错",
+    "Sending ..." : "正在发送...",
+    "Email sent" : "邮件已发送",
+    "Warning" : "警告",
+    "The object type is not specified." : "未指定对象类型。",
+    "Enter new" : "输入新...",
+    "Delete" : "删除",
+    "Add" : "增加",
+    "Edit tags" : "编辑标签",
+    "Error loading dialog template: {error}" : "加载对话框模板出错: {error}",
+    "No tags selected for deletion." : "请选择要删除的标签。",
+    "Updating {productName} to version {version}, this may take a while." : "更新 {productName} 到版本 {version}，这可能需要一些时间。",
+    "Please reload the page." : "请重新加载页面。",
+    "The update was unsuccessful." : "更新未成功。",
+    "The update was successful. Redirecting you to ownCloud now." : "更新成功。正在重定向至 ownCloud。",
+    "Couldn't reset password because the token is invalid" : "令牌无效，无法重置密码",
+    "Couldn't send reset email. Please make sure your username is correct." : "无法发送重置邮件，请检查您的用户名是否正确。",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。",
+    "%s password reset" : "重置 %s 的密码",
+    "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码：{link}",
+    "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" : "使得，我真的要现在重设密码",
+    "Reset" : "重置",
+    "New password" : "新密码",
+    "New Password" : "新密码",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！",
+    "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。",
+    "Personal" : "个人",
+    "Users" : "用户",
+    "Apps" : "应用",
+    "Admin" : "管理",
+    "Help" : "帮助",
+    "Error loading tags" : "加载标签出错",
+    "Tag already exists" : "标签已存在",
+    "Error deleting tag(s)" : "删除标签(s)时出错",
+    "Error tagging" : "增加标签时出错",
+    "Error untagging" : "移除标签时出错",
+    "Error favoriting" : "收藏时出错",
+    "Error unfavoriting" : "删除收藏时出错",
+    "Access forbidden" : "访问禁止",
+    "File not found" : "文件未找到",
+    "The specified document has not been found on the server." : "在服务器上没找到指定的文件。",
+    "You can click here to return to %s." : "你可以点击这里返回 %s。",
+    "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",
+    "The share will expire on %s." : "此分享将在 %s 过期。",
+    "Cheers!" : "干杯！",
+    "The server encountered an internal error and was unable to complete your request." : "服务器发送一个内部错误并且无法完成你的请求。",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "请联系服务器管理员，如果多次出现这个错误，请把下面的技术细节包含在您的报告里。",
+    "More details can be found in the server log." : "更多细节能在服务器日志中找到。",
+    "Technical details" : "技术细节",
+    "Remote Address: %s" : "远程地址： %s",
+    "Request ID: %s" : "请求 ID: %s",
+    "Code: %s" : "代码: %s",
+    "Message: %s" : "消息: %s",
+    "File: %s" : "文件: %s",
+    "Line: %s" : "行: %s",
+    "Trace" : "追踪",
+    "Security Warning" : "安全警告",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "为保证安全使用 %s 请更新您的PHP。",
+    "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>。",
+    "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>",
+    "Password" : "密码",
+    "Storage & database" : "存储 & 数据库",
+    "Data folder" : "数据目录",
+    "Configure the database" : "配置数据库",
+    "Only %s is available." : "仅 %s 可用。",
+    "Database user" : "数据库用户",
+    "Database password" : "数据库密码",
+    "Database name" : "数据库名",
+    "Database tablespace" : "数据库表空间",
+    "Database host" : "数据库主机",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "将会使用 SQLite 为数据库。我们不建议大型站点使用 SQLite。",
+    "Finish setup" : "安装完成",
+    "Finishing …" : "正在结束 ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此页面。",
+    "%s is available. Get more information on how to update." : "%s 可用。获取更多关于如何升级的信息。",
+    "Log out" : "注销",
+    "Server side authentication failed!" : "服务端验证失败！",
+    "Please contact your administrator." : "请联系你的管理员。",
+    "Forgot your password? Reset it!" : "忘记密码？立即重置！",
+    "remember" : "记住",
+    "Log in" : "登录",
+    "Alternative Logins" : "其他登录方式",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨、你好,<br><br>只想让你知道 %s 分享了 <strong>%s</strong> 给你。<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." : "感谢让你久等了。",
+    "You are accessing the server from an untrusted domain." : "您正在访问来自不信任域名的服务器。",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "请联系你的系统管理员。如果你是系统管理员，配置config/config.php文件中参数\"trusted_domain\" 设置。可以在config/config.sample.php文件中找到例子。",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "基于你的配置，作为系统管理员，你可能还能点击下面的按钮来信任这个域。",
+    "Add \"%s\" as trusted domain" : "添加 \"%s\"为信任域",
+    "%s will be updated to version %s." : "%s 将会更新到版本 %s。",
+    "The following apps will be disabled:" : "以下应用将会被禁用：",
+    "The theme %s has been disabled." : "%s 主题已被禁用。",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。",
+    "Start update" : "开始更新",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "为避免更大的安装演示，你能在你的安装目录下面运行这些命令：",
+    "This %s instance is currently being updated, which may take a while." : "当前ownCloud实例 %s 正在更新，可能需要一段时间。",
+    "This page will refresh itself when the %s instance is available again." : "当实例 %s 再次可用时这个页面将刷新。"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
new file mode 100644
index 00000000000..ec286eae039
--- /dev/null
+++ b/core/l10n/zh_CN.json
@@ -0,0 +1,209 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "发送失败，用户如下: %s ",
+    "Turned on maintenance mode" : "启用维护模式",
+    "Turned off maintenance mode" : "关闭维护模式",
+    "Updated database" : "数据库已更新",
+    "Checked database schema update" : "已经检查数据库架构更新",
+    "Checked database schema update for apps" : "已经检查数据库架构更新",
+    "Updated \"%s\" to %s" : "更新 \"%s\" 为 %s",
+    "Disabled incompatible apps: %s" : "禁用不兼容应用：%s",
+    "No image or file provided" : "没有提供图片或文件",
+    "Unknown filetype" : "未知的文件类型",
+    "Invalid image" : "无效的图像",
+    "No temporary profile picture available, try again" : "没有临时概览页图片可用，请重试",
+    "No crop data provided" : "没有提供相应数据",
+    "Sunday" : "星期日",
+    "Monday" : "星期一",
+    "Tuesday" : "星期二",
+    "Wednesday" : "星期三",
+    "Thursday" : "星期四",
+    "Friday" : "星期五",
+    "Saturday" : "星期六",
+    "January" : "一月",
+    "February" : "二月",
+    "March" : "三月",
+    "April" : "四月",
+    "May" : "五月",
+    "June" : "六月",
+    "July" : "七月",
+    "August" : "八月",
+    "September" : "九月",
+    "October" : "十月",
+    "November" : "十一月",
+    "December" : "十二月",
+    "Settings" : "设置",
+    "File" : "文件",
+    "Folder" : "文件夹",
+    "Image" : "图像",
+    "Audio" : "声音",
+    "Saving..." : "保存中",
+    "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件，请联系管理员。",
+    "The link to reset your password has been sent to your email. 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>如果未能收到邮件请联系管理员。",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？",
+    "I know what I'm doing" : "我知道我在做什么",
+    "Reset password" : "重置密码",
+    "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。",
+    "No" : "否",
+    "Yes" : "是",
+    "Choose" : "选择(&C)...",
+    "Error loading file picker template: {error}" : "加载文件分拣模板出错: {error}",
+    "Ok" : "好",
+    "Error loading message template: {error}" : "加载消息模板出错: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} 个文件冲突"],
+    "One file conflict" : "1个文件冲突",
+    "New Files" : "新文件",
+    "Already existing files" : "已经存在的文件",
+    "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}个)",
+    "Error loading file exists template" : "加载文件存在性模板失败",
+    "Very weak password" : "非常弱的密码",
+    "Weak password" : "弱密码",
+    "So-so password" : "一般强度的密码",
+    "Good password" : "较强的密码",
+    "Strong password" : "强密码",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
+    "Error occurred while checking server setup" : "当检查服务器启动时出错",
+    "Shared" : "已共享",
+    "Shared with {recipients}" : "由{recipients}分享",
+    "Share" : "分享",
+    "Error" : "错误",
+    "Error while sharing" : "共享时出错",
+    "Error while unsharing" : "取消共享时出错",
+    "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" : "分享链接",
+    "The public link will expire no later than {days} days after it is created" : "这个共享链接将在创建后 {days} 天失效",
+    "Password protect" : "密码保护",
+    "Choose a password for the public link" : "为共享链接设置密码",
+    "Allow Public Upload" : "允许公开上传",
+    "Email link to person" : "发送链接到个人",
+    "Send" : "发送",
+    "Set expiration date" : "设置过期日期",
+    "Expiration date" : "过期日期",
+    "Adding user..." : "添加用户中...",
+    "group" : "组",
+    "Resharing is not allowed" : "不允许二次共享",
+    "Shared in {item} with {user}" : "在 {item} 与 {user} 共享。",
+    "Unshare" : "取消共享",
+    "notify by email" : "以邮件通知",
+    "can share" : "可共享",
+    "can edit" : "可以修改",
+    "access control" : "访问控制",
+    "create" : "创建",
+    "update" : "更新",
+    "delete" : "删除",
+    "Password protected" : "密码已受保护",
+    "Error unsetting expiration date" : "取消设置过期日期时出错",
+    "Error setting expiration date" : "设置过期日期时出错",
+    "Sending ..." : "正在发送...",
+    "Email sent" : "邮件已发送",
+    "Warning" : "警告",
+    "The object type is not specified." : "未指定对象类型。",
+    "Enter new" : "输入新...",
+    "Delete" : "删除",
+    "Add" : "增加",
+    "Edit tags" : "编辑标签",
+    "Error loading dialog template: {error}" : "加载对话框模板出错: {error}",
+    "No tags selected for deletion." : "请选择要删除的标签。",
+    "Updating {productName} to version {version}, this may take a while." : "更新 {productName} 到版本 {version}，这可能需要一些时间。",
+    "Please reload the page." : "请重新加载页面。",
+    "The update was unsuccessful." : "更新未成功。",
+    "The update was successful. Redirecting you to ownCloud now." : "更新成功。正在重定向至 ownCloud。",
+    "Couldn't reset password because the token is invalid" : "令牌无效，无法重置密码",
+    "Couldn't send reset email. Please make sure your username is correct." : "无法发送重置邮件，请检查您的用户名是否正确。",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。",
+    "%s password reset" : "重置 %s 的密码",
+    "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码：{link}",
+    "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" : "使得，我真的要现在重设密码",
+    "Reset" : "重置",
+    "New password" : "新密码",
+    "New Password" : "新密码",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！",
+    "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。",
+    "Personal" : "个人",
+    "Users" : "用户",
+    "Apps" : "应用",
+    "Admin" : "管理",
+    "Help" : "帮助",
+    "Error loading tags" : "加载标签出错",
+    "Tag already exists" : "标签已存在",
+    "Error deleting tag(s)" : "删除标签(s)时出错",
+    "Error tagging" : "增加标签时出错",
+    "Error untagging" : "移除标签时出错",
+    "Error favoriting" : "收藏时出错",
+    "Error unfavoriting" : "删除收藏时出错",
+    "Access forbidden" : "访问禁止",
+    "File not found" : "文件未找到",
+    "The specified document has not been found on the server." : "在服务器上没找到指定的文件。",
+    "You can click here to return to %s." : "你可以点击这里返回 %s。",
+    "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",
+    "The share will expire on %s." : "此分享将在 %s 过期。",
+    "Cheers!" : "干杯！",
+    "The server encountered an internal error and was unable to complete your request." : "服务器发送一个内部错误并且无法完成你的请求。",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "请联系服务器管理员，如果多次出现这个错误，请把下面的技术细节包含在您的报告里。",
+    "More details can be found in the server log." : "更多细节能在服务器日志中找到。",
+    "Technical details" : "技术细节",
+    "Remote Address: %s" : "远程地址： %s",
+    "Request ID: %s" : "请求 ID: %s",
+    "Code: %s" : "代码: %s",
+    "Message: %s" : "消息: %s",
+    "File: %s" : "文件: %s",
+    "Line: %s" : "行: %s",
+    "Trace" : "追踪",
+    "Security Warning" : "安全警告",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "为保证安全使用 %s 请更新您的PHP。",
+    "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>。",
+    "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>",
+    "Password" : "密码",
+    "Storage & database" : "存储 & 数据库",
+    "Data folder" : "数据目录",
+    "Configure the database" : "配置数据库",
+    "Only %s is available." : "仅 %s 可用。",
+    "Database user" : "数据库用户",
+    "Database password" : "数据库密码",
+    "Database name" : "数据库名",
+    "Database tablespace" : "数据库表空间",
+    "Database host" : "数据库主机",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "将会使用 SQLite 为数据库。我们不建议大型站点使用 SQLite。",
+    "Finish setup" : "安装完成",
+    "Finishing …" : "正在结束 ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此页面。",
+    "%s is available. Get more information on how to update." : "%s 可用。获取更多关于如何升级的信息。",
+    "Log out" : "注销",
+    "Server side authentication failed!" : "服务端验证失败！",
+    "Please contact your administrator." : "请联系你的管理员。",
+    "Forgot your password? Reset it!" : "忘记密码？立即重置！",
+    "remember" : "记住",
+    "Log in" : "登录",
+    "Alternative Logins" : "其他登录方式",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨、你好,<br><br>只想让你知道 %s 分享了 <strong>%s</strong> 给你。<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." : "感谢让你久等了。",
+    "You are accessing the server from an untrusted domain." : "您正在访问来自不信任域名的服务器。",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "请联系你的系统管理员。如果你是系统管理员，配置config/config.php文件中参数\"trusted_domain\" 设置。可以在config/config.sample.php文件中找到例子。",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "基于你的配置，作为系统管理员，你可能还能点击下面的按钮来信任这个域。",
+    "Add \"%s\" as trusted domain" : "添加 \"%s\"为信任域",
+    "%s will be updated to version %s." : "%s 将会更新到版本 %s。",
+    "The following apps will be disabled:" : "以下应用将会被禁用：",
+    "The theme %s has been disabled." : "%s 主题已被禁用。",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。",
+    "Start update" : "开始更新",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "为避免更大的安装演示，你能在你的安装目录下面运行这些命令：",
+    "This %s instance is currently being updated, which may take a while." : "当前ownCloud实例 %s 正在更新，可能需要一段时间。",
+    "This page will refresh itself when the %s instance is available again." : "当实例 %s 再次可用时这个页面将刷新。"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
deleted file mode 100644
index 3f177994c22..00000000000
--- a/core/l10n/zh_CN.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "发送失败，用户如下: %s ",
-"Turned on maintenance mode" => "启用维护模式",
-"Turned off maintenance mode" => "关闭维护模式",
-"Updated database" => "数据库已更新",
-"Checked database schema update" => "已经检查数据库架构更新",
-"Checked database schema update for apps" => "已经检查数据库架构更新",
-"Updated \"%s\" to %s" => "更新 \"%s\" 为 %s",
-"Disabled incompatible apps: %s" => "禁用不兼容应用：%s",
-"No image or file provided" => "没有提供图片或文件",
-"Unknown filetype" => "未知的文件类型",
-"Invalid image" => "无效的图像",
-"No temporary profile picture available, try again" => "没有临时概览页图片可用，请重试",
-"No crop data provided" => "没有提供相应数据",
-"Sunday" => "星期日",
-"Monday" => "星期一",
-"Tuesday" => "星期二",
-"Wednesday" => "星期三",
-"Thursday" => "星期四",
-"Friday" => "星期五",
-"Saturday" => "星期六",
-"January" => "一月",
-"February" => "二月",
-"March" => "三月",
-"April" => "四月",
-"May" => "五月",
-"June" => "六月",
-"July" => "七月",
-"August" => "八月",
-"September" => "九月",
-"October" => "十月",
-"November" => "十一月",
-"December" => "十二月",
-"Settings" => "设置",
-"File" => "文件",
-"Folder" => "文件夹",
-"Image" => "图像",
-"Audio" => "声音",
-"Saving..." => "保存中",
-"Couldn't send reset email. Please contact your administrator." => "未能成功发送重置邮件，请联系管理员。",
-"The link to reset your password has been sent to your email. 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>如果未能收到邮件请联系管理员。",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？",
-"I know what I'm doing" => "我知道我在做什么",
-"Reset password" => "重置密码",
-"Password can not be changed. Please contact your administrator." => "无法修改密码，请联系管理员。",
-"No" => "否",
-"Yes" => "是",
-"Choose" => "选择(&C)...",
-"Error loading file picker template: {error}" => "加载文件分拣模板出错: {error}",
-"Ok" => "好",
-"Error loading message template: {error}" => "加载消息模板出错: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} 个文件冲突"),
-"One file conflict" => "1个文件冲突",
-"New Files" => "新文件",
-"Already existing files" => "已经存在的文件",
-"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}个)",
-"Error loading file exists template" => "加载文件存在性模板失败",
-"Very weak password" => "非常弱的密码",
-"Weak password" => "弱密码",
-"So-so password" => "一般强度的密码",
-"Good password" => "较强的密码",
-"Strong password" => "强密码",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
-"Error occurred while checking server setup" => "当检查服务器启动时出错",
-"Shared" => "已共享",
-"Shared with {recipients}" => "由{recipients}分享",
-"Share" => "分享",
-"Error" => "错误",
-"Error while sharing" => "共享时出错",
-"Error while unsharing" => "取消共享时出错",
-"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" => "分享链接",
-"The public link will expire no later than {days} days after it is created" => "这个共享链接将在创建后 {days} 天失效",
-"Password protect" => "密码保护",
-"Choose a password for the public link" => "为共享链接设置密码",
-"Allow Public Upload" => "允许公开上传",
-"Email link to person" => "发送链接到个人",
-"Send" => "发送",
-"Set expiration date" => "设置过期日期",
-"Expiration date" => "过期日期",
-"Adding user..." => "添加用户中...",
-"group" => "组",
-"Resharing is not allowed" => "不允许二次共享",
-"Shared in {item} with {user}" => "在 {item} 与 {user} 共享。",
-"Unshare" => "取消共享",
-"notify by email" => "以邮件通知",
-"can share" => "可共享",
-"can edit" => "可以修改",
-"access control" => "访问控制",
-"create" => "创建",
-"update" => "更新",
-"delete" => "删除",
-"Password protected" => "密码已受保护",
-"Error unsetting expiration date" => "取消设置过期日期时出错",
-"Error setting expiration date" => "设置过期日期时出错",
-"Sending ..." => "正在发送...",
-"Email sent" => "邮件已发送",
-"Warning" => "警告",
-"The object type is not specified." => "未指定对象类型。",
-"Enter new" => "输入新...",
-"Delete" => "删除",
-"Add" => "增加",
-"Edit tags" => "编辑标签",
-"Error loading dialog template: {error}" => "加载对话框模板出错: {error}",
-"No tags selected for deletion." => "请选择要删除的标签。",
-"Updating {productName} to version {version}, this may take a while." => "更新 {productName} 到版本 {version}，这可能需要一些时间。",
-"Please reload the page." => "请重新加载页面。",
-"The update was unsuccessful." => "更新未成功。",
-"The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。",
-"Couldn't reset password because the token is invalid" => "令牌无效，无法重置密码",
-"Couldn't send reset email. Please make sure your username is correct." => "无法发送重置邮件，请检查您的用户名是否正确。",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。",
-"%s password reset" => "重置 %s 的密码",
-"Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}",
-"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" => "使得，我真的要现在重设密码",
-"Reset" => "重置",
-"New password" => "新密码",
-"New Password" => "新密码",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！",
-"For the best results, please consider using a GNU/Linux server instead." => "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。",
-"Personal" => "个人",
-"Users" => "用户",
-"Apps" => "应用",
-"Admin" => "管理",
-"Help" => "帮助",
-"Error loading tags" => "加载标签出错",
-"Tag already exists" => "标签已存在",
-"Error deleting tag(s)" => "删除标签(s)时出错",
-"Error tagging" => "增加标签时出错",
-"Error untagging" => "移除标签时出错",
-"Error favoriting" => "收藏时出错",
-"Error unfavoriting" => "删除收藏时出错",
-"Access forbidden" => "访问禁止",
-"File not found" => "文件未找到",
-"The specified document has not been found on the server." => "在服务器上没找到指定的文件。",
-"You can click here to return to %s." => "你可以点击这里返回 %s。",
-"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",
-"The share will expire on %s." => "此分享将在 %s 过期。",
-"Cheers!" => "干杯！",
-"The server encountered an internal error and was unable to complete your request." => "服务器发送一个内部错误并且无法完成你的请求。",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "请联系服务器管理员，如果多次出现这个错误，请把下面的技术细节包含在您的报告里。",
-"More details can be found in the server log." => "更多细节能在服务器日志中找到。",
-"Technical details" => "技术细节",
-"Remote Address: %s" => "远程地址： %s",
-"Request ID: %s" => "请求 ID: %s",
-"Code: %s" => "代码: %s",
-"Message: %s" => "消息: %s",
-"File: %s" => "文件: %s",
-"Line: %s" => "行: %s",
-"Trace" => "追踪",
-"Security Warning" => "安全警告",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "为保证安全使用 %s 请更新您的PHP。",
-"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>。",
-"Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
-"Password" => "密码",
-"Storage & database" => "存储 & 数据库",
-"Data folder" => "数据目录",
-"Configure the database" => "配置数据库",
-"Only %s is available." => "仅 %s 可用。",
-"Database user" => "数据库用户",
-"Database password" => "数据库密码",
-"Database name" => "数据库名",
-"Database tablespace" => "数据库表空间",
-"Database host" => "数据库主机",
-"SQLite will be used as database. For larger installations we recommend to change this." => "将会使用 SQLite 为数据库。我们不建议大型站点使用 SQLite。",
-"Finish setup" => "安装完成",
-"Finishing …" => "正在结束 ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此页面。",
-"%s is available. Get more information on how to update." => "%s 可用。获取更多关于如何升级的信息。",
-"Log out" => "注销",
-"Server side authentication failed!" => "服务端验证失败！",
-"Please contact your administrator." => "请联系你的管理员。",
-"Forgot your password? Reset it!" => "忘记密码？立即重置！",
-"remember" => "记住",
-"Log in" => "登录",
-"Alternative Logins" => "其他登录方式",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "嗨、你好,<br><br>只想让你知道 %s 分享了 <strong>%s</strong> 给你。<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." => "感谢让你久等了。",
-"You are accessing the server from an untrusted domain." => "您正在访问来自不信任域名的服务器。",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "请联系你的系统管理员。如果你是系统管理员，配置config/config.php文件中参数\"trusted_domain\" 设置。可以在config/config.sample.php文件中找到例子。",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "基于你的配置，作为系统管理员，你可能还能点击下面的按钮来信任这个域。",
-"Add \"%s\" as trusted domain" => "添加 \"%s\"为信任域",
-"%s will be updated to version %s." => "%s 将会更新到版本 %s。",
-"The following apps will be disabled:" => "以下应用将会被禁用：",
-"The theme %s has been disabled." => "%s 主题已被禁用。",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。",
-"Start update" => "开始更新",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "为避免更大的安装演示，你能在你的安装目录下面运行这些命令：",
-"This %s instance is currently being updated, which may take a while." => "当前ownCloud实例 %s 正在更新，可能需要一段时间。",
-"This page will refresh itself when the %s instance is available again." => "当实例 %s 再次可用时这个页面将刷新。"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js
new file mode 100644
index 00000000000..5caaa4a2f36
--- /dev/null
+++ b/core/l10n/zh_HK.js
@@ -0,0 +1,80 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "星期日",
+    "Monday" : "星期一",
+    "Tuesday" : "星期二",
+    "Wednesday" : "星期三",
+    "Thursday" : "星期四",
+    "Friday" : "星期五",
+    "Saturday" : "星期六",
+    "January" : "一月",
+    "February" : "二月",
+    "March" : "三月",
+    "April" : "四月",
+    "May" : "五月",
+    "June" : "六月",
+    "July" : "七月",
+    "August" : "八月",
+    "September" : "九月",
+    "October" : "十月",
+    "November" : "十一月",
+    "December" : "十二月",
+    "Settings" : "設定",
+    "File" : "文件",
+    "Folder" : "資料夾",
+    "Image" : "圖片",
+    "Audio" : "聲音",
+    "Saving..." : "儲存中...",
+    "Reset password" : "重設密碼",
+    "No" : "否",
+    "Yes" : "是",
+    "Ok" : "確認",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "取消",
+    "Shared" : "已分享",
+    "Share" : "分享",
+    "Error" : "錯誤",
+    "Error while sharing" : "分享時發生錯誤",
+    "Error while unsharing" : "取消分享時發生錯誤",
+    "Error while changing permissions" : "更改權限時發生錯誤",
+    "Shared with you and the group {group} by {owner}" : "{owner}與你及群組的分享",
+    "Shared with you by {owner}" : "{owner}與你的分享",
+    "Share link" : "分享連結",
+    "Password protect" : "密碼保護",
+    "Send" : "傳送",
+    "Set expiration date" : "設定分享期限",
+    "Expiration date" : "分享期限",
+    "Unshare" : "取消分享",
+    "create" : "新增",
+    "update" : "更新",
+    "delete" : "刪除",
+    "Password protected" : "密碼保護",
+    "Sending ..." : "發送中...",
+    "Email sent" : "郵件已傳",
+    "Warning" : "警告",
+    "Delete" : "刪除",
+    "Add" : "加入",
+    "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正",
+    "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}",
+    "You will receive a link to reset your password via Email." : "你將收到一封電郵",
+    "Username" : "用戶名稱",
+    "Reset" : "重設",
+    "New password" : "新密碼",
+    "New Password" : "新密碼",
+    "Personal" : "個人",
+    "Users" : "用戶",
+    "Apps" : "軟件",
+    "Admin" : "管理",
+    "Help" : "幫助",
+    "Create an <strong>admin account</strong>" : "建立管理員帳戶",
+    "Password" : "密碼",
+    "Configure the database" : "設定資料庫",
+    "Database user" : "資料庫帳戶",
+    "Database password" : "資料庫密碼",
+    "Database name" : "資料庫名稱",
+    "Log out" : "登出",
+    "remember" : "記住",
+    "Log in" : "登入"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json
new file mode 100644
index 00000000000..4d3bbaa8aea
--- /dev/null
+++ b/core/l10n/zh_HK.json
@@ -0,0 +1,78 @@
+{ "translations": {
+    "Sunday" : "星期日",
+    "Monday" : "星期一",
+    "Tuesday" : "星期二",
+    "Wednesday" : "星期三",
+    "Thursday" : "星期四",
+    "Friday" : "星期五",
+    "Saturday" : "星期六",
+    "January" : "一月",
+    "February" : "二月",
+    "March" : "三月",
+    "April" : "四月",
+    "May" : "五月",
+    "June" : "六月",
+    "July" : "七月",
+    "August" : "八月",
+    "September" : "九月",
+    "October" : "十月",
+    "November" : "十一月",
+    "December" : "十二月",
+    "Settings" : "設定",
+    "File" : "文件",
+    "Folder" : "資料夾",
+    "Image" : "圖片",
+    "Audio" : "聲音",
+    "Saving..." : "儲存中...",
+    "Reset password" : "重設密碼",
+    "No" : "否",
+    "Yes" : "是",
+    "Ok" : "確認",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "取消",
+    "Shared" : "已分享",
+    "Share" : "分享",
+    "Error" : "錯誤",
+    "Error while sharing" : "分享時發生錯誤",
+    "Error while unsharing" : "取消分享時發生錯誤",
+    "Error while changing permissions" : "更改權限時發生錯誤",
+    "Shared with you and the group {group} by {owner}" : "{owner}與你及群組的分享",
+    "Shared with you by {owner}" : "{owner}與你的分享",
+    "Share link" : "分享連結",
+    "Password protect" : "密碼保護",
+    "Send" : "傳送",
+    "Set expiration date" : "設定分享期限",
+    "Expiration date" : "分享期限",
+    "Unshare" : "取消分享",
+    "create" : "新增",
+    "update" : "更新",
+    "delete" : "刪除",
+    "Password protected" : "密碼保護",
+    "Sending ..." : "發送中...",
+    "Email sent" : "郵件已傳",
+    "Warning" : "警告",
+    "Delete" : "刪除",
+    "Add" : "加入",
+    "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正",
+    "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}",
+    "You will receive a link to reset your password via Email." : "你將收到一封電郵",
+    "Username" : "用戶名稱",
+    "Reset" : "重設",
+    "New password" : "新密碼",
+    "New Password" : "新密碼",
+    "Personal" : "個人",
+    "Users" : "用戶",
+    "Apps" : "軟件",
+    "Admin" : "管理",
+    "Help" : "幫助",
+    "Create an <strong>admin account</strong>" : "建立管理員帳戶",
+    "Password" : "密碼",
+    "Configure the database" : "設定資料庫",
+    "Database user" : "資料庫帳戶",
+    "Database password" : "資料庫密碼",
+    "Database name" : "資料庫名稱",
+    "Log out" : "登出",
+    "remember" : "記住",
+    "Log in" : "登入"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
deleted file mode 100644
index 45a52a3ca0f..00000000000
--- a/core/l10n/zh_HK.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "星期日",
-"Monday" => "星期一",
-"Tuesday" => "星期二",
-"Wednesday" => "星期三",
-"Thursday" => "星期四",
-"Friday" => "星期五",
-"Saturday" => "星期六",
-"January" => "一月",
-"February" => "二月",
-"March" => "三月",
-"April" => "四月",
-"May" => "五月",
-"June" => "六月",
-"July" => "七月",
-"August" => "八月",
-"September" => "九月",
-"October" => "十月",
-"November" => "十一月",
-"December" => "十二月",
-"Settings" => "設定",
-"File" => "文件",
-"Folder" => "資料夾",
-"Image" => "圖片",
-"Audio" => "聲音",
-"Saving..." => "儲存中...",
-"Reset password" => "重設密碼",
-"No" => "否",
-"Yes" => "是",
-"Ok" => "確認",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"Cancel" => "取消",
-"Shared" => "已分享",
-"Share" => "分享",
-"Error" => "錯誤",
-"Error while sharing" => "分享時發生錯誤",
-"Error while unsharing" => "取消分享時發生錯誤",
-"Error while changing permissions" => "更改權限時發生錯誤",
-"Shared with you and the group {group} by {owner}" => "{owner}與你及群組的分享",
-"Shared with you by {owner}" => "{owner}與你的分享",
-"Share link" => "分享連結",
-"Password protect" => "密碼保護",
-"Send" => "傳送",
-"Set expiration date" => "設定分享期限",
-"Expiration date" => "分享期限",
-"Unshare" => "取消分享",
-"create" => "新增",
-"update" => "更新",
-"delete" => "刪除",
-"Password protected" => "密碼保護",
-"Sending ..." => "發送中...",
-"Email sent" => "郵件已傳",
-"Warning" => "警告",
-"Delete" => "刪除",
-"Add" => "加入",
-"The update was successful. Redirecting you to ownCloud now." => "更新成功, 正",
-"Use the following link to reset your password: {link}" => "請用以下連結重設你的密碼: {link}",
-"You will receive a link to reset your password via Email." => "你將收到一封電郵",
-"Username" => "用戶名稱",
-"Reset" => "重設",
-"New password" => "新密碼",
-"New Password" => "新密碼",
-"Personal" => "個人",
-"Users" => "用戶",
-"Apps" => "軟件",
-"Admin" => "管理",
-"Help" => "幫助",
-"Create an <strong>admin account</strong>" => "建立管理員帳戶",
-"Password" => "密碼",
-"Configure the database" => "設定資料庫",
-"Database user" => "資料庫帳戶",
-"Database password" => "資料庫密碼",
-"Database name" => "資料庫名稱",
-"Log out" => "登出",
-"remember" => "記住",
-"Log in" => "登入"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
new file mode 100644
index 00000000000..a112af12d07
--- /dev/null
+++ b/core/l10n/zh_TW.js
@@ -0,0 +1,211 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "無法寄送郵件給這些使用者：%s",
+    "Turned on maintenance mode" : "已啓用維護模式",
+    "Turned off maintenance mode" : "已停用維護模式",
+    "Updated database" : "已更新資料庫",
+    "Checked database schema update" : "已檢查資料庫格式更新",
+    "Checked database schema update for apps" : "已檢查應用程式的資料庫格式更新",
+    "Updated \"%s\" to %s" : "已更新 %s 到 %s",
+    "Disabled incompatible apps: %s" : "停用不相容的應用程式：%s",
+    "No image or file provided" : "未提供圖片或檔案",
+    "Unknown filetype" : "未知的檔案類型",
+    "Invalid image" : "無效的圖片",
+    "No temporary profile picture available, try again" : "沒有臨時用的大頭貼，請再試一次",
+    "No crop data provided" : "未設定剪裁",
+    "Sunday" : "週日",
+    "Monday" : "週一",
+    "Tuesday" : "週二",
+    "Wednesday" : "週三",
+    "Thursday" : "週四",
+    "Friday" : "週五",
+    "Saturday" : "週六",
+    "January" : "一月",
+    "February" : "二月",
+    "March" : "三月",
+    "April" : "四月",
+    "May" : "五月",
+    "June" : "六月",
+    "July" : "七月",
+    "August" : "八月",
+    "September" : "九月",
+    "October" : "十月",
+    "November" : "十一月",
+    "December" : "十二月",
+    "Settings" : "設定",
+    "File" : "檔案",
+    "Folder" : "資料夾",
+    "Image" : "圖片",
+    "Audio" : "音訊",
+    "Saving..." : "儲存中...",
+    "Couldn't send reset email. Please contact your administrator." : "無法寄送重設 email ，請聯絡系統管理員",
+    "The link to reset your password has been sent to your email. 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 至你的信箱，如果你在一段時間內沒收到，請檢查垃圾郵件資料夾，如果還是找不到，請聯絡系統管理員。",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的檔案是加密的，如果您沒有啟用救援金鑰，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？",
+    "I know what I'm doing" : "我知道我在幹嘛",
+    "Reset password" : "重設密碼",
+    "Password can not be changed. Please contact your administrator." : "無法變更密碼，請聯絡您的系統管理員",
+    "No" : "否",
+    "Yes" : "是",
+    "Choose" : "選擇",
+    "Error loading file picker template: {error}" : "載入檔案選擇器樣板出錯： {error}",
+    "Ok" : "好",
+    "Error loading message template: {error}" : "載入訊息樣板出錯： {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} 個檔案衝突"],
+    "One file conflict" : "一個檔案衝突",
+    "New Files" : "新檔案",
+    "Already existing files" : "已經存在的檔案",
+    "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} 項）",
+    "Error loading file exists template" : "載入檔案存在樣板出錯",
+    "Very weak password" : "非常弱的密碼",
+    "Weak password" : "弱的密碼",
+    "So-so password" : "普通的密碼",
+    "Good password" : "好的密碼",
+    "Strong password" : "很強的密碼",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "這臺 ownCloud 伺服器沒有連接到網際網路，因此有些功能像是掛載外部儲存空間、更新 ownCloud 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 ownCloud 完整的功能，建議您將這臺伺服器連接至網際網路。",
+    "Error occurred while checking server setup" : "檢查伺服器配置時發生錯誤",
+    "Shared" : "已分享",
+    "Shared with {recipients}" : "與 {recipients} 分享",
+    "Share" : "分享",
+    "Error" : "錯誤",
+    "Error while sharing" : "分享時發生錯誤",
+    "Error while unsharing" : "取消分享時發生錯誤",
+    "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" : "分享連結",
+    "The public link will expire no later than {days} days after it is created" : "這個公開連結會在 {days} 天內失效",
+    "Password protect" : "密碼保護",
+    "Choose a password for the public link" : "為公開連結選一個密碼",
+    "Allow Public Upload" : "允許任何人上傳",
+    "Email link to person" : "將連結 email 給別人",
+    "Send" : "寄出",
+    "Set expiration date" : "指定到期日",
+    "Expiration date" : "到期日",
+    "Adding user..." : "新增使用者……",
+    "group" : "群組",
+    "Resharing is not allowed" : "不允許重新分享",
+    "Shared in {item} with {user}" : "已和 {user} 分享 {item}",
+    "Unshare" : "取消分享",
+    "notify by email" : "以 email 通知",
+    "can share" : "可分享",
+    "can edit" : "可編輯",
+    "access control" : "存取控制",
+    "create" : "建立",
+    "update" : "更新",
+    "delete" : "刪除",
+    "Password protected" : "受密碼保護",
+    "Error unsetting expiration date" : "取消到期日設定失敗",
+    "Error setting expiration date" : "設定到期日發生錯誤",
+    "Sending ..." : "正在傳送…",
+    "Email sent" : "Email 已寄出",
+    "Warning" : "警告",
+    "The object type is not specified." : "未指定物件類型",
+    "Enter new" : "輸入新的",
+    "Delete" : "刪除",
+    "Add" : "增加",
+    "Edit tags" : "編輯標籤",
+    "Error loading dialog template: {error}" : "載入對話樣板出錯：{error}",
+    "No tags selected for deletion." : "沒有選擇要刪除的標籤",
+    "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 到版本 {version} ，請稍候",
+    "Please reload the page." : "請重新整理頁面",
+    "The update was unsuccessful." : "更新失敗",
+    "The update was successful. Redirecting you to ownCloud now." : "升級成功，正將您重新導向至 ownCloud 。",
+    "Couldn't reset password because the token is invalid" : "無法重設密碼因為 token 無效",
+    "Couldn't send reset email. Please make sure your username is correct." : "無法寄送重設 email ，請確認您的帳號輸入正確",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員",
+    "%s password reset" : "%s 密碼重設",
+    "Use the following link to reset your password: {link}" : "請至以下連結重設您的密碼： {link}",
+    "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" : "對，我現在想要重設我的密碼。",
+    "Reset" : "重設",
+    "New password" : "新密碼",
+    "New Password" : "新密碼",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險！",
+    "For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以取得最好的效果",
+    "Personal" : "個人",
+    "Users" : "使用者",
+    "Apps" : "應用程式",
+    "Admin" : "管理",
+    "Help" : "說明",
+    "Error loading tags" : "載入標籤出錯",
+    "Tag already exists" : "標籤已經存在",
+    "Error deleting tag(s)" : "刪除標籤出錯",
+    "Error tagging" : "貼標籤發生錯誤",
+    "Error untagging" : "移除標籤失敗",
+    "Error favoriting" : "加入最愛時出錯",
+    "Error unfavoriting" : "從最愛移除出錯",
+    "Access forbidden" : "存取被拒",
+    "File not found" : "找不到檔案",
+    "The specified document has not been found on the server." : "該文件不存在於伺服器上",
+    "You can click here to return to %s." : "點這裡以回到 %s",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "嗨，\n\n%s 和你分享了 %s ，到這裡看它：%s\n",
+    "The share will expire on %s." : "這個分享將會於 %s 過期",
+    "Cheers!" : "太棒了！",
+    "The server encountered an internal error and was unable to complete your request." : "伺服器遭遇內部錯誤，無法完成您的要求",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "如果這個錯誤重複出現，請聯絡系統管理員，並附上以下的錯誤細節",
+    "More details can be found in the server log." : "伺服器記錄檔裡面有更多細節",
+    "Technical details" : "技術細節",
+    "Remote Address: %s" : "遠端位置：%s",
+    "Request ID: %s" : "請求編號：%s",
+    "Code: %s" : "代碼：%s",
+    "Message: %s" : "訊息：%s",
+    "File: %s" : "檔案：%s",
+    "Line: %s" : "行數：%s",
+    "Trace" : "追蹤",
+    "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。",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的資料目錄看起來可以被 Internet 公開存取，因為 .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>以瞭解如何正確設定您的伺服器。",
+    "Create an <strong>admin account</strong>" : "建立一個<strong>管理者帳號</strong>",
+    "Password" : "密碼",
+    "Storage & database" : "儲存空間和資料庫",
+    "Data folder" : "資料儲存位置",
+    "Configure the database" : "設定資料庫",
+    "Only %s is available." : "剩下 %s 可使用",
+    "Database user" : "資料庫使用者",
+    "Database password" : "資料庫密碼",
+    "Database name" : "資料庫名稱",
+    "Database tablespace" : "資料庫 tablespace",
+    "Database host" : "資料庫主機",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "將會使用 SQLite 作為資料庫，在大型安裝中建議使用其他種資料庫",
+    "Finish setup" : "完成設定",
+    "Finishing …" : "即將完成…",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "這個應用程式需要 Javascript 才能正常運作，請<a href=\"http://enable-javascript.com/\" target=\"_blank\">啟用 Javascript</a> 然後重新整理。",
+    "%s is available. Get more information on how to update." : "%s 已經釋出，瞭解更多資訊以進行更新。",
+    "Log out" : "登出",
+    "Server side authentication failed!" : "伺服器端認證失敗！",
+    "Please contact your administrator." : "請聯絡系統管理員。",
+    "Forgot your password? Reset it!" : "忘了密碼？重設它！",
+    "remember" : "記住",
+    "Log in" : "登入",
+    "Alternative Logins" : "其他登入方法",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<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." : "感謝您的耐心",
+    "You are accessing the server from an untrusted domain." : "你正在從一個未信任的網域存取伺服器",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "請聯絡您的系統管理員，如果您就是系統管理員，請設定 config/config.php 中的 \"trusted_domain\" 選項。範例設定提供於 config/config.sample.php",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "依照設定而定，您身為系統管理員可能也可以使用底下的按鈕來信任這個網域",
+    "Add \"%s\" as trusted domain" : "將 %s 加入到信任的網域",
+    "%s will be updated to version %s." : "%s 將會被升級到版本 %s",
+    "The following apps will be disabled:" : "這些應用程式會被停用：",
+    "The theme %s has been disabled." : "主題 %s 已經被停用",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在繼續之前，請備份資料庫、config 目錄及資料目錄",
+    "Start update" : "開始升級",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "在大型安裝上，為了避免升級請求逾時，你也可以在安裝目錄執行下列指令：",
+    "This %s instance is currently being updated, which may take a while." : "正在更新這個 %s 安裝，需要一段時間",
+    "This page will refresh itself when the %s instance is available again." : "%s 安裝恢復可用之後，本頁會自動重新整理"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
new file mode 100644
index 00000000000..0f09ca62862
--- /dev/null
+++ b/core/l10n/zh_TW.json
@@ -0,0 +1,209 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "無法寄送郵件給這些使用者：%s",
+    "Turned on maintenance mode" : "已啓用維護模式",
+    "Turned off maintenance mode" : "已停用維護模式",
+    "Updated database" : "已更新資料庫",
+    "Checked database schema update" : "已檢查資料庫格式更新",
+    "Checked database schema update for apps" : "已檢查應用程式的資料庫格式更新",
+    "Updated \"%s\" to %s" : "已更新 %s 到 %s",
+    "Disabled incompatible apps: %s" : "停用不相容的應用程式：%s",
+    "No image or file provided" : "未提供圖片或檔案",
+    "Unknown filetype" : "未知的檔案類型",
+    "Invalid image" : "無效的圖片",
+    "No temporary profile picture available, try again" : "沒有臨時用的大頭貼，請再試一次",
+    "No crop data provided" : "未設定剪裁",
+    "Sunday" : "週日",
+    "Monday" : "週一",
+    "Tuesday" : "週二",
+    "Wednesday" : "週三",
+    "Thursday" : "週四",
+    "Friday" : "週五",
+    "Saturday" : "週六",
+    "January" : "一月",
+    "February" : "二月",
+    "March" : "三月",
+    "April" : "四月",
+    "May" : "五月",
+    "June" : "六月",
+    "July" : "七月",
+    "August" : "八月",
+    "September" : "九月",
+    "October" : "十月",
+    "November" : "十一月",
+    "December" : "十二月",
+    "Settings" : "設定",
+    "File" : "檔案",
+    "Folder" : "資料夾",
+    "Image" : "圖片",
+    "Audio" : "音訊",
+    "Saving..." : "儲存中...",
+    "Couldn't send reset email. Please contact your administrator." : "無法寄送重設 email ，請聯絡系統管理員",
+    "The link to reset your password has been sent to your email. 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 至你的信箱，如果你在一段時間內沒收到，請檢查垃圾郵件資料夾，如果還是找不到，請聯絡系統管理員。",
+    "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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的檔案是加密的，如果您沒有啟用救援金鑰，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？",
+    "I know what I'm doing" : "我知道我在幹嘛",
+    "Reset password" : "重設密碼",
+    "Password can not be changed. Please contact your administrator." : "無法變更密碼，請聯絡您的系統管理員",
+    "No" : "否",
+    "Yes" : "是",
+    "Choose" : "選擇",
+    "Error loading file picker template: {error}" : "載入檔案選擇器樣板出錯： {error}",
+    "Ok" : "好",
+    "Error loading message template: {error}" : "載入訊息樣板出錯： {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} 個檔案衝突"],
+    "One file conflict" : "一個檔案衝突",
+    "New Files" : "新檔案",
+    "Already existing files" : "已經存在的檔案",
+    "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} 項）",
+    "Error loading file exists template" : "載入檔案存在樣板出錯",
+    "Very weak password" : "非常弱的密碼",
+    "Weak password" : "弱的密碼",
+    "So-so password" : "普通的密碼",
+    "Good password" : "好的密碼",
+    "Strong password" : "很強的密碼",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "這臺 ownCloud 伺服器沒有連接到網際網路，因此有些功能像是掛載外部儲存空間、更新 ownCloud 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 ownCloud 完整的功能，建議您將這臺伺服器連接至網際網路。",
+    "Error occurred while checking server setup" : "檢查伺服器配置時發生錯誤",
+    "Shared" : "已分享",
+    "Shared with {recipients}" : "與 {recipients} 分享",
+    "Share" : "分享",
+    "Error" : "錯誤",
+    "Error while sharing" : "分享時發生錯誤",
+    "Error while unsharing" : "取消分享時發生錯誤",
+    "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" : "分享連結",
+    "The public link will expire no later than {days} days after it is created" : "這個公開連結會在 {days} 天內失效",
+    "Password protect" : "密碼保護",
+    "Choose a password for the public link" : "為公開連結選一個密碼",
+    "Allow Public Upload" : "允許任何人上傳",
+    "Email link to person" : "將連結 email 給別人",
+    "Send" : "寄出",
+    "Set expiration date" : "指定到期日",
+    "Expiration date" : "到期日",
+    "Adding user..." : "新增使用者……",
+    "group" : "群組",
+    "Resharing is not allowed" : "不允許重新分享",
+    "Shared in {item} with {user}" : "已和 {user} 分享 {item}",
+    "Unshare" : "取消分享",
+    "notify by email" : "以 email 通知",
+    "can share" : "可分享",
+    "can edit" : "可編輯",
+    "access control" : "存取控制",
+    "create" : "建立",
+    "update" : "更新",
+    "delete" : "刪除",
+    "Password protected" : "受密碼保護",
+    "Error unsetting expiration date" : "取消到期日設定失敗",
+    "Error setting expiration date" : "設定到期日發生錯誤",
+    "Sending ..." : "正在傳送…",
+    "Email sent" : "Email 已寄出",
+    "Warning" : "警告",
+    "The object type is not specified." : "未指定物件類型",
+    "Enter new" : "輸入新的",
+    "Delete" : "刪除",
+    "Add" : "增加",
+    "Edit tags" : "編輯標籤",
+    "Error loading dialog template: {error}" : "載入對話樣板出錯：{error}",
+    "No tags selected for deletion." : "沒有選擇要刪除的標籤",
+    "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 到版本 {version} ，請稍候",
+    "Please reload the page." : "請重新整理頁面",
+    "The update was unsuccessful." : "更新失敗",
+    "The update was successful. Redirecting you to ownCloud now." : "升級成功，正將您重新導向至 ownCloud 。",
+    "Couldn't reset password because the token is invalid" : "無法重設密碼因為 token 無效",
+    "Couldn't send reset email. Please make sure your username is correct." : "無法寄送重設 email ，請確認您的帳號輸入正確",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員",
+    "%s password reset" : "%s 密碼重設",
+    "Use the following link to reset your password: {link}" : "請至以下連結重設您的密碼： {link}",
+    "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" : "對，我現在想要重設我的密碼。",
+    "Reset" : "重設",
+    "New password" : "新密碼",
+    "New Password" : "新密碼",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險！",
+    "For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以取得最好的效果",
+    "Personal" : "個人",
+    "Users" : "使用者",
+    "Apps" : "應用程式",
+    "Admin" : "管理",
+    "Help" : "說明",
+    "Error loading tags" : "載入標籤出錯",
+    "Tag already exists" : "標籤已經存在",
+    "Error deleting tag(s)" : "刪除標籤出錯",
+    "Error tagging" : "貼標籤發生錯誤",
+    "Error untagging" : "移除標籤失敗",
+    "Error favoriting" : "加入最愛時出錯",
+    "Error unfavoriting" : "從最愛移除出錯",
+    "Access forbidden" : "存取被拒",
+    "File not found" : "找不到檔案",
+    "The specified document has not been found on the server." : "該文件不存在於伺服器上",
+    "You can click here to return to %s." : "點這裡以回到 %s",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "嗨，\n\n%s 和你分享了 %s ，到這裡看它：%s\n",
+    "The share will expire on %s." : "這個分享將會於 %s 過期",
+    "Cheers!" : "太棒了！",
+    "The server encountered an internal error and was unable to complete your request." : "伺服器遭遇內部錯誤，無法完成您的要求",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "如果這個錯誤重複出現，請聯絡系統管理員，並附上以下的錯誤細節",
+    "More details can be found in the server log." : "伺服器記錄檔裡面有更多細節",
+    "Technical details" : "技術細節",
+    "Remote Address: %s" : "遠端位置：%s",
+    "Request ID: %s" : "請求編號：%s",
+    "Code: %s" : "代碼：%s",
+    "Message: %s" : "訊息：%s",
+    "File: %s" : "檔案：%s",
+    "Line: %s" : "行數：%s",
+    "Trace" : "追蹤",
+    "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。",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的資料目錄看起來可以被 Internet 公開存取，因為 .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>以瞭解如何正確設定您的伺服器。",
+    "Create an <strong>admin account</strong>" : "建立一個<strong>管理者帳號</strong>",
+    "Password" : "密碼",
+    "Storage & database" : "儲存空間和資料庫",
+    "Data folder" : "資料儲存位置",
+    "Configure the database" : "設定資料庫",
+    "Only %s is available." : "剩下 %s 可使用",
+    "Database user" : "資料庫使用者",
+    "Database password" : "資料庫密碼",
+    "Database name" : "資料庫名稱",
+    "Database tablespace" : "資料庫 tablespace",
+    "Database host" : "資料庫主機",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "將會使用 SQLite 作為資料庫，在大型安裝中建議使用其他種資料庫",
+    "Finish setup" : "完成設定",
+    "Finishing …" : "即將完成…",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "這個應用程式需要 Javascript 才能正常運作，請<a href=\"http://enable-javascript.com/\" target=\"_blank\">啟用 Javascript</a> 然後重新整理。",
+    "%s is available. Get more information on how to update." : "%s 已經釋出，瞭解更多資訊以進行更新。",
+    "Log out" : "登出",
+    "Server side authentication failed!" : "伺服器端認證失敗！",
+    "Please contact your administrator." : "請聯絡系統管理員。",
+    "Forgot your password? Reset it!" : "忘了密碼？重設它！",
+    "remember" : "記住",
+    "Log in" : "登入",
+    "Alternative Logins" : "其他登入方法",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<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." : "感謝您的耐心",
+    "You are accessing the server from an untrusted domain." : "你正在從一個未信任的網域存取伺服器",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "請聯絡您的系統管理員，如果您就是系統管理員，請設定 config/config.php 中的 \"trusted_domain\" 選項。範例設定提供於 config/config.sample.php",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "依照設定而定，您身為系統管理員可能也可以使用底下的按鈕來信任這個網域",
+    "Add \"%s\" as trusted domain" : "將 %s 加入到信任的網域",
+    "%s will be updated to version %s." : "%s 將會被升級到版本 %s",
+    "The following apps will be disabled:" : "這些應用程式會被停用：",
+    "The theme %s has been disabled." : "主題 %s 已經被停用",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在繼續之前，請備份資料庫、config 目錄及資料目錄",
+    "Start update" : "開始升級",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "在大型安裝上，為了避免升級請求逾時，你也可以在安裝目錄執行下列指令：",
+    "This %s instance is currently being updated, which may take a while." : "正在更新這個 %s 安裝，需要一段時間",
+    "This page will refresh itself when the %s instance is available again." : "%s 安裝恢復可用之後，本頁會自動重新整理"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
deleted file mode 100644
index a431c6670da..00000000000
--- a/core/l10n/zh_TW.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "無法寄送郵件給這些使用者：%s",
-"Turned on maintenance mode" => "已啓用維護模式",
-"Turned off maintenance mode" => "已停用維護模式",
-"Updated database" => "已更新資料庫",
-"Checked database schema update" => "已檢查資料庫格式更新",
-"Checked database schema update for apps" => "已檢查應用程式的資料庫格式更新",
-"Updated \"%s\" to %s" => "已更新 %s 到 %s",
-"Disabled incompatible apps: %s" => "停用不相容的應用程式：%s",
-"No image or file provided" => "未提供圖片或檔案",
-"Unknown filetype" => "未知的檔案類型",
-"Invalid image" => "無效的圖片",
-"No temporary profile picture available, try again" => "沒有臨時用的大頭貼，請再試一次",
-"No crop data provided" => "未設定剪裁",
-"Sunday" => "週日",
-"Monday" => "週一",
-"Tuesday" => "週二",
-"Wednesday" => "週三",
-"Thursday" => "週四",
-"Friday" => "週五",
-"Saturday" => "週六",
-"January" => "一月",
-"February" => "二月",
-"March" => "三月",
-"April" => "四月",
-"May" => "五月",
-"June" => "六月",
-"July" => "七月",
-"August" => "八月",
-"September" => "九月",
-"October" => "十月",
-"November" => "十一月",
-"December" => "十二月",
-"Settings" => "設定",
-"File" => "檔案",
-"Folder" => "資料夾",
-"Image" => "圖片",
-"Audio" => "音訊",
-"Saving..." => "儲存中...",
-"Couldn't send reset email. Please contact your administrator." => "無法寄送重設 email ，請聯絡系統管理員",
-"The link to reset your password has been sent to your email. 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 至你的信箱，如果你在一段時間內沒收到，請檢查垃圾郵件資料夾，如果還是找不到，請聯絡系統管理員。",
-"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "您的檔案是加密的，如果您沒有啟用救援金鑰，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？",
-"I know what I'm doing" => "我知道我在幹嘛",
-"Reset password" => "重設密碼",
-"Password can not be changed. Please contact your administrator." => "無法變更密碼，請聯絡您的系統管理員",
-"No" => "否",
-"Yes" => "是",
-"Choose" => "選擇",
-"Error loading file picker template: {error}" => "載入檔案選擇器樣板出錯： {error}",
-"Ok" => "好",
-"Error loading message template: {error}" => "載入訊息樣板出錯： {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} 個檔案衝突"),
-"One file conflict" => "一個檔案衝突",
-"New Files" => "新檔案",
-"Already existing files" => "已經存在的檔案",
-"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} 項）",
-"Error loading file exists template" => "載入檔案存在樣板出錯",
-"Very weak password" => "非常弱的密碼",
-"Weak password" => "弱的密碼",
-"So-so password" => "普通的密碼",
-"Good password" => "好的密碼",
-"Strong password" => "很強的密碼",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "這臺 ownCloud 伺服器沒有連接到網際網路，因此有些功能像是掛載外部儲存空間、更新 ownCloud 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 ownCloud 完整的功能，建議您將這臺伺服器連接至網際網路。",
-"Error occurred while checking server setup" => "檢查伺服器配置時發生錯誤",
-"Shared" => "已分享",
-"Shared with {recipients}" => "與 {recipients} 分享",
-"Share" => "分享",
-"Error" => "錯誤",
-"Error while sharing" => "分享時發生錯誤",
-"Error while unsharing" => "取消分享時發生錯誤",
-"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" => "分享連結",
-"The public link will expire no later than {days} days after it is created" => "這個公開連結會在 {days} 天內失效",
-"Password protect" => "密碼保護",
-"Choose a password for the public link" => "為公開連結選一個密碼",
-"Allow Public Upload" => "允許任何人上傳",
-"Email link to person" => "將連結 email 給別人",
-"Send" => "寄出",
-"Set expiration date" => "指定到期日",
-"Expiration date" => "到期日",
-"Adding user..." => "新增使用者……",
-"group" => "群組",
-"Resharing is not allowed" => "不允許重新分享",
-"Shared in {item} with {user}" => "已和 {user} 分享 {item}",
-"Unshare" => "取消分享",
-"notify by email" => "以 email 通知",
-"can share" => "可分享",
-"can edit" => "可編輯",
-"access control" => "存取控制",
-"create" => "建立",
-"update" => "更新",
-"delete" => "刪除",
-"Password protected" => "受密碼保護",
-"Error unsetting expiration date" => "取消到期日設定失敗",
-"Error setting expiration date" => "設定到期日發生錯誤",
-"Sending ..." => "正在傳送…",
-"Email sent" => "Email 已寄出",
-"Warning" => "警告",
-"The object type is not specified." => "未指定物件類型",
-"Enter new" => "輸入新的",
-"Delete" => "刪除",
-"Add" => "增加",
-"Edit tags" => "編輯標籤",
-"Error loading dialog template: {error}" => "載入對話樣板出錯：{error}",
-"No tags selected for deletion." => "沒有選擇要刪除的標籤",
-"Updating {productName} to version {version}, this may take a while." => "正在更新 {productName} 到版本 {version} ，請稍候",
-"Please reload the page." => "請重新整理頁面",
-"The update was unsuccessful." => "更新失敗",
-"The update was successful. Redirecting you to ownCloud now." => "升級成功，正將您重新導向至 ownCloud 。",
-"Couldn't reset password because the token is invalid" => "無法重設密碼因為 token 無效",
-"Couldn't send reset email. Please make sure your username is correct." => "無法寄送重設 email ，請確認您的帳號輸入正確",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員",
-"%s password reset" => "%s 密碼重設",
-"Use the following link to reset your password: {link}" => "請至以下連結重設您的密碼： {link}",
-"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" => "對，我現在想要重設我的密碼。",
-"Reset" => "重設",
-"New password" => "新密碼",
-"New Password" => "新密碼",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險！",
-"For the best results, please consider using a GNU/Linux server instead." => "請考慮使用 GNU/Linux 伺服器以取得最好的效果",
-"Personal" => "個人",
-"Users" => "使用者",
-"Apps" => "應用程式",
-"Admin" => "管理",
-"Help" => "說明",
-"Error loading tags" => "載入標籤出錯",
-"Tag already exists" => "標籤已經存在",
-"Error deleting tag(s)" => "刪除標籤出錯",
-"Error tagging" => "貼標籤發生錯誤",
-"Error untagging" => "移除標籤失敗",
-"Error favoriting" => "加入最愛時出錯",
-"Error unfavoriting" => "從最愛移除出錯",
-"Access forbidden" => "存取被拒",
-"File not found" => "找不到檔案",
-"The specified document has not been found on the server." => "該文件不存在於伺服器上",
-"You can click here to return to %s." => "點這裡以回到 %s",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "嗨，\n\n%s 和你分享了 %s ，到這裡看它：%s\n",
-"The share will expire on %s." => "這個分享將會於 %s 過期",
-"Cheers!" => "太棒了！",
-"The server encountered an internal error and was unable to complete your request." => "伺服器遭遇內部錯誤，無法完成您的要求",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "如果這個錯誤重複出現，請聯絡系統管理員，並附上以下的錯誤細節",
-"More details can be found in the server log." => "伺服器記錄檔裡面有更多細節",
-"Technical details" => "技術細節",
-"Remote Address: %s" => "遠端位置：%s",
-"Request ID: %s" => "請求編號：%s",
-"Code: %s" => "代碼：%s",
-"Message: %s" => "訊息：%s",
-"File: %s" => "檔案：%s",
-"Line: %s" => "行數：%s",
-"Trace" => "追蹤",
-"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。",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的資料目錄看起來可以被 Internet 公開存取，因為 .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>以瞭解如何正確設定您的伺服器。",
-"Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>",
-"Password" => "密碼",
-"Storage & database" => "儲存空間和資料庫",
-"Data folder" => "資料儲存位置",
-"Configure the database" => "設定資料庫",
-"Only %s is available." => "剩下 %s 可使用",
-"Database user" => "資料庫使用者",
-"Database password" => "資料庫密碼",
-"Database name" => "資料庫名稱",
-"Database tablespace" => "資料庫 tablespace",
-"Database host" => "資料庫主機",
-"SQLite will be used as database. For larger installations we recommend to change this." => "將會使用 SQLite 作為資料庫，在大型安裝中建議使用其他種資料庫",
-"Finish setup" => "完成設定",
-"Finishing …" => "即將完成…",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "這個應用程式需要 Javascript 才能正常運作，請<a href=\"http://enable-javascript.com/\" target=\"_blank\">啟用 Javascript</a> 然後重新整理。",
-"%s is available. Get more information on how to update." => "%s 已經釋出，瞭解更多資訊以進行更新。",
-"Log out" => "登出",
-"Server side authentication failed!" => "伺服器端認證失敗！",
-"Please contact your administrator." => "請聯絡系統管理員。",
-"Forgot your password? Reset it!" => "忘了密碼？重設它！",
-"remember" => "記住",
-"Log in" => "登入",
-"Alternative Logins" => "其他登入方法",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<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." => "感謝您的耐心",
-"You are accessing the server from an untrusted domain." => "你正在從一個未信任的網域存取伺服器",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "請聯絡您的系統管理員，如果您就是系統管理員，請設定 config/config.php 中的 \"trusted_domain\" 選項。範例設定提供於 config/config.sample.php",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "依照設定而定，您身為系統管理員可能也可以使用底下的按鈕來信任這個網域",
-"Add \"%s\" as trusted domain" => "將 %s 加入到信任的網域",
-"%s will be updated to version %s." => "%s 將會被升級到版本 %s",
-"The following apps will be disabled:" => "這些應用程式會被停用：",
-"The theme %s has been disabled." => "主題 %s 已經被停用",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "在繼續之前，請備份資料庫、config 目錄及資料目錄",
-"Start update" => "開始升級",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "在大型安裝上，為了避免升級請求逾時，你也可以在安裝目錄執行下列指令：",
-"This %s instance is currently being updated, which may take a while." => "正在更新這個 %s 安裝，需要一段時間",
-"This page will refresh itself when the %s instance is available again." => "%s 安裝恢復可用之後，本頁會自動重新整理"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";