copy commits

2 files changed, 11 insertions, 10 deletions

diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 85a442c84..a5d7eea30 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -13,5 +13,6 @@
 	<color name="grey200">#ffeeeeee</color>
 	<color name="grey800">#ff424242</color>
 	<color name="red500">#fff44336</color>
+	<color name="red800">#ffc62828</color>
 	<color name="orange500">#ffff9800</color>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7e7913a91..4253c7a24 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -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 Axolotl encrypted message</string>
+	<string name="send_axolotl_message">Send Multi-End 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">Axolotl</string>
+	<string name="encryption_choice_axolotl">Multi-End</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,13 +208,14 @@
 	<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">Axolotl fingerprint</string>
-	<string name="this_device_axolotl_fingerprint">Own Axolotl 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="other_devices">Other devices</string>
-	<string name="trust_keys">Trust Axolotl Keys</string>
+	<string name="trust_keys">Trust Multi-End Keys</string>
 	<string name="fetching_keys">Fetching keys...</string>
 	<string name="done">Done</string>
-	<string name="axolotl_devicelist">Other own Axolotl Devices</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>
@@ -321,7 +322,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">Axolotl fingerprint copied to clipboard!</string>
+	<string name="toast_message_axolotl_fingerprint">Multi-End 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>
@@ -388,11 +389,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 Axolotl 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="clear_other_devices">Clear devices</string>
-	<string name="clear_other_devices_desc">Are you sure you want to clear all other devices from the axolotl 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 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="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>
@@ -473,7 +474,6 @@
 	<string name="received_location">Received location</string>
 	<string name="title_undo_swipe_out_conversation">Conversation closed</string>
 	<string name="title_undo_swipe_out_muc">Left conference</string>
-	<string name="pref_certificate_options">Certificate options</string>
 	<string name="pref_dont_trust_system_cas_title">Don’t trust system CAs</string>
 	<string name="pref_dont_trust_system_cas_summary">All certificates must be manually approved</string>
 	<string name="pref_remove_trusted_certificates_title">Remove certificates</string>