From b0bc2c28561de4a899022e16965d6ed85fe26f73 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 14 Apr 2024 17:06:22 +0200 Subject: [PATCH] omit type of encryption from message hint --- .../http/HttpDownloadConnection.java | 3 +-- .../http/HttpUploadConnection.java | 3 +-- .../conversations/utils/CryptoHelper.java | 24 ++++++++--------- .../siacs/conversations/utils/UIHelper.java | 27 +++++++++---------- src/main/res/values-ar/strings.xml | 2 -- src/main/res/values-bg/strings.xml | 2 -- src/main/res/values-bn-rIN/strings.xml | 2 -- src/main/res/values-ca/strings.xml | 2 -- src/main/res/values-cs/strings.xml | 2 -- src/main/res/values-da-rDK/strings.xml | 2 -- src/main/res/values-de/strings.xml | 2 -- src/main/res/values-el/strings.xml | 2 -- src/main/res/values-es/strings.xml | 2 -- src/main/res/values-eu/strings.xml | 2 -- src/main/res/values-fa-rIR/strings.xml | 2 -- src/main/res/values-fi/strings.xml | 2 -- src/main/res/values-fr/strings.xml | 2 -- src/main/res/values-gl/strings.xml | 2 -- src/main/res/values-hu/strings.xml | 2 -- src/main/res/values-id/strings.xml | 2 -- src/main/res/values-it/strings.xml | 2 -- src/main/res/values-iw/strings.xml | 2 -- src/main/res/values-ja/strings.xml | 2 -- src/main/res/values-ko/strings.xml | 2 -- src/main/res/values-ml/strings.xml | 2 -- src/main/res/values-nb-rNO/strings.xml | 2 -- src/main/res/values-nl/strings.xml | 2 -- src/main/res/values-pl/strings.xml | 2 -- src/main/res/values-pt-rBR/strings.xml | 2 -- src/main/res/values-pt/strings.xml | 2 -- src/main/res/values-ro-rRO/strings.xml | 2 -- src/main/res/values-ru/strings.xml | 2 -- src/main/res/values-sk/strings.xml | 2 -- src/main/res/values-sq-rAL/strings.xml | 2 -- src/main/res/values-sr/strings.xml | 2 -- src/main/res/values-sv/strings.xml | 2 -- src/main/res/values-szl/strings.xml | 2 -- src/main/res/values-tr-rTR/strings.xml | 2 -- src/main/res/values-uk/strings.xml | 2 -- src/main/res/values-vi/strings.xml | 2 -- src/main/res/values-zh-rCN/strings.xml | 2 -- src/main/res/values-zh-rTW/strings.xml | 2 -- src/main/res/values/strings.xml | 11 ++++---- 43 files changed, 31 insertions(+), 113 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java index 850c0683d..88e5f801f 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java @@ -91,8 +91,7 @@ public class HttpDownloadConnection implements Transferable { final AbstractConnectionManager.Extension extension = AbstractConnectionManager.Extension.of(mUrl.encodedPath()); if (VALID_CRYPTO_EXTENSIONS.contains(extension.main)) { this.message.setEncryption(Message.ENCRYPTION_PGP); - } else if (message.getEncryption() != Message.ENCRYPTION_OTR - && message.getEncryption() != Message.ENCRYPTION_AXOLOTL) { + } else if (message.getEncryption() != Message.ENCRYPTION_AXOLOTL) { this.message.setEncryption(Message.ENCRYPTION_NONE); } final String ext = extension.getExtension(); diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java index e2366dd48..ef51b9af4 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java @@ -123,8 +123,7 @@ public class HttpUploadConnection implements Transferable, AbstractConnectionMan final long originalFileSize = file.getSize(); this.delayed = delay; if (Config.ENCRYPT_ON_HTTP_UPLOADED - || message.getEncryption() == Message.ENCRYPTION_AXOLOTL - || message.getEncryption() == Message.ENCRYPTION_OTR) { + || message.getEncryption() == Message.ENCRYPTION_AXOLOTL) { this.key = new byte[44]; SECURE_RANDOM.nextBytes(this.key); this.file.setKeyAndIv(this.key); diff --git a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java index 85ea2bb86..34f5caccf 100644 --- a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java @@ -6,6 +6,8 @@ import android.os.Bundle; import android.util.Base64; import android.util.Pair; +import androidx.annotation.StringRes; + import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x500.style.BCStyle; import org.bouncycastle.asn1.x500.style.IETFUtils; @@ -262,19 +264,15 @@ public final class CryptoHelper { } } - public static int encryptionTypeToText(int encryption) { - switch (encryption) { - case Message.ENCRYPTION_OTR: - return R.string.encryption_choice_otr; - case Message.ENCRYPTION_AXOLOTL: - case Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE: - case Message.ENCRYPTION_AXOLOTL_FAILED: - return R.string.encryption_choice_omemo; - case Message.ENCRYPTION_NONE: - return R.string.encryption_choice_unencrypted; - default: - return R.string.encryption_choice_pgp; - } + public static @StringRes int encryptionTypeToText(final int encryption) { + return switch (encryption) { + case Message.ENCRYPTION_OTR -> R.string.encryption_choice_otr; + case Message.ENCRYPTION_AXOLOTL, + Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE, + Message.ENCRYPTION_AXOLOTL_FAILED -> R.string.encryption_choice_omemo; + case Message.ENCRYPTION_PGP -> R.string.encryption_choice_pgp; + default -> R.string.encryption_choice_unencrypted; + }; } public static boolean isPgpEncryptedUrl(String url) { diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index 9fcf508d2..e1996440c 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -457,26 +457,25 @@ public class UIHelper { } } - public static String getMessageHint(Context context, Conversation conversation) { - switch (conversation.getNextEncryption()) { - case Message.ENCRYPTION_NONE: + public static String getMessageHint(final Context context,final Conversation conversation) { + return switch (conversation.getNextEncryption()) { + case Message.ENCRYPTION_NONE -> { if (Config.multipleEncryptionChoices()) { - return context.getString(R.string.send_unencrypted_message); + yield context.getString(R.string.send_unencrypted_message); } else { - return context.getString(R.string.send_message_to_x, conversation.getName()); + yield context.getString(R.string.send_message_to_x, conversation.getName()); } - case Message.ENCRYPTION_AXOLOTL: - AxolotlService axolotlService = conversation.getAccount().getAxolotlService(); + } + case Message.ENCRYPTION_AXOLOTL -> { + final AxolotlService axolotlService = conversation.getAccount().getAxolotlService(); if (axolotlService != null && axolotlService.trustedSessionVerified(conversation)) { - return context.getString(R.string.send_omemo_x509_message); + yield context.getString(R.string.send_omemo_x509_message); } else { - return context.getString(R.string.send_omemo_message); + yield context.getString(R.string.send_encrypted_message); } - case Message.ENCRYPTION_PGP: - return context.getString(R.string.send_pgp_message); - default: - return ""; - } + } + default -> context.getString(R.string.send_encrypted_message); + }; } public static String getDisplayedMucCounterpart(final Jid counterpart) { diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index 62cb7bf7f..32b4ab142 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -76,9 +76,7 @@ إرسال رسالة غير مشفرة إبعث رسالة إبعث رسالة إلى %s - إرسال رسالة مشفرة عبر OMEMO إبعث رسالة مشفَّرة بـ أومي مو OMEMO - إرسال رسالة مشفرة عبر OpenPGP إسم مستخدم جديد تحت الإستعمال إرسال بدون تشفير فشل فك التشفير. ربما ليس لديك المفتاح الخاص الصحيح. diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index eb8a71721..00e645282 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -87,9 +87,7 @@ Изпр. на нешифр. съобщение Изпращане на съобщение Изпращане на съобщение до %s - Изпр. на съобщение, шифр. чрез OMEMO Изпр. на съобщение, шифр. чрез v\\OMEMO - Изпр. на съобщение, шифр. чрез OpenPGP Новият псевдоним е зает Изпращане нешифровано Неуспешно дешифроване. Възможно е да нямате правилния частен ключ. diff --git a/src/main/res/values-bn-rIN/strings.xml b/src/main/res/values-bn-rIN/strings.xml index cffaa14ae..f87d6df06 100644 --- a/src/main/res/values-bn-rIN/strings.xml +++ b/src/main/res/values-bn-rIN/strings.xml @@ -83,9 +83,7 @@ অসাঙ্কেতিক বার্তাই পাঠানো হোক বার্তা পাঠানো হোক %s-কে বার্তা পাঠানো হোক - OMEMO সাঙ্কেতিক বার্তা পাঠানো হোক v\\OMEMO সাঙ্কেতিক বার্তা পাঠানো হোক - OpenPGP সাঙ্কেতিক বার্তা পাঠানো হোক নতুন নাম ব্যবহার করা হচ্ছে এনক্রিপ্ট না করেই পাঠানো হোক ডিক্রিপ্ট করা যায়নি। হয়তো আপনার কাছে সঠিক Private Key নেই। diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index a4c203f2e..3f681dffa 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -88,9 +88,7 @@ Envia un missatge no xifrat Envia un missatge Envia un missatge a %s - Envia un missatge xifrat amb OMEMO Envia un missatge xifrat amb v\\OMEMO - Envia un missatge xifrat amb OpenPGP Nou sobrenom en ús Envia sense xifrar El desxiframent ha fallat. Potser no teniu la clau privada apropiada. diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 46b92abe9..4905b019b 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -90,9 +90,7 @@ Odeslat nešifrovanou zprávu Odeslat zprávu Odeslat zprávu pro %s - Poslat OMEMO šifrovanou zprávu Odeslat v\\OMEMO šifrovanou zprávu - Poslat OpenPGP šifrovanou zprávu Přezdívka změněna Poslat nešifrované Zašifrování se nezdařilo. Možná nemáte správný privátní klíč. diff --git a/src/main/res/values-da-rDK/strings.xml b/src/main/res/values-da-rDK/strings.xml index 80d0fd863..f9cde7131 100644 --- a/src/main/res/values-da-rDK/strings.xml +++ b/src/main/res/values-da-rDK/strings.xml @@ -89,9 +89,7 @@ Send ukrypteret besked Send besked Send besked til %s - Send OMEMO-krypteret besked Send v\\OMEMO-krypteret besked - Send OpenPGP krypteret besked Nyt kaldenavn i brug Send ukrypteret Dekryptering mislykkes. Måske du ikke har den rette private nøgle. diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 9a1e24c07..3658283e6 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -89,9 +89,7 @@ Unverschlüsselt schreiben… Nachricht senden Nachricht an %s senden - OMEMO-verschlüsselt schreiben… v\\OMEMO-verschlüsselte Nachricht senden - OpenPGP-verschlüsselt schreiben… Neuer Nickname wird jetzt verwendet Unverschlüsselt senden Entschlüsselung fehlgeschlagen. Vielleicht hast du nicht den richtigen privaten Schlüssel. diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 599ed4201..703fe3b99 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -87,9 +87,7 @@ Αποστολή μη κρυπτογραφημένου μηνύματος Αποστολή μηνύματος Αποστολή μηνύματος στον/στην %s - Αποστολή κρυπτογραφημένου μηνύματος OMEMO Αποστολή v\\κρυπτογραφημένου μηνύματος OMEMO - Αποστολή κρυπτογραφημένου μηνύματος OpenPGP Χρήση νέου ψευδωνύμου Αποστολή χωρίς κρυπτογράφηση Η αποκρυπτογράφηση απέτυχε. Ίσως δεν κατέχετε το σωστό ιδιωτικό κλειδί. diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index f13ba36b8..bb65ebf16 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -90,9 +90,7 @@ Enviar mensaje sin cifrar Enviar mensaje Enviar mensaje a %s - Enviar mensaje cifrado con OMEMO Enviar mensaje cifrado v\\OMEMO - Enviar mensaje cifrado con OpenPGP El apodo ha sido modificado Enviar sin cifrar Falló el descifrado. Tal vez no tengas la clave privada apropiada. diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 3c0a2130d..80b4af042 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -71,9 +71,7 @@ Enkriptatu gabeko mezua bidali Mezua bidali %s(r)i mezua bidali - OMEMOz enkriptatutako mezua bidali v\\OMEMOz enkriptatutako mezua bidali - OpenPGPz enkriptatutako mezua bidali Enkriptatu gabe bidali Desenkriptazioak huts egin du. Agian ez duzu gako pribatu egokia. OpenKeychain diff --git a/src/main/res/values-fa-rIR/strings.xml b/src/main/res/values-fa-rIR/strings.xml index 8c274f212..e7ced4f7c 100644 --- a/src/main/res/values-fa-rIR/strings.xml +++ b/src/main/res/values-fa-rIR/strings.xml @@ -59,9 +59,7 @@ پیام رمز نشده ارسال کن ارسال پیام ارسال پیام به %s - ارسال پیام رمز شده با OMEMO ارسال پیام رمز شده با OMEMO - ارسال پیام رمز شده با OpenPGP ارسال رمز نشده رمزگشایی موفق نبود. شاید شما کلید محرمانه صحیح را در اختیار ندارید. OpenKeychain diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index 80b928ef8..c1ef9fd48 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -88,9 +88,7 @@ Lähetä salaamaton viesti Lähetä viesti Lähetä viesti henkilölle %s - Lähetä OMEMO-salattu viesti Lähetä v\\OMEMO-salattu viesti - Lähetä OpenPGP-salattu viesti Uusi nimimerkki on jo varattu Lähetä salaamaton Salauksen purku epäonnistui. Sinulle ei varmaan ole oikeaa salaista avainta. diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 7b0507db5..7433936de 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -90,9 +90,7 @@ Envoyer un message en clair Envoyer le message Envoyer un message à %s - Envoyer un message chiffré avec OMEMO Envoyer un message chiffré avec \\OMEMO - Envoyer un message chiffré avec OpenPGP Votre identifiant a été changé Envoyer en clair Échec du déchiffrement. Avez-vous la bonne clé privée ? diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 8a64f99e2..3936f3de0 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -89,9 +89,7 @@ Enviar mensaxe non cifrada Enviar mensaxe Enviar mensaxe a 1%s - Enviar mensaxe cifrada con OMEMO Enviar mensaxe cifrada v\\OMEMO - Enviar mensaxe cifrada con OpenPGP Novo alcume en uso Enviar sen cifrar Fallou o desencriptado. Quizais non teñas a chave privada apropiada. diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index 5df2980ff..4e20e6947 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -87,9 +87,7 @@ Titkosítatlan üzenet küldése Üzenet küldése Üzenet küldése %s számára - OMEMO titkosítású üzenet küldése v\\OMEMO titkosítású üzenet küldése - OpenPGP titkosítású üzenet küldése Új becenév használva Küldés titkosítatlanul A visszafejtés sikertelen. Talán nem rendelkezik a megfelelő személyes kulccsal. diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml index 95fcd8708..181ceabb4 100644 --- a/src/main/res/values-id/strings.xml +++ b/src/main/res/values-id/strings.xml @@ -84,9 +84,7 @@ Kirim pesan tak-terenkripsi Kirim pesan Kirimkan pesan ke %s - Kirim pesan terenkripsi OMEMO Mengirim pesan terenkripsi v\\OMEMO - Kirim pesan terenskripsi OpenPGP Nama panggilan sudah dipakai Kirim tidak terenkripsi Dekripsi gagal. Mungkin Anda tidak memiliki kunci pribadi yang tepat. diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 678fa12d3..f0dccd7a0 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -88,9 +88,7 @@ Invia messaggio non cifrato Invia messaggio Invia messaggio a %s - Invia messaggio cifrato OMEMO Invia messaggio cifrato v\\OMEMO - Messaggio OpenPGP Nuovo nome utente in uso Invia non cifrato Decifrazione fallita. Forse non disponi della chiave privata corretta. diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 98642dfc0..afee25582 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -52,8 +52,6 @@ נקה היסטוריה נקה היסטוריית שיחה שלח הודעה בלתי מוצפנת - של הודעה בהצפנת OMEMO - שלח הודעה בהצפנת OpenPGP שלח ללא הצפנה פענוח נכשל. אולי אין לך את המפתח הפרטי המתאים. OpenKeychain diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index fb203f40b..727e81db8 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -86,9 +86,7 @@ 暗号化されていないメッセージを送信 メッセージを送信 メッセージを %s に送信 - OMEMO 暗号化メッセージを送信 v\\OMEMO 暗号化メッセージを送信 - OpenPGP 暗号化メッセージを送信 ニックネームが変更されました 暗号化せずに送信 復号に失敗しました。適切な秘密鍵を持っていないのかもしれません。 diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 5cce30f91..5c9a3f7f3 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -56,9 +56,7 @@ 기기 선택 암호화하지 않은 메세지 전송 %s 에게 매세지 보내기 - OMEMO로 암호화된 메세지 v\\OMEMO로 암호화된 메세지 전송 - OpenPGP 암호화된 메세지 전송 암호화하지 않고 전송 복호화 실패. 올바른 개인 키를 가지고 있지 않은 것 같습니다. OpenKeychain diff --git a/src/main/res/values-ml/strings.xml b/src/main/res/values-ml/strings.xml index 1ba9b24c5..fde9a5692 100644 --- a/src/main/res/values-ml/strings.xml +++ b/src/main/res/values-ml/strings.xml @@ -65,9 +65,7 @@ സുരക്ഷിതമല്ലാത്ത സന്ദേശം അയയ്കൂ സന്ദേശം അയയ്ക്കൂ %s-ന് (ക്ക്) സന്ദേശം അയയ്ക്കൂ - OMEMO സുരക്ഷിതമാക്കിയ സന്ദേശം അയയ്ക്കൂ v\\OMEMO സുരക്ഷിതമാക്കിയ സന്ദേശം അയയ്ക്കൂ - OpenPGP സുരക്ഷിതമാക്കിയ സന്ദേശം അയയ്ക്കൂ പുതിയ വിളിപ്പേര് ഉപയോഗത്തിലുള്ളതാണ് OpenKeychain പുനരാരംഭിക്കൂ diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml index 97bdcae5a..c2d44f898 100644 --- a/src/main/res/values-nb-rNO/strings.xml +++ b/src/main/res/values-nb-rNO/strings.xml @@ -62,9 +62,7 @@ Send ukryptert melding Send melding Send melding til %s - Send OMEMO-kryptert melding Send \\OMEMO-kryptert melding - Send OpenPGP-kryptert melding Send ukryptert Dekryptering feilet. Kanskje du ikke lenger har den rette private nøkkelen. OpenKeychain diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 6a1a6b837..109e0a7d5 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -84,9 +84,7 @@ Verstuur onversleuteld bericht Verstuur bericht Bericht sturen naar %s - Verstuur OMEMO-versleuteld bericht Verstuur v\\OMEMO-versleuteld bericht - Verstuur OpenPGP-versleuteld bericht Nieuwe bijnaam in gebruik Verstuur onversleuteld Ontsleutelen mislukt. Misschien heb je niet de juiste private sleutel. diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 13ff9d516..743a5d6a7 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -91,9 +91,7 @@ Wyślij wiadomość bez szyfrowania Wyślij wiadomość Wyślij wiadomość do %s - Wyślij wiadomość zaszyfrowaną OMEMO Wyślij wiadomość zaszyfrowaną v\\OMEMO - Wyślij zaszyfrowaną wiadomość (OpenPGP) Nowy pseudonim jest już użyciu Wyślij bez szyfrowania Nie można odszyfrować. Sprawdź poprawność klucza prywatnego. diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 5bdd80536..fa046f760 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -88,9 +88,7 @@ Enviar mensagem não criptografada Enviar mensagem Enviar mensagem para %s - Enviar mensagem criptografada via OMEMO Enviar mensagem criptografada via v\\OMEMO - Enviar mensagem criptografada via OpenPGP Novo apelido em uso Enviar descriptografada Não foi possível descriptografar. Talvez você não tenha a chave privada apropriada. diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index b33d8fce0..d20287ff0 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -62,9 +62,7 @@ Enviar mensagem não cifrada Enviar mensagem Enviar mensagem para %s - Enviar mensagem cifrada com OMEMO Enviar mensagem cifrada com v\\OMEMO - Enviar mensagem cifrada com OpenPGP Enviar não cifrada A decifragem falhou. Talvez não tenha a chave privada correta. OpenKeychain diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml index a76f33ab6..d7b679123 100644 --- a/src/main/res/values-ro-rRO/strings.xml +++ b/src/main/res/values-ro-rRO/strings.xml @@ -90,9 +90,7 @@ Trimite mesaje necriptate Trimite mesaj Trimite mesaj către %s - Trimite mesaj criptat cu OMEMO Trimite mesaj criptat cu v\\OMEMO - Trimite mesaj criptat cu OpenPGP Numele de utilizator este deja alocat Trimite necriptat Decriptarea a eșuat. Poate nu aveți cheia privată corectă. diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index f2573c11d..3709130c1 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -91,9 +91,7 @@ Нешифрованное сообщение Сообщение Сообщение для %s - OMEMO-зашифр. сообщение v\\OMEMO-зашифр. сообщение - OpenPGP зашифр. сообщение Используется новое имя Отправить в незашифрованном виде Расшифровка не удалась. Вероятно, что у вас нет надлежащего ключа. diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index 5821b7d45..436c08730 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -88,9 +88,7 @@ Poslať nezašifrovanú správu Poslať správu Poslať správu na %s - Poslať OMEMO šifrovanú správu Poslať v\\OMEMO šifrovanú správu - Poslať OpenPGP šifrovanú správu Používa sa nová prezývka Poslať nešifrované Zašifrovanie zlyhalo. Možno nemáte správny privátny kľúč. diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml index 092a9342e..894127990 100644 --- a/src/main/res/values-sq-rAL/strings.xml +++ b/src/main/res/values-sq-rAL/strings.xml @@ -71,9 +71,7 @@ Dërgoni mesazh të pafshehtëzuar Dërgoni mesazh Dërgoje mesazhin për %s - Dërgoni një mesazh të fshehtëzuar me OMEMO Dërgoni një mesazh të fshehtëzuar me v\\OMEMO - Dërgoni një mesazh të fshehtëzuar me OpenPGP Nofkë e re në përdorim Dërgoje të pafshehtëzuar Instaloje diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 738f0a045..5c9d59b34 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -88,9 +88,7 @@ Пошаљи нешифровану поруку Пошаљи поруку Пошаљи поруку за %s - Пошаљи ОМЕМО шифровану поруку Пошаљи v\\ОМЕМО шифровану поруку - Пошаљи ОпенПГП шифровану поруку Нови надимак је у употреби Пошаљи нешифровано Шифровање није успело. Можда немате одговарајући лични кључ. diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 5d58c4c15..20a6b823d 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -89,9 +89,7 @@ Skicka okrypterat meddelande Skicka meddelande Skicka meddelande till %s - Skicka OMEMO-krypterat meddelande Skicka v\\OMEMO-krypterat meddelande - Skicka OpenPGP-krypterat meddelande Nytt smeknamn är nu i bruk Skicka okrypterat Dekrypteringen misslyckades. Du har kanske inte rätt privat nyckel. diff --git a/src/main/res/values-szl/strings.xml b/src/main/res/values-szl/strings.xml index 8c1aac69f..e1de036bb 100644 --- a/src/main/res/values-szl/strings.xml +++ b/src/main/res/values-szl/strings.xml @@ -90,9 +90,7 @@ Wyślij wiadōmość bez szyfrowanio Wyślij wiadōmość Wyślij wiadōmość do kōntaktu %s - Wyślij wiadōmość zaszyfrowano OMEMO Wyślij wiadōmość zaszyfrowano v\\OMEMO - Wyślij zaszyfrowano wiadōmość (OpenPGP) Przemianek je umiyniōny Wyślij bez szyfrowanio Niy idzie ôdszyfrować. Możno niy mosz noleznego prywatnego klucza. diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml index 517750e7c..3815ac77a 100644 --- a/src/main/res/values-tr-rTR/strings.xml +++ b/src/main/res/values-tr-rTR/strings.xml @@ -87,9 +87,7 @@ Şifrelenmemiş ileti gönder Mesajı gönder %s kişisine ileti gönder - OMEMO ile şifrelenmiş ileti gönder v\\OMEMO ile şifrelenmiş ileti gönder - OpenPGP ile şifrelenmiş ileti gönder Yeni rumuz kullanımda Şifrelenmemiş gönder Deşifre edilemedi. Uygun bir özel anahtarınız olmayabilir. diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 88b783e10..d70236c94 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -83,9 +83,7 @@ Незашифроване повідомлення Надіслати повідомлення Повідомлення %s - Повідомлення, зашифроване OMEMO Повідомлення, зашифроване v\\OMEMO - Повідомлення зашифроване OpenPGP Ваше прізвисько змінено Надіслати без шифрування Не вдалося розшифрувати. Можливо, у Вас відсутній потрібний приватний ключ. diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 905d7f339..915c4924f 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -88,9 +88,7 @@ Gửi tin nhắn không mã hoá Gửi tin nhắn Gửi tin nhắn đến %s - Gửi tin nhắn mã hoá OMEMO Gửi tin nhắn mã hoá v\\OMEMO - Gửi tin nhắn mã hoá OpenPGP Biệt danh mới đang được sử dụng Gửi dạng không mã hoá Giải mã thất bại. Có lẽ bạn không có đúng khoá cá nhân. diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index cca4befab..72c01f943 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -88,9 +88,7 @@ 发送未加密消息 发送消息 发送消息至 %s - 发送 OMEMO 加密消息 发送 v\\OMEMO 加密消息 - 发送 OpenPGP 加密消息 正在使用新昵称 发送未加密的 解密失败。也许您没有正确的私钥。 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 7422821ec..48a03b6a4 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -81,9 +81,7 @@ 傳送未加密的訊息 傳送訊息 傳送訊息至 %s - 傳送 OMEMO 加密訊息 傳送 v\\OMEMO 加密訊息 - 傳送 OpenPGP 加密訊息 新暱稱已被使用 不加密傳送 解密失敗，可能是私密金鑰不正確。 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 7486969ea..3da83cb6c 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -89,14 +89,13 @@ Are you sure you want to delete this file?\n\nWarning: This will not delete copies of this file that are stored on other devices or servers. Archive this chat Choose device - Send unencrypted message + Send clear text message Send message Send message to %s - Send OMEMO encrypted message + Send encrypted message Send v\\OMEMO encrypted message - Send OpenPGP encrypted message New nickname in use - Send unencrypted + Send clear text Decryption failed. Maybe you don’t have the proper private key. OpenKeychain OpenKeychain to encrypt and decrypt messages and manage your public keys.

It is licensed under GPLv3+ and available on F-Droid and Google Play.

(Please restart %1$s afterwards.)]]> @@ -171,7 +170,7 @@ Incompatible client Stream error Stream opening error - Unencrypted + Clear text OTR OpenPGP OMEMO @@ -883,7 +882,7 @@ Discover channels Search channels Possible privacy violation! - search.jabber.network.

Using this feature will transmit your IP address and search terms to that service. See their Privacy Policy for more information.]]> + Channel discovery uses a third party service called <a href="https://search.jabber.network">search.jabber.network</a>.<br><br>Using this feature will transmit your IP address and search terms to that service. See their <a href="https://search.jabber.network/privacy">Privacy Policy</a> for more information. I already have an account Add existing account Register new account