[tx-robot] updated from transifex

62 files changed, 198 insertions, 6 deletions

diff --git a/l10n/ast.js b/l10n/ast.js
index 0ba6180a3..5660e910d 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -62,6 +62,7 @@ OC.L10N.register(
     "IMAP Password" : "Contraseña IMAP",
     "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Agospiu IMAP",
+    "None" : "Dengún",
     "IMAP Port" : "Puertu IMAP",
     "IMAP User" : "Usuariu IMAP",
     "SMTP Host" : "Agospiu SMTP",
diff --git a/l10n/ast.json b/l10n/ast.json
index 5b41e1a99..d2abb08d9 100644
--- a/l10n/ast.json
+++ b/l10n/ast.json
@@ -60,6 +60,7 @@
     "IMAP Password" : "Contraseña IMAP",
     "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Agospiu IMAP",
+    "None" : "Dengún",
     "IMAP Port" : "Puertu IMAP",
     "IMAP User" : "Usuariu IMAP",
     "SMTP Host" : "Agospiu SMTP",
diff --git a/l10n/az.js b/l10n/az.js
index 716fcfb7a..c937ad500 100644
--- a/l10n/az.js
+++ b/l10n/az.js
@@ -62,6 +62,7 @@ OC.L10N.register(
     "IMAP Password" : "IMAP Şifrəsi",
     "Manual configuration" : "Əllə konfiqurasiya",
     "IMAP Host" : "IMAP Host",
+    "None" : "Heç bir",
     "IMAP Port" : "IMAP Port",
     "IMAP User" : "IMAP İstifadəçi",
     "SMTP Host" : "SMTP Host",
diff --git a/l10n/az.json b/l10n/az.json
index 31e5167a0..d8201451e 100644
--- a/l10n/az.json
+++ b/l10n/az.json
@@ -60,6 +60,7 @@
     "IMAP Password" : "IMAP Şifrəsi",
     "Manual configuration" : "Əllə konfiqurasiya",
     "IMAP Host" : "IMAP Host",
+    "None" : "Heç bir",
     "IMAP Port" : "IMAP Port",
     "IMAP User" : "IMAP İstifadəçi",
     "SMTP Host" : "SMTP Host",
diff --git a/l10n/bg_BG.js b/l10n/bg_BG.js
index b571490f0..231812527 100644
--- a/l10n/bg_BG.js
+++ b/l10n/bg_BG.js
@@ -63,6 +63,7 @@ OC.L10N.register(
     "IMAP Password" : "IMAP Парола",
     "Manual configuration" : "Ръчна конфигурация",
     "IMAP Host" : "IMAP Сървър",
+    "None" : "Няма",
     "IMAP Port" : "IMAP Порт",
     "IMAP User" : "IMAP Потребител",
     "SMTP Host" : "SMTP Сървър",
diff --git a/l10n/bg_BG.json b/l10n/bg_BG.json
index bce91f5ff..a9866354b 100644
--- a/l10n/bg_BG.json
+++ b/l10n/bg_BG.json
@@ -61,6 +61,7 @@
     "IMAP Password" : "IMAP Парола",
     "Manual configuration" : "Ръчна конфигурация",
     "IMAP Host" : "IMAP Сървър",
+    "None" : "Няма",
     "IMAP Port" : "IMAP Порт",
     "IMAP User" : "IMAP Потребител",
     "SMTP Host" : "SMTP Сървър",
diff --git a/l10n/cs_CZ.js b/l10n/cs_CZ.js
index 7396e8ae4..75613cb8d 100644
--- a/l10n/cs_CZ.js
+++ b/l10n/cs_CZ.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Mail" : "Pošta",
     "Error while loading the accounts." : "Chyba při načítání účtů.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nových zpráv v {folderName} \nod {from}",
     "you" : "vy",
     "Error while loading the selected account." : "Chyba během načítání vybraného účtu.",
     "Error while loading messages." : "Chyba během načítání zpráv.",
@@ -69,6 +70,9 @@ OC.L10N.register(
     "Manual configuration" : "Ruční nastavení",
     "IMAP Host" : "IMAP hostitel",
     "IMAP security" : "IMAP zabezpečení",
+    "None" : "Žádné",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP port",
     "IMAP User" : "IMAP uživatel",
     "SMTP Host" : "SMTP hostitel",
diff --git a/l10n/cs_CZ.json b/l10n/cs_CZ.json
index 14f72474b..09f180660 100644
--- a/l10n/cs_CZ.json
+++ b/l10n/cs_CZ.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Mail" : "Pošta",
     "Error while loading the accounts." : "Chyba při načítání účtů.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nových zpráv v {folderName} \nod {from}",
     "you" : "vy",
     "Error while loading the selected account." : "Chyba během načítání vybraného účtu.",
     "Error while loading messages." : "Chyba během načítání zpráv.",
@@ -67,6 +68,9 @@
     "Manual configuration" : "Ruční nastavení",
     "IMAP Host" : "IMAP hostitel",
     "IMAP security" : "IMAP zabezpečení",
+    "None" : "Žádné",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP port",
     "IMAP User" : "IMAP uživatel",
     "SMTP Host" : "SMTP hostitel",
diff --git a/l10n/da.js b/l10n/da.js
index ac2a33e53..c6bbb5666 100644
--- a/l10n/da.js
+++ b/l10n/da.js
@@ -67,6 +67,7 @@ OC.L10N.register(
     "Manual configuration" : "Manuel konfiguration",
     "IMAP Host" : "IMAP vært",
     "IMAP security" : "IMAP-sikkerhed",
+    "None" : "Ingen",
     "IMAP Port" : "IMAP port",
     "IMAP User" : "IMAP bruger",
     "SMTP Host" : "SMTP vært",
diff --git a/l10n/da.json b/l10n/da.json
index b7754f2fc..89dec0a6c 100644
--- a/l10n/da.json
+++ b/l10n/da.json
@@ -65,6 +65,7 @@
     "Manual configuration" : "Manuel konfiguration",
     "IMAP Host" : "IMAP vært",
     "IMAP security" : "IMAP-sikkerhed",
+    "None" : "Ingen",
     "IMAP Port" : "IMAP port",
     "IMAP User" : "IMAP bruger",
     "SMTP Host" : "SMTP vært",
diff --git a/l10n/de.js b/l10n/de.js
index dd3fc2b59..3967984d3 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fehler beim Laden der Konten.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} neue Nachrichten in {folderName} \nvon {from}",
     "you" : "Du",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
@@ -69,6 +70,9 @@ OC.L10N.register(
     "Manual configuration" : "Manuelle Konfiguration",
     "IMAP Host" : "IMAP-Host",
     "IMAP security" : "IMAP-Sicherheit",
+    "None" : "Keine",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-Port",
     "IMAP User" : "IMAP-Nutzer",
     "SMTP Host" : "SMTP-Host",
diff --git a/l10n/de.json b/l10n/de.json
index a79432e86..c96715895 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fehler beim Laden der Konten.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} neue Nachrichten in {folderName} \nvon {from}",
     "you" : "Du",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
@@ -67,6 +68,9 @@
     "Manual configuration" : "Manuelle Konfiguration",
     "IMAP Host" : "IMAP-Host",
     "IMAP security" : "IMAP-Sicherheit",
+    "None" : "Keine",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-Port",
     "IMAP User" : "IMAP-Nutzer",
     "SMTP Host" : "SMTP-Host",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 8c0271758..b0b8347d9 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fehler beim Laden der Konten.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} neue Nachrichten in {folderName}\nvon {from}",
     "you" : "Sie",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
@@ -69,6 +70,9 @@ OC.L10N.register(
     "Manual configuration" : "Manuelle Konfiguration",
     "IMAP Host" : "IMAP-Host",
     "IMAP security" : "IMAP-Sicherheit",
+    "None" : "Keine",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-Port",
     "IMAP User" : "IMAP-Benutzer",
     "SMTP Host" : "SMTP-Host",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 908ecf648..c29bc5967 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Mail" : "Mail",
     "Error while loading the accounts." : "Fehler beim Laden der Konten.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} neue Nachrichten in {folderName}\nvon {from}",
     "you" : "Sie",
     "Error while loading the selected account." : "Fehler beim Laden des ausgewählten Kontos.",
     "Error while loading messages." : "Fehler beim Laden der Nachrichten.",
@@ -67,6 +68,9 @@
     "Manual configuration" : "Manuelle Konfiguration",
     "IMAP Host" : "IMAP-Host",
     "IMAP security" : "IMAP-Sicherheit",
+    "None" : "Keine",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-Port",
     "IMAP User" : "IMAP-Benutzer",
     "SMTP Host" : "SMTP-Host",
diff --git a/l10n/el.js b/l10n/el.js
index 5e12a2d05..d710de6b4 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Mail" : "Αλληλογραφία",
     "Error while loading the accounts." : "Σφάλμα κατά τη φόρτωση των λογαριασμών.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} νέα μηνύματα σε {folderName} \nαπό {from}",
     "you" : "εσείς",
     "Error while loading the selected account." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου λογαριασμού.",
     "Error while loading messages." : "Σφάλμα κατά τη φόρτωση μηνυμάτων.",
@@ -69,6 +70,9 @@ OC.L10N.register(
     "Manual configuration" : "Χειροκίνητη ρύθμιση",
     "IMAP Host" : "Διακομιστής IMAP",
     "IMAP security" : "Ασφάλεια IMAP",
+    "None" : "Τίποτα",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Θύρα IMAP",
     "IMAP User" : "Χρήστης IMAP",
     "SMTP Host" : "Διακομιστής SMTP",
diff --git a/l10n/el.json b/l10n/el.json
index 94b7bd12a..9e835a651 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Mail" : "Αλληλογραφία",
     "Error while loading the accounts." : "Σφάλμα κατά τη φόρτωση των λογαριασμών.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} νέα μηνύματα σε {folderName} \nαπό {from}",
     "you" : "εσείς",
     "Error while loading the selected account." : "Σφάλμα κατά τη φόρτωση του επιλεγμένου λογαριασμού.",
     "Error while loading messages." : "Σφάλμα κατά τη φόρτωση μηνυμάτων.",
@@ -67,6 +68,9 @@
     "Manual configuration" : "Χειροκίνητη ρύθμιση",
     "IMAP Host" : "Διακομιστής IMAP",
     "IMAP security" : "Ασφάλεια IMAP",
+    "None" : "Τίποτα",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Θύρα IMAP",
     "IMAP User" : "Χρήστης IMAP",
     "SMTP Host" : "Διακομιστής SMTP",
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index 88e173bae..6c8b97e67 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -67,6 +67,7 @@ OC.L10N.register(
     "Manual configuration" : "Manual configuration",
     "IMAP Host" : "IMAP Host",
     "IMAP security" : "IMAP security",
+    "None" : "None",
     "IMAP Port" : "IMAP Port",
     "IMAP User" : "IMAP User",
     "SMTP Host" : "SMTP Host",
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index 877382ed8..f145bbedf 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -65,6 +65,7 @@
     "Manual configuration" : "Manual configuration",
     "IMAP Host" : "IMAP Host",
     "IMAP security" : "IMAP security",
+    "None" : "None",
     "IMAP Port" : "IMAP Port",
     "IMAP User" : "IMAP User",
     "SMTP Host" : "SMTP Host",
diff --git a/l10n/es.js b/l10n/es.js
index 8ca8059ff..0cfbcee2f 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -18,7 +18,7 @@ OC.L10N.register(
     "Connect" : "Conectar",
     "Sending …" : "Enviando...",
     "Reply" : "Responder",
-    "Message sent!" : "Mensaje enviado!",
+    "Message sent!" : "¡Mensaje enviado!",
     "Error sending the reply." : "Error al enviar la respuesta.",
     "Error while deleting account." : "Error al eliminar la cuenta.",
     "Choose a file to add as attachment" : "Escoja un archivo para adjuntar",
@@ -59,7 +59,7 @@ OC.L10N.register(
     "Forward" : "Reenviar",
     "Add mail account" : "Agregar cuenta de correo",
     "No search results for {{searchTerm}}" : "No hay resultados para {{searchTerm}}",
-    "Check messages …" : "Chequear mensajes ...",
+    "Check messages …" : "Comprobar mensajes...",
     "No messages in this folder!" : "No hay mensajes en esta carpeta!",
     "New message" : "Nuevo mensaje",
     "Connect your mail account" : "Conecte su cuenta de correo",
@@ -69,6 +69,7 @@ OC.L10N.register(
     "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
     "IMAP security" : "Seguridad IMAP",
+    "None" : "Ninguno",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "SMTP Host" : "Servidor SMTP",
diff --git a/l10n/es.json b/l10n/es.json
index 6afad89e1..ac49039e0 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -16,7 +16,7 @@
     "Connect" : "Conectar",
     "Sending …" : "Enviando...",
     "Reply" : "Responder",
-    "Message sent!" : "Mensaje enviado!",
+    "Message sent!" : "¡Mensaje enviado!",
     "Error sending the reply." : "Error al enviar la respuesta.",
     "Error while deleting account." : "Error al eliminar la cuenta.",
     "Choose a file to add as attachment" : "Escoja un archivo para adjuntar",
@@ -57,7 +57,7 @@
     "Forward" : "Reenviar",
     "Add mail account" : "Agregar cuenta de correo",
     "No search results for {{searchTerm}}" : "No hay resultados para {{searchTerm}}",
-    "Check messages …" : "Chequear mensajes ...",
+    "Check messages …" : "Comprobar mensajes...",
     "No messages in this folder!" : "No hay mensajes en esta carpeta!",
     "New message" : "Nuevo mensaje",
     "Connect your mail account" : "Conecte su cuenta de correo",
@@ -67,6 +67,7 @@
     "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
     "IMAP security" : "Seguridad IMAP",
+    "None" : "Ninguno",
     "IMAP Port" : "Puerto IMAP",
     "IMAP User" : "Usuario IMAP",
     "SMTP Host" : "Servidor SMTP",
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
index 1564573b8..542587424 100644
--- a/l10n/et_EE.js
+++ b/l10n/et_EE.js
@@ -62,6 +62,7 @@ OC.L10N.register(
     "IMAP Password" : "IMAP parool",
     "Manual configuration" : "Käsitsi seadistsamine",
     "IMAP Host" : "IMAP host",
+    "None" : "Pole",
     "IMAP Port" : "IMAP port",
     "IMAP User" : "IMAP kasutaja",
     "SMTP Host" : "SMTP host",
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
index 82df5b24c..f45283b6d 100644
--- a/l10n/et_EE.json
+++ b/l10n/et_EE.json
@@ -60,6 +60,7 @@
     "IMAP Password" : "IMAP parool",
     "Manual configuration" : "Käsitsi seadistsamine",
     "IMAP Host" : "IMAP host",
+    "None" : "Pole",
     "IMAP Port" : "IMAP port",
     "IMAP User" : "IMAP kasutaja",
     "SMTP Host" : "SMTP host",
diff --git a/l10n/eu.js b/l10n/eu.js
index f61608bfc..8cb2b6bb1 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -61,6 +61,7 @@ OC.L10N.register(
     "IMAP Password" : "IMAP pasahitza",
     "Manual configuration" : "Eskuzko konfigurazioa",
     "IMAP Host" : "IMAP Ostalaria",
+    "None" : "Ezer",
     "IMAP Port" : "IMAP Portua",
     "IMAP User" : "IMAP Erabiltzailea",
     "SMTP Host" : "SMTP Ostalaria",
diff --git a/l10n/eu.json b/l10n/eu.json
index d1aa65dc1..b56f5b2db 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -59,6 +59,7 @@
     "IMAP Password" : "IMAP pasahitza",
     "Manual configuration" : "Eskuzko konfigurazioa",
     "IMAP Host" : "IMAP Ostalaria",
+    "None" : "Ezer",
     "IMAP Port" : "IMAP Portua",
     "IMAP User" : "IMAP Erabiltzailea",
     "SMTP Host" : "SMTP Ostalaria",
diff --git a/l10n/fi_FI.js b/l10n/fi_FI.js
index 125a7759a..33668ab0d 100644
--- a/l10n/fi_FI.js
+++ b/l10n/fi_FI.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Mail" : "Sähköposti",
     "Error while loading the accounts." : "Virhe tilejä ladatessa.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} uutta viestiä kansiossa {folderName} \nlähettäjältä {from}",
     "you" : "sinä",
     "Error while loading the selected account." : "Virhe ladatessa valittua tiliä.",
     "Error while loading messages." : "Virhe viestejä ladatessa.",
@@ -65,6 +66,9 @@ OC.L10N.register(
     "Manual configuration" : "Manuaalinen määritys",
     "IMAP Host" : "IMAP-osoite",
     "IMAP security" : "IMAP-tietoturva",
+    "None" : "Ei mitään",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-portti",
     "IMAP User" : "IMAP-käyttäjä",
     "SMTP Host" : "SMTP-osoite",
@@ -73,6 +77,7 @@ OC.L10N.register(
     "SMTP Port (default 25, ssl 465)" : "SMTP-portti (oletus 25, ssl 465)",
     "SMTP User" : "SMTP-käyttäjä",
     "SMTP Password" : "SMTP-salasana",
+    "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Ohjataan edelleen kohteeseen %s - napsauta tästä, jos uudelleenohjaus ei tapahdu muutaman sekunnin kuluessa.",
     "Redirect Warning" : "Varoitus uudelleenohjauksesta",
     "The previous page is sending you to %s." : "Edellinen sivu pyrkii lähettämään sinut sivulle %s.",
     "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Jos et halua päätyä kyseiselle sivulle, voit palata <a href=\"%s\">sähköpostisovellukseen</a>.",
diff --git a/l10n/fi_FI.json b/l10n/fi_FI.json
index ddd951ca0..0235dac1e 100644
--- a/l10n/fi_FI.json
+++ b/l10n/fi_FI.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Mail" : "Sähköposti",
     "Error while loading the accounts." : "Virhe tilejä ladatessa.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} uutta viestiä kansiossa {folderName} \nlähettäjältä {from}",
     "you" : "sinä",
     "Error while loading the selected account." : "Virhe ladatessa valittua tiliä.",
     "Error while loading messages." : "Virhe viestejä ladatessa.",
@@ -63,6 +64,9 @@
     "Manual configuration" : "Manuaalinen määritys",
     "IMAP Host" : "IMAP-osoite",
     "IMAP security" : "IMAP-tietoturva",
+    "None" : "Ei mitään",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP-portti",
     "IMAP User" : "IMAP-käyttäjä",
     "SMTP Host" : "SMTP-osoite",
@@ -71,6 +75,7 @@
     "SMTP Port (default 25, ssl 465)" : "SMTP-portti (oletus 25, ssl 465)",
     "SMTP User" : "SMTP-käyttäjä",
     "SMTP Password" : "SMTP-salasana",
+    "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Ohjataan edelleen kohteeseen %s - napsauta tästä, jos uudelleenohjaus ei tapahdu muutaman sekunnin kuluessa.",
     "Redirect Warning" : "Varoitus uudelleenohjauksesta",
     "The previous page is sending you to %s." : "Edellinen sivu pyrkii lähettämään sinut sivulle %s.",
     "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Jos et halua päätyä kyseiselle sivulle, voit palata <a href=\"%s\">sähköpostisovellukseen</a>.",
diff --git a/l10n/fr.js b/l10n/fr.js
index 94952c769..4ea03878b 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Mail" : "Mail",
     "Error while loading the accounts." : "Erreur lors du chargement des comptes.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nouveaux messages dans {folderName}\nde {from}",
     "you" : "vous",
     "Error while loading the selected account." : "Erreur lors du chargement du compte sélectionné.",
     "Error while loading messages." : "Erreur lors du chargement des messages.",
@@ -69,6 +70,9 @@ OC.L10N.register(
     "Manual configuration" : "Configuration manuelle",
     "IMAP Host" : "Hôte IMAP",
     "IMAP security" : "Sécurité IMAP",
+    "None" : "Aucun",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Port IMAP",
     "IMAP User" : "Utilisateur IMAP",
     "SMTP Host" : "Hôte SMTP",
diff --git a/l10n/fr.json b/l10n/fr.json
index 9114ea5b6..4bb0070e1 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Mail" : "Mail",
     "Error while loading the accounts." : "Erreur lors du chargement des comptes.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nouveaux messages dans {folderName}\nde {from}",
     "you" : "vous",
     "Error while loading the selected account." : "Erreur lors du chargement du compte sélectionné.",
     "Error while loading messages." : "Erreur lors du chargement des messages.",
@@ -67,6 +68,9 @@
     "Manual configuration" : "Configuration manuelle",
     "IMAP Host" : "Hôte IMAP",
     "IMAP security" : "Sécurité IMAP",
+    "None" : "Aucun",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Port IMAP",
     "IMAP User" : "Utilisateur IMAP",
     "SMTP Host" : "Hôte SMTP",
diff --git a/l10n/gl.js b/l10n/gl.js
index 025a0ab6d..1e58cc726 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Mail" : "Correo",
     "Error while loading the accounts." : "Produciuse un erro mentres cargaba as contas.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} mensaxes novas en {folderName} \nde {from}",
     "you" : "vostede",
     "Error while loading the selected account." : "Produciuse un erro ao cargar a conta seleccionada.",
     "Error while loading messages." : "Produciuse un erro mentres cargaba as mensaxes.",
@@ -69,6 +70,9 @@ OC.L10N.register(
     "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
     "IMAP security" : "Seguridade IMAP",
+    "None" : "Ningún",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Porto IMAP",
     "IMAP User" : "Usuario IMAP",
     "SMTP Host" : "Servidor SMTP",
diff --git a/l10n/gl.json b/l10n/gl.json
index de5d330a1..fc218702b 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Mail" : "Correo",
     "Error while loading the accounts." : "Produciuse un erro mentres cargaba as contas.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} mensaxes novas en {folderName} \nde {from}",
     "you" : "vostede",
     "Error while loading the selected account." : "Produciuse un erro ao cargar a conta seleccionada.",
     "Error while loading messages." : "Produciuse un erro mentres cargaba as mensaxes.",
@@ -67,6 +68,9 @@
     "Manual configuration" : "Configuración manual",
     "IMAP Host" : "Servidor IMAP",
     "IMAP security" : "Seguridade IMAP",
+    "None" : "Ningún",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Porto IMAP",
     "IMAP User" : "Usuario IMAP",
     "SMTP Host" : "Servidor SMTP",
diff --git a/l10n/id.js b/l10n/id.js
index 316c986ad..4d94c9da4 100644
--- a/l10n/id.js
+++ b/l10n/id.js
@@ -67,6 +67,7 @@ OC.L10N.register(
     "Manual configuration" : "Konfigurasi manual",
     "IMAP Host" : "Host IMAP",
     "IMAP security" : "Keamanan IMAP",
+    "None" : "Tidak ada",
     "IMAP Port" : "Port IMAP",
     "IMAP User" : "Pengguna IMAP",
     "SMTP Host" : "Host SMTP",
diff --git a/l10n/id.json b/l10n/id.json
index 0ce32cf30..2a8353e7e 100644
--- a/l10n/id.json
+++ b/l10n/id.json
@@ -65,6 +65,7 @@
     "Manual configuration" : "Konfigurasi manual",
     "IMAP Host" : "Host IMAP",
     "IMAP security" : "Keamanan IMAP",
+    "None" : "Tidak ada",
     "IMAP Port" : "Port IMAP",
     "IMAP User" : "Pengguna IMAP",
     "SMTP Host" : "Host SMTP",
diff --git a/l10n/it.js b/l10n/it.js
index 7b4b76e34..32306f239 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -69,6 +69,7 @@ OC.L10N.register(
     "Manual configuration" : "Configurazione manuale",
     "IMAP Host" : "Host IMAP",
     "IMAP security" : "Protezione IMAP",
+    "None" : "Nessuno",
     "IMAP Port" : "Porta IMAP",
     "IMAP User" : "Utente IMAP",
     "SMTP Host" : "Host SMTP",
diff --git a/l10n/it.json b/l10n/it.json
index 0beae4790..2f8fc9c61 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -67,6 +67,7 @@
     "Manual configuration" : "Configurazione manuale",
     "IMAP Host" : "Host IMAP",
     "IMAP security" : "Protezione IMAP",
+    "None" : "Nessuno",
     "IMAP Port" : "Porta IMAP",
     "IMAP User" : "Utente IMAP",
     "SMTP Host" : "Host SMTP",
diff --git a/l10n/ja.js b/l10n/ja.js
index 22d79cca3..dd1a58862 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -63,6 +63,7 @@ OC.L10N.register(
     "IMAP Password" : "IMAP パスワード",
     "Manual configuration" : "手動設定",
     "IMAP Host" : "IMAPホスト",
+    "None" : "なし",
     "IMAP Port" : "IMAPポート",
     "IMAP User" : "IMAPユーザー",
     "SMTP Host" : "SMTPホスト",
diff --git a/l10n/ja.json b/l10n/ja.json
index 0ec7891d1..72cb94f93 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -61,6 +61,7 @@
     "IMAP Password" : "IMAP パスワード",
     "Manual configuration" : "手動設定",
     "IMAP Host" : "IMAPホスト",
+    "None" : "なし",
     "IMAP Port" : "IMAPポート",
     "IMAP User" : "IMAPユーザー",
     "SMTP Host" : "SMTPホスト",
diff --git a/l10n/ko.js b/l10n/ko.js
index 92d982760..a23d0cca8 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -62,6 +62,7 @@ OC.L10N.register(
     "IMAP Password" : "IMAP 암호",
     "Manual configuration" : "수동 설정",
     "IMAP Host" : "IMAP 호스트",
+    "None" : "없음",
     "IMAP Port" : "IMAP 포트",
     "IMAP User" : "IMAP 사용자",
     "SMTP Host" : "SMTP 호스트",
diff --git a/l10n/ko.json b/l10n/ko.json
index 60629729a..587c48026 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -60,6 +60,7 @@
     "IMAP Password" : "IMAP 암호",
     "Manual configuration" : "수동 설정",
     "IMAP Host" : "IMAP 호스트",
+    "None" : "없음",
     "IMAP Port" : "IMAP 포트",
     "IMAP User" : "IMAP 사용자",
     "SMTP Host" : "SMTP 호스트",
diff --git a/l10n/nb_NO.js b/l10n/nb_NO.js
index ab49ab28d..8b39c253e 100644
--- a/l10n/nb_NO.js
+++ b/l10n/nb_NO.js
@@ -62,6 +62,7 @@ OC.L10N.register(
     "IMAP Password" : "IMAP-passord",
     "Manual configuration" : "Manuell konfigurering",
     "IMAP Host" : "IMAP-vert",
+    "None" : "Ingen",
     "IMAP Port" : "IMAP-port",
     "IMAP User" : "IMAP-bruker",
     "SMTP Host" : "SMTP-vert",
diff --git a/l10n/nb_NO.json b/l10n/nb_NO.json
index 1d9c52d9a..0c343a4bd 100644
--- a/l10n/nb_NO.json
+++ b/l10n/nb_NO.json
@@ -60,6 +60,7 @@
     "IMAP Password" : "IMAP-passord",
     "Manual configuration" : "Manuell konfigurering",
     "IMAP Host" : "IMAP-vert",
+    "None" : "Ingen",
     "IMAP Port" : "IMAP-port",
     "IMAP User" : "IMAP-bruker",
     "SMTP Host" : "SMTP-vert",
diff --git a/l10n/nl.js b/l10n/nl.js
index f3c818fbc..1acd928dc 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Mail" : "E-mail",
     "Error while loading the accounts." : "Fout tijdens het laden van de accounts.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nieuwe berichten in {folderName} \nvan {from}",
     "you" : "je",
     "Error while loading the selected account." : "Fout tijdens het laden van het gekozen account.",
     "Error while loading messages." : "Fout bij laden berichten.",
@@ -69,6 +70,9 @@ OC.L10N.register(
     "Manual configuration" : "Handmatige configuratie",
     "IMAP Host" : "IMAP server",
     "IMAP security" : "IMAP beveiliging",
+    "None" : "Geen",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP Poort",
     "IMAP User" : "IMAP gebruikersnaam",
     "SMTP Host" : "SMTP server",
diff --git a/l10n/nl.json b/l10n/nl.json
index 49a55c843..9878741e5 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Mail" : "E-mail",
     "Error while loading the accounts." : "Fout tijdens het laden van de accounts.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} nieuwe berichten in {folderName} \nvan {from}",
     "you" : "je",
     "Error while loading the selected account." : "Fout tijdens het laden van het gekozen account.",
     "Error while loading messages." : "Fout bij laden berichten.",
@@ -67,6 +68,9 @@
     "Manual configuration" : "Handmatige configuratie",
     "IMAP Host" : "IMAP server",
     "IMAP security" : "IMAP beveiliging",
+    "None" : "Geen",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP Poort",
     "IMAP User" : "IMAP gebruikersnaam",
     "SMTP Host" : "SMTP server",
diff --git a/l10n/pl.js b/l10n/pl.js
index 6d9f9bdc7..a6c58e79f 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "IMAP Password" : "Hasło IMAP",
     "Manual configuration" : "Ręczna konfiguracja",
     "IMAP Host" : "Serwer IMAP",
+    "None" : "Nic",
     "IMAP Port" : "Port IMAP",
     "IMAP User" : "Użytkownik IMAP",
     "SMTP Host" : "Serwer SMTP",
diff --git a/l10n/pl.json b/l10n/pl.json
index c19b9829b..7b55c49e7 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -57,6 +57,7 @@
     "IMAP Password" : "Hasło IMAP",
     "Manual configuration" : "Ręczna konfiguracja",
     "IMAP Host" : "Serwer IMAP",
+    "None" : "Nic",
     "IMAP Port" : "Port IMAP",
     "IMAP User" : "Użytkownik IMAP",
     "SMTP Host" : "Serwer SMTP",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 0d46bcdb6..4acf849a3 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Mail" : "EMail",
     "Error while loading the accounts." : "Erro no carregamento das contas.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} novas mensagens em {folderName} \nde {from}",
     "you" : "você",
     "Error while loading the selected account." : "Erro enquanto carregava a conta selecionada",
     "Error while loading messages." : "Erro no carregamento das mensagens.",
@@ -69,6 +70,9 @@ OC.L10N.register(
     "Manual configuration" : "Configuração manual",
     "IMAP Host" : "Host IMAP",
     "IMAP security" : "Segurança IMAP",
+    "None" : "Nenhuma",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Porta IMAP",
     "IMAP User" : "Usuário IMAP",
     "SMTP Host" : "Host SMTP",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 2a67a3ae2..9e7ee0568 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Mail" : "EMail",
     "Error while loading the accounts." : "Erro no carregamento das contas.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} novas mensagens em {folderName} \nde {from}",
     "you" : "você",
     "Error while loading the selected account." : "Erro enquanto carregava a conta selecionada",
     "Error while loading messages." : "Erro no carregamento das mensagens.",
@@ -67,6 +68,9 @@
     "Manual configuration" : "Configuração manual",
     "IMAP Host" : "Host IMAP",
     "IMAP security" : "Segurança IMAP",
+    "None" : "Nenhuma",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Porta IMAP",
     "IMAP User" : "Usuário IMAP",
     "SMTP Host" : "Host SMTP",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index 86406ad45..e4278caa5 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Mail" : "Correio",
     "Error while loading the accounts." : "Erro a carregar as contas.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} novas mensagens em {folderName} \nde {from}",
     "you" : "Você",
     "Error while loading the selected account." : "Erro a carregar a conta seleccionada.",
     "Error while loading messages." : "Erro durante o carregamento das mensagens.",
@@ -18,6 +19,7 @@ OC.L10N.register(
     "Connect" : "Ligar",
     "Sending …" : "A enviar...",
     "Reply" : "Responder",
+    "Message sent!" : "Mensagem enviada!",
     "Error sending the reply." : "Erro ao enviar a resposta.",
     "Error while deleting account." : "Erro durante a eliminação da conta.",
     "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
@@ -38,6 +40,7 @@ OC.L10N.register(
     "Starred" : "Marcado",
     "Creating account failed: " : "Não foi possível criar a conta:",
     "Auto detect failed. Please use manual mode." : "A deteção automática falhou. Por favor, utilize o modo manual",
+    "& others" : "e outros",
     "from" : "de",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "para",
@@ -55,17 +58,26 @@ OC.L10N.register(
     "+ cc" : "+ cc",
     "Reply …" : "Responder...",
     "Forward" : "Avançar",
+    "Add mail account" : "Adicionar conta de correio",
+    "No search results for {{searchTerm}}" : "Sem resultados de procura para {{searchTerm}}",
+    "Check messages …" : "Verificar mensagens...",
     "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
+    "New message" : "Nova mensagem",
     "Connect your mail account" : "Conete a sua conta de correio",
     "Name" : "Nome",
     "Mail Address" : "Endereço de Correio Eletrónico",
     "IMAP Password" : "Senha IMAP",
     "Manual configuration" : "Configuração Manual",
     "IMAP Host" : "Hospedeiro IMAP",
+    "IMAP security" : "Segurança IMAP",
+    "None" : "Nenhum",
+    "SSL/TLS" : "SSL/TLS",
     "IMAP Port" : "Porta IMAP",
     "IMAP User" : "Utilizador IMAP",
     "SMTP Host" : "Hospedeiro SMTP",
+    "SMTP security" : "Segurança SMTP",
     "SMTP Port" : "Porta SMTP",
+    "SMTP Port (default 25, ssl 465)" : "Porta SMTP (predefinição 25, ssl 465)",
     "SMTP User" : "Utilizador SMTP",
     "SMTP Password" : "Senha SMTP",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "A encaminhá-lho para %s - clique aqui se não for redireccionado automaticamente dentro de alguns segundos.",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index 209017e95..b3febe9f5 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Mail" : "Correio",
     "Error while loading the accounts." : "Erro a carregar as contas.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} novas mensagens em {folderName} \nde {from}",
     "you" : "Você",
     "Error while loading the selected account." : "Erro a carregar a conta seleccionada.",
     "Error while loading messages." : "Erro durante o carregamento das mensagens.",
@@ -16,6 +17,7 @@
     "Connect" : "Ligar",
     "Sending …" : "A enviar...",
     "Reply" : "Responder",
+    "Message sent!" : "Mensagem enviada!",
     "Error sending the reply." : "Erro ao enviar a resposta.",
     "Error while deleting account." : "Erro durante a eliminação da conta.",
     "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
@@ -36,6 +38,7 @@
     "Starred" : "Marcado",
     "Creating account failed: " : "Não foi possível criar a conta:",
     "Auto detect failed. Please use manual mode." : "A deteção automática falhou. Por favor, utilize o modo manual",
+    "& others" : "e outros",
     "from" : "de",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "para",
@@ -53,17 +56,26 @@
     "+ cc" : "+ cc",
     "Reply …" : "Responder...",
     "Forward" : "Avançar",
+    "Add mail account" : "Adicionar conta de correio",
+    "No search results for {{searchTerm}}" : "Sem resultados de procura para {{searchTerm}}",
+    "Check messages …" : "Verificar mensagens...",
     "No messages in this folder!" : "Nenhuma mensagem nesta pasta!",
+    "New message" : "Nova mensagem",
     "Connect your mail account" : "Conete a sua conta de correio",
     "Name" : "Nome",
     "Mail Address" : "Endereço de Correio Eletrónico",
     "IMAP Password" : "Senha IMAP",
     "Manual configuration" : "Configuração Manual",
     "IMAP Host" : "Hospedeiro IMAP",
+    "IMAP security" : "Segurança IMAP",
+    "None" : "Nenhum",
+    "SSL/TLS" : "SSL/TLS",
     "IMAP Port" : "Porta IMAP",
     "IMAP User" : "Utilizador IMAP",
     "SMTP Host" : "Hospedeiro SMTP",
+    "SMTP security" : "Segurança SMTP",
     "SMTP Port" : "Porta SMTP",
+    "SMTP Port (default 25, ssl 465)" : "Porta SMTP (predefinição 25, ssl 465)",
     "SMTP User" : "Utilizador SMTP",
     "SMTP Password" : "Senha SMTP",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "A encaminhá-lho para %s - clique aqui se não for redireccionado automaticamente dentro de alguns segundos.",
diff --git a/l10n/ru.js b/l10n/ru.js
index 44f3a5679..307234784 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -67,6 +67,7 @@ OC.L10N.register(
     "Manual configuration" : "Ручная настройка",
     "IMAP Host" : "Адрес сервера IMAP",
     "IMAP security" : "Безопасность IMAP",
+    "None" : "Отсутствует",
     "IMAP Port" : "Порт сервера IMAP",
     "IMAP User" : "Пользователь сервера IMAP",
     "SMTP Host" : "Адрес сервера SMTP",
@@ -80,4 +81,4 @@ OC.L10N.register(
     "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Если вы не хотите посещать ту страницу, вы можете вернуться к <a href=\"%s\">почтовому приложению</a>.",
     "Click here to visit the website." : "Нажмите здесь чтобы посетить website."
 },
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
+"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/l10n/ru.json b/l10n/ru.json
index 23fd8982c..39f999149 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -65,6 +65,7 @@
     "Manual configuration" : "Ручная настройка",
     "IMAP Host" : "Адрес сервера IMAP",
     "IMAP security" : "Безопасность IMAP",
+    "None" : "Отсутствует",
     "IMAP Port" : "Порт сервера IMAP",
     "IMAP User" : "Пользователь сервера IMAP",
     "SMTP Host" : "Адрес сервера SMTP",
@@ -77,5 +78,5 @@
     "The previous page is sending you to %s." : "Предыдущая страница отправляет вас на %s.",
     "If you do not want to visit that page, you can return to <a href=\"%s\">the mail app</a>." : "Если вы не хотите посещать ту страницу, вы можете вернуться к <a href=\"%s\">почтовому приложению</a>.",
     "Click here to visit the website." : "Нажмите здесь чтобы посетить website."
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }
\ No newline at end of file
diff --git a/l10n/sk_SK.js b/l10n/sk_SK.js
index 778a3aecc..7fecb040a 100644
--- a/l10n/sk_SK.js
+++ b/l10n/sk_SK.js
@@ -65,6 +65,7 @@ OC.L10N.register(
     "Manual configuration" : "Ručné nastavenie",
     "IMAP Host" : "IMAP Host",
     "IMAP security" : "IMAP zabezpečenie",
+    "None" : "Žiadny",
     "IMAP Port" : "IMAP Port",
     "IMAP User" : "IMAP používateľ",
     "SMTP Host" : "SMTP Host",
diff --git a/l10n/sk_SK.json b/l10n/sk_SK.json
index b9354edfe..646374fb7 100644
--- a/l10n/sk_SK.json
+++ b/l10n/sk_SK.json
@@ -63,6 +63,7 @@
     "Manual configuration" : "Ručné nastavenie",
     "IMAP Host" : "IMAP Host",
     "IMAP security" : "IMAP zabezpečenie",
+    "None" : "Žiadny",
     "IMAP Port" : "IMAP Port",
     "IMAP User" : "IMAP používateľ",
     "SMTP Host" : "SMTP Host",
diff --git a/l10n/sl.js b/l10n/sl.js
index 533724e2e..c4fc3429a 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Mail" : "Elektronska pošta",
     "Error while loading the accounts." : "Prišlo je do napake med nalaganjem računa.¸",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} novih sporočil v {folderName} \nod {from}",
     "you" : "vi",
     "Error while loading the selected account." : "Prišlo je do napake med nalaganjem izbranega računa.",
     "Error while loading messages." : "Prišlo je do napake nalaganja sporočil.",
@@ -18,6 +19,7 @@ OC.L10N.register(
     "Connect" : "Poveži",
     "Sending …" : "Pošiljanje ...",
     "Reply" : "Odgovori",
+    "Message sent!" : "Sporočilo poslano!",
     "Error sending the reply." : "Napaka pošiljanja odgovora.",
     "Error while deleting account." : "Prišlo je do napake med brisanjem računa.",
     "Choose a file to add as attachment" : "Izbor datoteke za prilogo",
@@ -38,6 +40,7 @@ OC.L10N.register(
     "Starred" : "Označeno",
     "Creating account failed: " : "Ustvarjanje računa je spodletelo:",
     "Auto detect failed. Please use manual mode." : "Samodejno zaznavanje je spodletelo. Zaznavo bo treba izvesti ročno.",
+    "& others" : "in drugo",
     "from" : "od",
     "+ cc/bcc" : "+ kp/skp",
     "to" : "za",
@@ -55,17 +58,27 @@ OC.L10N.register(
     "+ cc" : "+ kp",
     "Reply …" : "Odgovori ...",
     "Forward" : "Posreduj",
+    "Add mail account" : "Dodajte poštni račun",
+    "No search results for {{searchTerm}}" : "Ni rezultatov iskanja za  {{searchTerm}}",
+    "Check messages …" : "Preverjam sporočila...",
     "No messages in this folder!" : "V tej mapi ni sporočil!",
+    "New message" : "Novo sporočilo",
     "Connect your mail account" : "Povezava s poštnim računom",
     "Name" : "Ime",
     "Mail Address" : "Elektronski naslov",
     "IMAP Password" : "Geslo IMAP",
     "Manual configuration" : "Ročna nastavitev",
     "IMAP Host" : "Gostitelj IMAP",
+    "IMAP security" : "Varnost IMAP",
+    "None" : "Brez",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Vrata IMAP",
     "IMAP User" : "Uporabnik IMAP",
     "SMTP Host" : "Gostitelj SMTP",
+    "SMTP security" : "Varnost SMTP",
     "SMTP Port" : "Vrata SMTP",
+    "SMTP Port (default 25, ssl 465)" : "SMTP Vrata (privzeto 25, ssl 465)",
     "SMTP User" : "Uporabnik SMTP",
     "SMTP Password" : "Geslo SMTP",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Poteka preusmeritev na %s - v kolikor preusmeritev ni izvedena samodejno, kliknite tu.",
diff --git a/l10n/sl.json b/l10n/sl.json
index 62cb22440..70a7fc747 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Mail" : "Elektronska pošta",
     "Error while loading the accounts." : "Prišlo je do napake med nalaganjem računa.¸",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{newMessageCount} novih sporočil v {folderName} \nod {from}",
     "you" : "vi",
     "Error while loading the selected account." : "Prišlo je do napake med nalaganjem izbranega računa.",
     "Error while loading messages." : "Prišlo je do napake nalaganja sporočil.",
@@ -16,6 +17,7 @@
     "Connect" : "Poveži",
     "Sending …" : "Pošiljanje ...",
     "Reply" : "Odgovori",
+    "Message sent!" : "Sporočilo poslano!",
     "Error sending the reply." : "Napaka pošiljanja odgovora.",
     "Error while deleting account." : "Prišlo je do napake med brisanjem računa.",
     "Choose a file to add as attachment" : "Izbor datoteke za prilogo",
@@ -36,6 +38,7 @@
     "Starred" : "Označeno",
     "Creating account failed: " : "Ustvarjanje računa je spodletelo:",
     "Auto detect failed. Please use manual mode." : "Samodejno zaznavanje je spodletelo. Zaznavo bo treba izvesti ročno.",
+    "& others" : "in drugo",
     "from" : "od",
     "+ cc/bcc" : "+ kp/skp",
     "to" : "za",
@@ -53,17 +56,27 @@
     "+ cc" : "+ kp",
     "Reply …" : "Odgovori ...",
     "Forward" : "Posreduj",
+    "Add mail account" : "Dodajte poštni račun",
+    "No search results for {{searchTerm}}" : "Ni rezultatov iskanja za  {{searchTerm}}",
+    "Check messages …" : "Preverjam sporočila...",
     "No messages in this folder!" : "V tej mapi ni sporočil!",
+    "New message" : "Novo sporočilo",
     "Connect your mail account" : "Povezava s poštnim računom",
     "Name" : "Ime",
     "Mail Address" : "Elektronski naslov",
     "IMAP Password" : "Geslo IMAP",
     "Manual configuration" : "Ročna nastavitev",
     "IMAP Host" : "Gostitelj IMAP",
+    "IMAP security" : "Varnost IMAP",
+    "None" : "Brez",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "Vrata IMAP",
     "IMAP User" : "Uporabnik IMAP",
     "SMTP Host" : "Gostitelj SMTP",
+    "SMTP security" : "Varnost SMTP",
     "SMTP Port" : "Vrata SMTP",
+    "SMTP Port (default 25, ssl 465)" : "SMTP Vrata (privzeto 25, ssl 465)",
     "SMTP User" : "Uporabnik SMTP",
     "SMTP Password" : "Geslo SMTP",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "Poteka preusmeritev na %s - v kolikor preusmeritev ni izvedena samodejno, kliknite tu.",
diff --git a/l10n/sr.js b/l10n/sr.js
index 5dc4a2a26..07cf32aab 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Mail" : "Пошта",
     "Error while loading the accounts." : "Грешка при учитавању налога.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "Нових порука: {newMessageCount} у {folderName} \nод {from}",
     "you" : "ви",
     "Error while loading the selected account." : "Грешка при учитавању изабраног налога.",
     "Error while loading messages." : "Грешка при учитавању порука.",
@@ -69,6 +70,9 @@ OC.L10N.register(
     "Manual configuration" : "Ручна постава",
     "IMAP Host" : "ИМАП домаћин",
     "IMAP security" : "ИМАП безбедност",
+    "None" : "Ништа",
+    "SSL/TLS" : "ССЛ/ТЛС",
+    "STARTTLS" : "СТАРТТЛС",
     "IMAP Port" : "ИМАП порт",
     "IMAP User" : "ИМАП корисник",
     "SMTP Host" : "СМТП домаћин",
diff --git a/l10n/sr.json b/l10n/sr.json
index fa0f61220..1ed4daed5 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Mail" : "Пошта",
     "Error while loading the accounts." : "Грешка при учитавању налога.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "Нових порука: {newMessageCount} у {folderName} \nод {from}",
     "you" : "ви",
     "Error while loading the selected account." : "Грешка при учитавању изабраног налога.",
     "Error while loading messages." : "Грешка при учитавању порука.",
@@ -67,6 +68,9 @@
     "Manual configuration" : "Ручна постава",
     "IMAP Host" : "ИМАП домаћин",
     "IMAP security" : "ИМАП безбедност",
+    "None" : "Ништа",
+    "SSL/TLS" : "ССЛ/ТЛС",
+    "STARTTLS" : "СТАРТТЛС",
     "IMAP Port" : "ИМАП порт",
     "IMAP User" : "ИМАП корисник",
     "SMTP Host" : "СМТП домаћин",
diff --git a/l10n/sv.js b/l10n/sv.js
index 4a1ee8d87..1286f95f1 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -62,6 +62,7 @@ OC.L10N.register(
     "IMAP Password" : "IMAP-lösenord",
     "Manual configuration" : "Manuell konfiguration",
     "IMAP Host" : "IMAP-värd",
+    "None" : "Ingen",
     "IMAP Port" : "IMAP-port",
     "IMAP User" : "IMAP-användare",
     "SMTP Host" : "SMTP-värd",
diff --git a/l10n/sv.json b/l10n/sv.json
index e86e40c46..a0c8a03bd 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -60,6 +60,7 @@
     "IMAP Password" : "IMAP-lösenord",
     "Manual configuration" : "Manuell konfiguration",
     "IMAP Host" : "IMAP-värd",
+    "None" : "Ingen",
     "IMAP Port" : "IMAP-port",
     "IMAP User" : "IMAP-användare",
     "SMTP Host" : "SMTP-värd",
diff --git a/l10n/tr.js b/l10n/tr.js
index 0ec3eabef..fd31906ba 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Mail" : "Posta",
     "Error while loading the accounts." : "Hesaplar yüklenirken hata.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{folderName} içinde  {from} dan {newMessageCount} yeni mesaj bulundu",
     "you" : "siz",
     "Error while loading the selected account." : "Seçili hesap yüklenirken hata.",
     "Error while loading messages." : "İletiler yüklenirken hata.",
@@ -39,6 +40,7 @@ OC.L10N.register(
     "Starred" : "Yıldızlı",
     "Creating account failed: " : "Hesap oluşturma başarısız:",
     "Auto detect failed. Please use manual mode." : "Otomatik sınama başarısız. Lütfen el kipini kullanın.",
+    "& others" : "& diğerleri",
     "from" : "kimden",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "alıcı",
@@ -56,17 +58,27 @@ OC.L10N.register(
     "+ cc" : "+ cc",
     "Reply …" : "Yanıtla...",
     "Forward" : "İlet",
+    "Add mail account" : "Posta hesabı ekle",
+    "No search results for {{searchTerm}}" : "{{searchTerm}} için hiç bir sonuç bulunamadı",
+    "Check messages …" : "Mesajları kontrol et ...",
     "No messages in this folder!" : "Bu klasörde ileti yok!",
+    "New message" : "Yeni mesaj",
     "Connect your mail account" : "Posta hesabınızı bağlayın",
     "Name" : "Ad",
     "Mail Address" : "Posta Adresi",
     "IMAP Password" : "IMAP Parolası",
     "Manual configuration" : "El ile yapılandırma",
     "IMAP Host" : "IMAP Sunucusu",
+    "IMAP security" : "IMAP güvenliği",
+    "None" : "Hiçbiri",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP Bağ. Nok.",
     "IMAP User" : "IMAP Kullanıcısı",
     "SMTP Host" : "SMTP Sunucusu",
+    "SMTP security" : "SMTP güvenliği",
     "SMTP Port" : "SMTP Bağ. Nok.",
+    "SMTP Port (default 25, ssl 465)" : "SMTP Portu (varsayılan 25, ssl 465)",
     "SMTP User" : "SMTP Kullanıcısı",
     "SMTP Password" : "SMTP Parolası",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "%s sayfasına yönlendiriliyorsunuz - birkaç saniye içinde yönlendirilmezseniz, buraya tıklayın.",
diff --git a/l10n/tr.json b/l10n/tr.json
index 01d11f3ac..f05cea029 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Mail" : "Posta",
     "Error while loading the accounts." : "Hesaplar yüklenirken hata.",
+    "{newMessageCount} new messages in {folderName} \nfrom {from}" : "{folderName} içinde  {from} dan {newMessageCount} yeni mesaj bulundu",
     "you" : "siz",
     "Error while loading the selected account." : "Seçili hesap yüklenirken hata.",
     "Error while loading messages." : "İletiler yüklenirken hata.",
@@ -37,6 +38,7 @@
     "Starred" : "Yıldızlı",
     "Creating account failed: " : "Hesap oluşturma başarısız:",
     "Auto detect failed. Please use manual mode." : "Otomatik sınama başarısız. Lütfen el kipini kullanın.",
+    "& others" : "& diğerleri",
     "from" : "kimden",
     "+ cc/bcc" : "+ cc/bcc",
     "to" : "alıcı",
@@ -54,17 +56,27 @@
     "+ cc" : "+ cc",
     "Reply …" : "Yanıtla...",
     "Forward" : "İlet",
+    "Add mail account" : "Posta hesabı ekle",
+    "No search results for {{searchTerm}}" : "{{searchTerm}} için hiç bir sonuç bulunamadı",
+    "Check messages …" : "Mesajları kontrol et ...",
     "No messages in this folder!" : "Bu klasörde ileti yok!",
+    "New message" : "Yeni mesaj",
     "Connect your mail account" : "Posta hesabınızı bağlayın",
     "Name" : "Ad",
     "Mail Address" : "Posta Adresi",
     "IMAP Password" : "IMAP Parolası",
     "Manual configuration" : "El ile yapılandırma",
     "IMAP Host" : "IMAP Sunucusu",
+    "IMAP security" : "IMAP güvenliği",
+    "None" : "Hiçbiri",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "IMAP Port" : "IMAP Bağ. Nok.",
     "IMAP User" : "IMAP Kullanıcısı",
     "SMTP Host" : "SMTP Sunucusu",
+    "SMTP security" : "SMTP güvenliği",
     "SMTP Port" : "SMTP Bağ. Nok.",
+    "SMTP Port (default 25, ssl 465)" : "SMTP Portu (varsayılan 25, ssl 465)",
     "SMTP User" : "SMTP Kullanıcısı",
     "SMTP Password" : "SMTP Parolası",
     "Forwarding you to %s - click here if you are not automatically redirected within the next few seconds." : "%s sayfasına yönlendiriliyorsunuz - birkaç saniye içinde yönlendirilmezseniz, buraya tıklayın.",
diff --git a/l10n/uk.js b/l10n/uk.js
index e7e153cc8..19b80f30d 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -67,6 +67,7 @@ OC.L10N.register(
     "Manual configuration" : "Ручне налаштування",
     "IMAP Host" : "IMAP Хост",
     "IMAP security" : "Безпека ",
+    "None" : "Жоден",
     "IMAP Port" : "IMAP Порт",
     "IMAP User" : "IMAP Користувач",
     "SMTP Host" : "SMTP Хост",
diff --git a/l10n/uk.json b/l10n/uk.json
index 18c3665f6..afb8421ab 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -65,6 +65,7 @@
     "Manual configuration" : "Ручне налаштування",
     "IMAP Host" : "IMAP Хост",
     "IMAP security" : "Безпека ",
+    "None" : "Жоден",
     "IMAP Port" : "IMAP Порт",
     "IMAP User" : "IMAP Користувач",
     "SMTP Host" : "SMTP Хост",