From 8b9b74ff7ee863160e0cf2827e2a5a431d4fb90f Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 8 Aug 2015 13:29:21 +0200 Subject: [PATCH] renamed multi-end / axolotl to OMEMO --- src/main/AndroidManifest.xml | 2 +- .../ui/ConversationFragment.java | 2 +- .../conversations/ui/EditAccountActivity.java | 4 ++-- .../conversations/ui/TrustKeysActivity.java | 2 +- .../siacs/conversations/ui/XmppActivity.java | 6 ++--- src/main/res/layout/activity_edit_account.xml | 6 ++--- src/main/res/menu/encryption_choices.xml | 6 ++--- src/main/res/values/strings.xml | 23 +++++++++---------- 8 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index b0611f848..15d5bc255 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -132,7 +132,7 @@ + android:text="@string/this_device_omemo_fingerprint"/> + android:contentDescription="@string/copy_omemo_clipboard_description"/> + android:contentDescription="@string/regenerate_omemo_key"/> diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml index 1b3fe76ef..9af2cd346 100644 --- a/src/main/res/menu/encryption_choices.xml +++ b/src/main/res/menu/encryption_choices.xml @@ -5,15 +5,15 @@ + - \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 41e1ccff2..50c0ecf85 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -80,7 +80,7 @@ Choose presence to contact Send plain text message Send OTR encrypted message - Send Multi-End encrypted message + Send OMEMO encrypted message Send OpenPGP encrypted message Your nickname has been changed Send unencrypted @@ -155,7 +155,7 @@ Plain text OTR OpenPGP - Multi-End + OMEMO Edit account Delete account Temporarily disable @@ -208,14 +208,13 @@ Reception failed Your fingerprint OTR fingerprint - Multi-End fingerprint - Multi-End fingerprint of message - Own Multi-End fingerprint + OMEMO fingerprint + OMEMO fingerprint of message + Own OMEMO fingerprint Other devices - Trust Multi-End Keys + Trust OMEMO Fingerprints Fetching keys... Done - Other own Multi-End Devices Verify Decrypt Conferences @@ -322,7 +321,7 @@ Conference name Use room’s subject instead of JID to identify conferences OTR fingerprint copied to clipboard! - Multi-End fingerprint copied to clipboard! + OMEMO fingerprint copied to clipboard! You are banned from this conference This conference is members only You have been kicked from this conference @@ -389,11 +388,11 @@ Reset Account avatar Copy OTR fingerprint to clipboard - Copy Multi-End fingerprint to clipboard - Copy Axolotl fingerprint to clipboard - Wipe other devices from PEP + Copy OMEMO fingerprint to clipboard + Regenerate OMEMO key + Wipe other devices from PEP Clear devices - Are you sure you want to clear all other devices from the Multi-End announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime. + Are you sure you want to clear all other devices from the OMEMO announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime. Purge key Are you sure you want to purge this key? It will irreversibly be considered compromised, and you can never build a session with it again.