[tx-robot] updated from transifex

102 files changed, 150 insertions, 194 deletions

diff --git a/settings/l10n/ar.js b/settings/l10n/ar.js
index edf299d7d44..ca7f9e32a7f 100644
--- a/settings/l10n/ar.js
+++ b/settings/l10n/ar.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Sharing" : "مشاركة",
     "Cron" : "مجدول",
-    "Email Server" : "خادم البريد الالكتروني",
     "Log" : "سجل",
     "Authentication error" : "لم يتم التأكد من الشخصية بنجاح",
     "Your full name has been changed." : "اسمك الكامل تم تغييره.",
diff --git a/settings/l10n/ar.json b/settings/l10n/ar.json
index 32b279576d7..0376c432aa1 100644
--- a/settings/l10n/ar.json
+++ b/settings/l10n/ar.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Sharing" : "مشاركة",
     "Cron" : "مجدول",
-    "Email Server" : "خادم البريد الالكتروني",
     "Log" : "سجل",
     "Authentication error" : "لم يتم التأكد من الشخصية بنجاح",
     "Your full name has been changed." : "اسمك الكامل تم تغييره.",
diff --git a/settings/l10n/ast.js b/settings/l10n/ast.js
index 03a3fc57aa4..228e0fd2ffd 100644
--- a/settings/l10n/ast.js
+++ b/settings/l10n/ast.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Compartiendo",
     "External Storage" : "Almacenamientu esternu",
     "Cron" : "Cron",
-    "Email Server" : "Sirvidor de corréu-e",
     "Log" : "Rexistru",
     "Updates" : "Anovamientos",
     "Authentication error" : "Fallu d'autenticación",
diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json
index a3bb4a9ea20..1636a558d82 100644
--- a/settings/l10n/ast.json
+++ b/settings/l10n/ast.json
@@ -2,7 +2,6 @@
     "Sharing" : "Compartiendo",
     "External Storage" : "Almacenamientu esternu",
     "Cron" : "Cron",
-    "Email Server" : "Sirvidor de corréu-e",
     "Log" : "Rexistru",
     "Updates" : "Anovamientos",
     "Authentication error" : "Fallu d'autenticación",
diff --git a/settings/l10n/az.js b/settings/l10n/az.js
index db1b897a848..a088666f52c 100644
--- a/settings/l10n/az.js
+++ b/settings/l10n/az.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Təhlükəsizlik & işə salma xəbərdarlıqları",
     "Sharing" : "Paylaşılır",
     "External Storage" : "Kənar depo",
-    "Server Side Encryption" : "Server tərəf şifrələnmə",
     "Cron" : "Cron",
-    "Email Server" : "Email server",
     "Log" : "Jurnal",
     "Updates" : "Yenilənmələr",
     "Authentication error" : "Təyinat metodikası",
diff --git a/settings/l10n/az.json b/settings/l10n/az.json
index bf741ed9f9b..0a3eb295f44 100644
--- a/settings/l10n/az.json
+++ b/settings/l10n/az.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Təhlükəsizlik & işə salma xəbərdarlıqları",
     "Sharing" : "Paylaşılır",
     "External Storage" : "Kənar depo",
-    "Server Side Encryption" : "Server tərəf şifrələnmə",
     "Cron" : "Cron",
-    "Email Server" : "Email server",
     "Log" : "Jurnal",
     "Updates" : "Yenilənmələr",
     "Authentication error" : "Təyinat metodikası",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index 93cb0f7bf0e..d1bdea2b333 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Предупреждения за сигурност и настройки",
     "Sharing" : "Споделяне",
     "External Storage" : "Външно Дисково Пространство",
-    "Server Side Encryption" : "Криптиране от страна на сървъра",
     "Cron" : "Крон",
-    "Email Server" : "Имейл Сървър",
     "Log" : "Лог",
     "Updates" : "Обновления",
     "Authentication error" : "Възникна проблем с идентификацията",
@@ -127,7 +125,6 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Изпълни по едно задание с всяка заредена страница.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php е регистриран към webcron да се свързва с cron.php всеки 15 минути по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Изполвай системната cron service, за връзка с cron.php файла всеки 15 минути.",
-    "Enable Server-Side-Encryption" : "Включи криптиране от страна на сървъра",
     "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
     "Send mode" : "Режим на изпращане",
     "Encryption" : "Криптиране",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index ddea8771468..0fcbc78187b 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Предупреждения за сигурност и настройки",
     "Sharing" : "Споделяне",
     "External Storage" : "Външно Дисково Пространство",
-    "Server Side Encryption" : "Криптиране от страна на сървъра",
     "Cron" : "Крон",
-    "Email Server" : "Имейл Сървър",
     "Log" : "Лог",
     "Updates" : "Обновления",
     "Authentication error" : "Възникна проблем с идентификацията",
@@ -125,7 +123,6 @@
     "Execute one task with each page loaded" : "Изпълни по едно задание с всяка заредена страница.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php е регистриран към webcron да се свързва с cron.php всеки 15 минути по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Изполвай системната cron service, за връзка с cron.php файла всеки 15 минути.",
-    "Enable Server-Side-Encryption" : "Включи криптиране от страна на сървъра",
     "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
     "Send mode" : "Режим на изпращане",
     "Encryption" : "Криптиране",
diff --git a/settings/l10n/bn_BD.js b/settings/l10n/bn_BD.js
index a99381bf4f5..1de8c38432d 100644
--- a/settings/l10n/bn_BD.js
+++ b/settings/l10n/bn_BD.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Sharing" : "ভাগাভাগিরত",
     "External Storage" : "বাহ্যিক সংরক্ষণাগার",
-    "Email Server" : "ইমেইল সার্ভার",
     "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
     "Your full name has been changed." : "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
     "Couldn't remove app." : "অ্যাপ অপসারণ করা গেলনা",
diff --git a/settings/l10n/bn_BD.json b/settings/l10n/bn_BD.json
index 036a7cc4826..d71b26b853f 100644
--- a/settings/l10n/bn_BD.json
+++ b/settings/l10n/bn_BD.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Sharing" : "ভাগাভাগিরত",
     "External Storage" : "বাহ্যিক সংরক্ষণাগার",
-    "Email Server" : "ইমেইল সার্ভার",
     "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
     "Your full name has been changed." : "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
     "Couldn't remove app." : "অ্যাপ অপসারণ করা গেলনা",
diff --git a/settings/l10n/bs.js b/settings/l10n/bs.js
index 56715ba1902..293aff2cf3a 100644
--- a/settings/l10n/bs.js
+++ b/settings/l10n/bs.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Sharing" : "Dijeljenje",
     "Cron" : "Cron",
-    "Email Server" : "Server e-pošte",
     "Log" : "Zapisnik",
     "Updates" : "Ažuriranja",
     "Authentication error" : "Grešna autentifikacije",
diff --git a/settings/l10n/bs.json b/settings/l10n/bs.json
index 9af8f64c061..272158b9e46 100644
--- a/settings/l10n/bs.json
+++ b/settings/l10n/bs.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Sharing" : "Dijeljenje",
     "Cron" : "Cron",
-    "Email Server" : "Server e-pošte",
     "Log" : "Zapisnik",
     "Updates" : "Ažuriranja",
     "Authentication error" : "Grešna autentifikacije",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index 81f5a26297e..175b2572c2f 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Seguretat i configuració de alertes",
     "Sharing" : "Compartir",
     "External Storage" : "Emmagatzemament extern",
-    "Server Side Encryption" : "Xifrat en el servidor",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de correu",
     "Log" : "Registre",
     "Tips & tricks" : "Consells i trucs",
     "Updates" : "Actualitzacions",
@@ -131,7 +129,6 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Executa una tasca per cada paquet carregat",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Fer servir el cron del sistema per cridar el cron.php cada 15 minuts.",
-    "Enable Server-Side-Encryption" : "Habilitar xifrat en el servidor",
     "This is used for sending out notifications." : "S'usa per enviar notificacions.",
     "Send mode" : "Mode d'enviament",
     "Encryption" : "Xifrat",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index 3be9e2fc010..32c0b588b1a 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Seguretat i configuració de alertes",
     "Sharing" : "Compartir",
     "External Storage" : "Emmagatzemament extern",
-    "Server Side Encryption" : "Xifrat en el servidor",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de correu",
     "Log" : "Registre",
     "Tips & tricks" : "Consells i trucs",
     "Updates" : "Actualitzacions",
@@ -129,7 +127,6 @@
     "Execute one task with each page loaded" : "Executa una tasca per cada paquet carregat",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Fer servir el cron del sistema per cridar el cron.php cada 15 minuts.",
-    "Enable Server-Side-Encryption" : "Habilitar xifrat en el servidor",
     "This is used for sending out notifications." : "S'usa per enviar notificacions.",
     "Send mode" : "Mode d'enviament",
     "Encryption" : "Xifrat",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 400f7df6248..e18898a072a 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Upozornění zabezpečení a nastavení",
     "Sharing" : "Sdílení",
     "External Storage" : "Externí úložiště",
-    "Server Side Encryption" : "Šifrování na serveru",
     "Cron" : "Cron",
-    "Email Server" : "Emailový server",
     "Log" : "Záznam",
     "Tips & tricks" : "Tipy a triky",
     "Updates" : "Aktualizace",
@@ -133,7 +131,6 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
-    "Enable Server-Side-Encryption" : "Povolit šifrování na straně serveru",
     "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
     "Send mode" : "Mód odesílání",
     "Encryption" : "Šifrování",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index e253f080157..fd24779b135 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Upozornění zabezpečení a nastavení",
     "Sharing" : "Sdílení",
     "External Storage" : "Externí úložiště",
-    "Server Side Encryption" : "Šifrování na serveru",
     "Cron" : "Cron",
-    "Email Server" : "Emailový server",
     "Log" : "Záznam",
     "Tips & tricks" : "Tipy a triky",
     "Updates" : "Aktualizace",
@@ -131,7 +129,6 @@
     "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
-    "Enable Server-Side-Encryption" : "Povolit šifrování na straně serveru",
     "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
     "Send mode" : "Mód odesílání",
     "Encryption" : "Šifrování",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index e83069de909..5ddd3f728cb 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Advarsler om sikkerhed og opsætning",
     "Sharing" : "Deling",
     "External Storage" : "Ekstern opbevaring",
-    "Server Side Encryption" : "Kryptering på serverdelen",
     "Cron" : "Cron",
-    "Email Server" : "E-mailserver",
     "Log" : "Log",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "Opdateringer",
@@ -135,7 +133,6 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæsning",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
-    "Enable Server-Side-Encryption" : "Aktiver kryptering på serverdelen",
     "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
     "Send mode" : "Tilstand for afsendelse",
     "Encryption" : "Kryptering",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 62642160765..65aed57dea0 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Advarsler om sikkerhed og opsætning",
     "Sharing" : "Deling",
     "External Storage" : "Ekstern opbevaring",
-    "Server Side Encryption" : "Kryptering på serverdelen",
     "Cron" : "Cron",
-    "Email Server" : "E-mailserver",
     "Log" : "Log",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "Opdateringer",
@@ -133,7 +131,6 @@
     "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæsning",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
-    "Enable Server-Side-Encryption" : "Aktiver kryptering på serverdelen",
     "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
     "Send mode" : "Tilstand for afsendelse",
     "Encryption" : "Kryptering",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 5d2c4b83787..08cea0056da 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
     "Sharing" : "Teilen",
     "External Storage" : "Externer Speicher",
-    "Server Side Encryption" : "Serverseitige Verschlüsselung",
     "Cron" : "Cron",
-    "Email Server" : "E-Mail-Server",
     "Log" : "Log",
     "Tips & tricks" : "Tipps & Tricks",
     "Updates" : "Updates",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
+    "A problem occurred, please check your log files (Error: %s)" : "Ein Problem ist aufgetreten, bitte prüfen sie ihre Log Dateien (Fehler: %s)",
+    "Migration Completed" : "Migration komplett",
     "Group already exists." : "Gruppe existiert bereits.",
     "Unable to add group." : "Gruppe konnte nicht angelegt werden.",
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "E-Mail-Adresse gespeichert",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bist Du wirklich sicher, dass Du „{domain}“ als vertrauenswürdige Domain hinzufügen möchtest?",
     "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Migration in progress. Please wait until the migration is finished" : "Migration in Arbeit. Bitte warten Sie bis die Migration beendet ist",
+    "Migration started …" : "Migration gestartet ...",
     "Sending..." : "Senden…",
     "All" : "Alle",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
@@ -135,7 +137,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Enable Server-Side-Encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Start migration" : "Starte die Migration",
     "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
     "Encryption" : "Verschlüsselung",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 2f338f5ab48..7b4008d3415 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
     "Sharing" : "Teilen",
     "External Storage" : "Externer Speicher",
-    "Server Side Encryption" : "Serverseitige Verschlüsselung",
     "Cron" : "Cron",
-    "Email Server" : "E-Mail-Server",
     "Log" : "Log",
     "Tips & tricks" : "Tipps & Tricks",
     "Updates" : "Updates",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
+    "A problem occurred, please check your log files (Error: %s)" : "Ein Problem ist aufgetreten, bitte prüfen sie ihre Log Dateien (Fehler: %s)",
+    "Migration Completed" : "Migration komplett",
     "Group already exists." : "Gruppe existiert bereits.",
     "Unable to add group." : "Gruppe konnte nicht angelegt werden.",
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
@@ -46,6 +46,8 @@
     "Email saved" : "E-Mail-Adresse gespeichert",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bist Du wirklich sicher, dass Du „{domain}“ als vertrauenswürdige Domain hinzufügen möchtest?",
     "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Migration in progress. Please wait until the migration is finished" : "Migration in Arbeit. Bitte warten Sie bis die Migration beendet ist",
+    "Migration started …" : "Migration gestartet ...",
     "Sending..." : "Senden…",
     "All" : "Alle",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
@@ -133,7 +135,7 @@
     "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Enable Server-Side-Encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Start migration" : "Starte die Migration",
     "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
     "Encryption" : "Verschlüsselung",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index afe28c9dae5..f5bea44f4fb 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
     "Sharing" : "Teilen",
     "External Storage" : "Externer Speicher",
-    "Server Side Encryption" : "Serverseitige Verschlüsselung",
     "Cron" : "Cron",
-    "Email Server" : "E-Mail-Server",
     "Log" : "Log",
     "Tips & tricks" : "Tipps & Tricks",
     "Updates" : "Updates",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
+    "A problem occurred, please check your log files (Error: %s)" : "Ein Problem ist aufgetreten, bitte prüfen sie ihre Log Dateien (Fehler: %s)",
+    "Migration Completed" : "Migration komplett",
     "Group already exists." : "Gruppe existiert bereits.",
     "Unable to add group." : "Gruppe konnte nicht angelegt werden.",
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "E-Mail-Adresse gespeichert",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?",
     "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Migration in progress. Please wait until the migration is finished" : "Migration in Arbeit. Bitte warten Sie bis die Migration beendet ist",
+    "Migration started …" : "Migration gestartet ...",
     "Sending..." : "Wird gesendet…",
     "All" : "Alle",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
@@ -135,7 +137,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Enable Server-Side-Encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Start migration" : "Starte die Migration",
     "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
     "Encryption" : "Verschlüsselung",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index cd411726fb4..c8521b6817b 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
     "Sharing" : "Teilen",
     "External Storage" : "Externer Speicher",
-    "Server Side Encryption" : "Serverseitige Verschlüsselung",
     "Cron" : "Cron",
-    "Email Server" : "E-Mail-Server",
     "Log" : "Log",
     "Tips & tricks" : "Tipps & Tricks",
     "Updates" : "Updates",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
+    "A problem occurred, please check your log files (Error: %s)" : "Ein Problem ist aufgetreten, bitte prüfen sie ihre Log Dateien (Fehler: %s)",
+    "Migration Completed" : "Migration komplett",
     "Group already exists." : "Gruppe existiert bereits.",
     "Unable to add group." : "Gruppe konnte nicht angelegt werden.",
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
@@ -46,6 +46,8 @@
     "Email saved" : "E-Mail-Adresse gespeichert",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?",
     "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Migration in progress. Please wait until the migration is finished" : "Migration in Arbeit. Bitte warten Sie bis die Migration beendet ist",
+    "Migration started …" : "Migration gestartet ...",
     "Sending..." : "Wird gesendet…",
     "All" : "Alle",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
@@ -133,7 +135,7 @@
     "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Enable Server-Side-Encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Start migration" : "Starte die Migration",
     "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
     "Encryption" : "Verschlüsselung",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 3e17e634e3b..75871aecf3f 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Προειδοποιήσεις ασφάλειας & ρυθμίσεων",
     "Sharing" : "Διαμοιρασμός",
     "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
-    "Server Side Encryption" : "Κρυπτογράφηση από τον Διακομιστή",
     "Cron" : "Cron",
-    "Email Server" : "Διακομιστής Email",
     "Log" : "Καταγραφές",
     "Tips & tricks" : "Συμβουλές & τεχνάσματα",
     "Updates" : "Ενημερώσεις",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού",
     "Enabled" : "Ενεργοποιημένο",
     "Not enabled" : "Μη ενεργοποιημένο",
+    "A problem occurred, please check your log files (Error: %s)" : "Παρουσιάστηκε πρόβλημα, παρακαλώ ελέγξτε τα αρχεία καταγραφής σας (Σφάλμα: %s)",
+    "Migration Completed" : "Η μετάβαση ολοκληρώθηκε",
     "Group already exists." : "Η ομάδα υπάρχει ήδη.",
     "Unable to add group." : "Αδυναμία προσθήκης ομάδας.",
     "Unable to delete group." : "Αδυναμία διαγραφής ομάδας.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "Το email αποθηκεύτηκε ",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
     "Add trusted domain" : "Προσθέστε αξιόπιστη περιοχή",
+    "Migration in progress. Please wait until the migration is finished" : "Μετάβαση σε εξέλιξη. Παρακαλούμε περιμένετε μέχρι να ολοκληρωθεί η μετάβαση",
+    "Migration started …" : "Η μετάβαση ξεκίνησε ...",
     "Sending..." : "Αποστέλεται...",
     "All" : "Όλες",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Οι επίσημες εφαρμογές αναπτύσσονται από την κοινότητα ownCloud. Προσφέρουν λειτουργικότητα κοντά στο ownCloud και είναι έτοιμες για χρήση.",
@@ -135,7 +137,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Εκτελεί μια διεργασία κάθε φορά που φορτώνεται μια σελίδα",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Το cron.php είναι καταχωρημένο σε μια υπηρεσία webcron ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
-    "Enable Server-Side-Encryption" : "Ενεργοποίηση Κρυπτογράφησης από το Διακομηστή",
+    "Start migration" : "Έναρξη μετάβασης",
     "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
     "Send mode" : "Κατάσταση αποστολής",
     "Encryption" : "Κρυπτογράφηση",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 988d9277e75..368a7d292b6 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Προειδοποιήσεις ασφάλειας & ρυθμίσεων",
     "Sharing" : "Διαμοιρασμός",
     "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
-    "Server Side Encryption" : "Κρυπτογράφηση από τον Διακομιστή",
     "Cron" : "Cron",
-    "Email Server" : "Διακομιστής Email",
     "Log" : "Καταγραφές",
     "Tips & tricks" : "Συμβουλές & τεχνάσματα",
     "Updates" : "Ενημερώσεις",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού",
     "Enabled" : "Ενεργοποιημένο",
     "Not enabled" : "Μη ενεργοποιημένο",
+    "A problem occurred, please check your log files (Error: %s)" : "Παρουσιάστηκε πρόβλημα, παρακαλώ ελέγξτε τα αρχεία καταγραφής σας (Σφάλμα: %s)",
+    "Migration Completed" : "Η μετάβαση ολοκληρώθηκε",
     "Group already exists." : "Η ομάδα υπάρχει ήδη.",
     "Unable to add group." : "Αδυναμία προσθήκης ομάδας.",
     "Unable to delete group." : "Αδυναμία διαγραφής ομάδας.",
@@ -46,6 +46,8 @@
     "Email saved" : "Το email αποθηκεύτηκε ",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
     "Add trusted domain" : "Προσθέστε αξιόπιστη περιοχή",
+    "Migration in progress. Please wait until the migration is finished" : "Μετάβαση σε εξέλιξη. Παρακαλούμε περιμένετε μέχρι να ολοκληρωθεί η μετάβαση",
+    "Migration started …" : "Η μετάβαση ξεκίνησε ...",
     "Sending..." : "Αποστέλεται...",
     "All" : "Όλες",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Οι επίσημες εφαρμογές αναπτύσσονται από την κοινότητα ownCloud. Προσφέρουν λειτουργικότητα κοντά στο ownCloud και είναι έτοιμες για χρήση.",
@@ -133,7 +135,7 @@
     "Execute one task with each page loaded" : "Εκτελεί μια διεργασία κάθε φορά που φορτώνεται μια σελίδα",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Το cron.php είναι καταχωρημένο σε μια υπηρεσία webcron ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
-    "Enable Server-Side-Encryption" : "Ενεργοποίηση Κρυπτογράφησης από το Διακομηστή",
+    "Start migration" : "Έναρξη μετάβασης",
     "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
     "Send mode" : "Κατάσταση αποστολής",
     "Encryption" : "Κρυπτογράφηση",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 275e545fbd7..51a134063ca 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Sharing",
     "External Storage" : "External Storage",
     "Cron" : "Cron",
-    "Email Server" : "Email Server",
     "Log" : "Log",
     "Updates" : "Updates",
     "Authentication error" : "Authentication error",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index f14203d6aff..0de8369e68e 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -2,7 +2,6 @@
     "Sharing" : "Sharing",
     "External Storage" : "External Storage",
     "Cron" : "Cron",
-    "Email Server" : "Email Server",
     "Log" : "Log",
     "Updates" : "Updates",
     "Authentication error" : "Authentication error",
diff --git a/settings/l10n/eo.js b/settings/l10n/eo.js
index 040615e9d9c..84e3585b70f 100644
--- a/settings/l10n/eo.js
+++ b/settings/l10n/eo.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Kunhavigo",
     "External Storage" : "Malena memorilo",
     "Cron" : "Cron",
-    "Email Server" : "Retpoŝtoservilo",
     "Log" : "Protokolo",
     "Updates" : "Ĝisdatigoj",
     "Authentication error" : "Aŭtentiga eraro",
diff --git a/settings/l10n/eo.json b/settings/l10n/eo.json
index d77c0a38894..40522fc9519 100644
--- a/settings/l10n/eo.json
+++ b/settings/l10n/eo.json
@@ -2,7 +2,6 @@
     "Sharing" : "Kunhavigo",
     "External Storage" : "Malena memorilo",
     "Cron" : "Cron",
-    "Email Server" : "Retpoŝtoservilo",
     "Log" : "Protokolo",
     "Updates" : "Ĝisdatigoj",
     "Authentication error" : "Aŭtentiga eraro",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index f4495740922..dfbbcb0566e 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Avisos de seguidad y configuración",
     "Sharing" : "Compartiendo",
     "External Storage" : "Almacenamiento externo",
-    "Server Side Encryption" : "Cifrado en el servidor",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de correo electrónico",
     "Log" : "Registro",
     "Tips & tricks" : "Sugerencias y trucos",
     "Updates" : "Actualizaciones",
@@ -135,7 +133,6 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
-    "Enable Server-Side-Encryption" : "Habilitar cifrado en el servidor",
     "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
     "Send mode" : "Modo de envío",
     "Encryption" : "Cifrado",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 241e91c28f1..7cefb5d83c4 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Avisos de seguidad y configuración",
     "Sharing" : "Compartiendo",
     "External Storage" : "Almacenamiento externo",
-    "Server Side Encryption" : "Cifrado en el servidor",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de correo electrónico",
     "Log" : "Registro",
     "Tips & tricks" : "Sugerencias y trucos",
     "Updates" : "Actualizaciones",
@@ -133,7 +131,6 @@
     "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
-    "Enable Server-Side-Encryption" : "Habilitar cifrado en el servidor",
     "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
     "Send mode" : "Modo de envío",
     "Encryption" : "Cifrado",
diff --git a/settings/l10n/es_AR.js b/settings/l10n/es_AR.js
index fed0f97de08..abe15748f72 100644
--- a/settings/l10n/es_AR.js
+++ b/settings/l10n/es_AR.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Compartiendo",
     "External Storage" : "Almacenamiento externo",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de correo electrónico",
     "Log" : "Log",
     "Updates" : "Actualizaciones",
     "Authentication error" : "Error al autenticar",
diff --git a/settings/l10n/es_AR.json b/settings/l10n/es_AR.json
index 24ae430aa1c..5e4f087c33b 100644
--- a/settings/l10n/es_AR.json
+++ b/settings/l10n/es_AR.json
@@ -2,7 +2,6 @@
     "Sharing" : "Compartiendo",
     "External Storage" : "Almacenamiento externo",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de correo electrónico",
     "Log" : "Log",
     "Updates" : "Actualizaciones",
     "Authentication error" : "Error al autenticar",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index 3d9e2a942bb..6e0677337dc 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Jagamine",
     "External Storage" : "Väline salvestuskoht",
     "Cron" : "Cron",
-    "Email Server" : "Postiserver",
     "Log" : "Logi",
     "Updates" : "Uuendused",
     "Authentication error" : "Autentimise viga",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index 9e3051441e8..0edc3d3b916 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -2,7 +2,6 @@
     "Sharing" : "Jagamine",
     "External Storage" : "Väline salvestuskoht",
     "Cron" : "Cron",
-    "Email Server" : "Postiserver",
     "Log" : "Logi",
     "Updates" : "Uuendused",
     "Authentication error" : "Autentimise viga",
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
index cb59604bf98..7f30c91fa52 100644
--- a/settings/l10n/eu.js
+++ b/settings/l10n/eu.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Partekatzea",
     "External Storage" : "Kanpoko biltegiratzea",
     "Cron" : "Cron",
-    "Email Server" : "Eposta zerbitzaria",
     "Log" : "Log",
     "Updates" : "Eguneraketak",
     "Authentication error" : "Autentifikazio errorea",
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
index f9b724e36f5..5c9ce4bdf34 100644
--- a/settings/l10n/eu.json
+++ b/settings/l10n/eu.json
@@ -2,7 +2,6 @@
     "Sharing" : "Partekatzea",
     "External Storage" : "Kanpoko biltegiratzea",
     "Cron" : "Cron",
-    "Email Server" : "Eposta zerbitzaria",
     "Log" : "Log",
     "Updates" : "Eguneraketak",
     "Authentication error" : "Autentifikazio errorea",
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
index 4201415d938..ddfa303ede4 100644
--- a/settings/l10n/fa.js
+++ b/settings/l10n/fa.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "اشتراک گذاری",
     "External Storage" : "حافظه خارجی",
     "Cron" : "زمانبند",
-    "Email Server" : "سرور ایمیل",
     "Log" : "کارنامه",
     "Updates" : "به روز رسانی ها",
     "Authentication error" : "خطا در اعتبار سنجی",
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
index 2deb4af7f16..0a84e5b5889 100644
--- a/settings/l10n/fa.json
+++ b/settings/l10n/fa.json
@@ -2,7 +2,6 @@
     "Sharing" : "اشتراک گذاری",
     "External Storage" : "حافظه خارجی",
     "Cron" : "زمانبند",
-    "Email Server" : "سرور ایمیل",
     "Log" : "کارنامه",
     "Updates" : "به روز رسانی ها",
     "Authentication error" : "خطا در اعتبار سنجی",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index add1f61c317..14097570157 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Turvallisuus- ja asetusvaroitukset",
     "Sharing" : "Jakaminen",
     "External Storage" : "Erillinen tallennusväline",
-    "Server Side Encryption" : "Palvelinpään salaus",
     "Cron" : "Cron",
-    "Email Server" : "Sähköpostipalvelin",
     "Log" : "Loki",
     "Tips & tricks" : "Vinkit",
     "Updates" : "Päivitykset",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Salasanan vaihto ei onnistunut",
     "Enabled" : "Käytössä",
     "Not enabled" : "Ei käytössä",
+    "A problem occurred, please check your log files (Error: %s)" : "Tapahtui virhe, tarkista lokitiedostot (Virhe: %s)",
+    "Migration Completed" : "Migraatio valmistui",
     "Group already exists." : "Ryhmä on jo olemassa.",
     "Unable to add group." : "Ryhmän lisääminen ei onnistunut.",
     "Unable to delete group." : "Ryhmän poistaminen ei onnistunut.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "Sähköposti tallennettu",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?",
     "Add trusted domain" : "Lisää luotettu toimialue",
+    "Migration in progress. Please wait until the migration is finished" : "Migraatio on kesken. Odota kunnes migraatio valmistuu",
+    "Migration started …" : "Migraatio käynnistyi…",
     "Sending..." : "Lähetetään...",
     "All" : "Kaikki",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Viralliset sovellukset kehitetään ownCloud-yhteisön toimesta. Sovellukset tarjoavat lisäominaisuuksia ownCloudin keskeisiin toimintoihin liittyen ja ovat valmiita tuotantokäyttöön.",
@@ -129,7 +131,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
-    "Enable Server-Side-Encryption" : "Käytä palvelinpään salausta",
+    "Start migration" : "Käynnistä migraatio",
     "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
     "Send mode" : "Lähetystila",
     "Encryption" : "Salaus",
@@ -161,6 +163,7 @@ OC.L10N.register(
     "Version" : "Versio",
     "More apps" : "Lisää sovelluksia",
     "Developer documentation" : "Kehittäjädokumentaatio",
+    "Experimental applications ahead" : "Kokeellisia sovelluksia edessä",
     "by" : " Kirjoittaja:",
     "licensed" : "lisensoitu",
     "Documentation:" : "Ohjeistus:",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index a5036d9e2ba..43f9244b343 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Turvallisuus- ja asetusvaroitukset",
     "Sharing" : "Jakaminen",
     "External Storage" : "Erillinen tallennusväline",
-    "Server Side Encryption" : "Palvelinpään salaus",
     "Cron" : "Cron",
-    "Email Server" : "Sähköpostipalvelin",
     "Log" : "Loki",
     "Tips & tricks" : "Vinkit",
     "Updates" : "Päivitykset",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Salasanan vaihto ei onnistunut",
     "Enabled" : "Käytössä",
     "Not enabled" : "Ei käytössä",
+    "A problem occurred, please check your log files (Error: %s)" : "Tapahtui virhe, tarkista lokitiedostot (Virhe: %s)",
+    "Migration Completed" : "Migraatio valmistui",
     "Group already exists." : "Ryhmä on jo olemassa.",
     "Unable to add group." : "Ryhmän lisääminen ei onnistunut.",
     "Unable to delete group." : "Ryhmän poistaminen ei onnistunut.",
@@ -46,6 +46,8 @@
     "Email saved" : "Sähköposti tallennettu",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?",
     "Add trusted domain" : "Lisää luotettu toimialue",
+    "Migration in progress. Please wait until the migration is finished" : "Migraatio on kesken. Odota kunnes migraatio valmistuu",
+    "Migration started …" : "Migraatio käynnistyi…",
     "Sending..." : "Lähetetään...",
     "All" : "Kaikki",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Viralliset sovellukset kehitetään ownCloud-yhteisön toimesta. Sovellukset tarjoavat lisäominaisuuksia ownCloudin keskeisiin toimintoihin liittyen ja ovat valmiita tuotantokäyttöön.",
@@ -127,7 +129,7 @@
     "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
-    "Enable Server-Side-Encryption" : "Käytä palvelinpään salausta",
+    "Start migration" : "Käynnistä migraatio",
     "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
     "Send mode" : "Lähetystila",
     "Encryption" : "Salaus",
@@ -159,6 +161,7 @@
     "Version" : "Versio",
     "More apps" : "Lisää sovelluksia",
     "Developer documentation" : "Kehittäjädokumentaatio",
+    "Experimental applications ahead" : "Kokeellisia sovelluksia edessä",
     "by" : " Kirjoittaja:",
     "licensed" : "lisensoitu",
     "Documentation:" : "Ohjeistus:",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 37979eb0cdd..3be50ae0ee2 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Avertissements de sécurité ou de configuration",
     "Sharing" : "Partage",
     "External Storage" : "Stockage externe",
-    "Server Side Encryption" : "Chiffrement côté serveur",
     "Cron" : "Cron",
-    "Email Server" : "Serveur mail",
     "Log" : "Log",
     "Tips & tricks" : "Trucs et astuces",
     "Updates" : "Mises à jour",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Impossible de modifier le mot de passe",
     "Enabled" : "Activées",
     "Not enabled" : "Désactivées",
+    "A problem occurred, please check your log files (Error: %s)" : "Une erreur est survenue, veuillez vérifier vos fichiers de log (Erreur: %s)",
+    "Migration Completed" : "Migration terminée",
     "Group already exists." : "Ce groupe existe déjà.",
     "Unable to add group." : "Impossible d'ajouter le groupe.",
     "Unable to delete group." : "Impossible de supprimer le groupe.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "Email sauvegardé",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
     "Add trusted domain" : "Ajouter un domaine de confiance",
+    "Migration in progress. Please wait until the migration is finished" : "Migration en cours. Veuillez attendre que celle-ci se termine",
+    "Migration started …" : "Migration démarrée...",
     "Sending..." : "Envoi en cours...",
     "All" : "Tous",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Les applications officielles sont développées par et avec la communauté ownCloud. Elles offrent ses fonctionnalités principales à ownCloud et sont prêtes pour une utilisation en production. ",
@@ -135,7 +137,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré auprès d'un service webcron qui l'exécutera toutes les 15 minutes via http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
-    "Enable Server-Side-Encryption" : "Activer le chiffrement côté serveur",
+    "Start migration" : "Démarrer la migration",
     "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
     "Send mode" : "Mode d'envoi",
     "Encryption" : "Chiffrement",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index ab75cecc533..eac4dabeb00 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Avertissements de sécurité ou de configuration",
     "Sharing" : "Partage",
     "External Storage" : "Stockage externe",
-    "Server Side Encryption" : "Chiffrement côté serveur",
     "Cron" : "Cron",
-    "Email Server" : "Serveur mail",
     "Log" : "Log",
     "Tips & tricks" : "Trucs et astuces",
     "Updates" : "Mises à jour",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Impossible de modifier le mot de passe",
     "Enabled" : "Activées",
     "Not enabled" : "Désactivées",
+    "A problem occurred, please check your log files (Error: %s)" : "Une erreur est survenue, veuillez vérifier vos fichiers de log (Erreur: %s)",
+    "Migration Completed" : "Migration terminée",
     "Group already exists." : "Ce groupe existe déjà.",
     "Unable to add group." : "Impossible d'ajouter le groupe.",
     "Unable to delete group." : "Impossible de supprimer le groupe.",
@@ -46,6 +46,8 @@
     "Email saved" : "Email sauvegardé",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
     "Add trusted domain" : "Ajouter un domaine de confiance",
+    "Migration in progress. Please wait until the migration is finished" : "Migration en cours. Veuillez attendre que celle-ci se termine",
+    "Migration started …" : "Migration démarrée...",
     "Sending..." : "Envoi en cours...",
     "All" : "Tous",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Les applications officielles sont développées par et avec la communauté ownCloud. Elles offrent ses fonctionnalités principales à ownCloud et sont prêtes pour une utilisation en production. ",
@@ -133,7 +135,7 @@
     "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré auprès d'un service webcron qui l'exécutera toutes les 15 minutes via http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
-    "Enable Server-Side-Encryption" : "Activer le chiffrement côté serveur",
+    "Start migration" : "Démarrer la migration",
     "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
     "Send mode" : "Mode d'envoi",
     "Encryption" : "Chiffrement",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index a5243375817..415d67822c2 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Avisos de seguridade e configuración",
     "Sharing" : "Compartindo",
     "External Storage" : "Almacenamento externo",
-    "Server Side Encryption" : "Cifrado na parte do servidor",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de correo",
     "Log" : "Rexistro",
     "Tips & tricks" : "Trucos e consellos",
     "Updates" : "Actualizacións",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Non é posíbel cambiar o contrasinal",
     "Enabled" : "Activado",
     "Not enabled" : "Non activado",
+    "A problem occurred, please check your log files (Error: %s)" : "Ocorreu un problema revise os ficheiros de rexistro (Erro: %s)",
+    "Migration Completed" : "Completouse a migración",
     "Group already exists." : "Xa existe o grupo.",
     "Unable to add group." : "Non é posíbel engadir o grupo.",
     "Unable to delete group." : "Non é posíbel eliminar o grupo.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "Correo gardado",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Confirma que quere engadir «{domain}» como dominio de confianza?",
     "Add trusted domain" : "Engadir dominio de confianza",
+    "Migration in progress. Please wait until the migration is finished" : "A migración está en proceso. Agarde a que remate.",
+    "Migration started …" : "Iniciada a migración ...",
     "Sending..." : "Enviando...",
     "All" : "Todo",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As aplicacións oficiais son desenvolvidas pola comunidade dentro de ownCloud. Ofrecen una funcionalidade central para ownCloud e están preparadas para o seu uso en produción.",
@@ -135,7 +137,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Executar unha tarefa con cada páxina cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
-    "Enable Server-Side-Encryption" : "Activar o cifrado na parte do servidor",
+    "Start migration" : "Iniciar a migración",
     "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.",
     "Send mode" : "Modo de envío",
     "Encryption" : "Cifrado",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index c9f940e389e..b1f998a3152 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Avisos de seguridade e configuración",
     "Sharing" : "Compartindo",
     "External Storage" : "Almacenamento externo",
-    "Server Side Encryption" : "Cifrado na parte do servidor",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de correo",
     "Log" : "Rexistro",
     "Tips & tricks" : "Trucos e consellos",
     "Updates" : "Actualizacións",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Non é posíbel cambiar o contrasinal",
     "Enabled" : "Activado",
     "Not enabled" : "Non activado",
+    "A problem occurred, please check your log files (Error: %s)" : "Ocorreu un problema revise os ficheiros de rexistro (Erro: %s)",
+    "Migration Completed" : "Completouse a migración",
     "Group already exists." : "Xa existe o grupo.",
     "Unable to add group." : "Non é posíbel engadir o grupo.",
     "Unable to delete group." : "Non é posíbel eliminar o grupo.",
@@ -46,6 +46,8 @@
     "Email saved" : "Correo gardado",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Confirma que quere engadir «{domain}» como dominio de confianza?",
     "Add trusted domain" : "Engadir dominio de confianza",
+    "Migration in progress. Please wait until the migration is finished" : "A migración está en proceso. Agarde a que remate.",
+    "Migration started …" : "Iniciada a migración ...",
     "Sending..." : "Enviando...",
     "All" : "Todo",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As aplicacións oficiais son desenvolvidas pola comunidade dentro de ownCloud. Ofrecen una funcionalidade central para ownCloud e están preparadas para o seu uso en produción.",
@@ -133,7 +135,7 @@
     "Execute one task with each page loaded" : "Executar unha tarefa con cada páxina cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
-    "Enable Server-Side-Encryption" : "Activar o cifrado na parte do servidor",
+    "Start migration" : "Iniciar a migración",
     "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.",
     "Send mode" : "Modo de envío",
     "Encryption" : "Cifrado",
diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js
index df3fe9cc7df..fcfd8fa63c1 100644
--- a/settings/l10n/hr.js
+++ b/settings/l10n/hr.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Dijeljenje zajedničkih resursa",
     "External Storage" : "Vanjsko spremište",
     "Cron" : "Cron",
-    "Email Server" : "Poslužitelj e-pošte",
     "Log" : "Zapisnik",
     "Updates" : "nadogradnje",
     "Authentication error" : "Pogrešna autentikacija",
diff --git a/settings/l10n/hr.json b/settings/l10n/hr.json
index 8029837f4ac..682ba270f68 100644
--- a/settings/l10n/hr.json
+++ b/settings/l10n/hr.json
@@ -2,7 +2,6 @@
     "Sharing" : "Dijeljenje zajedničkih resursa",
     "External Storage" : "Vanjsko spremište",
     "Cron" : "Cron",
-    "Email Server" : "Poslužitelj e-pošte",
     "Log" : "Zapisnik",
     "Updates" : "nadogradnje",
     "Authentication error" : "Pogrešna autentikacija",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index ab814016112..e408bed23e1 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Megosztás",
     "External Storage" : "Külső tárolási szolgáltatások becsatolása",
     "Cron" : "Ütemezett feladatok",
-    "Email Server" : "E-mail kiszolgáló",
     "Log" : "Naplózás",
     "Updates" : "Frissítések",
     "Authentication error" : "Azonosítási hiba",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index cca98b38ae6..0ca93409f2d 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -2,7 +2,6 @@
     "Sharing" : "Megosztás",
     "External Storage" : "Külső tárolási szolgáltatások becsatolása",
     "Cron" : "Ütemezett feladatok",
-    "Email Server" : "E-mail kiszolgáló",
     "Log" : "Naplózás",
     "Updates" : "Frissítések",
     "Authentication error" : "Azonosítási hiba",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index bc675cc4627..5719ca22195 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Berbagi",
     "External Storage" : "Penyimpanan Eksternal",
     "Cron" : "Cron",
-    "Email Server" : "Server Email",
     "Log" : "Log",
     "Updates" : "Pembaruan",
     "Authentication error" : "Terjadi kesalahan saat otentikasi",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 366ab477779..c4b0c17df75 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -2,7 +2,6 @@
     "Sharing" : "Berbagi",
     "External Storage" : "Penyimpanan Eksternal",
     "Cron" : "Cron",
-    "Email Server" : "Server Email",
     "Log" : "Log",
     "Updates" : "Pembaruan",
     "Authentication error" : "Terjadi kesalahan saat otentikasi",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 7be28b14222..f44c9d77b0b 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Avvisi di sicurezza e di configurazione",
     "Sharing" : "Condivisione",
     "External Storage" : "Archiviazione esterna",
-    "Server Side Encryption" : "Cifratura lato server",
     "Cron" : "Cron",
-    "Email Server" : "Server di posta",
     "Log" : "Log",
     "Tips & tricks" : "Suggerimenti e trucchi",
     "Updates" : "Aggiornamenti",
@@ -28,6 +26,7 @@ OC.L10N.register(
     "Unable to change password" : "Impossibile cambiare la password",
     "Enabled" : "Abilitata",
     "Not enabled" : "Non abilitata",
+    "Migration Completed" : "Migrazione completata",
     "Group already exists." : "Il gruppo esiste già.",
     "Unable to add group." : "Impossibile aggiungere il gruppo.",
     "Unable to delete group." : "Impossibile eliminare il gruppo.",
@@ -48,6 +47,7 @@ OC.L10N.register(
     "Email saved" : "Email salvata",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sei sicuro di voler aggiungere \"{domain}\"  come dominio attendibile?",
     "Add trusted domain" : "Aggiungi dominio attendibile",
+    "Migration started …" : "Migrazione avviata...",
     "Sending..." : "Invio in corso...",
     "All" : "Tutti",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Le applicazioni ufficiali sono sviluppate da e con la comunità di ownCloud. Offrono le funzioni fondamentali di ownCloud e sono pronte per l'utilizzo in produzione.",
@@ -135,7 +135,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
-    "Enable Server-Side-Encryption" : "Abilita cifratura lato server",
+    "Start migration" : "Avvia migrazione",
     "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
     "Send mode" : "Modalità di invio",
     "Encryption" : "Cifratura",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 99aed5aefb5..1683ffef203 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Avvisi di sicurezza e di configurazione",
     "Sharing" : "Condivisione",
     "External Storage" : "Archiviazione esterna",
-    "Server Side Encryption" : "Cifratura lato server",
     "Cron" : "Cron",
-    "Email Server" : "Server di posta",
     "Log" : "Log",
     "Tips & tricks" : "Suggerimenti e trucchi",
     "Updates" : "Aggiornamenti",
@@ -26,6 +24,7 @@
     "Unable to change password" : "Impossibile cambiare la password",
     "Enabled" : "Abilitata",
     "Not enabled" : "Non abilitata",
+    "Migration Completed" : "Migrazione completata",
     "Group already exists." : "Il gruppo esiste già.",
     "Unable to add group." : "Impossibile aggiungere il gruppo.",
     "Unable to delete group." : "Impossibile eliminare il gruppo.",
@@ -46,6 +45,7 @@
     "Email saved" : "Email salvata",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sei sicuro di voler aggiungere \"{domain}\"  come dominio attendibile?",
     "Add trusted domain" : "Aggiungi dominio attendibile",
+    "Migration started …" : "Migrazione avviata...",
     "Sending..." : "Invio in corso...",
     "All" : "Tutti",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Le applicazioni ufficiali sono sviluppate da e con la comunità di ownCloud. Offrono le funzioni fondamentali di ownCloud e sono pronte per l'utilizzo in produzione.",
@@ -133,7 +133,7 @@
     "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
-    "Enable Server-Side-Encryption" : "Abilita cifratura lato server",
+    "Start migration" : "Avvia migrazione",
     "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
     "Send mode" : "Modalità di invio",
     "Encryption" : "Cifratura",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 04ad2ec4ff0..11862e37b66 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "セキュリティ＆セットアップ警告",
     "Sharing" : "共有",
     "External Storage" : "外部ストレージ",
-    "Server Side Encryption" : "サーバーサイド暗号化",
     "Cron" : "Cron",
-    "Email Server" : "メールサーバー",
     "Log" : "ログ",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "アップデート",
@@ -129,7 +127,6 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています。",
     "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行する。",
-    "Enable Server-Side-Encryption" : "サーバーサイド暗号化を有効に",
     "This is used for sending out notifications." : "通知を送信する際に使用します。",
     "Send mode" : "送信モード",
     "Encryption" : "暗号化",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index daa013178bd..47243d1c55b 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "セキュリティ＆セットアップ警告",
     "Sharing" : "共有",
     "External Storage" : "外部ストレージ",
-    "Server Side Encryption" : "サーバーサイド暗号化",
     "Cron" : "Cron",
-    "Email Server" : "メールサーバー",
     "Log" : "ログ",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "アップデート",
@@ -127,7 +125,6 @@
     "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています。",
     "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行する。",
-    "Enable Server-Side-Encryption" : "サーバーサイド暗号化を有効に",
     "This is used for sending out notifications." : "通知を送信する際に使用します。",
     "Send mode" : "送信モード",
     "Encryption" : "暗号化",
diff --git a/settings/l10n/km.js b/settings/l10n/km.js
index 71c614dcfb8..0798e7ca01c 100644
--- a/settings/l10n/km.js
+++ b/settings/l10n/km.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "ការ​ចែក​រំលែក",
     "External Storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
     "Cron" : "Cron",
-    "Email Server" : "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
     "Log" : "Log",
     "Authentication error" : "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
     "Language changed" : "បាន​ប្ដូរ​ភាសា",
diff --git a/settings/l10n/km.json b/settings/l10n/km.json
index fab32e06e57..f8e193041cc 100644
--- a/settings/l10n/km.json
+++ b/settings/l10n/km.json
@@ -2,7 +2,6 @@
     "Sharing" : "ការ​ចែក​រំលែក",
     "External Storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
     "Cron" : "Cron",
-    "Email Server" : "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
     "Log" : "Log",
     "Authentication error" : "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
     "Language changed" : "បាន​ប្ដូរ​ភាសា",
diff --git a/settings/l10n/kn.js b/settings/l10n/kn.js
index 4e739742b48..424d1493fca 100644
--- a/settings/l10n/kn.js
+++ b/settings/l10n/kn.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "settings",
     {
     "Sharing" : "ಹಂಚಿಕೆ",
-    "Email Server" : "ಇ-ಅಂಚೆಯ ಪರಿಚಾರಕ ಗಣಕಯಂತ್ರ",
     "Log" : "ಹಿನ್ನೆಲೆಯ ದಾಖಲೆ",
     "Authentication error" : "ದೃಢೀಕರಣ ದೋಷ",
     "Your full name has been changed." : "ನಿಮ್ಮ ಪೂರ್ಣ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ.",
diff --git a/settings/l10n/kn.json b/settings/l10n/kn.json
index 9f50b421edf..88cfcc52c59 100644
--- a/settings/l10n/kn.json
+++ b/settings/l10n/kn.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Sharing" : "ಹಂಚಿಕೆ",
-    "Email Server" : "ಇ-ಅಂಚೆಯ ಪರಿಚಾರಕ ಗಣಕಯಂತ್ರ",
     "Log" : "ಹಿನ್ನೆಲೆಯ ದಾಖಲೆ",
     "Authentication error" : "ದೃಢೀಕರಣ ದೋಷ",
     "Your full name has been changed." : "ನಿಮ್ಮ ಪೂರ್ಣ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ.",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index fb9b25bebdc..03b9b29a989 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "공유",
     "External Storage" : "외부 저장소",
     "Cron" : "Cron",
-    "Email Server" : "전자우편 서버",
     "Log" : "로그",
     "Updates" : "업데이트",
     "Authentication error" : "인증 오류",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index 98c612b116d..ccdaa3fdd39 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -2,7 +2,6 @@
     "Sharing" : "공유",
     "External Storage" : "외부 저장소",
     "Cron" : "Cron",
-    "Email Server" : "전자우편 서버",
     "Log" : "로그",
     "Updates" : "업데이트",
     "Authentication error" : "인증 오류",
diff --git a/settings/l10n/lo.js b/settings/l10n/lo.js
index 3f5ec7a0bce..862f93e195f 100644
--- a/settings/l10n/lo.js
+++ b/settings/l10n/lo.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "settings",
     {
     "Sharing" : "ການແບ່ງປັນ",
-    "Email Server" : "ເຊີເວີອີເມວ",
     "Log" : "ບັນທຶກ",
     "Unable to change full name" : "ບໍ່ສາມາດປ່ຽນຊື່ເຕັມໄດ້",
     "Couldn't remove app." : "ບໍ່ສາມາດລຶບແອັບຯອອກໄດ້"
diff --git a/settings/l10n/lo.json b/settings/l10n/lo.json
index e92493d0fe1..75515944189 100644
--- a/settings/l10n/lo.json
+++ b/settings/l10n/lo.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Sharing" : "ການແບ່ງປັນ",
-    "Email Server" : "ເຊີເວີອີເມວ",
     "Log" : "ບັນທຶກ",
     "Unable to change full name" : "ບໍ່ສາມາດປ່ຽນຊື່ເຕັມໄດ້",
     "Couldn't remove app." : "ບໍ່ສາມາດລຶບແອັບຯອອກໄດ້"
diff --git a/settings/l10n/lv.js b/settings/l10n/lv.js
index c0683a44fa1..dca43da8cda 100644
--- a/settings/l10n/lv.js
+++ b/settings/l10n/lv.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Dalīšanās",
     "External Storage" : "Ārējā krātuve",
     "Cron" : "Cron",
-    "Email Server" : "E-pasta serveris",
     "Log" : "Žurnāls",
     "Authentication error" : "Autentifikācijas kļūda",
     "Your full name has been changed." : "Jūsu pilnais vārds tika mainīts.",
diff --git a/settings/l10n/lv.json b/settings/l10n/lv.json
index 8b0ed430b9c..1b8afb4d657 100644
--- a/settings/l10n/lv.json
+++ b/settings/l10n/lv.json
@@ -2,7 +2,6 @@
     "Sharing" : "Dalīšanās",
     "External Storage" : "Ārējā krātuve",
     "Cron" : "Cron",
-    "Email Server" : "E-pasta serveris",
     "Log" : "Žurnāls",
     "Authentication error" : "Autentifikācijas kļūda",
     "Your full name has been changed." : "Jūsu pilnais vārds tika mainīts.",
diff --git a/settings/l10n/mk.js b/settings/l10n/mk.js
index 4119f985b59..1ee7c5e7c1d 100644
--- a/settings/l10n/mk.js
+++ b/settings/l10n/mk.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Споделување",
     "External Storage" : "Надворешно складиште",
     "Cron" : "Крон",
-    "Email Server" : "Сервер за електронска пошта",
     "Log" : "Записник",
     "Authentication error" : "Грешка во автентикација",
     "Your full name has been changed." : "Вашето целосно име е променето.",
diff --git a/settings/l10n/mk.json b/settings/l10n/mk.json
index 40b8b433dea..ab2eff42d5a 100644
--- a/settings/l10n/mk.json
+++ b/settings/l10n/mk.json
@@ -2,7 +2,6 @@
     "Sharing" : "Споделување",
     "External Storage" : "Надворешно складиште",
     "Cron" : "Крон",
-    "Email Server" : "Сервер за електронска пошта",
     "Log" : "Записник",
     "Authentication error" : "Грешка во автентикација",
     "Your full name has been changed." : "Вашето целосно име е променето.",
diff --git a/settings/l10n/mn.js b/settings/l10n/mn.js
index 099846ae293..30c8a71df7a 100644
--- a/settings/l10n/mn.js
+++ b/settings/l10n/mn.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Sharing" : "Түгээлт",
     "Cron" : "Крон",
-    "Email Server" : "И-мэйл сервер",
     "Log" : "Лог бичилт",
     "Authentication error" : "Нотолгооны алдаа",
     "Your full name has been changed." : "Таны бүтэн нэр солигдлоо.",
diff --git a/settings/l10n/mn.json b/settings/l10n/mn.json
index 7ad0993ae09..95400f3893c 100644
--- a/settings/l10n/mn.json
+++ b/settings/l10n/mn.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Sharing" : "Түгээлт",
     "Cron" : "Крон",
-    "Email Server" : "И-мэйл сервер",
     "Log" : "Лог бичилт",
     "Authentication error" : "Нотолгооны алдаа",
     "Your full name has been changed." : "Таны бүтэн нэр солигдлоо.",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 3a5ee411a43..51e7b24564b 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Advarsler om sikkerhet og oppsett",
     "Sharing" : "Deling",
     "External Storage" : "Ekstern lagring",
-    "Server Side Encryption" : "Serverkryptering",
     "Cron" : "Cron",
-    "Email Server" : "E-postserver",
     "Log" : "Logg",
     "Tips & tricks" : "Tips og triks",
     "Updates" : "Oppdateringer",
@@ -131,7 +129,6 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
-    "Enable Server-Side-Encryption" : "Slå på serverkryptering",
     "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
     "Send mode" : "Sendemåte",
     "Encryption" : "Kryptering",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index 6e5a29f8cd4..db720d1a9e8 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Advarsler om sikkerhet og oppsett",
     "Sharing" : "Deling",
     "External Storage" : "Ekstern lagring",
-    "Server Side Encryption" : "Serverkryptering",
     "Cron" : "Cron",
-    "Email Server" : "E-postserver",
     "Log" : "Logg",
     "Tips & tricks" : "Tips og triks",
     "Updates" : "Oppdateringer",
@@ -129,7 +127,6 @@
     "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
-    "Enable Server-Side-Encryption" : "Slå på serverkryptering",
     "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
     "Send mode" : "Sendemåte",
     "Encryption" : "Kryptering",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 80389ed6d80..fedce057925 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Beveiligings- en instellingswaarschuwingen",
     "Sharing" : "Delen",
     "External Storage" : "Externe opslag",
-    "Server Side Encryption" : "Server-side versleuteling",
     "Cron" : "Cron",
-    "Email Server" : "E-mailserver",
     "Log" : "Log",
     "Tips & tricks" : "Tips & trucs",
     "Updates" : "Updates",
@@ -135,7 +133,6 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
-    "Enable Server-Side-Encryption" : "Inschakelen server-side versleuteling",
     "This is used for sending out notifications." : "Dit wordt gebruikt voor het verzenden van meldingen.",
     "Send mode" : "Verstuurmodus",
     "Encryption" : "Versleuteling",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 80a6f944a3f..fe1e94296a4 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Beveiligings- en instellingswaarschuwingen",
     "Sharing" : "Delen",
     "External Storage" : "Externe opslag",
-    "Server Side Encryption" : "Server-side versleuteling",
     "Cron" : "Cron",
-    "Email Server" : "E-mailserver",
     "Log" : "Log",
     "Tips & tricks" : "Tips & trucs",
     "Updates" : "Updates",
@@ -133,7 +131,6 @@
     "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
-    "Enable Server-Side-Encryption" : "Inschakelen server-side versleuteling",
     "This is used for sending out notifications." : "Dit wordt gebruikt voor het verzenden van meldingen.",
     "Send mode" : "Verstuurmodus",
     "Encryption" : "Versleuteling",
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
index fb0a2469c61..924856fe64f 100644
--- a/settings/l10n/pl.js
+++ b/settings/l10n/pl.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Ostrzeżenia bezpieczeństwa i konfiguracji",
     "Sharing" : "Udostępnianie",
     "External Storage" : "Zewnętrzna zasoby dyskowe",
-    "Server Side Encryption" : "Szyfrowanie po stronie serwera",
     "Cron" : "Cron",
-    "Email Server" : "Serwer pocztowy",
     "Log" : "Logi",
     "Updates" : "Aktualizacje",
     "Authentication error" : "Błąd uwierzytelniania",
@@ -118,7 +116,6 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
-    "Enable Server-Side-Encryption" : "Włącz szyfrowanie po stronie serwera",
     "This is used for sending out notifications." : "To jest używane do wysyłania powiadomień",
     "Send mode" : "Tryb wysyłki",
     "Encryption" : "Szyfrowanie",
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
index 2510bc614a7..1e4a1054f31 100644
--- a/settings/l10n/pl.json
+++ b/settings/l10n/pl.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Ostrzeżenia bezpieczeństwa i konfiguracji",
     "Sharing" : "Udostępnianie",
     "External Storage" : "Zewnętrzna zasoby dyskowe",
-    "Server Side Encryption" : "Szyfrowanie po stronie serwera",
     "Cron" : "Cron",
-    "Email Server" : "Serwer pocztowy",
     "Log" : "Logi",
     "Updates" : "Aktualizacje",
     "Authentication error" : "Błąd uwierzytelniania",
@@ -116,7 +114,6 @@
     "Execute one task with each page loaded" : "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
-    "Enable Server-Side-Encryption" : "Włącz szyfrowanie po stronie serwera",
     "This is used for sending out notifications." : "To jest używane do wysyłania powiadomień",
     "Send mode" : "Tryb wysyłki",
     "Encryption" : "Szyfrowanie",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 20e1697930a..aaecb907769 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Segurança & avisos de configuração",
     "Sharing" : "Compartilhamento",
     "External Storage" : "Armazenamento Externo",
-    "Server Side Encryption" : "Criptografia do Lado do Servidor",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de Email",
     "Log" : "Registro",
     "Tips & tricks" : "Dicas & Truques",
     "Updates" : "Atualizações",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Impossível modificar senha",
     "Enabled" : "Habilitado",
     "Not enabled" : "Desabilitado",
+    "A problem occurred, please check your log files (Error: %s)" : "Ocorreu um problema enquanto verificava seus arquivos de log (Erro: %s)",
+    "Migration Completed" : "Migração Concluida",
     "Group already exists." : "O Grupo já existe.",
     "Unable to add group." : "Não é possível adicionar grupo.",
     "Unable to delete group." : "Não é possível excluir grupo.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "E-mail salvo",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?",
     "Add trusted domain" : "Adicionar domínio confiável",
+    "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor aguarde até que a migração seja finalizada",
+    "Migration started …" : "Migração iniciada ...",
     "Sending..." : "Enviando...",
     "All" : "Todos",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicativos oficiais são desenvolvidos por e dentro da comunidade ownCloud. Eles oferecem funcionalidade central para ownCloud e estão prontos para uso em produção.",
@@ -135,7 +137,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Execute uma tarefa com cada página carregada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
-    "Enable Server-Side-Encryption" : "Habilitar a Criptografia do Lado do Servidor",
+    "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
     "Send mode" : "Modo enviar",
     "Encryption" : "Criptografia",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index d76516f2ac0..88132b7b0f5 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Segurança & avisos de configuração",
     "Sharing" : "Compartilhamento",
     "External Storage" : "Armazenamento Externo",
-    "Server Side Encryption" : "Criptografia do Lado do Servidor",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de Email",
     "Log" : "Registro",
     "Tips & tricks" : "Dicas & Truques",
     "Updates" : "Atualizações",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Impossível modificar senha",
     "Enabled" : "Habilitado",
     "Not enabled" : "Desabilitado",
+    "A problem occurred, please check your log files (Error: %s)" : "Ocorreu um problema enquanto verificava seus arquivos de log (Erro: %s)",
+    "Migration Completed" : "Migração Concluida",
     "Group already exists." : "O Grupo já existe.",
     "Unable to add group." : "Não é possível adicionar grupo.",
     "Unable to delete group." : "Não é possível excluir grupo.",
@@ -46,6 +46,8 @@
     "Email saved" : "E-mail salvo",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?",
     "Add trusted domain" : "Adicionar domínio confiável",
+    "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor aguarde até que a migração seja finalizada",
+    "Migration started …" : "Migração iniciada ...",
     "Sending..." : "Enviando...",
     "All" : "Todos",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicativos oficiais são desenvolvidos por e dentro da comunidade ownCloud. Eles oferecem funcionalidade central para ownCloud e estão prontos para uso em produção.",
@@ -133,7 +135,7 @@
     "Execute one task with each page loaded" : "Execute uma tarefa com cada página carregada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
-    "Enable Server-Side-Encryption" : "Habilitar a Criptografia do Lado do Servidor",
+    "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
     "Send mode" : "Modo enviar",
     "Encryption" : "Criptografia",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 73563e8b35d..44706a6f4df 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Avisos de configuração e segurança",
     "Sharing" : "Partilha",
     "External Storage" : "Armazenamento Externo",
-    "Server Side Encryption" : "Encriptação do lado do Servidor",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de e-mail",
     "Log" : "Registo",
     "Tips & tricks" : "Dicas e truqes",
     "Updates" : "Atualizações",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Não foi possível alterar a sua palavra-passe ",
     "Enabled" : "Ativada",
     "Not enabled" : "Desativada",
+    "A problem occurred, please check your log files (Error: %s)" : "Ocorreu um problema, por favor, verifique os ficheiros de registo (Erro: %s)",
+    "Migration Completed" : "Migração Concluída",
     "Group already exists." : "O grupo já existe.",
     "Unable to add group." : "Impossível acrescentar o grupo.",
     "Unable to delete group." : "Impossível apagar grupo.",
@@ -48,8 +48,11 @@ OC.L10N.register(
     "Email saved" : "E-mail guardado",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
     "Add trusted domain" : "Adicionar domínio confiável ",
+    "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor, aguarde até que a mesma esteja concluída..",
+    "Migration started …" : "Migração iniciada...",
     "Sending..." : "A enviar...",
     "All" : "Todos",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As apps oficiais são desenvolvidas por e na comunidade da ownCloud. Elas oferecem funcionalidade central para a ownCloud e está pronta para uma utilização na produção.",
     "Please wait...." : "Por favor, aguarde...",
     "Error while disabling app" : "Ocorreu  um erro enquanto desativava a app",
     "Disable" : "Desativar",
@@ -128,10 +131,11 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Última execução de cron job: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Última execução de cron job: %s. Algo está errado.",
     "Cron was not executed yet!" : "Cron ainda não foi executado!",
+    "Open documentation" : "Abrir documentação",
     "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
-    "Enable Server-Side-Encryption" : "Ativar encriptação do lado do servidor",
+    "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de Envio",
     "Encryption" : "Encriptação",
@@ -164,6 +168,8 @@ OC.L10N.register(
     "Version" : "Versão",
     "More apps" : "Mais aplicações",
     "Developer documentation" : "Documentação de Programador",
+    "Experimental applications ahead" : "Aplicações experimentais de futuro",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "As apps experimentais não estão selecionadas para problemas de segurança, nova ou conhecida como instável e em forte desenvolvimento. Ao instalá-las pode causar a perda de dados ou quebra de segurança.",
     "by" : "por",
     "licensed" : "licenciado",
     "Documentation:" : "Documentação:",
@@ -175,6 +181,7 @@ OC.L10N.register(
     "Update to %s" : "Actualizar para %s",
     "Enable only for specific groups" : "Activar só para grupos específicos",
     "Uninstall App" : "Desinstalar aplicação",
+    "Enable experimental apps" : "Ativar apps experimentais",
     "No apps found for your version" : "Nenhuma aplicação encontrada para a sua versão",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Olá,<br><br>apenas para informar que você tem uma conta %s.<br><br>O seu nome de utilizador: %s<br>Acesse à sua conta: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Parabéns!",
@@ -183,6 +190,7 @@ OC.L10N.register(
     "Administrator documentation" : "Documentação de Administrador.",
     "Online documentation" : "Documentação Online",
     "Forum" : "Fórum",
+    "Issue tracker" : "Pesquisador de problemad",
     "Commercial support" : "Suporte Comercial",
     "Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
     "Desktop client" : "Cliente Desktop",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 438de6006f0..3b116ebfd38 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Avisos de configuração e segurança",
     "Sharing" : "Partilha",
     "External Storage" : "Armazenamento Externo",
-    "Server Side Encryption" : "Encriptação do lado do Servidor",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de e-mail",
     "Log" : "Registo",
     "Tips & tricks" : "Dicas e truqes",
     "Updates" : "Atualizações",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Não foi possível alterar a sua palavra-passe ",
     "Enabled" : "Ativada",
     "Not enabled" : "Desativada",
+    "A problem occurred, please check your log files (Error: %s)" : "Ocorreu um problema, por favor, verifique os ficheiros de registo (Erro: %s)",
+    "Migration Completed" : "Migração Concluída",
     "Group already exists." : "O grupo já existe.",
     "Unable to add group." : "Impossível acrescentar o grupo.",
     "Unable to delete group." : "Impossível apagar grupo.",
@@ -46,8 +46,11 @@
     "Email saved" : "E-mail guardado",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
     "Add trusted domain" : "Adicionar domínio confiável ",
+    "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor, aguarde até que a mesma esteja concluída..",
+    "Migration started …" : "Migração iniciada...",
     "Sending..." : "A enviar...",
     "All" : "Todos",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As apps oficiais são desenvolvidas por e na comunidade da ownCloud. Elas oferecem funcionalidade central para a ownCloud e está pronta para uma utilização na produção.",
     "Please wait...." : "Por favor, aguarde...",
     "Error while disabling app" : "Ocorreu  um erro enquanto desativava a app",
     "Disable" : "Desativar",
@@ -126,10 +129,11 @@
     "Last cron job execution: %s." : "Última execução de cron job: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Última execução de cron job: %s. Algo está errado.",
     "Cron was not executed yet!" : "Cron ainda não foi executado!",
+    "Open documentation" : "Abrir documentação",
     "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
-    "Enable Server-Side-Encryption" : "Ativar encriptação do lado do servidor",
+    "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de Envio",
     "Encryption" : "Encriptação",
@@ -162,6 +166,8 @@
     "Version" : "Versão",
     "More apps" : "Mais aplicações",
     "Developer documentation" : "Documentação de Programador",
+    "Experimental applications ahead" : "Aplicações experimentais de futuro",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "As apps experimentais não estão selecionadas para problemas de segurança, nova ou conhecida como instável e em forte desenvolvimento. Ao instalá-las pode causar a perda de dados ou quebra de segurança.",
     "by" : "por",
     "licensed" : "licenciado",
     "Documentation:" : "Documentação:",
@@ -173,6 +179,7 @@
     "Update to %s" : "Actualizar para %s",
     "Enable only for specific groups" : "Activar só para grupos específicos",
     "Uninstall App" : "Desinstalar aplicação",
+    "Enable experimental apps" : "Ativar apps experimentais",
     "No apps found for your version" : "Nenhuma aplicação encontrada para a sua versão",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Olá,<br><br>apenas para informar que você tem uma conta %s.<br><br>O seu nome de utilizador: %s<br>Acesse à sua conta: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Parabéns!",
@@ -181,6 +188,7 @@
     "Administrator documentation" : "Documentação de Administrador.",
     "Online documentation" : "Documentação Online",
     "Forum" : "Fórum",
+    "Issue tracker" : "Pesquisador de problemad",
     "Commercial support" : "Suporte Comercial",
     "Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
     "Desktop client" : "Cliente Desktop",
diff --git a/settings/l10n/ro.js b/settings/l10n/ro.js
index 8b7f63c7197..3c51bba6cd3 100644
--- a/settings/l10n/ro.js
+++ b/settings/l10n/ro.js
@@ -1,10 +1,13 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & setup warnings" : "Alerte de securitate & configurare",
     "Sharing" : "Partajare",
     "External Storage" : "Stocare externă",
     "Cron" : "Cron",
     "Log" : "Jurnal de activitate",
+    "Tips & tricks" : "Tips & tricks",
+    "Updates" : "Actualizări",
     "Authentication error" : "Eroare la autentificare",
     "Your full name has been changed." : "Numele tău complet a fost schimbat.",
     "Unable to change full name" : "Nu s-a puput schimba numele complet",
@@ -24,6 +27,11 @@ OC.L10N.register(
     "Saved" : "Salvat",
     "test email settings" : "verifică setările de e-mail",
     "Email sent" : "Mesajul a fost expediat",
+    "Invalid mail address" : "Adresa mail invalidă",
+    "Unable to create user." : "Imposibil de creat utilizatorul",
+    "Your %s account was created" : "Contul tău %s a fost creat",
+    "Unable to delete user." : "Imposibil de șters utilizatorul.",
+    "Forbidden" : "Interzis",
     "Invalid user" : "Utilizator nevalid",
     "Email saved" : "E-mail salvat",
     "Sending..." : "Se expediază...",
@@ -61,6 +69,7 @@ OC.L10N.register(
     "Allow apps to use the Share API" : "Permite aplicațiilor să folosească API-ul de partajare",
     "Allow public uploads" : "Permite încărcări publice",
     "Allow users to send mail notification for shared files" : "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
+    "days" : "zile",
     "Allow resharing" : "Permite repartajarea",
     "Execute one task with each page loaded" : "Execută o sarcină la fiecare pagină încărcată",
     "Send mode" : "Modul de expediere",
@@ -81,6 +90,9 @@ OC.L10N.register(
     "User Documentation" : "Documentație utilizator",
     "Forum" : "Forum",
     "Get the apps to sync your files" : "Ia acum aplicatia pentru sincronizarea fisierelor ",
+    "Desktop client" : "Client Desktop",
+    "Android app" : "Aplicatie Android",
+    "iOS app" : "Aplicație iOS",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
     "Password" : "Parolă",
     "Unable to change your password" : "Imposibil de-ați schimbat parola",
diff --git a/settings/l10n/ro.json b/settings/l10n/ro.json
index cdbe2ed734a..51e5d01f190 100644
--- a/settings/l10n/ro.json
+++ b/settings/l10n/ro.json
@@ -1,8 +1,11 @@
 { "translations": {
+    "Security & setup warnings" : "Alerte de securitate & configurare",
     "Sharing" : "Partajare",
     "External Storage" : "Stocare externă",
     "Cron" : "Cron",
     "Log" : "Jurnal de activitate",
+    "Tips & tricks" : "Tips & tricks",
+    "Updates" : "Actualizări",
     "Authentication error" : "Eroare la autentificare",
     "Your full name has been changed." : "Numele tău complet a fost schimbat.",
     "Unable to change full name" : "Nu s-a puput schimba numele complet",
@@ -22,6 +25,11 @@
     "Saved" : "Salvat",
     "test email settings" : "verifică setările de e-mail",
     "Email sent" : "Mesajul a fost expediat",
+    "Invalid mail address" : "Adresa mail invalidă",
+    "Unable to create user." : "Imposibil de creat utilizatorul",
+    "Your %s account was created" : "Contul tău %s a fost creat",
+    "Unable to delete user." : "Imposibil de șters utilizatorul.",
+    "Forbidden" : "Interzis",
     "Invalid user" : "Utilizator nevalid",
     "Email saved" : "E-mail salvat",
     "Sending..." : "Se expediază...",
@@ -59,6 +67,7 @@
     "Allow apps to use the Share API" : "Permite aplicațiilor să folosească API-ul de partajare",
     "Allow public uploads" : "Permite încărcări publice",
     "Allow users to send mail notification for shared files" : "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
+    "days" : "zile",
     "Allow resharing" : "Permite repartajarea",
     "Execute one task with each page loaded" : "Execută o sarcină la fiecare pagină încărcată",
     "Send mode" : "Modul de expediere",
@@ -79,6 +88,9 @@
     "User Documentation" : "Documentație utilizator",
     "Forum" : "Forum",
     "Get the apps to sync your files" : "Ia acum aplicatia pentru sincronizarea fisierelor ",
+    "Desktop client" : "Client Desktop",
+    "Android app" : "Aplicatie Android",
+    "iOS app" : "Aplicație iOS",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
     "Password" : "Parolă",
     "Unable to change your password" : "Imposibil de-ați schimbat parola",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 6ee0f04e2b3..7f7670c960e 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Предупреждения безопасности и установки",
     "Sharing" : "Общий доступ",
     "External Storage" : "Внешнее хранилище",
-    "Server Side Encryption" : "Шифрование на стороне сервера",
     "Cron" : "Cron (планировщик задач)",
-    "Email Server" : "Почтовый сервер",
     "Log" : "Журнал",
     "Tips & tricks" : "Советы и трюки",
     "Updates" : "Обновления",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Невозможно изменить пароль",
     "Enabled" : "Включено",
     "Not enabled" : "Не включено",
+    "A problem occurred, please check your log files (Error: %s)" : "Возникла проблема, пожалуйста, проверьте ваши файлы журнала (Ошибка: %s)",
+    "Migration Completed" : "Миграция завершена",
     "Group already exists." : "Группа уже существует.",
     "Unable to add group." : "Невозможно добавить группу.",
     "Unable to delete group." : "Невозможно удалить группу.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "Email сохранен",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
     "Add trusted domain" : "Добавить доверенный домен",
+    "Migration in progress. Please wait until the migration is finished" : "Миграция в процессе. Пожалуйста, подождите завершения миграции",
+    "Migration started …" : "Начата миграция ...",
     "Sending..." : "Отправляется ...",
     "All" : "Все",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Официальные приложения разработаны силами сообщества ownCloud. Они полностью функциональны и готовы к работе.",
@@ -135,7 +137,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Выполнять одно задание с каждой загруженной страницей",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
-    "Enable Server-Side-Encryption" : "Включить шифрование на стороне сервера",
+    "Start migration" : "Запустить миграцию",
     "This is used for sending out notifications." : "Используется для отправки уведомлений.",
     "Send mode" : "Способ отправки",
     "Encryption" : "Шифрование",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 8d811c7a27e..14a2b1144e3 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Предупреждения безопасности и установки",
     "Sharing" : "Общий доступ",
     "External Storage" : "Внешнее хранилище",
-    "Server Side Encryption" : "Шифрование на стороне сервера",
     "Cron" : "Cron (планировщик задач)",
-    "Email Server" : "Почтовый сервер",
     "Log" : "Журнал",
     "Tips & tricks" : "Советы и трюки",
     "Updates" : "Обновления",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Невозможно изменить пароль",
     "Enabled" : "Включено",
     "Not enabled" : "Не включено",
+    "A problem occurred, please check your log files (Error: %s)" : "Возникла проблема, пожалуйста, проверьте ваши файлы журнала (Ошибка: %s)",
+    "Migration Completed" : "Миграция завершена",
     "Group already exists." : "Группа уже существует.",
     "Unable to add group." : "Невозможно добавить группу.",
     "Unable to delete group." : "Невозможно удалить группу.",
@@ -46,6 +46,8 @@
     "Email saved" : "Email сохранен",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
     "Add trusted domain" : "Добавить доверенный домен",
+    "Migration in progress. Please wait until the migration is finished" : "Миграция в процессе. Пожалуйста, подождите завершения миграции",
+    "Migration started …" : "Начата миграция ...",
     "Sending..." : "Отправляется ...",
     "All" : "Все",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Официальные приложения разработаны силами сообщества ownCloud. Они полностью функциональны и готовы к работе.",
@@ -133,7 +135,7 @@
     "Execute one task with each page loaded" : "Выполнять одно задание с каждой загруженной страницей",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
-    "Enable Server-Side-Encryption" : "Включить шифрование на стороне сервера",
+    "Start migration" : "Запустить миграцию",
     "This is used for sending out notifications." : "Используется для отправки уведомлений.",
     "Send mode" : "Способ отправки",
     "Encryption" : "Шифрование",
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index ea3a870d427..e0db3ab18ee 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Zdieľanie",
     "External Storage" : "Externé úložisko",
     "Cron" : "Cron",
-    "Email Server" : "Email server",
     "Log" : "Záznam",
     "Tips & tricks" : "Tipy a triky",
     "Updates" : "Aktualizácie",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index a4f1a539a1e..30e34ac1d6c 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -2,7 +2,6 @@
     "Sharing" : "Zdieľanie",
     "External Storage" : "Externé úložisko",
     "Cron" : "Cron",
-    "Email Server" : "Email server",
     "Log" : "Záznam",
     "Tips & tricks" : "Tipy a triky",
     "Updates" : "Aktualizácie",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index b7d8c8550a7..78af6f4d0aa 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -3,9 +3,7 @@ OC.L10N.register(
     {
     "Sharing" : "Souporaba",
     "External Storage" : "Zunanja podatkovna shramba",
-    "Server Side Encryption" : "Strežniško šifriranje",
     "Cron" : "Periodično opravilo",
-    "Email Server" : "Poštni strežnik",
     "Log" : "Dnevnik",
     "Updates" : "Posodobitve",
     "Authentication error" : "Napaka med overjanjem",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index b8ad39d592b..5fc355467bd 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -1,9 +1,7 @@
 { "translations": {
     "Sharing" : "Souporaba",
     "External Storage" : "Zunanja podatkovna shramba",
-    "Server Side Encryption" : "Strežniško šifriranje",
     "Cron" : "Periodično opravilo",
-    "Email Server" : "Poštni strežnik",
     "Log" : "Dnevnik",
     "Updates" : "Posodobitve",
     "Authentication error" : "Napaka med overjanjem",
diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js
index 23110ad2006..c8bbca38488 100644
--- a/settings/l10n/sq.js
+++ b/settings/l10n/sq.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Sharing" : "Ndarje",
     "Cron" : "Cron",
-    "Email Server" : "Serveri Email",
     "Log" : "Historik aktiviteti",
     "Authentication error" : "Gabim autentifikimi",
     "Your full name has been changed." : "Emri juaj i plotë ka ndryshuar.",
diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json
index 57af50a4bc0..8ffdd975868 100644
--- a/settings/l10n/sq.json
+++ b/settings/l10n/sq.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Sharing" : "Ndarje",
     "Cron" : "Cron",
-    "Email Server" : "Serveri Email",
     "Log" : "Historik aktiviteti",
     "Authentication error" : "Gabim autentifikimi",
     "Your full name has been changed." : "Emri juaj i plotë ka ndryshuar.",
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
index 43008a05a72..c4eaa14084b 100644
--- a/settings/l10n/sr.js
+++ b/settings/l10n/sr.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Безбедносна и упозорења поставе",
     "Sharing" : "Дељење",
     "External Storage" : "Спољашње складиште",
-    "Server Side Encryption" : "Шифровање на страни сервера",
     "Cron" : "Крон",
-    "Email Server" : "Сервер е-поште",
     "Log" : "Бележење",
     "Tips & tricks" : "Савети и трикови",
     "Updates" : "Ажурирања",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Не могу да променим лозинку",
     "Enabled" : "Укључено",
     "Not enabled" : "Искључено",
+    "A problem occurred, please check your log files (Error: %s)" : "Појавио се проблем. Проверите записнике (грешка: %s)",
+    "Migration Completed" : "Пресељење завршено",
     "Group already exists." : "Група већ постоји.",
     "Unable to add group." : "Није могуће додати групу.",
     "Unable to delete group." : "Није могуће обрисати групу.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "Е-порука сачувана",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Да ли заиста желите да додате „{domain}“ као поуздан домен?",
     "Add trusted domain" : "Додај поуздан домен",
+    "Migration in progress. Please wait until the migration is finished" : "Пресељење је у току. Сачекајте док се не заврши",
+    "Migration started …" : "Пресељење покренуто...",
     "Sending..." : "Шаљем...",
     "All" : "Све",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Званичнe апликације су развиjене од стране ownCloud заједнице. Оне нуде функционалност намењену пре свега ownCloud-у и спремне су за функционалну употребу.",
@@ -135,7 +137,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Изврши један задатак са сваком учитаном страницом",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php је регистрован код  вебкрон сервиса за позивање cron.php сваких 15 минута преко протокола http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Користите системски крон сервис за позивање cron.php фајла сваких 15 минута.",
-    "Enable Server-Side-Encryption" : "Укључи шифровање на страни сервера",
+    "Start migration" : "Покрени пресељење",
     "This is used for sending out notifications." : "Ово се користи за слање обавештења.",
     "Send mode" : "Режим слања",
     "Encryption" : "Шифровање",
@@ -185,7 +187,7 @@ OC.L10N.register(
     "No apps found for your version" : "Нема апликација за вашу верзију",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Поздрав,<br><br>само вас обавештавам да сад имате %s налог.<br><br>Ваше корисничко име: %s<br>Приступите му на: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Здраво!",
-    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Добродошли,\n\nСамо да знате да сада имате %s налог.\n\nВаше корисничко име: %s\nПриступите: %s\n",
+    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Поздрав.\n\nСамо да знате да сада имате %s налог.\n\nВаше корисничко име: %s\nПриступите му на: %s\n",
     "User documentation" : "Корисничка документација",
     "Administrator documentation" : "Администраторска документација",
     "Online documentation" : "Документација на мрежи",
@@ -226,7 +228,7 @@ OC.L10N.register(
     "Issued By" : "Издавач",
     "Valid until %s" : "Важи до %s",
     "Import root certificate" : "Увоз кореног сертификата",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Развијено од {communityopen}заједнице сопственогОблака{linkclose}, {githubopen}изворни код{linkclose} је лиценциран под {licenseopen}<abbr title=\"Affero General Public License\">АГПЛ</abbr>{linkclose}.",
+    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Развијено од стране {communityopen}оунКлауд заједнице{linkclose}, {githubopen}изворни код{linkclose} је лиценциран под {licenseopen}<abbr title=\"Аферо општа јавна лиценца\">АОЈЛ (AGPL)</abbr>{linkclose}.",
     "Show storage location" : "Прикажи локацију складишта",
     "Show last log in" : "Прикажи последњу пријаву",
     "Show user backend" : "Прикажи позадину за кориснике",
diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json
index 98cd3535e1f..c613cae0d8a 100644
--- a/settings/l10n/sr.json
+++ b/settings/l10n/sr.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Безбедносна и упозорења поставе",
     "Sharing" : "Дељење",
     "External Storage" : "Спољашње складиште",
-    "Server Side Encryption" : "Шифровање на страни сервера",
     "Cron" : "Крон",
-    "Email Server" : "Сервер е-поште",
     "Log" : "Бележење",
     "Tips & tricks" : "Савети и трикови",
     "Updates" : "Ажурирања",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Не могу да променим лозинку",
     "Enabled" : "Укључено",
     "Not enabled" : "Искључено",
+    "A problem occurred, please check your log files (Error: %s)" : "Појавио се проблем. Проверите записнике (грешка: %s)",
+    "Migration Completed" : "Пресељење завршено",
     "Group already exists." : "Група већ постоји.",
     "Unable to add group." : "Није могуће додати групу.",
     "Unable to delete group." : "Није могуће обрисати групу.",
@@ -46,6 +46,8 @@
     "Email saved" : "Е-порука сачувана",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Да ли заиста желите да додате „{domain}“ као поуздан домен?",
     "Add trusted domain" : "Додај поуздан домен",
+    "Migration in progress. Please wait until the migration is finished" : "Пресељење је у току. Сачекајте док се не заврши",
+    "Migration started …" : "Пресељење покренуто...",
     "Sending..." : "Шаљем...",
     "All" : "Све",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Званичнe апликације су развиjене од стране ownCloud заједнице. Оне нуде функционалност намењену пре свега ownCloud-у и спремне су за функционалну употребу.",
@@ -133,7 +135,7 @@
     "Execute one task with each page loaded" : "Изврши један задатак са сваком учитаном страницом",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php је регистрован код  вебкрон сервиса за позивање cron.php сваких 15 минута преко протокола http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Користите системски крон сервис за позивање cron.php фајла сваких 15 минута.",
-    "Enable Server-Side-Encryption" : "Укључи шифровање на страни сервера",
+    "Start migration" : "Покрени пресељење",
     "This is used for sending out notifications." : "Ово се користи за слање обавештења.",
     "Send mode" : "Режим слања",
     "Encryption" : "Шифровање",
@@ -183,7 +185,7 @@
     "No apps found for your version" : "Нема апликација за вашу верзију",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Поздрав,<br><br>само вас обавештавам да сад имате %s налог.<br><br>Ваше корисничко име: %s<br>Приступите му на: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Здраво!",
-    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Добродошли,\n\nСамо да знате да сада имате %s налог.\n\nВаше корисничко име: %s\nПриступите: %s\n",
+    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Поздрав.\n\nСамо да знате да сада имате %s налог.\n\nВаше корисничко име: %s\nПриступите му на: %s\n",
     "User documentation" : "Корисничка документација",
     "Administrator documentation" : "Администраторска документација",
     "Online documentation" : "Документација на мрежи",
@@ -224,7 +226,7 @@
     "Issued By" : "Издавач",
     "Valid until %s" : "Важи до %s",
     "Import root certificate" : "Увоз кореног сертификата",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Развијено од {communityopen}заједнице сопственогОблака{linkclose}, {githubopen}изворни код{linkclose} је лиценциран под {licenseopen}<abbr title=\"Affero General Public License\">АГПЛ</abbr>{linkclose}.",
+    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Развијено од стране {communityopen}оунКлауд заједнице{linkclose}, {githubopen}изворни код{linkclose} је лиценциран под {licenseopen}<abbr title=\"Аферо општа јавна лиценца\">АОЈЛ (AGPL)</abbr>{linkclose}.",
     "Show storage location" : "Прикажи локацију складишта",
     "Show last log in" : "Прикажи последњу пријаву",
     "Show user backend" : "Прикажи позадину за кориснике",
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index 3a714b4c626..05b7dcba6c0 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Dela",
     "External Storage" : "Extern lagring",
     "Cron" : "Cron",
-    "Email Server" : "E-postserver",
     "Log" : "Logg",
     "Updates" : "Uppdateringar",
     "Authentication error" : "Fel vid autentisering",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index 3c4460fd086..42bd8e5b6f4 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -2,7 +2,6 @@
     "Sharing" : "Dela",
     "External Storage" : "Extern lagring",
     "Cron" : "Cron",
-    "Email Server" : "E-postserver",
     "Log" : "Logg",
     "Updates" : "Uppdateringar",
     "Authentication error" : "Fel vid autentisering",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 38d029b037b..7b89faba329 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Güvenlik ve kurulum uyarıları",
     "Sharing" : "Paylaşım",
     "External Storage" : "Harici Depolama",
-    "Server Side Encryption" : "Sunucu Taraflı Şifreleme",
     "Cron" : "Cron",
-    "Email Server" : "E-Posta Sunucusu",
     "Log" : "Günlük",
     "Tips & tricks" : "İpuçları ve hileler",
     "Updates" : "Güncellemeler",
@@ -131,7 +129,6 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
-    "Enable Server-Side-Encryption" : "Sunucu Taraflı Şifrelemeyi Etkinleştir",
     "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
     "Send mode" : "Gönderme kipi",
     "Encryption" : "Şifreleme",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 162af10663f..440b67241c0 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Güvenlik ve kurulum uyarıları",
     "Sharing" : "Paylaşım",
     "External Storage" : "Harici Depolama",
-    "Server Side Encryption" : "Sunucu Taraflı Şifreleme",
     "Cron" : "Cron",
-    "Email Server" : "E-Posta Sunucusu",
     "Log" : "Günlük",
     "Tips & tricks" : "İpuçları ve hileler",
     "Updates" : "Güncellemeler",
@@ -129,7 +127,6 @@
     "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
-    "Enable Server-Side-Encryption" : "Sunucu Taraflı Şifrelemeyi Etkinleştir",
     "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
     "Send mode" : "Gönderme kipi",
     "Encryption" : "Şifreleme",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index e4d4dedb3f4..d2d571ca2af 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Спільний доступ",
     "External Storage" : "Зовнішні сховища",
     "Cron" : "Планувальник Cron",
-    "Email Server" : "Сервер електронної пошти",
     "Log" : "Журнал",
     "Updates" : "Оновлення",
     "Authentication error" : "Помилка автентифікації",
@@ -20,7 +19,7 @@ OC.L10N.register(
     "Wrong password" : "Невірний пароль",
     "No user supplied" : "Користувач не знайден",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Будь ласка введіть пароль адміністратора для відновлення, інакше всі дані будуть втрачені",
-    "Wrong admin recovery password. Please check the password and try again." : "Неправильний пароль адміністратора для відновлення. Перевірте пароль та спробуйте ще раз.",
+    "Wrong admin recovery password. Please check the password and try again." : "Невірний пароль адміністратора для відновлення.  Будь ласка, перевірте пароль та спробуйте ще раз.",
     "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Використовуваний механізм не підтримує зміну паролів, але користувальницький ключ шифрування був успішно змінено",
     "Unable to change password" : "Неможливо змінити пароль",
     "Enabled" : "Увімкнено",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index f36feec3a67..567297e384d 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -2,7 +2,6 @@
     "Sharing" : "Спільний доступ",
     "External Storage" : "Зовнішні сховища",
     "Cron" : "Планувальник Cron",
-    "Email Server" : "Сервер електронної пошти",
     "Log" : "Журнал",
     "Updates" : "Оновлення",
     "Authentication error" : "Помилка автентифікації",
@@ -18,7 +17,7 @@
     "Wrong password" : "Невірний пароль",
     "No user supplied" : "Користувач не знайден",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Будь ласка введіть пароль адміністратора для відновлення, інакше всі дані будуть втрачені",
-    "Wrong admin recovery password. Please check the password and try again." : "Неправильний пароль адміністратора для відновлення. Перевірте пароль та спробуйте ще раз.",
+    "Wrong admin recovery password. Please check the password and try again." : "Невірний пароль адміністратора для відновлення.  Будь ласка, перевірте пароль та спробуйте ще раз.",
     "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Використовуваний механізм не підтримує зміну паролів, але користувальницький ключ шифрування був успішно змінено",
     "Unable to change password" : "Неможливо змінити пароль",
     "Enabled" : "Увімкнено",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index f8b40607816..242c78eee7a 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "共享",
     "External Storage" : "外部存储",
     "Cron" : "计划任务",
-    "Email Server" : "电子邮件服务器",
     "Log" : "日志",
     "Updates" : "更新",
     "Authentication error" : "认证错误",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index f6394c2437a..f911248ed41 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -2,7 +2,6 @@
     "Sharing" : "共享",
     "External Storage" : "外部存储",
     "Cron" : "计划任务",
-    "Email Server" : "电子邮件服务器",
     "Log" : "日志",
     "Updates" : "更新",
     "Authentication error" : "认证错误",
diff --git a/settings/l10n/zh_HK.js b/settings/l10n/zh_HK.js
index 3211c4dc26d..6b613fdf4f7 100644
--- a/settings/l10n/zh_HK.js
+++ b/settings/l10n/zh_HK.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "settings",
     {
     "Sharing" : "分享",
-    "Email Server" : "電子郵件伺服器",
     "Log" : "日誌",
     "Updates" : "更新",
     "Wrong password" : "密碼錯誤",
diff --git a/settings/l10n/zh_HK.json b/settings/l10n/zh_HK.json
index 9b76d35b796..1f562400c05 100644
--- a/settings/l10n/zh_HK.json
+++ b/settings/l10n/zh_HK.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Sharing" : "分享",
-    "Email Server" : "電子郵件伺服器",
     "Log" : "日誌",
     "Updates" : "更新",
     "Wrong password" : "密碼錯誤",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index 639b6f12617..e946e3b5de2 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "分享",
     "External Storage" : "外部儲存",
     "Cron" : "工作排程",
-    "Email Server" : "郵件伺服器",
     "Log" : "紀錄",
     "Updates" : "更新",
     "Authentication error" : "認證錯誤",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index a22d8c37518..cb4858f9009 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -2,7 +2,6 @@
     "Sharing" : "分享",
     "External Storage" : "外部儲存",
     "Cron" : "工作排程",
-    "Email Server" : "郵件伺服器",
     "Log" : "紀錄",
     "Updates" : "更新",
     "Authentication error" : "認證錯誤",