diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b2e66e239..f8097c9fe 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -390,10 +390,10 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
     <string name="account_setup_incoming_security_label">Tipus de seguretat</string>
     <string name="account_setup_incoming_auth_type_label">Tipus d\'autenticació</string>
     <string name="account_setup_incoming_security_none_label">Cap</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (si és disponible)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (sempre)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (si és disponible)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (sempre)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (si és disponible)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (sempre)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (si és disponible)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (sempre)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Quan esborro missatges</string>
     <string name="account_setup_incoming_delete_policy_never_label">No els esborris del servidor</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 53b7cb3bd..1c74fc04b 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -394,10 +394,10 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
     <string name="account_setup_incoming_security_label">Typ zabezpečení</string>
     <string name="account_setup_incoming_auth_type_label">Typ ověření</string>
     <string name="account_setup_incoming_security_none_label">Žádné</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (je-li dostupné)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (vždy)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (je-li dostupné)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (vždy)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (je-li dostupné)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (vždy)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (je-li dostupné)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (vždy)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Když smažu zprávu</string>
     <string name="account_setup_incoming_delete_policy_never_label">Nemazat ji na serveru</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a90249cd6..657cf6406 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -388,10 +388,10 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
     <string name="account_setup_incoming_security_label">Sikkerhed</string>
     <string name="account_setup_incoming_auth_type_label">Autentifikations type</string>
     <string name="account_setup_incoming_security_none_label">Ingen</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (hvis tilgængelig)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (altid)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (hvis tilgængelig)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (altid)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (hvis tilgængelig)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (altid)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (hvis tilgængelig)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (altid)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Når jeg sletter en mail</string>
     <string name="account_setup_incoming_delete_policy_never_label">Undlad at slette på server</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1750ce671..45b60790e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -388,10 +388,10 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
     <string name="account_setup_incoming_security_label">Sicherheitstyp</string>
     <string name="account_setup_incoming_auth_type_label">Authentifizierungstyp</string>
     <string name="account_setup_incoming_security_none_label">Keine Verschlüsselung</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (falls verfügbar)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (immer)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (falls verfügbar)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (immer)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (falls verfügbar)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (immer)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (falls verfügbar)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (immer)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Beim Löschen von Nachrichten</string>
     <string name="account_setup_incoming_delete_policy_never_label">Nie von Server löschen</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 171fe0b5b..6644c3ec4 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -383,10 +383,10 @@
     <string name="account_setup_incoming_security_label">Ασφάλεια</string>
     <string name="account_setup_incoming_auth_type_label">Πιστοποίηση</string>
     <string name="account_setup_incoming_security_none_label">Καμιά</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (αν υπάρχει)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (πάντοτε)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (αν υπάρχει)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (πάντοτε)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (αν υπάρχει)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (πάντοτε)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (αν υπάρχει)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (πάντοτε)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Κατά τη διαγραφή μηνύματος</string>
     <string name="account_setup_incoming_delete_policy_never_label">Να μη διαγράφεται στο server</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3d4f33c82..5ac6d81fc 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -387,10 +387,10 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
     <string name="account_setup_incoming_security_label">Tipo de Seguridad</string>
     <string name="account_setup_incoming_auth_type_label">Tipo de autentificación</string>
     <string name="account_setup_incoming_security_none_label">Ninguna</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (si disponible)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (siempre)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (si disponible)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (siempre)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (si disponible)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (siempre)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (si disponible)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (siempre)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Borrado de mensajes</string>
     <string name="account_setup_incoming_delete_policy_never_label">No borrar del servidor</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 210d4503a..a3b2a9f5f 100755
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -396,10 +396,10 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
     <string name="account_setup_incoming_security_label">Suojauksen tyyppi</string>
     <string name="account_setup_incoming_auth_type_label">Todennuksen tyyppi</string>
     <string name="account_setup_incoming_security_none_label">Ei mitään</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (jos käytettävissä)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (aina)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (jos käytettävissä)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (aina)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (jos käytettävissä)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (aina)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (jos käytettävissä)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (aina)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Kun viesti poistetaan</string>
     <string name="account_setup_incoming_delete_policy_never_label">Älä poista palvelimelta</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6f8a0202a..67e4ca6bf 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -422,10 +422,10 @@ de plus</string>
     <string name="account_setup_incoming_security_label">Type de sécurité</string>
     <string name="account_setup_incoming_auth_type_label">Type d\'authentification</string>
     <string name="account_setup_incoming_security_none_label">Aucun</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (si disponible)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (toujours)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (si disponible)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (toujours)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (si disponible)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (toujours)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (si disponible)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (toujours)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Supprimer les messages du serveur\u00A0:</string>
     <string name="account_setup_incoming_delete_policy_never_label">Jamais</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index ae17c0eaf..93e50c95c 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -386,10 +386,10 @@ Por favor, envía os erros detectados, contribúe con novas funcionalidas e preg
     <string name="account_setup_incoming_security_label">Tipo de Seguridade</string>
     <string name="account_setup_incoming_auth_type_label">Tipo de autentificación</string>
     <string name="account_setup_incoming_security_none_label">Ningunha</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (se dispoñible)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (sempre)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (se dispoñible)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (sempre)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (se dispoñible)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (sempre)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (se dispoñible)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (sempre)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Borrado de mesaxes</string>
     <string name="account_setup_incoming_delete_policy_never_label">Non borrar do servidor</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 95c23fbe4..cbb8c4905 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -388,10 +388,10 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
     <string name="account_setup_incoming_security_label">Kapcsolat biztonsága</string>
     <string name="account_setup_incoming_auth_type_label">Hitelesítés típus</string>
     <string name="account_setup_incoming_security_none_label">Nincs</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (ha elérhető)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (mindig)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (ha elérhető)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (mindig)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (ha elérhető)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (mindig)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (ha elérhető)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (mindig)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Üzenet törlésekor</string>
     <string name="account_setup_incoming_delete_policy_never_label">Ne törlődjön a szerverről</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index df38c5d38..9b74c0b99 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -390,10 +390,10 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
     <string name="account_setup_incoming_security_label">Tipo di protezione</string>
     <string name="account_setup_incoming_auth_type_label">Tipo di autenticazione</string>
     <string name="account_setup_incoming_security_none_label">Nessuna</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (se disponibile)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (sempre)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (se disponibile)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (sempre)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (se disponibile)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (sempre)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (se disponibile)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (sempre)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Quando si elimina un messaggio</string>
     <string name="account_setup_incoming_delete_policy_never_label">Non eliminare dal server</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e34188382..4edb4cc2c 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -389,10 +389,10 @@
     <string name="account_setup_incoming_security_label">סוג אבטחה</string>
     <string name="account_setup_incoming_auth_type_label">סוג אימות</string>
     <string name="account_setup_incoming_security_none_label">כלום</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (אם זמין)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (תמיד)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (אם זמין)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (תמיד)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (אם זמין)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (תמיד)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (אם זמין)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (תמיד)</string>
 
     <string name="account_setup_incoming_delete_policy_label">כאשר אני מוחק הודעה</string>
     <string name="account_setup_incoming_delete_policy_never_label">אל תמחוק בשרת</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 11eb8d0fd..9a70f4b2e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -389,10 +389,10 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
     <string name="account_setup_incoming_security_label">保護された接続</string>
     <string name="account_setup_incoming_auth_type_label">認証タイプ</string>
     <string name="account_setup_incoming_security_none_label">使用しない</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">可能なら SSL を使用する</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL を使用する</string>
-    <string name="account_setup_incoming_security_tls_optional_label">可能なら TLS を使用する</string>
-    <string name="account_setup_incoming_security_tls_label">TLS を使用する</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">可能なら SSL/TLS を使用する</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS を使用する</string>
+    <string name="account_setup_incoming_security_tls_optional_label">可能なら STARTTLS を使用する</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS を使用する</string>
 
     <string name="account_setup_incoming_delete_policy_label">メール削除時の動作</string>
     <string name="account_setup_incoming_delete_policy_never_label">サーバでは削除しない</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e59e5e8af..cab15c7a3 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -386,10 +386,10 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
     <string name="account_setup_incoming_security_label">보안 연결</string>
     <string name="account_setup_incoming_auth_type_label">인증 방식</string>
     <string name="account_setup_incoming_security_none_label">없음</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (유효할 경우)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (모든 인증서 허용)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (유효할 경우)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (모든 인증서 허용)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (유효할 경우)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (모든 인증서 허용)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (유효할 경우)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (모든 인증서 허용)</string>
 
     <string name="account_setup_incoming_delete_policy_label">메시지 삭제 시</string>
     <string name="account_setup_incoming_delete_policy_never_label">서버에는 메일을 삭제하지 않음</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 96d18ee79..96341e1d7 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -387,10 +387,10 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
     <string name="account_setup_incoming_security_label">Beveiligings type</string>
     <string name="account_setup_incoming_auth_type_label">Authenticatie type</string>
     <string name="account_setup_incoming_security_none_label">Geen</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (indien beschikbaar)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (altijd)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (indien beschikbaar)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (altijd)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (indien beschikbaar)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (altijd)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (indien beschikbaar)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (altijd)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Wanneer ik een bericht verwijder</string>
     <string name="account_setup_incoming_delete_policy_never_label">Verwijder niet van server</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 01c1aebae..cb526cb3c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -396,10 +396,10 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
     <string name="account_setup_incoming_security_label">Zabezpieczenia</string>
     <string name="account_setup_incoming_auth_type_label">Rodzaj uwierzytelnienia</string>
     <string name="account_setup_incoming_security_none_label">Brak</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (jeśli dostępne)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (zawsze)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (jeśli dostępne)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (zawsze)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (jeśli dostępne)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (zawsze)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (jeśli dostępne)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (zawsze)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Gdy skasuję wiadomość</string>
     <string name="account_setup_incoming_delete_policy_never_label">Nie usuwaj z serwera</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 3441efac0..6bbf1ca26 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -384,10 +384,10 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
     <string name="account_setup_incoming_security_label">Tipo de segurança</string>
     <string name="account_setup_incoming_auth_type_label">Tipo de autenticação</string>
     <string name="account_setup_incoming_security_none_label">Nenhum</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (se disponível)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (sempre)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (se disponível)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (sempre)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (se disponível)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (sempre)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (se disponível)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (sempre)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Quando eu excluir uma mensagem</string>
     <string name="account_setup_incoming_delete_policy_never_label">Não excluí-la do servidor</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index dafa253e1..e34256ab4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -387,10 +387,10 @@ K-9 Mail это программа электронной почты для Andr
     <string name="account_setup_incoming_security_label">Безопасность</string>
     <string name="account_setup_incoming_auth_type_label">Аутентификация</string>
     <string name="account_setup_incoming_security_none_label">Нет</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (если доступно)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (всегда)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (если доступно)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (всегда)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (если доступно)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (всегда)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (если доступно)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (всегда)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Удалённое, на сервере</string>
     <string name="account_setup_incoming_delete_policy_never_label">Оставить</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b7975f0be..ef4c8c562 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -390,10 +390,10 @@ Prosím nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte s
     <string name="account_setup_incoming_security_label">Zabezpečenie</string>
     <string name="account_setup_incoming_auth_type_label">Overovanie</string>
     <string name="account_setup_incoming_security_none_label">Žiadne</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (ak je k dispozícii)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (vždy)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (ak je k dispozícii)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (vždy)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (ak je k dispozícii)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (vždy)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (ak je k dispozícii)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (vždy)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Keď zmažem správu</string>
     <string name="account_setup_incoming_delete_policy_never_label">Nemazať na serveri</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index bab693905..dd3b4e0d9 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -388,10 +388,10 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
     <string name="account_setup_incoming_security_label">Säkerhetstyp</string>
     <string name="account_setup_incoming_auth_type_label">Autentiseringstyp</string>
     <string name="account_setup_incoming_security_none_label">Ingen</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (om tillgängligt)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (alltid)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (om tillgängligt)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (alltid)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (om tillgängligt)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (alltid)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (om tillgängligt)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (alltid)</string>
 
     <string name="account_setup_incoming_delete_policy_label">När jag raderar ett brev</string>
     <string name="account_setup_incoming_delete_policy_never_label">Radera inte på servern</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c2b04dfa8..94b8231f7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -388,10 +388,10 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
     <string name="account_setup_incoming_security_label">Güvenlik tipi</string>
     <string name="account_setup_incoming_auth_type_label">Kimlik doğrulama tipi</string>
     <string name="account_setup_incoming_security_none_label">Hiçbiri</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (Varsa)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (daima)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (Varsa)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (Daima)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (Varsa)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (daima)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (Varsa)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (Daima)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Bir mesaj sildiğim zaman</string>
     <string name="account_setup_incoming_delete_policy_never_label">Sunucudan silme</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 12e86bc35..9256bd293 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -388,10 +388,10 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
     <string name="account_setup_incoming_security_label">Тип системи захисту</string>
     <string name="account_setup_incoming_auth_type_label">Метод автентифікації</string>
     <string name="account_setup_incoming_security_none_label">Немає</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (якщо доступно)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (завжди)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (якщо доступно)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (завжди)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (якщо доступно)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (завжди)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (якщо доступно)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (завжди)</string>
 
     <string name="account_setup_incoming_delete_policy_label">Коли повідомлення видалено</string>
     <string name="account_setup_incoming_delete_policy_never_label">Не видаляти на сервері</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 15549e4b6..1224e05bb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -381,10 +381,10 @@ K-9改进的功能包括：
     <string name="account_setup_incoming_security_label">加密方法</string>
     <string name="account_setup_incoming_auth_type_label">身份验证方法</string>
     <string name="account_setup_incoming_security_none_label">无</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL（如果可能的话）</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL（总是）</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS（如果可能的话）</string>
-    <string name="account_setup_incoming_security_tls_label">TLS（总是）</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS（如果可能的话）</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS（总是）</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS（如果可能的话）</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS（总是）</string>
 
     <string name="account_setup_incoming_delete_policy_label">当我删除邮件时</string>
     <string name="account_setup_incoming_delete_policy_never_label">不要从服务器上删除</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3276026c6..116f6aa41 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -295,10 +295,10 @@
   <string name="account_setup_incoming_security_label">加密類型</string>
   <string name="account_setup_incoming_auth_type_label">身份驗證類型</string>
   <string name="account_setup_incoming_security_none_label">無</string>
-  <string name="account_setup_incoming_security_ssl_optional_label">SSL（如果可用）</string>
-  <string name="account_setup_incoming_security_ssl_label">SSL（預設）</string>
-  <string name="account_setup_incoming_security_tls_optional_label">TLS（如果可用）</string>
-  <string name="account_setup_incoming_security_tls_label">TLS（預設）</string>
+  <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS（如果可用）</string>
+  <string name="account_setup_incoming_security_ssl_label">SSL/TLS（預設）</string>
+  <string name="account_setup_incoming_security_tls_optional_label">STARTTLS（如果可用）</string>
+  <string name="account_setup_incoming_security_tls_label">STARTTLS（預設）</string>
   <string name="account_setup_incoming_delete_policy_label">當我刪除郵件時</string>
   <string name="account_setup_incoming_delete_policy_never_label">不要從伺服器上刪除</string>
   <string name="account_setup_incoming_delete_policy_delete_label">立刻從伺服器上刪除</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 819817672..4f1fcfe72 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -398,10 +398,10 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="account_setup_incoming_security_label">Security</string>
     <string name="account_setup_incoming_auth_type_label">Authentication</string>
     <string name="account_setup_incoming_security_none_label">None</string>
-    <string name="account_setup_incoming_security_ssl_optional_label">SSL (if available)</string>
-    <string name="account_setup_incoming_security_ssl_label">SSL (always)</string>
-    <string name="account_setup_incoming_security_tls_optional_label">TLS (if available)</string>
-    <string name="account_setup_incoming_security_tls_label">TLS (always)</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL/TLS (if available)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS (always)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">STARTTLS (if available)</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS (always)</string>
 
     <string name="account_setup_incoming_delete_policy_label">When I delete a message</string>
     <string name="account_setup_incoming_delete_policy_never_label">Do not delete on server</string>