From 730a5c644bbacea3189479ef067b3ebbd7dcffd6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 24 Aug 2015 21:15:47 +0200
Subject: [PATCH] renamed plain text to unencrypted. fixes #1331

---
 .../java/eu/siacs/conversations/ui/ConversationFragment.java  | 2 +-
 src/main/res/menu/encryption_choices.xml                      | 2 +-
 src/main/res/values-ar-rEG/strings.xml                        | 4 ++--
 src/main/res/values-bg/strings.xml                            | 4 ++--
 src/main/res/values-ca/strings.xml                            | 4 ++--
 src/main/res/values-cs/strings.xml                            | 4 ++--
 src/main/res/values-de/strings.xml                            | 4 ++--
 src/main/res/values-el/strings.xml                            | 4 ++--
 src/main/res/values-es/strings.xml                            | 4 ++--
 src/main/res/values-eu/strings.xml                            | 4 ++--
 src/main/res/values-fr/strings.xml                            | 4 ++--
 src/main/res/values-gl/strings.xml                            | 4 ++--
 src/main/res/values-id/strings.xml                            | 4 ++--
 src/main/res/values-it/strings.xml                            | 4 ++--
 src/main/res/values-iw/strings.xml                            | 4 ++--
 src/main/res/values-ja/strings.xml                            | 4 ++--
 src/main/res/values-ko/strings.xml                            | 4 ++--
 src/main/res/values-nl/strings.xml                            | 4 ++--
 src/main/res/values-pl/strings.xml                            | 4 ++--
 src/main/res/values-pt/strings.xml                            | 4 ++--
 src/main/res/values-ro-rRO/strings.xml                        | 2 +-
 src/main/res/values-ru/strings.xml                            | 4 ++--
 src/main/res/values-sk/strings.xml                            | 4 ++--
 src/main/res/values-sr/strings.xml                            | 4 ++--
 src/main/res/values-sv/strings.xml                            | 4 ++--
 src/main/res/values-zh-rCN/strings.xml                        | 4 ++--
 src/main/res/values-zh-rTW/strings.xml                        | 4 ++--
 src/main/res/values/strings.xml                               | 4 ++--
 28 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 541e1533b..2d6288714 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -327,7 +327,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 			switch (conversation.getNextEncryption()) {
 				case Message.ENCRYPTION_NONE:
 					mEditMessage
-							.setHint(getString(R.string.send_plain_text_message));
+							.setHint(getString(R.string.send_unencrypted_message));
 					break;
 				case Message.ENCRYPTION_OTR:
 					mEditMessage.setHint(getString(R.string.send_otr_message));
diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index 9af2cd346..ab42a206b 100644
--- a/src/main/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
@@ -4,7 +4,7 @@
     <group android:checkableBehavior="single" >
         <item
             android:id="@+id/encryption_choice_none"
-            android:title="@string/encryption_choice_none"/>
+            android:title="@string/encryption_choice_unencrypted"/>
         <item
             android:id="@+id/encryption_choice_axolotl"
             android:title="@string/encryption_choice_omemo"/>
diff --git a/src/main/res/values-ar-rEG/strings.xml b/src/main/res/values-ar-rEG/strings.xml
index 0d85e55c5..2c347f13b 100644
--- a/src/main/res/values-ar-rEG/strings.xml
+++ b/src/main/res/values-ar-rEG/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">حذف الرسائل</string>
   <string name="also_end_conversation">انهاء هذه المحادثة بعد الكلمات</string>
   <string name="choose_presence">اختيار ظهورك لجهات الإتصال</string>
-  <string name="send_plain_text_message">ارسال رسالة غير مشفّرة</string>
+  <string name="send_unencrypted_message">ارسال رسالة غير مشفّرة</string>
   <string name="send_otr_message">OTRارساله رساله مشفره عبر</string>
   <string name="send_pgp_message">OpenPGPارساله رساله مشفره عبر</string>
   <string name="your_nick_has_been_changed">تم تغيير لقبك بنجاح</string>
@@ -128,7 +128,7 @@
   <string name="account_status_regis_conflict">اسم المستخدم مستخدم من قبل</string>
   <string name="account_status_regis_success">تم تسجيل حسابك بنجاح</string>
   <string name="account_status_regis_not_sup">تسجيل الحسابات غير متاح على هذا السرفر</string>
-  <string name="encryption_choice_none">رساله عادية</string>
+  <string name="encryption_choice_unencrypted">رساله عادية</string>
   <string name="encryption_choice_otr">OTRرسالة مشفرة عبر</string>
   <string name="encryption_choice_pgp">OpenPGPرسالة مشفرة عبر</string>
   <string name="mgmt_account_edit">تعديل الحساب</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index e21a6cee6..c1064c193 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Изтриване на съобщенията</string>
   <string name="also_end_conversation">Този разговор да приключи след това</string>
   <string name="choose_presence">Изберете присъствие за контакта</string>
-  <string name="send_plain_text_message">Изпр. на обикновено текстово съобщение</string>
+  <string name="send_unencrypted_message">Изпр. на обикновено текстово съобщение</string>
   <string name="send_otr_message">Изпр. на съобщение, шифр. чрез OTP</string>
   <string name="send_omemo_message">Изпр. на съобщение, шифр. чрез OMEMO</string>
   <string name="send_pgp_message">Изпр. на съобщение, шифр. чрез OpenPGP</string>
@@ -150,7 +150,7 @@
   <string name="account_status_regis_not_sup">Сървърът не поддържа регистриране</string>
   <string name="account_status_security_error">Грешка в сигурността</string>
   <string name="account_status_incompatible_server">Несъвместим сървър</string>
-  <string name="encryption_choice_none">Обикновен текст</string>
+  <string name="encryption_choice_unencrypted">Обикновен текст</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 74d87736b..2e508219a 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Esborrar missatges</string>
   <string name="also_end_conversation">Finalitzar aquesta conversa més tard</string>
   <string name="choose_presence">Selecciona recurs del contacte</string>
-  <string name="send_plain_text_message">Enviar missatge de text</string>
+  <string name="send_unencrypted_message">Enviar missatge de text</string>
   <string name="send_otr_message">Enviar missatge xifrat amb OTR</string>
   <string name="send_pgp_message">Enviar missatge xifrat amb OpenPGP</string>
   <string name="your_nick_has_been_changed">El teu sobrenom s\'ha modificat</string>
@@ -147,7 +147,7 @@
   <string name="account_status_regis_not_sup">El servidor no admet el registre</string>
   <string name="account_status_security_error">Error de seguretat</string>
   <string name="account_status_incompatible_server">Servidor incompatible</string>
-  <string name="encryption_choice_none">Text pla</string>
+  <string name="encryption_choice_unencrypted">Text pla</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">Edita compte</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 2cdf06a95..8fb7babb6 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Smazat zprávy</string>
   <string name="also_end_conversation">Poté ukončit i tuto konverzaci</string>
   <string name="choose_presence">Vybrat aktualizaci stavu pro kontakt</string>
-  <string name="send_plain_text_message">Poslat textovou zprávu</string>
+  <string name="send_unencrypted_message">Poslat textovou zprávu</string>
   <string name="send_otr_message">Poslat OTR šifrovanou zprávu</string>
   <string name="send_omemo_message">Poslat OMEMO šifrovanou zprávu</string>
   <string name="send_pgp_message">Poslat OpenPGP šifrovanou zprávu</string>
@@ -150,7 +150,7 @@
   <string name="account_status_regis_not_sup">Server nepodporuje registrace</string>
   <string name="account_status_security_error">Bezpečnostní chyba</string>
   <string name="account_status_incompatible_server">Nekompatibilní server</string>
-  <string name="encryption_choice_none">Čistý text</string>
+  <string name="encryption_choice_unencrypted">Čistý text</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 178738ea8..ccb8f703e 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Nachrichten löschen</string>
   <string name="also_end_conversation">Diese Unterhaltung danach beenden</string>
   <string name="choose_presence">Ressource des Kontakts auswählen</string>
-  <string name="send_plain_text_message">Normal schreiben…</string>
+  <string name="send_unencrypted_message">Normal schreiben…</string>
   <string name="send_otr_message">OTR-verschlüsselt schreiben…</string>
   <string name="send_omemo_message">OMEMO-verschlüsselt schreiben…</string>
   <string name="send_pgp_message">OpenPGP-verschlüsselt schreiben…</string>
@@ -150,7 +150,7 @@
   <string name="account_status_regis_not_sup">Der Server unterstützt keine Registrierung</string>
   <string name="account_status_security_error">Sicherheitsfehler</string>
   <string name="account_status_incompatible_server">Inkompatibler Server</string>
-  <string name="encryption_choice_none">Klartext</string>
+  <string name="encryption_choice_unencrypted">Klartext</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index b9fc352ce..54c6b07ee 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Διαγραφή μηνυμάτων</string>
   <string name="also_end_conversation">Τερματισμός αυτής της συζήτησης αμέσως μετά</string>
   <string name="choose_presence">Επιλέξτε παρουσία για επικοινωνία</string>
-  <string name="send_plain_text_message">Αποστολή απλού μηνύματος κειμένου</string>
+  <string name="send_unencrypted_message">Αποστολή απλού μηνύματος κειμένου</string>
   <string name="send_otr_message">Αποστολή κρυπτογραφημένου μηνύματος OTR</string>
   <string name="send_pgp_message">Αποστολή κρυπτογραφημένου μηνύματος OpenPGP</string>
   <string name="your_nick_has_been_changed">Το ψευδώνυμό σας έχει αλλάξει</string>
@@ -147,7 +147,7 @@
   <string name="account_status_regis_not_sup">Ο διακομιστής δεν υποστηρίζει εγγραφή</string>
   <string name="account_status_security_error">Σφάλμα ασφάλειας</string>
   <string name="account_status_incompatible_server">Μη συμβατός διακομιστής</string>
-  <string name="encryption_choice_none">Απλό κείμενο</string>
+  <string name="encryption_choice_unencrypted">Απλό κείμενο</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">Επεξεργασία λογαριασμού</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 56b7c2e0d..50f7974c1 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Borrar mensajes</string>
   <string name="also_end_conversation">Además, terminar esta conversación</string>
   <string name="choose_presence">Selecciona recurso del contacto</string>
-  <string name="send_plain_text_message">Enviar mensaje de texto</string>
+  <string name="send_unencrypted_message">Enviar mensaje de texto</string>
   <string name="send_otr_message">Enviar mensaje cifrado con OTR</string>
   <string name="send_omemo_message">Enviar mensaje cifrado con OMEMO </string>
   <string name="send_pgp_message">Enviar mensaje cifrado con OpenPGP</string>
@@ -150,7 +150,7 @@
   <string name="account_status_regis_not_sup">El servidor no soporta registros</string>
   <string name="account_status_security_error">Error de seguridad</string>
   <string name="account_status_incompatible_server">Servidor incompatible</string>
-  <string name="encryption_choice_none">Texto plano</string>
+  <string name="encryption_choice_unencrypted">Texto plano</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 75b6dc090..d870f78da 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Mezuak ezabatu</string>
   <string name="also_end_conversation">Elkarrizketa hau jarraian amaitu</string>
   <string name="choose_presence">Hautatu agerpena kontaktuarentzat</string>
-  <string name="send_plain_text_message">Testu mezua bidali</string>
+  <string name="send_unencrypted_message">Testu mezua bidali</string>
   <string name="send_otr_message">OTRz enkriptatutako mezua bidali</string>
   <string name="send_omemo_message">OMEMOz enkriptatutako mezua bidali</string>
   <string name="send_pgp_message">OpenPGPz enkriptatutako mezua bidali</string>
@@ -150,7 +150,7 @@
   <string name="account_status_regis_not_sup">Zerbitzariak ez du erregistratzea onartzen</string>
   <string name="account_status_security_error">Segurtasun akatsa</string>
   <string name="account_status_incompatible_server">Zerbitzari ez bateragarria</string>
-  <string name="encryption_choice_none">Testu laua</string>
+  <string name="encryption_choice_unencrypted">Testu laua</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 646f54141..e2695988a 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Supprimer les messages</string>
   <string name="also_end_conversation">Terminer plus tard cette conversation</string>
   <string name="choose_presence">Choisir le status de présence</string>
-  <string name="send_plain_text_message">Envoyer un message</string>
+  <string name="send_unencrypted_message">Envoyer un message</string>
   <string name="send_otr_message">Envoyer un message sécurisé par OTR</string>
   <string name="send_pgp_message">Envoyer un message sécurisé par OpenPGP</string>
   <string name="your_nick_has_been_changed">Votre identifiant a été changé</string>
@@ -147,7 +147,7 @@
   <string name="account_status_regis_not_sup">Le serveur ne permet pas l\'enregistrement</string>
   <string name="account_status_security_error">Erreur de sécurité</string>
   <string name="account_status_incompatible_server">Serveur incompatible</string>
-  <string name="encryption_choice_none">Texte clair</string>
+  <string name="encryption_choice_unencrypted">Texte clair</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">Modifier le compte</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 6a6b23c1d..c98a4ced1 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -44,7 +44,7 @@
   <string name="delete_messages">Borrar mensaxes</string>
   <string name="also_end_conversation">Terminar esta conversa máis tarde</string>
   <string name="choose_presence">Selecciona recurso del contacto</string>
-  <string name="send_plain_text_message">Enviar mensaxe de texto</string>
+  <string name="send_unencrypted_message">Enviar mensaxe de texto</string>
   <string name="send_otr_message">Enviar mensaxe cifrado con OTR</string>
   <string name="send_pgp_message">Enviar mensaxe cifrado con OpenPGP</string>
   <string name="your_nick_has_been_changed">Modificouse o teu apodo</string>
@@ -107,7 +107,7 @@
   <string name="account_status_regis_conflict">O identificador xa está en uso</string>
   <string name="account_status_regis_success">Rexistro completado</string>
   <string name="account_status_regis_not_sup">O servidor non soporta rexistros</string>
-  <string name="encryption_choice_none">Texto plano</string>
+  <string name="encryption_choice_unencrypted">Texto plano</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">Editar conta</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index f859bde1a..fe5056716 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Hapus pesan</string>
   <string name="also_end_conversation">Akhiri percakapan setelahnya</string>
   <string name="choose_presence">Pilih kehadiran untuk kontak</string>
-  <string name="send_plain_text_message">Kirim pesan teks biasa</string>
+  <string name="send_unencrypted_message">Kirim pesan teks biasa</string>
   <string name="send_otr_message">Kirim pesan terenskripsi OTR</string>
   <string name="send_pgp_message">Kirim pesan terenskripsi OpenPGP</string>
   <string name="your_nick_has_been_changed">Nick kamu telah dirubah</string>
@@ -147,7 +147,7 @@
   <string name="account_status_regis_not_sup">Server tidak mendukung pendaftaran akun.</string>
   <string name="account_status_security_error">Kesalahan keamanan</string>
   <string name="account_status_incompatible_server">Server tidak cocok</string>
-  <string name="encryption_choice_none">Teks biasa</string>
+  <string name="encryption_choice_unencrypted">Teks biasa</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">Ubah akun</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 4e61aca72..35acf7f09 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Elimina messaggi</string>
   <string name="also_end_conversation">Termina questa conversazione in seguito</string>
   <string name="choose_presence">Choose presence to contact</string>
-  <string name="send_plain_text_message">Messaggio non cifrato</string>
+  <string name="send_unencrypted_message">Messaggio non cifrato</string>
   <string name="send_otr_message">Messaggio OTR</string>
   <string name="send_pgp_message">Messaggio OpenPGP</string>
   <string name="your_nick_has_been_changed">Il tuo nome utente è stato cambiato</string>
@@ -147,7 +147,7 @@
   <string name="account_status_regis_not_sup">Il Server non supporta la registrazione</string>
   <string name="account_status_security_error">Errore di sicurezza</string>
   <string name="account_status_incompatible_server">Server non compatibile</string>
-  <string name="encryption_choice_none">Testo semplice</string>
+  <string name="encryption_choice_unencrypted">Testo semplice</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">Modifica utente</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 8eeaab6b0..857d7c92a 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -62,7 +62,7 @@
   <string name="delete_messages">מחק הודעות</string>
   <string name="also_end_conversation">סיים את דיון זה לאחר מכן</string>
   <string name="choose_presence">בחר נוכחות לאיש קשר</string>
-  <string name="send_plain_text_message">שלח הודעת טקסט גלוי</string>
+  <string name="send_unencrypted_message">שלח הודעת טקסט גלוי</string>
   <string name="send_otr_message">שלח הודעה מוצפנת OTR</string>
   <string name="send_pgp_message">שלח הודעה מוצפנת OpenPGP</string>
   <string name="your_nick_has_been_changed">שם כינוי שלך השתנה</string>
@@ -130,7 +130,7 @@
   <string name="account_status_regis_conflict">שם משתמש כבר מצוי בשימוש</string>
   <string name="account_status_regis_success">הרשמה הושלמה</string>
   <string name="account_status_regis_not_sup">שרת לא תומך הרשמה</string>
-  <string name="encryption_choice_none">טקסט גלוי</string>
+  <string name="encryption_choice_unencrypted">טקסט גלוי</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">ערוך חשבון</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index bd65c7c76..743ddf9df 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">メッセージを削除</string>
   <string name="also_end_conversation">その後、この会話を終了</string>
   <string name="choose_presence">連絡する参加を選択</string>
-  <string name="send_plain_text_message">プレーンテキストを送信</string>
+  <string name="send_unencrypted_message">プレーンテキストを送信</string>
   <string name="send_otr_message">OTR 暗号化メッセージを送信</string>
   <string name="send_omemo_message">OMEMO 暗号化メッセージを送信</string>
   <string name="send_pgp_message">OpenPGP 暗号化メッセージを送信</string>
@@ -150,7 +150,7 @@
   <string name="account_status_regis_not_sup">サーバーが登録をサポートしていません</string>
   <string name="account_status_security_error">セキュリティ エラー</string>
   <string name="account_status_incompatible_server">互換性のないサーバー</string>
-  <string name="encryption_choice_none">プレーンテキスト</string>
+  <string name="encryption_choice_unencrypted">プレーンテキスト</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index a164dd101..023ba609b 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">메세지 삭제 </string>
   <string name="also_end_conversation">나중에 이 대화 끝내기 </string>
   <string name="choose_presence">연락할 프레즌스 선택 </string>
-  <string name="send_plain_text_message">평문 메세지 전송 </string>
+  <string name="send_unencrypted_message">평문 메세지 전송 </string>
   <string name="send_otr_message">OTR 암호화된 메세지 전송 </string>
   <string name="send_pgp_message">OpenPGP 암호화된 메세지 전송 </string>
   <string name="your_nick_has_been_changed">닉네임이 변경되었습니다 </string>
@@ -147,7 +147,7 @@
   <string name="account_status_regis_not_sup">서버가 등록을 지원하지 않습니다</string>
   <string name="account_status_security_error">보안 오류 </string>
   <string name="account_status_incompatible_server">호환되지 않는 서버 </string>
-  <string name="encryption_choice_none">평문 </string>
+  <string name="encryption_choice_unencrypted">평문 </string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP </string>
   <string name="mgmt_account_edit">계정 편집 </string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index d693f916c..d07a8f508 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Berichten verwijderen</string>
   <string name="also_end_conversation">Beëindig dit gesprek na afloop</string>
   <string name="choose_presence">Kies aanwezigheid om te tonen aan contact</string>
-  <string name="send_plain_text_message">Verstuur onversleuteld bericht</string>
+  <string name="send_unencrypted_message">Verstuur onversleuteld bericht</string>
   <string name="send_otr_message">Verstuur OTR-versleuteld bericht</string>
   <string name="send_omemo_message">Verstuur OMEMO-versleuteld bericht</string>
   <string name="send_pgp_message">Verstuur OpenPGP-versleuteld bericht</string>
@@ -150,7 +150,7 @@
   <string name="account_status_regis_not_sup">Server ondersteunt geen registratie</string>
   <string name="account_status_security_error">Fout bij beveiliging</string>
   <string name="account_status_incompatible_server">Incompatibele server</string>
-  <string name="encryption_choice_none">Onversleuteld</string>
+  <string name="encryption_choice_unencrypted">Onversleuteld</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 1ace55a84..9a67aca2a 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Usuń wiadomości</string>
   <string name="also_end_conversation">Zakończ konwersację po usunięciu historii</string>
   <string name="choose_presence">Wybierz widoczność dla kontaktu</string>
-  <string name="send_plain_text_message">Wyślij wiadomość jawną</string>
+  <string name="send_unencrypted_message">Wyślij wiadomość jawną</string>
   <string name="send_otr_message">Wyślij zaszyfrowaną wiadomość (OTR)</string>
   <string name="send_pgp_message">Wyślij zaszyfrowaną wiadomość (OpenPGP)</string>
   <string name="your_nick_has_been_changed">Twoja nazwa została zmieniona</string>
@@ -147,7 +147,7 @@
   <string name="account_status_regis_not_sup">Serwer nie umożliwia rejestracji</string>
   <string name="account_status_security_error">Błąd zabezpieczeń</string>
   <string name="account_status_incompatible_server">Serwer niekompatybilny</string>
-  <string name="encryption_choice_none">Tekst jawny</string>
+  <string name="encryption_choice_unencrypted">Tekst jawny</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">Edytuj konto</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 041b5e2dc..6f2c3c30d 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -74,7 +74,7 @@
   <string name="delete_messages">Remover mensagens</string>
   <string name="also_end_conversation">Finalizar essa conversa ao final</string>
   <string name="choose_presence">Escolha a presença do contato</string>
-  <string name="send_plain_text_message">Enviar mensagem de texto puro</string>
+  <string name="send_unencrypted_message">Enviar mensagem de texto puro</string>
   <string name="send_otr_message">Enviar mensagem criptografada com OTR</string>
   <string name="send_pgp_message">Enviar mensagem criptografada com OpenPGP</string>
   <string name="your_nick_has_been_changed">Seu apelido foi alterado</string>
@@ -137,7 +137,7 @@
   <string name="account_status_regis_not_sup">O servidor não aceita o registro</string>
   <string name="account_status_security_error">Erro de segurança</string>
   <string name="account_status_incompatible_server">Servidor incompatível</string>
-  <string name="encryption_choice_none">Texto puro</string>
+  <string name="encryption_choice_unencrypted">Texto puro</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">Editar conta</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 9cbfcdbf3..61225013a 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -75,7 +75,7 @@
   <string name="delete_messages">Sterge mesajele</string>
   <string name="also_end_conversation">Termina conversatia aceasta dupa</string>
   <string name="choose_presence">Alege prezenta pentru a contacta</string>
-  <string name="send_plain_text_message">Trimite text necriptat</string>
+  <string name="send_unencrypted_message">Trimite text necriptat</string>
   <string name="send_otr_message">Trimite mesaj criptat cu OTR</string>
   <string name="send_pgp_message">Trimite mesaj criptat cu OpenPGP</string>
   <string name="your_nick_has_been_changed">Numele tau a fost schimbat</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 053a675c9..e12b600c8 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Удалить сообщения</string>
   <string name="also_end_conversation">Завершить беседу</string>
   <string name="choose_presence">Укажите статус для контакта</string>
-  <string name="send_plain_text_message">Отправить незашифрованное текстовое сообщение</string>
+  <string name="send_unencrypted_message">Отправить незашифрованное текстовое сообщение</string>
   <string name="send_otr_message">Отправить OTR защифрованное сообщение</string>
   <string name="send_pgp_message">Отправить OpenPGP защифрованное сообщение</string>
   <string name="your_nick_has_been_changed">Ваш псевдоним был изменен</string>
@@ -147,7 +147,7 @@
   <string name="account_status_regis_not_sup">Сервер не поддерживает регистрацию</string>
   <string name="account_status_security_error">Ошибка безопасности</string>
   <string name="account_status_incompatible_server">Несовместимый сервер</string>
-  <string name="encryption_choice_none">Без шифрования</string>
+  <string name="encryption_choice_unencrypted">Без шифрования</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">Редактировать аккаунт</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 5bcc1aa50..4ce6b1f75 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Vymazať správy</string>
   <string name="also_end_conversation">Následne ukončiť aj túto konverzáciu</string>
   <string name="choose_presence">Vybrať aktualizáciu stavu pre kontakt</string>
-  <string name="send_plain_text_message">Poslať textovú správu</string>
+  <string name="send_unencrypted_message">Poslať textovú správu</string>
   <string name="send_otr_message">Poslať OTR šifrovanú správu</string>
   <string name="send_pgp_message">Poslať OpenPGP šifrovanú správu</string>
   <string name="your_nick_has_been_changed">Prezývka sa zmenila</string>
@@ -147,7 +147,7 @@
   <string name="account_status_regis_not_sup">Server nepodporuje registráciu</string>
   <string name="account_status_security_error">Bezpečnostná chyba</string>
   <string name="account_status_incompatible_server">Nekompatibilný server</string>
-  <string name="encryption_choice_none">Čistý text</string>
+  <string name="encryption_choice_unencrypted">Čistý text</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">Upraviť účet</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index a8b2c8896..c385b776c 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Обриши поруке</string>
   <string name="also_end_conversation">Окончај ову преписку након тога</string>
   <string name="choose_presence">Избор присутности за контакта</string>
-  <string name="send_plain_text_message">Пошаљи обичну текстуалну поруку</string>
+  <string name="send_unencrypted_message">Пошаљи обичну текстуалну поруку</string>
   <string name="send_otr_message">Пошаљи ОТР шифровану поруку</string>
   <string name="send_omemo_message">Пошаљи ОМЕМО шифровану поруку</string>
   <string name="send_pgp_message">Пошаљи ОпенПГП шифровану поруку</string>
@@ -150,7 +150,7 @@
   <string name="account_status_regis_not_sup">Сервер не подржава регистрацију</string>
   <string name="account_status_security_error">Безбедносна грешка</string>
   <string name="account_status_incompatible_server">Некомпатибилан сервер</string>
-  <string name="encryption_choice_none">Обичан текст</string>
+  <string name="encryption_choice_unencrypted">Обичан текст</string>
   <string name="encryption_choice_otr">ОТР</string>
   <string name="encryption_choice_pgp">ОпенПГП</string>
   <string name="encryption_choice_omemo">ОМЕМО</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index c40625883..a90c1ef75 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">Ta bort meddelanden</string>
   <string name="also_end_conversation">Avsluta sedan denna konversation</string>
   <string name="choose_presence">Välj tillgänglighet till kontakt</string>
-  <string name="send_plain_text_message">Skicka meddelande i klartext</string>
+  <string name="send_unencrypted_message">Skicka meddelande i klartext</string>
   <string name="send_otr_message">Skicka OTR-krypterat meddelande</string>
   <string name="send_omemo_message">Skicka OMEMO-krypterat meddelande</string>
   <string name="send_pgp_message">Skicka OpenPGP-krypterat meddelande</string>
@@ -150,7 +150,7 @@
   <string name="account_status_regis_not_sup">Servern stödjer inte registrering</string>
   <string name="account_status_security_error">Säkerhetsfel</string>
   <string name="account_status_incompatible_server">Inkompatibel server</string>
-  <string name="encryption_choice_none">Klartext</string>
+  <string name="encryption_choice_unencrypted">Klartext</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 7a67ffdd0..0b6a9a77b 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -76,7 +76,7 @@
   <string name="delete_messages">删除消息</string>
   <string name="also_end_conversation">之后结束该会话</string>
   <string name="choose_presence">添加在线用户至联系人</string>
-  <string name="send_plain_text_message">发送纯文本信息</string>
+  <string name="send_unencrypted_message">发送纯文本信息</string>
   <string name="send_otr_message">发送 OTR 加密信息</string>
   <string name="send_pgp_message">发送 OpenPGP 加密信息</string>
   <string name="your_nick_has_been_changed">昵称修改成功</string>
@@ -147,7 +147,7 @@
   <string name="account_status_regis_not_sup">服务器不支持注册</string>
   <string name="account_status_security_error">安全错误</string>
   <string name="account_status_incompatible_server">服务器不兼容</string>
-  <string name="encryption_choice_none">纯文本内容</string>
+  <string name="encryption_choice_unencrypted">纯文本内容</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">编辑账号</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 8a4d3539e..9a38dcaa7 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -60,7 +60,7 @@
   <string name="delete_messages">刪除訊息</string>
   <string name="also_end_conversation">之後結束這對話</string>
   <string name="choose_presence">選擇狀態訊息</string>
-  <string name="send_plain_text_message">發送純文字訊息</string>
+  <string name="send_unencrypted_message">發送純文字訊息</string>
   <string name="send_otr_message">發送 OTR 加密訊息</string>
   <string name="send_pgp_message">發送 OpenPGP 加密訊息</string>
   <string name="your_nick_has_been_changed">用戶名稱修改成功</string>
@@ -129,7 +129,7 @@
   <string name="account_status_regis_conflict">該用戶名稱已被使用</string>
   <string name="account_status_regis_success">註冊完成</string>
   <string name="account_status_regis_not_sup">伺服器不支持註冊</string>
-  <string name="encryption_choice_none">純文字內容</string>
+  <string name="encryption_choice_unencrypted">純文字內容</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">編輯帳戶</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6abc17b13..0ee8676d3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -78,7 +78,7 @@
 	<string name="delete_messages">Delete messages</string>
 	<string name="also_end_conversation">End this conversations afterwards</string>
 	<string name="choose_presence">Choose presence to contact</string>
-	<string name="send_plain_text_message">Send plain text message</string>
+	<string name="send_unencrypted_message">Send unencrypted message</string>
 	<string name="send_otr_message">Send OTR encrypted message</string>
 	<string name="send_omemo_message">Send OMEMO encrypted message</string>
 	<string name="send_pgp_message">Send OpenPGP encrypted message</string>
@@ -152,7 +152,7 @@
 	<string name="account_status_regis_not_sup">Server does not support registration</string>
 	<string name="account_status_security_error">Security error</string>
 	<string name="account_status_incompatible_server">Incompatible server</string>
-	<string name="encryption_choice_none">Plain text</string>
+	<string name="encryption_choice_unencrypted">Unencrypted</string>
 	<string name="encryption_choice_otr">OTR</string>
 	<string name="encryption_choice_pgp">OpenPGP</string>
 	<string name="encryption_choice_omemo">OMEMO</string>