sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed multi-end / axolotl to OMEMO

This commit is contained in:
Daniel Gultsch 2015-08-08 13:29:21 +02:00
parent efdf3b6c1c
commit 8b9b74ff7e
8 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/AndroidManifest.xml
View File

@ -132,7 +132,7 @@
</activity>
<activity
android:name=".ui.TrustKeysActivity"
android:label="@string/trust_keys"
android:label="@string/trust_omemo_fingerprints"
android:windowSoftInputMode="stateAlwaysHidden"/>
<activity
android:name="de.duenndns.ssl.MemorizingActivity"

2
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -333,7 +333,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
mEditMessage.setHint(getString(R.string.send_otr_message));
break;
case Message.ENCRYPTION_AXOLOTL:
mEditMessage.setHint(getString(R.string.send_axolotl_message));
mEditMessage.setHint(getString(R.string.send_omemo_message));
break;
case Message.ENCRYPTION_PGP:
mEditMessage.setHint(getString(R.string.send_pgp_message));

4
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View File

@ -577,10 +577,10 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
@Override
public void onClick(final View v) {
if (copyTextToClipboard(axolotlFingerprint, R.string.axolotl_fingerprint)) {
if (copyTextToClipboard(axolotlFingerprint, R.string.omemo_fingerprint)) {
Toast.makeText(
EditAccountActivity.this,
R.string.toast_message_axolotl_fingerprint,
R.string.toast_message_omemo_fingerprint,
Toast.LENGTH_SHORT).show();
}
}

2
src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
View File

@ -111,7 +111,7 @@ public class TrustKeysActivity extends XmppActivity implements OnKeyStatusUpdate
}
private void populateView() {
setTitle(getString(R.string.trust_keys));
setTitle(getString(R.string.trust_omemo_fingerprints));
ownKeys.removeAllViews();
foreignKeys.removeAllViews();
boolean hasOwnKeys = false;

6
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
View File

@ -696,15 +696,15 @@ public abstract class XmppActivity extends Activity {
}
if (showTag) {
keyType.setText(getString(R.string.axolotl_fingerprint));
keyType.setText(getString(R.string.omemo_fingerprint));
} else {
keyType.setVisibility(View.GONE);
}
if (highlight) {
keyType.setTextColor(getResources().getColor(R.color.accent));
keyType.setText(getString(R.string.axolotl_fingerprint_selected_message));
keyType.setText(getString(R.string.omemo_fingerprint_selected_message));
} else {
keyType.setText(getString(R.string.axolotl_fingerprint));
keyType.setText(getString(R.string.omemo_fingerprint));
}
key.setText(CryptoHelper.prettifyFingerprint(identityKey.getFingerprint()));

6
src/main/res/layout/activity_edit_account.xml
View File

@ -374,7 +374,7 @@
android:layout_height="wrap_content"
android:textColor="@color/black54"
android:textSize="?attr/TextSizeInfo"
android:text="@string/this_device_axolotl_fingerprint"/>
android:text="@string/this_device_omemo_fingerprint"/>
</LinearLayout>
<LinearLayout
@ -393,7 +393,7 @@
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_copy"
android:visibility="visible"
android:contentDescription="@string/copy_axolotl_clipboard_description"/>
android:contentDescription="@string/copy_omemo_clipboard_description"/>
<ImageButton
android:id="@+id/action_regenerate_axolotl_key"
android:layout_width="wrap_content"
@ -402,7 +402,7 @@
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_refresh"
android:visibility="gone"
android:contentDescription="@string/regenerate_axolotl_key"/>
android:contentDescription="@string/regenerate_omemo_key"/>
</LinearLayout>
</RelativeLayout>

6
src/main/res/menu/encryption_choices.xml
View File

@ -5,15 +5,15 @@
<item
android:id="@+id/encryption_choice_none"
android:title="@string/encryption_choice_none"/>
<item
android:id="@+id/encryption_choice_axolotl"
android:title="@string/encryption_choice_omemo"/>
<item
android:id="@+id/encryption_choice_otr"
android:title="@string/encryption_choice_otr"/>
<item
android:id="@+id/encryption_choice_pgp"
android:title="@string/encryption_choice_pgp"/>
<item
android:id="@+id/encryption_choice_axolotl"
android:title="@string/encryption_choice_axolotl"/>
</group>
</menu>

23
src/main/res/values/strings.xml
View File

@ -80,7 +80,7 @@
<string name="choose_presence">Choose presence to contact</string>
<string name="send_plain_text_message">Send plain text message</string>
<string name="send_otr_message">Send OTR encrypted message</string>
<string name="send_axolotl_message">Send Multi-End encrypted message</string>
<string name="send_omemo_message">Send OMEMO encrypted message</string>
<string name="send_pgp_message">Send OpenPGP encrypted message</string>
<string name="your_nick_has_been_changed">Your nickname has been changed</string>
<string name="send_unencrypted">Send unencrypted</string>
@ -155,7 +155,7 @@
<string name="encryption_choice_none">Plain text</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_axolotl">Multi-End</string>
<string name="encryption_choice_omemo">OMEMO</string>
<string name="mgmt_account_edit">Edit account</string>
<string name="mgmt_account_delete">Delete account</string>
<string name="mgmt_account_disable">Temporarily disable</string>
@ -208,14 +208,13 @@
<string name="reception_failed">Reception failed</string>
<string name="your_fingerprint">Your fingerprint</string>
<string name="otr_fingerprint">OTR fingerprint</string>
<string name="axolotl_fingerprint">Multi-End fingerprint</string>
<string name="axolotl_fingerprint_selected_message">Multi-End fingerprint of message</string>
<string name="this_device_axolotl_fingerprint">Own Multi-End fingerprint</string>
<string name="omemo_fingerprint">OMEMO fingerprint</string>
<string name="omemo_fingerprint_selected_message">OMEMO fingerprint of message</string>
<string name="this_device_omemo_fingerprint">Own OMEMO fingerprint</string>
<string name="other_devices">Other devices</string>
<string name="trust_keys">Trust Multi-End Keys</string>
<string name="trust_omemo_fingerprints">Trust OMEMO Fingerprints</string>
<string name="fetching_keys">Fetching keys...</string>
<string name="done">Done</string>
<string name="axolotl_devicelist">Other own Multi-End Devices</string>
<string name="verify">Verify</string>
<string name="decrypt">Decrypt</string>
<string name="conferences">Conferences</string>
@ -322,7 +321,7 @@
<string name="pref_conference_name">Conference name</string>
<string name="pref_conference_name_summary">Use room’s subject instead of JID to identify conferences</string>
<string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string>
<string name="toast_message_axolotl_fingerprint">Multi-End fingerprint copied to clipboard!</string>
<string name="toast_message_omemo_fingerprint">OMEMO fingerprint copied to clipboard!</string>
<string name="conference_banned">You are banned from this conference</string>
<string name="conference_members_only">This conference is members only</string>
<string name="conference_kicked">You have been kicked from this conference</string>
@ -389,11 +388,11 @@
<string name="reset">Reset</string>
<string name="account_image_description">Account avatar</string>
<string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string>
<string name="copy_axolotl_clipboard_description">Copy Multi-End fingerprint to clipboard</string>
<string name="regenerate_axolotl_key">Copy Axolotl fingerprint to clipboard</string>
<string name="wipe_axolotl_pep">Wipe other devices from PEP</string>
<string name="copy_omemo_clipboard_description">Copy OMEMO fingerprint to clipboard</string>
<string name="regenerate_omemo_key">Regenerate OMEMO key</string>
<string name="wipe_omemo_pep">Wipe other devices from PEP</string>
<string name="clear_other_devices">Clear devices</string>
<string name="clear_other_devices_desc">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.</string>
<string name="clear_other_devices_desc">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.</string>
<string name="purge_key">Purge key</string>
<string name="purge_key_desc_part1">Are you sure you want to purge this key?</string>
<string name="purge_key_desc_part2">It will irreversibly be considered compromised, and you can never build a session with it again.</string>