From d9bdce01043ffdf97cb4a893f8d057b3e4d5fb8f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 29 Jul 2015 02:01:28 +0200
Subject: add new received message bubble drawable

---
 .../res/drawable-hdpi/message_bubble_received.9.png   | Bin 765 -> 765 bytes
 .../message_bubble_received_warning.9.png             | Bin 0 -> 757 bytes
 src/main/res/drawable-hdpi/message_bubble_sent.9.png  | Bin 687 -> 687 bytes
 .../res/drawable-mdpi/message_bubble_received.9.png   | Bin 594 -> 594 bytes
 .../message_bubble_received_warning.9.png             | Bin 0 -> 598 bytes
 src/main/res/drawable-mdpi/message_bubble_sent.9.png  | Bin 558 -> 558 bytes
 .../res/drawable-xhdpi/message_bubble_received.9.png  | Bin 929 -> 929 bytes
 .../message_bubble_received_warning.9.png             | Bin 0 -> 921 bytes
 src/main/res/drawable-xhdpi/message_bubble_sent.9.png | Bin 857 -> 857 bytes
 .../res/drawable-xxhdpi/message_bubble_received.9.png | Bin 1334 -> 1334 bytes
 .../message_bubble_received_warning.9.png             | Bin 0 -> 1308 bytes
 .../res/drawable-xxhdpi/message_bubble_sent.9.png     | Bin 1190 -> 1190 bytes
 .../drawable-xxxhdpi/message_bubble_received.9.png    | Bin 1714 -> 1714 bytes
 .../message_bubble_received_warning.9.png             | Bin 0 -> 1674 bytes
 .../res/drawable-xxxhdpi/message_bubble_sent.9.png    | Bin 1499 -> 1499 bytes
 15 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
 create mode 100644 src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
 create mode 100644 src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
 create mode 100644 src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
 create mode 100644 src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png

(limited to 'src/main/res')

diff --git a/src/main/res/drawable-hdpi/message_bubble_received.9.png b/src/main/res/drawable-hdpi/message_bubble_received.9.png
index 7433cd581..1a496771e 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received.9.png and b/src/main/res/drawable-hdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
new file mode 100644
index 000000000..9cd2f825d
Binary files /dev/null and b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent.9.png b/src/main/res/drawable-hdpi/message_bubble_sent.9.png
index 9f8a1c074..2bb4e04f6 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_sent.9.png and b/src/main/res/drawable-hdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received.9.png b/src/main/res/drawable-mdpi/message_bubble_received.9.png
index fd67e2450..7e134402f 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received.9.png and b/src/main/res/drawable-mdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
new file mode 100644
index 000000000..38f75e051
Binary files /dev/null and b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent.9.png b/src/main/res/drawable-mdpi/message_bubble_sent.9.png
index 315c18d77..b42664a85 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_sent.9.png and b/src/main/res/drawable-mdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received.9.png b/src/main/res/drawable-xhdpi/message_bubble_received.9.png
index 56f39294c..dc8ee5346 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
new file mode 100644
index 000000000..b5be808f8
Binary files /dev/null and b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
index 293d64f81..f1c462326 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
index 42a7d69b3..6ce844871 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
new file mode 100644
index 000000000..a31818698
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
index 762bcd916..9f36a6494 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
index 41d52aa73..e7fa6754b 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
new file mode 100644
index 000000000..398e53a2d
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
index 1b9604b38..be428cd2e 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png differ
-- 
cgit v1.2.3


From 2b3bb0226121acb173080e4893421eefef4a9571 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Wed, 29 Jul 2015 20:21:37 +0200
Subject: Highlight selected message's fingerprint in list

---
 src/main/res/layout/contact_key.xml | 1 +
 src/main/res/values/strings.xml     | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src/main/res')

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 6b86f80a5..0f61a15f1 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -28,6 +28,7 @@
             android:textColor="@color/black54"
             android:layout_alignParentLeft="true"
             android:layout_below="@+id/key"
+            android:maxLines="1"
             android:textSize="?attr/TextSizeInfo"/>
 
         <TextView
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5c8c0dbbf..e07c72fe9 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -209,6 +209,7 @@
 	<string name="your_fingerprint">Your fingerprint</string>
 	<string name="otr_fingerprint">OTR fingerprint</string>
 	<string name="axolotl_fingerprint">Axolotl fingerprint</string>
+	<string name="axolotl_fingerprint_selected_message">Axolotl fingerprint of message</string>
 	<string name="this_device_axolotl_fingerprint">Own Axolotl fingerprint</string>
 	<string name="other_devices">Other devices</string>
 	<string name="trust_keys">Trust Axolotl Keys</string>
-- 
cgit v1.2.3


From 1ed550b5c54ff873375c30fd94e4f20523f15187 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 30 Jul 2015 12:40:50 +0200
Subject: fixed some colors in message adapter

---
 src/main/res/layout/message_received.xml | 1 -
 src/main/res/layout/message_sent.xml     | 1 -
 src/main/res/values/colors.xml           | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/main/res')

diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 1919c0753..f78b82cbe 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -89,7 +89,6 @@
                     android:gravity="center_vertical"
                     android:text="@string/sending"
                     android:textColor="@color/white70"
-                    android:alpha="0.70"
                     android:textSize="?attr/TextSizeInfo" />
             </LinearLayout>
         </LinearLayout>
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 24750c9ba..553689298 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -80,7 +80,6 @@
                     android:gravity="center_vertical"
                     android:text="@string/sending"
                     android:textColor="@color/black54"
-                    android:alpha="0.54"
                     android:textSize="?attr/TextSizeInfo" />
 
                 <ImageView
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
-- 
cgit v1.2.3


From 5191e4ce95031b83353ec9ceacbbd57f53f01c6a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 31 Jul 2015 00:51:30 +0200
Subject: removed expert setting to 'force encryption'. merged certifcate and
 encryption settings into same category

---
 src/main/res/values/strings.xml  |   1 -
 src/main/res/xml/preferences.xml | 157 +++++++++++++++++++--------------------
 2 files changed, 75 insertions(+), 83 deletions(-)

(limited to 'src/main/res')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e07c72fe9..e0e472bf9 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -474,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>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 13598cb6f..8ab35c098 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory android:title="@string/pref_general" >
+    <PreferenceCategory android:title="@string/pref_general">
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="grant_new_contacts"
             android:summary="@string/pref_grant_presence_updates_summary"
-            android:title="@string/pref_grant_presence_updates" />
+            android:title="@string/pref_grant_presence_updates"/>
 
         <ListPreference
             android:defaultValue="Mobile"
@@ -14,65 +14,65 @@
             android:entryValues="@array/resources"
             android:key="resource"
             android:summary="@string/pref_xmpp_resource_summary"
-            android:title="@string/pref_xmpp_resource" />
+            android:title="@string/pref_xmpp_resource"/>
         <ListPreference
             android:defaultValue="524288"
             android:entries="@array/filesizes"
             android:entryValues="@array/filesizes_values"
             android:key="auto_accept_file_size"
             android:summary="@string/pref_accept_files_summary"
-            android:title="@string/pref_accept_files" />
+            android:title="@string/pref_accept_files"/>
 
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="confirm_messages"
             android:summary="@string/pref_confirm_messages_summary"
-            android:title="@string/pref_confirm_messages" />
+            android:title="@string/pref_confirm_messages"/>
 
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="chat_states"
             android:summary="@string/pref_chat_states_summary"
-            android:title="@string/pref_chat_states" />
+            android:title="@string/pref_chat_states"/>
 
     </PreferenceCategory>
     <PreferenceCategory
-        android:title="@string/pref_notification_settings"
-        android:key="notifications">
+        android:key="notifications"
+        android:title="@string/pref_notification_settings">
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="show_notification"
             android:summary="@string/pref_notifications_summary"
-            android:title="@string/pref_notifications" />
-          <PreferenceScreen
+            android:title="@string/pref_notifications"/>
+        <PreferenceScreen
             android:dependency="show_notification"
+            android:key="quiet_hours"
             android:summary="@string/pref_quiet_hours_summary"
-            android:title="@string/title_pref_quiet_hours"
-            android:key="quiet_hours">
+            android:title="@string/title_pref_quiet_hours">
             <CheckBoxPreference
-              android:defaultValue="false"
-              android:key="enable_quiet_hours"
-              android:summary="@string/pref_quiet_hours_summary"
-              android:title="@string/title_pref_enable_quiet_hours" />
+                android:defaultValue="false"
+                android:key="enable_quiet_hours"
+                android:summary="@string/pref_quiet_hours_summary"
+                android:title="@string/title_pref_enable_quiet_hours"/>
             <eu.siacs.conversations.ui.TimePreference
-              android:dependency="enable_quiet_hours"
-              android:key="quiet_hours_start"
-              android:negativeButtonText="@string/cancel"
-              android:positiveButtonText="@string/set"
-              android:title="@string/title_pref_quiet_hours_start_time" />
+                android:dependency="enable_quiet_hours"
+                android:key="quiet_hours_start"
+                android:negativeButtonText="@string/cancel"
+                android:positiveButtonText="@string/set"
+                android:title="@string/title_pref_quiet_hours_start_time"/>
             <eu.siacs.conversations.ui.TimePreference
-              android:dependency="enable_quiet_hours"
-              android:key="quiet_hours_end"
-              android:negativeButtonText="@string/cancel"
-              android:positiveButtonText="@string/set"
-              android:title="@string/title_pref_quiet_hours_end_time" />
-          </PreferenceScreen>
-          <CheckBoxPreference
+                android:dependency="enable_quiet_hours"
+                android:key="quiet_hours_end"
+                android:negativeButtonText="@string/cancel"
+                android:positiveButtonText="@string/set"
+                android:title="@string/title_pref_quiet_hours_end_time"/>
+        </PreferenceScreen>
+        <CheckBoxPreference
             android:defaultValue="true"
             android:dependency="show_notification"
             android:key="vibrate_on_notification"
             android:summary="@string/pref_vibrate_summary"
-            android:title="@string/pref_vibrate" />
+            android:title="@string/pref_vibrate"/>
 
         <RingtonePreference
             android:defaultValue="content://settings/system/notification_sound"
@@ -80,98 +80,91 @@
             android:key="notification_ringtone"
             android:ringtoneType="notification"
             android:summary="@string/pref_sound_summary"
-            android:title="@string/pref_sound" />
+            android:title="@string/pref_sound"/>
 
         <CheckBoxPreference
             android:defaultValue="false"
             android:dependency="show_notification"
             android:key="always_notify_in_conference"
             android:summary="@string/pref_conference_notifications_summary"
-            android:title="@string/pref_conference_notifications" />
+            android:title="@string/pref_conference_notifications"/>
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/pref_ui_options" >
+    <PreferenceCategory android:title="@string/pref_ui_options">
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="use_subject"
             android:summary="@string/pref_conference_name_summary"
-            android:title="@string/pref_conference_name" />
+            android:title="@string/pref_conference_name"/>
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="use_larger_font"
             android:summary="@string/pref_use_larger_font_summary"
-            android:title="@string/pref_use_larger_font" />
+            android:title="@string/pref_use_larger_font"/>
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="send_button_status"
             android:summary="@string/pref_use_send_button_to_indicate_status_summary"
-            android:title="@string/pref_use_send_button_to_indicate_status" />
+            android:title="@string/pref_use_send_button_to_indicate_status"/>
         <ListPreference
-            android:key="quick_action"
             android:defaultValue="recent"
+            android:dialogTitle="@string/choose_quick_action"
             android:entries="@array/quick_actions"
             android:entryValues="@array/quick_action_values"
+            android:key="quick_action"
             android:summary="@string/pref_quick_action_summary"
-            android:title="@string/pref_quick_action"
-            android:dialogTitle="@string/choose_quick_action"/>
+            android:title="@string/pref_quick_action"/>
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="show_dynamic_tags"
             android:summary="@string/pref_show_dynamic_tags_summary"
-            android:title="@string/pref_show_dynamic_tags" />
+            android:title="@string/pref_show_dynamic_tags"/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:title="@string/pref_advanced_options"
-        android:key="advanced">
+        android:key="advanced"
+        android:title="@string/pref_advanced_options">
         <PreferenceScreen
+            android:key="expert"
             android:summary="@string/pref_expert_options_summary"
-            android:title="@string/pref_expert_options"
-            android:key="expert">
-            <PreferenceCategory android:title="@string/pref_encryption_settings" >
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="force_encryption"
-                    android:summary="@string/pref_force_encryption_summary"
-                    android:title="@string/pref_force_encryption" />
+            android:title="@string/pref_expert_options">
+            <PreferenceCategory android:title="@string/pref_encryption_settings">
                 <CheckBoxPreference
                     android:defaultValue="false"
                     android:key="dont_save_encrypted"
                     android:summary="@string/pref_dont_save_encrypted_summary"
-                    android:title="@string/pref_dont_save_encrypted" />
+                    android:title="@string/pref_dont_save_encrypted"/>
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="dont_trust_system_cas"
+                    android:summary="@string/pref_dont_trust_system_cas_summary"
+                    android:title="@string/pref_dont_trust_system_cas_title"/>
+                <Preference
+                    android:key="remove_trusted_certificates"
+                    android:summary="@string/pref_remove_trusted_certificates_summary"
+                    android:title="@string/pref_remove_trusted_certificates_title"/>
+            </PreferenceCategory>
+            <PreferenceCategory android:title="@string/pref_input_options">
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="enter_is_send"
+                    android:summary="@string/pref_enter_is_send_summary"
+                    android:title="@string/pref_enter_is_send"/>
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="display_enter_key"
+                    android:summary="@string/pref_display_enter_key_summary"
+                    android:title="@string/pref_display_enter_key"/>
             </PreferenceCategory>
-	        <PreferenceCategory android:title="@string/pref_input_options">
-		        <CheckBoxPreference
-			        android:defaultValue="false"
-			        android:key="enter_is_send"
-			        android:title="@string/pref_enter_is_send"
-			        android:summary="@string/pref_enter_is_send_summary" />
-		        <CheckBoxPreference
-			        android:defaultValue="false"
-			        android:key="display_enter_key"
-			        android:title="@string/pref_display_enter_key"
-			        android:summary="@string/pref_display_enter_key_summary" />
-	        </PreferenceCategory>
-			<PreferenceCategory android:title="@string/pref_certificate_options">
-				<CheckBoxPreference
-					android:defaultValue="false"
-					android:key="dont_trust_system_cas"
-					android:title="@string/pref_dont_trust_system_cas_title"
-					android:summary="@string/pref_dont_trust_system_cas_summary" />
-				<Preference
-					android:key="remove_trusted_certificates"
-					android:title="@string/pref_remove_trusted_certificates_title"
-					android:summary="@string/pref_remove_trusted_certificates_summary" />
-			</PreferenceCategory>
-            <PreferenceCategory android:title="@string/pref_expert_options_other" >
+            <PreferenceCategory android:title="@string/pref_expert_options_other">
                 <CheckBoxPreference
                     android:defaultValue="false"
                     android:key="indicate_received"
                     android:summary="@string/pref_use_indicate_received_summary"
-                    android:title="@string/pref_use_indicate_received" />
+                    android:title="@string/pref_use_indicate_received"/>
                 <CheckBoxPreference
                     android:defaultValue="false"
                     android:key="keep_foreground_service"
-                    android:title="@string/pref_keep_foreground_service"
-                    android:summary="@string/pref_keep_foreground_service_summary" />
+                    android:summary="@string/pref_keep_foreground_service_summary"
+                    android:title="@string/pref_keep_foreground_service"/>
             </PreferenceCategory>
         </PreferenceScreen>
 
@@ -179,9 +172,9 @@
             android:defaultValue="false"
             android:key="never_send"
             android:summary="@string/pref_never_send_crash_summary"
-            android:title="@string/pref_never_send_crash" />
+            android:title="@string/pref_never_send_crash"/>
     </PreferenceCategory>
-		<eu.siacs.conversations.ui.AboutPreference
-			android:summary="@string/pref_about_conversations_summary"
-			android:title="@string/title_activity_about" />
+    <eu.siacs.conversations.ui.AboutPreference
+        android:summary="@string/pref_about_conversations_summary"
+        android:title="@string/title_activity_about"/>
 </PreferenceScreen>
-- 
cgit v1.2.3


From 2bf30bb296eb92912fc5307c4831861068c65d16 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 1 Aug 2015 23:36:59 +0200
Subject: temporarily renamed new encryption method to 'Multi-End' until a
 better name has been found

---
 src/main/res/values/strings.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/main/res')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e0e472bf9..722eec2d7 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,14 +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="axolotl_fingerprint_selected_message">Axolotl fingerprint of message</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>
@@ -322,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>
@@ -389,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>
-- 
cgit v1.2.3