Merge branch 'trz/rebase' into trz/rename

7 files changed, 436 insertions, 298 deletions

diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 24f8790c..f8028ea3 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -79,4 +79,10 @@
         <item>ALWAYS</item>
         <item>NEVER</item>
     </string-array>
+
+	<string-array name="mam_prefs">
+		<item>@string/never</item>
+		<item>@string/contacts</item>
+		<item>@string/always</item>
+	</string-array>
 </resources>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 7a195aa4..0d6d19b1 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -14,6 +14,7 @@
     <attr name="icon_download" format="reference"/>
     <attr name="icon_edit" format="reference"/>
     <attr name="icon_edit_dark" format="reference"/>
+    <attr name="icon_done" format="reference"/>
     <attr name="icon_group" format="reference"/>
     <attr name="icon_new" format="reference"/>
     <attr name="icon_new_attachment" format="reference"/>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 9cef1b0a..2d744395 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -9,17 +9,22 @@
     <color name="online">@color/green500</color>
     <color name="notification">@color/green500</color>
 
-    <color name="green500">#ff259b24</color>
+	<color name="primary">@color/green500</color>
+	<color name="primary_dark">@color/green700</color>
+	<color name="accent">#ff0091ea</color>
+	<color name="black87">#de000000</color>
+	<color name="black54">#8a000000</color>
+	<color name="black26">#42000000</color>
+	<color name="black12">#1f000000</color>
+	<color name="white">#ffffffff</color>
+	<color name="white70">#b2ffffff</color>
+	<color name="grey50">#fffafafa</color>
+	<color name="grey200">#ffeeeeee</color>
+	<color name="grey500">#ff9e9e9e</color>
+	<color name="grey800">#ff424242</color>
+	<color name="red500">#fff44336</color>
+	<color name="red800">#ffc62828</color>
+	<color name="orange500">#ffff9800</color>
+	<color name="green500">#ff259b24</color>
     <color name="green700">#ff0a7e07</color>
-    <color name="accent">#ff0091ea</color>
-    <color name="black87">#de000000</color>
-    <color name="black54">#8a000000</color>
-    <color name="black12">#1f000000</color>
-    <color name="white">#ffffffff</color>
-    <color name="white70">#b2ffffff</color>
-    <color name="grey50">#fffafafa</color>
-    <color name="grey200">#ffeeeeee</color>
-    <color name="grey800">#ff424242</color>
-    <color name="red500">#fff44336</color>
-    <color name="orange500">#ffff9800</color>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/encryption_settings.xml b/src/main/res/values/encryption_settings.xml
new file mode 100644
index 00000000..33db8387
--- /dev/null
+++ b/src/main/res/values/encryption_settings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="omemo_enabled">false</bool>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8885622b..15b7efc5 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,290 +1,304 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <string name="app_name" translatable="false">Conversations+</string>
-    <string name="action_settings">Settings</string>
-    <string name="action_add">New conversation</string>
-    <string name="action_accounts">Manage accounts</string>
-    <string name="action_end_conversation">End this conversation</string>
-    <string name="action_contact_details">Contact details</string>
-    <string name="action_muc_details">Conference details</string>
-    <string name="action_secure">Secure conversation</string>
-    <string name="action_add_account">Add account</string>
-    <string name="action_edit_contact">Edit name</string>
-    <string name="action_add_phone_book">Add to phone book</string>
-    <string name="action_delete_contact">Delete from roster</string>
-    <string name="action_block_contact">Block contact</string>
-    <string name="action_unblock_contact">Unblock contact</string>
-    <string name="action_block_domain">Block domain</string>
-    <string name="action_unblock_domain">Unblock domain</string>
-    <string name="title_activity_manage_accounts">Manage Accounts</string>
-    <string name="title_activity_settings">Settings</string>
-    <string name="title_activity_conference_details">Conference Details</string>
-    <string name="title_activity_contact_details">Contact Details</string>
-    <string name="title_activity_sharewith">Share with Conversation</string>
-    <string name="title_activity_start_conversation">Start Conversation</string>
-    <string name="title_activity_choose_contact">Choose contact</string>
-    <string name="title_activity_block_list">Block list</string>
-    <string name="just_now">just now</string>
-    <string name="minute_ago">1 min ago</string>
-    <string name="minutes_ago">%d mins ago</string>
-    <string name="unread_conversations">unread Conversations</string>
-    <string name="sending">sending…</string>
-    <string name="encrypted_message">Decrypting message. Please wait…</string>
-    <string name="nick_in_use">Nickname is already in use</string>
-    <string name="admin">Admin</string>
-    <string name="owner">Owner</string>
-    <string name="moderator">Moderator</string>
-    <string name="participant">Participant</string>
-    <string name="visitor">Visitor</string>
-    <string name="remove_contact_text">Would you like to remove %s from your roster? The conversation associated with this contact will not be removed.</string>
-    <string name="block_contact_text">Would you like to block %s from sending you messages?</string>
-    <string name="unblock_contact_text">Would you like to unblock %s and allow them to send you messages?</string>
-    <string name="block_domain_text">Block all contacts from %s?</string>
-    <string name="unblock_domain_text">Unblock all contacts from %s?</string>
-    <string name="contact_blocked">Contact blocked</string>
-    <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string>
-    <string name="register_account">Register new account on server</string>
-    <string name="change_password_on_server">Change password on server</string>
-    <string name="share_with">Share with…</string>
-    <string name="start_conversation">Start Conversation</string>
-    <string name="invite_contact">Invite Contact</string>
-    <string name="contacts">Contacts</string>
-    <string name="cancel">Cancel</string>
-    <string name="set">Set</string>
-    <string name="add">Add</string>
-    <string name="edit">Edit</string>
-    <string name="delete">Delete</string>
-    <string name="block">Block</string>
-    <string name="unblock">Unblock</string>
-    <string name="save">Save</string>
-    <string name="ok">OK</string>
-    <string name="crash_report_title">Conversations has crashed</string>
-    <string name="crash_report_message">By sending in stack traces you are helping the ongoing development of Conversations\n<b>Warning:</b> This will use your XMPP account to send the stack trace to the developer.</string>
-    <string name="send_now">Send now</string>
-    <string name="send_never">Never ask again</string>
-    <string name="problem_connecting_to_account">Unable to connect to account</string>
-    <string name="problem_connecting_to_accounts">Unable to connect to multiple accounts</string>
-    <string name="touch_to_fix">Touch here to manage your accounts</string>
-    <string name="attach_file">Attach file</string>
-    <string name="not_in_roster">The contact is not in your roster. Would you like to add it?</string>
-    <string name="add_contact">Add contact</string>
-    <string name="send_failed">delivery failed</string>
-    <string name="send_rejected">rejected</string>
-    <string name="preparing_image">Preparing image for transmission</string>
-    <string name="action_clear_history">Clear history</string>
-    <string name="clear_conversation_history">Clear Conversation History</string>
-    <string name="clear_histor_msg">Do you want to delete all messages within this Conversation?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string>
-    <string name="delete_messages">Delete messages</string>
-    <string name="also_end_conversation">End this conversations afterwards</string>
-    <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_pgp_message">Send OpenPGP encrypted message</string>
-    <string name="your_nick_has_been_changed">Your nickname has been changed</string>
-    <string name="download_image">Download Image</string>
-    <string name="send_unencrypted">Send unencrypted</string>
-    <string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string>
-    <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversations utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Conversations afterwards.)</small></string>
-    <string name="restart">Restart</string>
-    <string name="install">Install</string>
-    <string name="offering">offering…</string>
-    <string name="waiting">waiting…</string>
-    <string name="no_pgp_key">No OpenPGP Key found</string>
-    <string name="contact_has_no_pgp_key">Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup OpenPGP.</small></string>
-    <string name="no_pgp_keys">No OpenPGP Keys found</string>
-    <string name="contacts_have_no_pgp_keys">Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\n<small>Please ask your contacts to setup OpenPGP.</small></string>
-    <string name="encrypted_message_received"><i>Encrypted message received. Touch to view and decrypt.</i></string>
-    <string name="pref_general">General</string>
-    <string name="pref_xmpp_resource">XMPP resource</string>
-    <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string>
-    <string name="pref_accept_files">Accept files</string>
-    <string name="pref_accept_files_summary">Settings for accepting and automatically downloading files</string>
+	<string name="app_name" translatable="false">Conversations+</string>
+	<string name="action_settings">Settings</string>
+	<string name="action_add">New conversation</string>
+	<string name="action_accounts">Manage accounts</string>
+	<string name="action_end_conversation">End this conversation</string>
+	<string name="action_contact_details">Contact details</string>
+	<string name="action_muc_details">Conference details</string>
+	<string name="action_secure">Secure conversation</string>
+	<string name="action_add_account">Add account</string>
+	<string name="action_edit_contact">Edit name</string>
+	<string name="action_add_phone_book">Add to address book</string>
+	<string name="action_delete_contact">Delete from roster</string>
+	<string name="action_block_contact">Block contact</string>
+	<string name="action_unblock_contact">Unblock contact</string>
+	<string name="action_block_domain">Block domain</string>
+	<string name="action_unblock_domain">Unblock domain</string>
+	<string name="title_activity_manage_accounts">Manage Accounts</string>
+	<string name="title_activity_settings">Settings</string>
+	<string name="title_activity_conference_details">Conference Details</string>
+	<string name="title_activity_contact_details">Contact Details</string>
+	<string name="title_activity_sharewith">Share with Conversation</string>
+	<string name="title_activity_start_conversation">Start Conversation</string>
+	<string name="title_activity_choose_contact">Choose contact</string>
+	<string name="title_activity_block_list">Block list</string>
+	<string name="just_now">just now</string>
+	<string name="minute_ago">1 min ago</string>
+	<string name="minutes_ago">%d mins ago</string>
+	<string name="unread_conversations">unread Conversations</string>
+	<string name="sending">sending…</string>
+	<string name="message_decrypting">Decrypting message. Please wait…</string>
+	<string name="pgp_message">OpenPGP encrypted message</string>
+	<string name="nick_in_use">Nickname is already in use</string>
+	<string name="admin">Admin</string>
+	<string name="owner">Owner</string>
+	<string name="moderator">Moderator</string>
+	<string name="participant">Participant</string>
+	<string name="visitor">Visitor</string>
+	<string name="remove_contact_text">Would you like to remove %s from your roster? The conversation associated with this contact will not be removed.</string>
+	<string name="block_contact_text">Would you like to block %s from sending you messages?</string>
+	<string name="unblock_contact_text">Would you like to unblock %s and allow them to send you messages?</string>
+	<string name="block_domain_text">Block all contacts from %s?</string>
+	<string name="unblock_domain_text">Unblock all contacts from %s?</string>
+	<string name="contact_blocked">Contact blocked</string>
+	<string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string>
+	<string name="register_account">Register new account on server</string>
+	<string name="change_password_on_server">Change password on server</string>
+	<string name="share_with">Share with…</string>
+	<string name="start_conversation">Start Conversation</string>
+	<string name="invite_contact">Invite Contact</string>
+	<string name="contacts">Contacts</string>
+	<string name="cancel">Cancel</string>
+	<string name="set">Set</string>
+	<string name="add">Add</string>
+	<string name="edit">Edit</string>
+	<string name="delete">Delete</string>
+	<string name="block">Block</string>
+	<string name="unblock">Unblock</string>
+	<string name="save">Save</string>
+	<string name="ok">OK</string>
+	<string name="crash_report_title">Conversations has crashed</string>
+	<string name="crash_report_message">By sending in stack traces you are helping the ongoing development of Conversations\n<b>Warning:</b> This will use your XMPP account to send the stack trace to the developer.</string>
+	<string name="send_now">Send now</string>
+	<string name="send_never">Never ask again</string>
+	<string name="problem_connecting_to_account">Unable to connect to account</string>
+	<string name="problem_connecting_to_accounts">Unable to connect to multiple accounts</string>
+	<string name="touch_to_fix">Touch here to manage your accounts</string>
+	<string name="attach_file">Attach file</string>
+	<string name="not_in_roster">The contact is not in your roster. Would you like to add it?</string>
+	<string name="add_contact">Add contact</string>
+	<string name="send_failed">delivery failed</string>
+	<string name="send_rejected">rejected</string>
+	<string name="preparing_image">Preparing image for transmission</string>
+	<string name="action_clear_history">Clear history</string>
+	<string name="clear_conversation_history">Clear Conversation History</string>
+	<string name="clear_histor_msg">Do you want to delete all messages within this Conversation?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string>
+	<string name="delete_messages">Delete messages</string>
+	<string name="also_end_conversation">End this conversation afterwards</string>
+	<string name="choose_presence">Choose presence to contact</string>
+	<string name="send_unencrypted_message">Send unencrypted message</string>
+	<string name="send_otr_message">Send OTR encrypted message</string>
+	<string name="send_omemo_message">Send OMEMO encrypted message</string>
+	<string name="send_omemo_x509_message">Send v\\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>
+	<string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string>
+	<string name="openkeychain_required">OpenKeychain</string>
+	<string name="openkeychain_required_long">Conversations utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Conversations afterwards.)</small></string>
+	<string name="restart">Restart</string>
+	<string name="install">Install</string>
+	<string name="openkeychain_not_installed">Please install OpenKeychain</string>
+	<string name="offering">offering…</string>
+	<string name="waiting">waiting…</string>
+	<string name="no_pgp_key">No OpenPGP Key found</string>
+	<string name="contact_has_no_pgp_key">Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup OpenPGP.</small></string>
+	<string name="no_pgp_keys">No OpenPGP Keys found</string>
+	<string name="contacts_have_no_pgp_keys">Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\n<small>Please ask your contacts to setup OpenPGP.</small></string>
+	<string name="pref_general">General</string>
+	<string name="pref_xmpp_resource">XMPP resource</string>
+	<string name="pref_xmpp_resource_summary">The name this client identifies itself with</string>
+	<string name="pref_accept_files">Accept files</string>
+	<string name="pref_accept_files_summary">Automatically accept files smaller than…</string>
     <string name="pref_accept_files_size">Size</string>
     <string name="pref_accept_files_size_summary">Automatically accept files smaller than…</string>
     <string name="pref_accept_files_download">Wi-Fi only</string>
     <string name="pref_accept_files_download_summary">Download and accept files automatically only when using Wi-Fi</string>
     <string name="pref_accept_files_download_link">Image links</string>
     <string name="pref_accept_files_download_link_summary">Automatically download image links</string>
-    <string name="pref_notification_settings">Notification Settings</string>
-    <string name="pref_notifications">Notifications</string>
-    <string name="pref_notifications_summary">Notify when a new message arrives</string>
-    <string name="pref_vibrate">Vibrate</string>
-    <string name="pref_vibrate_summary">Also vibrate when a new message arrives</string>
-    <string name="pref_sound">Sound</string>
-    <string name="pref_sound_summary">Play ringtone with notification</string>
-    <string name="pref_conference_notifications">Conference notifications</string>
-    <string name="pref_conference_notifications_summary">Always notify when a new conference message arrives instead of only when highlighted</string>
-    <string name="pref_notification_grace_period">Notification grace period</string>
-    <string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string>
-    <string name="pref_advanced_options">Advanced Options</string>
-    <string name="pref_never_send_crash">Never send crash reports</string>
-    <string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string>
-    <string name="pref_confirm_messages">Confirm Messages</string>
-    <string name="pref_confirm_messages_summary">Let your contact know when you have received or read a message</string>
+	<string name="pref_notification_settings">Notification</string>
+	<string name="pref_notifications">Notifications</string>
+	<string name="pref_notifications_summary">Notify when a new message arrives</string>
+	<string name="pref_vibrate">Vibrate</string>
+	<string name="pref_vibrate_summary">Also vibrate when a new message arrives</string>
+	<string name="pref_sound">Sound</string>
+	<string name="pref_sound_summary">Play ringtone with notification</string>
+	<string name="pref_notification_grace_period">Notification grace period</string>
+	<string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string>
+	<string name="pref_advanced_options">Advanced</string>
+	<string name="pref_never_send_crash">Never send crash reports</string>
+	<string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string>
+	<string name="pref_confirm_messages">Confirm Messages</string>
+	<string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string>
     <string name="pref_confirm_messages_none">No confirmation</string>
     <string name="pref_confirm_messages_received">Confirmation for received message</string>
     <string name="pref_confirm_messages_read_and_received">Confirmation for received and read message</string>
-    <string name="pref_ui_options">UI Options</string>
+	<string name="pref_ui_options">UI</string>
     <string name="pref_parse_emoticons">Parse Emoticons</string>
     <string name="pref_parse_emoticons_summary">Replace emoticons with smilies.</string>
-    <string name="openpgp_error">OpenKeychain reported an error</string>
-    <string name="error_decrypting_file">I/O Error decrypting file</string>
-    <string name="accept">Accept</string>
-    <string name="error">An error has occurred</string>
-    <string name="pref_grant_presence_updates">Grant presence updates</string>
-    <string name="pref_grant_presence_updates_summary">Preemptively grant and ask for presence subscription for contacts you created</string>
-    <string name="subscriptions">Subscriptions</string>
-    <string name="your_account">Your account</string>
-    <string name="keys">Keys</string>
-    <string name="send_presence_updates">Send presence updates</string>
-    <string name="receive_presence_updates">Receive presence updates</string>
-    <string name="ask_for_presence_updates">Ask for presence updates</string>
-    <string name="attach_choose_picture">Choose picture</string>
-    <string name="attach_take_picture">Take picture</string>
-    <string name="preemptively_grant">Preemptively grant subscription request</string>
-    <string name="error_not_an_image_file">The file you selected is not an image</string>
-    <string name="error_compressing_image">Error while converting the image file</string>
-    <string name="error_file_not_found">File not found</string>
-    <string name="error_io_exception">General I/O error. Maybe you ran out of storage space?</string>
-    <string name="error_security_exception_during_image_copy">The app you used to select this image did not provide us with enough permissions to read the file.\n\n<small>Use a different file manager to choose an image</small></string>
-    <string name="account_status_unknown">Unknown</string>
-    <string name="account_status_disabled">Temporarily disabled</string>
-    <string name="account_status_online">Online</string>
-    <string name="account_status_connecting">Connecting\u2026</string>
-    <string name="account_status_offline">Offline</string>
-    <string name="account_status_unauthorized">Unauthorized</string>
-    <string name="account_status_not_found">Server not found</string>
-    <string name="account_status_no_internet">No connectivity</string>
-    <string name="account_status_regis_fail">Registration failed</string>
-    <string name="account_status_regis_conflict">Username already in use</string>
-    <string name="account_status_regis_success">Registration completed</string>
-    <string name="account_status_regis_not_sup">Server does not support registration</string>
-    <string name="account_status_security_error">Security error</string>
-    <string name="account_status_incompatible_server">Incompatible server</string>
-    <string name="encryption_choice_none">Plain text</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</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>
-    <string name="mgmt_account_publish_avatar">Publish avatar</string>
-    <string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string>
-    <string name="mgmt_account_enable">Enable account</string>
-    <string name="mgmt_account_are_you_sure">Are you sure?</string>
-    <string name="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string>
-    <string name="attach_record_voice">Record voice</string>
-    <string name="account_settings_jabber_id">Jabber ID</string>
-    <string name="account_settings_password">Password</string>
-    <string name="account_settings_example_jabber_id">username@example.com</string>
-    <string name="account_settings_confirm_password">Confirm password</string>
-    <string name="password">Password</string>
-    <string name="confirm_password">Confirm password</string>
-    <string name="passwords_do_not_match">Passwords do not match</string>
-    <string name="invalid_jid">This is not a valid Jabber ID</string>
-    <string name="error_out_of_memory">Out of memory. Image is too large</string>
-    <string name="add_phone_book_text">Do you want to add %s to your phones contact list?</string>
-    <string name="contact_status_online">online</string>
-    <string name="contact_status_free_to_chat">free to chat</string>
-    <string name="contact_status_away">away</string>
-    <string name="contact_status_extended_away">extended away</string>
-    <string name="contact_status_do_not_disturb">do not disturb</string>
-    <string name="contact_status_offline">offline</string>
-    <string name="muc_details_conference">Conference</string>
-    <string name="muc_details_other_members">Other Members</string>
-    <string name="server_info_show_more">Server info</string>
-    <string name="server_info_mam">XEP-0313: MAM</string>
-    <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
-    <string name="server_info_csi">XEP-0352: Client State Indication</string>
-    <string name="server_info_blocking">XEP-0191: Blocking Command</string>
-    <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
-    <string name="server_info_stream_management">XEP-0198: Stream Management</string>
-    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
-    <string name="server_info_available">available</string>
-    <string name="server_info_unavailable">unavailable</string>
-    <string name="missing_public_keys">Missing public key announcements</string>
-    <string name="last_seen_now">last seen just now</string>
-    <string name="last_seen_min">last seen 1 minute ago</string>
-    <string name="last_seen_mins">last seen %d minutes ago</string>
-    <string name="last_seen_hour">last seen 1 hour ago</string>
-    <string name="last_seen_hours">last seen %d hours ago</string>
-    <string name="last_seen_day">last seen 1 day ago</string>
-    <string name="last_seen_days">last seen %d days ago</string>
-    <string name="never_seen">never seen</string>
-    <string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string>
-    <string name="unknown_otr_fingerprint">Unknown OTR fingerprint</string>
-    <string name="openpgp_messages_found">OpenPGP encrypted messages found</string>
-    <string name="reception_failed">Reception failed</string>
-    <string name="your_fingerprint">Your fingerprint</string>
-    <string name="otr_fingerprint">OTR fingerprint</string>
-    <string name="verify">Verify</string>
-    <string name="decrypt">Decrypt</string>
-    <string name="conferences">Conferences</string>
-    <string name="search">Search</string>
-    <string name="create_contact">Create Contact</string>
-    <string name="join_conference">Join Conference</string>
-    <string name="delete_contact">Delete Contact</string>
-    <string name="view_contact_details">View contact details</string>
-    <string name="block_contact">Block contact</string>
-    <string name="unblock_contact">Unblock contact</string>
-    <string name="create">Create</string>
-    <string name="contact_already_exists">The contact already exists</string>
-    <string name="join">Join</string>
-    <string name="conference_address">Conference address</string>
-    <string name="conference_address_example">room@conference.example.com</string>
-    <string name="save_as_bookmark">Save as bookmark</string>
-    <string name="delete_bookmark">Delete bookmark</string>
-    <string name="bookmark_already_exists">This bookmark already exists</string>
-    <string name="you">You</string>
-    <string name="action_edit_subject">Edit conference subject</string>
-    <string name="conference_not_found">Conference not found</string>
-    <string name="leave">Leave</string>
-    <string name="contact_added_you">Contact added you to contact list</string>
-    <string name="add_back">Add back</string>
-    <string name="contact_has_read_up_to_this_point">%s has read up to this point</string>
-    <string name="publish">Publish</string>
-    <string name="touch_to_choose_picture">Touch avatar to select picture from gallery</string>
-    <string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string>
-    <string name="publishing">Publishing…</string>
-    <string name="error_publish_avatar_server_reject">The server rejected your publication</string>
-    <string name="error_publish_avatar_converting">Something went wrong while converting your picture</string>
-    <string name="error_saving_avatar">Could not save avatar to disk</string>
-    <string name="or_long_press_for_default">(Or long press to bring back default)</string>
-    <string name="error_publish_avatar_no_server_support">Your server does not support the publication of avatars</string>
-    <string name="private_message">whispered</string>
-    <string name="private_message_to">to %s</string>
-    <string name="send_private_message_to">Send private message to %s</string>
-    <string name="connect">Connect</string>
-    <string name="account_already_exists">This account already exists</string>
-    <string name="next">Next</string>
-    <string name="server_info_session_established">Current session established</string>
-    <string name="additional_information">Additional Information</string>
-    <string name="skip">Skip</string>
-    <string name="disable_notifications">Disable notifications</string>
-    <string name="disable_notifications_for_this_conversation">Disable notifications for this conversation</string>
-    <string name="notifications_disabled">Notifications are disabled</string>
-    <string name="enable">Enable</string>
-    <string name="conference_requires_password">Conference requires password</string>
-    <string name="enter_password">Enter password</string>
-    <string name="missing_presence_updates">Missing presence updates from contact</string>
-    <string name="request_presence_updates">Please request presence updates from your contact first.\n\n<small>This will be used to determine what client(s) your contact is using.</small></string>
-    <string name="request_now">Request now</string>
-    <string name="delete_fingerprint">Delete Fingerprint</string>
-    <string name="sure_delete_fingerprint">Are you sure you would like to delete this fingerprint?</string>
-    <string name="ignore">Ignore</string>
-    <string name="without_mutual_presence_updates"><b>Warning:</b> Sending this without mutual presence updates could cause unexpected problems.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string>
-    <string name="pref_encryption_settings">Encryption settings</string>
-    <string name="pref_force_encryption">Force end-to-end encryption</string>
-    <string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
-    <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
-    <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
-    <string name="pref_expert_options">Expert options</string>
-    <string name="pref_expert_options_summary">Please be careful with these</string>
-    <string name="title_activity_about">About Conversations</string>
-    <string name="pref_about_conversations_summary">Build and licensing information</string>
-    <string name="pref_about_message" translatable="false">
-            Conversations+ is the improved version of Conversations.
+	<string name="openpgp_error">OpenKeychain reported an error</string>
+	<string name="error_decrypting_file">I/O Error decrypting file</string>
+	<string name="accept">Accept</string>
+	<string name="error">An error has occurred</string>
+	<string name="pref_grant_presence_updates">Grant presence updates</string>
+	<string name="pref_grant_presence_updates_summary">Preemptively grant and ask for presence subscription for contacts you created</string>
+	<string name="subscriptions">Subscriptions</string>
+	<string name="your_account">Your account</string>
+	<string name="keys">Keys</string>
+	<string name="send_presence_updates">Send presence updates</string>
+	<string name="receive_presence_updates">Receive presence updates</string>
+	<string name="ask_for_presence_updates">Ask for presence updates</string>
+	<string name="attach_choose_picture">Choose picture</string>
+	<string name="attach_take_picture">Take picture</string>
+	<string name="preemptively_grant">Preemptively grant subscription request</string>
+	<string name="error_not_an_image_file">The file you selected is not an image</string>
+	<string name="error_compressing_image">Error while converting the image file</string>
+	<string name="error_file_not_found">File not found</string>
+	<string name="error_io_exception">General I/O error. Maybe you ran out of storage space?</string>
+	<string name="error_security_exception_during_image_copy">The app you used to select this image did not provide us with enough permissions to read the file.\n\n<small>Use a different file manager to choose an image</small></string>
+	<string name="account_status_unknown">Unknown</string>
+	<string name="account_status_disabled">Temporarily disabled</string>
+	<string name="account_status_online">Online</string>
+	<string name="account_status_connecting">Connecting\u2026</string>
+	<string name="account_status_offline">Offline</string>
+	<string name="account_status_unauthorized">Unauthorized</string>
+	<string name="account_status_not_found">Server not found</string>
+	<string name="account_status_no_internet">No connectivity</string>
+	<string name="account_status_regis_fail">Registration failed</string>
+	<string name="account_status_regis_conflict">Username already in use</string>
+	<string name="account_status_regis_success">Registration completed</string>
+	<string name="account_status_regis_not_sup">Server does not support registration</string>
+	<string name="account_status_security_error">Security error</string>
+	<string name="account_status_incompatible_server">Incompatible server</string>
+	<string name="encryption_choice_unencrypted">Unencrypted</string>
+	<string name="encryption_choice_otr">OTR</string>
+	<string name="encryption_choice_pgp">OpenPGP</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>
+	<string name="mgmt_account_publish_avatar">Publish avatar</string>
+	<string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string>
+	<string name="mgmt_account_enable">Enable account</string>
+	<string name="mgmt_account_are_you_sure">Are you sure?</string>
+	<string name="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string>
+	<string name="attach_record_voice">Record voice</string>
+	<string name="account_settings_jabber_id">Jabber ID</string>
+	<string name="account_settings_password">Password</string>
+	<string name="account_settings_example_jabber_id">username@example.com</string>
+	<string name="account_settings_confirm_password">Confirm password</string>
+	<string name="password">Password</string>
+	<string name="confirm_password">Confirm password</string>
+	<string name="passwords_do_not_match">Passwords do not match</string>
+	<string name="invalid_jid">This is not a valid Jabber ID</string>
+	<string name="error_out_of_memory">Out of memory. Image is too large</string>
+	<string name="add_phone_book_text">Do you want to add %s to your address book?</string>
+	<string name="contact_status_online">online</string>
+	<string name="contact_status_free_to_chat">free to chat</string>
+	<string name="contact_status_away">away</string>
+	<string name="contact_status_extended_away">extended away</string>
+	<string name="contact_status_do_not_disturb">do not disturb</string>
+	<string name="contact_status_offline">offline</string>
+	<string name="muc_details_conference">Conference</string>
+	<string name="muc_details_other_members">Other Members</string>
+	<string name="server_info_show_more">Server info</string>
+	<string name="server_info_mam">XEP-0313: MAM</string>
+	<string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+	<string name="server_info_csi">XEP-0352: Client State Indication</string>
+	<string name="server_info_blocking">XEP-0191: Blocking Command</string>
+	<string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
+	<string name="server_info_stream_management">XEP-0198: Stream Management</string>
+	<string name="server_info_pep">XEP-0163: PEP (Avatars / OMEMO)</string>
+	<string name="server_info_http_upload">XEP-0363: HTTP File Upload</string>
+	<string name="server_info_push">XEP-0357: Push</string>
+	<string name="server_info_available">available</string>
+	<string name="server_info_unavailable">unavailable</string>
+	<string name="missing_public_keys">Missing public key announcements</string>
+	<string name="last_seen_now">last seen just now</string>
+	<string name="last_seen_min">last seen 1 minute ago</string>
+	<string name="last_seen_mins">last seen %d minutes ago</string>
+	<string name="last_seen_hour">last seen 1 hour ago</string>
+	<string name="last_seen_hours">last seen %d hours ago</string>
+	<string name="last_seen_day">last seen 1 day ago</string>
+	<string name="last_seen_days">last seen %d days ago</string>
+	<string name="never_seen">never seen</string>
+	<string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string>
+	<string name="unknown_otr_fingerprint">Unknown OTR fingerprint</string>
+	<string name="openpgp_messages_found">OpenPGP encrypted messages found</string>
+	<string name="reception_failed">Reception failed</string>
+	<string name="your_fingerprint">Your fingerprint</string>
+	<string name="otr_fingerprint">OTR fingerprint</string>
+	<string name="omemo_fingerprint">OMEMO fingerprint</string>
+	<string name="omemo_fingerprint_x509">v\\OMEMO fingerprint</string>
+	<string name="omemo_fingerprint_selected_message">OMEMO fingerprint of message</string>
+	<string name="omemo_fingerprint_x509_selected_message">v\\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_omemo_fingerprints">Trust OMEMO Fingerprints</string>
+	<string name="fetching_keys">Fetching keys…</string>
+	<string name="done">Done</string>
+	<string name="verify">Verify</string>
+	<string name="decrypt">Decrypt</string>
+	<string name="conferences">Conferences</string>
+	<string name="search">Search</string>
+	<string name="create_contact">Create Contact</string>
+	<string name="enter_contact">Enter Contact</string>
+	<string name="join_conference">Join Conference</string>
+	<string name="delete_contact">Delete Contact</string>
+	<string name="view_contact_details">View contact details</string>
+	<string name="block_contact">Block contact</string>
+	<string name="unblock_contact">Unblock contact</string>
+	<string name="create">Create</string>
+	<string name="select">Select</string>
+	<string name="contact_already_exists">The contact already exists</string>
+	<string name="join">Join</string>
+	<string name="conference_address">Conference address</string>
+	<string name="conference_address_example">room@conference.example.com</string>
+	<string name="save_as_bookmark">Save as bookmark</string>
+	<string name="delete_bookmark">Delete bookmark</string>
+	<string name="bookmark_already_exists">This bookmark already exists</string>
+	<string name="you">You</string>
+	<string name="action_edit_subject">Edit conference subject</string>
+	<string name="joining_conference">Joining conference…</string>
+	<string name="leave">Leave</string>
+	<string name="contact_added_you">Contact added you to contact list</string>
+	<string name="add_back">Add back</string>
+	<string name="contact_has_read_up_to_this_point">%s has read up to this point</string>
+	<string name="publish">Publish</string>
+	<string name="touch_to_choose_picture">Touch avatar to select picture from gallery</string>
+	<string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string>
+	<string name="publishing">Publishing…</string>
+	<string name="error_publish_avatar_server_reject">The server rejected your publication</string>
+	<string name="error_publish_avatar_converting">Something went wrong while converting your picture</string>
+	<string name="error_saving_avatar">Could not save avatar to disk</string>
+	<string name="or_long_press_for_default">(Or long press to bring back default)</string>
+	<string name="error_publish_avatar_no_server_support">Your server does not support the publication of avatars</string>
+	<string name="private_message">whispered</string>
+	<string name="private_message_to">to %s</string>
+	<string name="send_private_message_to">Send private message to %s</string>
+	<string name="connect">Connect</string>
+	<string name="account_already_exists">This account already exists</string>
+	<string name="next">Next</string>
+	<string name="server_info_session_established">Current session established</string>
+	<string name="additional_information">Additional Information</string>
+	<string name="skip">Skip</string>
+	<string name="disable_notifications">Disable notifications</string>
+	<string name="disable_notifications_for_this_conversation">Disable notifications for this conversation</string>
+	<string name="enable">Enable</string>
+	<string name="conference_requires_password">Conference requires password</string>
+	<string name="enter_password">Enter password</string>
+	<string name="missing_presence_updates">Missing presence updates from contact</string>
+	<string name="request_presence_updates">Please request presence updates from your contact first.\n\n<small>This will be used to determine what client(s) your contact is using.</small></string>
+	<string name="request_now">Request now</string>
+	<string name="delete_fingerprint">Delete Fingerprint</string>
+	<string name="sure_delete_fingerprint">Are you sure you would like to delete this fingerprint?</string>
+	<string name="ignore">Ignore</string>
+	<string name="without_mutual_presence_updates"><b>Warning:</b> Sending this without mutual presence updates could cause unexpected problems.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string>
+	<string name="pref_security_settings">Security</string>
+	<string name="pref_force_encryption">Force end-to-end encryption</string>
+	<string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
+	<string name="pref_allow_message_correction">Allow message correction</string>
+	<string name="pref_allow_message_correction_summary">Allow your contacts to retroactively edit their messages</string>
+	<string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
+	<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
+	<string name="pref_expert_options">Expert settings</string>
+	<string name="pref_expert_options_summary">Please be careful with these</string>
+	<string name="title_activity_about">About Conversations</string>
+	<string name="pref_about_conversations_summary">Build and licensing information</string>
+	<string name="pref_about_message" translatable="false">
+			Conversations+ is the improved version of Conversations.
 			\n\nThe extensions are designed and developed by thedevstack.de
 			\n\nThis program is free software: you can redistribute it and/or modify
 			it under the terms of the GNU General Public License as published by
@@ -309,7 +323,12 @@
 			\n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0)
 			\n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0)
 			\n\nhttps://github.com/timroes/EnhancedListView\n(Apache License, Version 2.0)
-            \n\nhttps://github.com/ankushsachdeva/emojicon\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/leolin310148/ShortcutBadger\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/kyleduo/SwitchButton\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/WhisperSystems/libaxolotl-java\n(GPLv3)
+			\n\nhttps://github.com/vinc3m1/RoundedImageView\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/jdamcd/android-crop\n(Apache License, Version 2.0)
+    		\n\nhttps://github.com/ankushsachdeva/emojicon\n(Apache License, Version 2.0)
             \n\nhttps://github.com/yukuku/ambilwarna\n(Apache License, Version 2.0)
 	</string>
 	<string name="title_pref_quiet_hours">Quiet Hours</string>
@@ -326,13 +345,17 @@
 	<string name="pref_expert_options_other">Other</string>
 	<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="pref_autojoin">Automatically join conferences</string>
+	<string name="pref_autojoin_summary">Respect the autojoin flag in conference bookmarks</string>
 	<string name="toast_message_otr_fingerprint">OTR 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>
+	<string name="conference_shutdown">The conference was shut down</string>
+	<string name="conference_unknown_error">You are no longer in this conference</string>
 	<string name="using_account">using account %s</string>
 	<string name="checking_x">Checking %s on HTTP host</string>
-    <string name="image_file_deleted">The image file has been deleted</string>
 	<string name="not_connected_try_again">You are not connected. Try again later</string>
 	<string name="check_x_filesize">Check %s size</string>
 	<string name="message_options">Message options</string>
@@ -351,7 +374,6 @@
 	<string name="verify_otr">Verify OTR</string>
 	<string name="remote_fingerprint">Remote Fingerprint</string>
 	<string name="scan">scan</string>
-	<string name="or_touch_phones">(or touch phones)</string>
 	<string name="smp">Socialist Millionaire Protocol</string>
 	<string name="shared_secret_hint">Hint or Question</string>
 	<string name="shared_secret_secret">Shared Secret</string>
@@ -368,6 +390,9 @@
 	<string name="conversations_foreground_service">Conversations</string>
 	<string name="pref_keep_foreground_service">Keep service in foreground</string>
 	<string name="pref_keep_foreground_service_summary">Prevents the operating system from killing your connection</string>
+	<string name="pref_export_logs">Export Logs</string>
+	<string name="pref_export_logs_summary">Write logs to SD card</string>
+	<string name="notification_export_logs_title">Writing logs to SD card</string>
 	<string name="choose_file">Choose file</string>
 	<string name="receiving_x_file">Receiving %1$s (%2$d%% completed)</string>
 	<string name="download_x_file">Download %s</string>
@@ -394,6 +419,17 @@
 	<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_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 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>
+	<string name="error_no_keys_to_trust_server_error">There are no usable keys available for this contact.\nFetching new keys from the server has been unsuccessful. Maybe there is something wrong with your contacts server.</string>
+	<string name="error_no_keys_to_trust">There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones.</string>
+	<string name="error_trustkeys_title">Error</string>
 	<string name="fetching_history_from_server">Fetching history from server</string>
 	<string name="no_more_history_on_server">No more history on server</string>
 	<string name="updating">Updating…</string>
@@ -432,8 +468,10 @@
 	<string name="public_conference">Publicly accessible conference</string>
 	<string name="private_conference">Private, members only conference</string>
 	<string name="conference_options">Conference options</string>
-	<string name="members_only">Private (Members only)</string>
+	<string name="members_only">Private, members only</string>
 	<string name="non_anonymous">Non-anonymous</string>
+	<string name="moderated">Moderated</string>
+	<string name="you_are_not_participating">You are not participating</string>
 	<string name="modified_conference_options">Modified conference options!</string>
 	<string name="could_not_modify_conference_options">Could not modify conference options</string>
 	<string name="never">Never</string>
@@ -442,7 +480,7 @@
 	<string name="two_hours">2 hours</string>
 	<string name="eight_hours">8 hours</string>
 	<string name="until_further_notice">Until further notice</string>
-	<string name="pref_input_options">Input options</string>
+	<string name="pref_input_options">Input</string>
 	<string name="pref_enter_is_send">Enter is send</string>
 	<string name="pref_enter_is_send_summary">Use enter key to send message</string>
 	<string name="pref_display_enter_key">Show enter key</string>
@@ -461,7 +499,7 @@
 	<string name="offering_x_file">Offering %s</string>
 	<string name="hide_offline">Hide offline</string>
 	<string name="disable_account">Disable Account</string>
-	<string name="contact_is_typing">%s is typing...</string>
+	<string name="contact_is_typing">%s is typing…</string>
 	<string name="contact_has_stopped_typing">%s has stopped typing</string>
 	<string name="pref_chat_states">Typing notifications</string>
 	<string name="pref_chat_states_summary">Let your contact know when you are writing a new message</string>
@@ -472,7 +510,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>
@@ -494,7 +531,6 @@
 	<string name="none">None</string>
 	<string name="recently_used">Most recently used</string>
 	<string name="choose_quick_action">Choose quick action</string>
-	<string name="file_not_found_on_remote_host">File not found on remote server</string>
 	<string name="search_for_contacts_or_groups">Search for contacts or groups</string>
     <string name="pref_led_notification_color">LED notification color</string>
     <string name="pref_led_notification_color_summary">Change the color of the LED notification</string>
@@ -545,4 +581,79 @@
     <string name="pref_file_transfer_category">File Transfer</string>
     <string name="cplus_not_copied_to_clipboard_empty">Nothing to copy.</string>
     <string name="cplus_me">Me</string>
+	<string name="send_private_message">Send private message</string>
+	<string name="user_has_left_conference">%s has left the conference!</string>
+	<string name="username">Username</string>
+	<string name="username_hint">Username</string>
+	<string name="invalid_username">This is not a valid username</string>
+	<string name="conference_name">Conference name</string>
+	<string name="invalid_conference_name">This is not a valid conference name</string>
+	<string name="download_failed_server_not_found">Download failed: Server not found</string>
+	<string name="download_failed_file_not_found">Download failed: File not found</string>
+	<string name="download_failed_could_not_connect">Download failed: Could not connect to host</string>
+	<string name="account_status_tor_unavailable">Tor network unavailable</string>
+	<string name="server_info_broken">Broken</string>
+	<string name="pref_presence_settings">Presence</string>
+	<string name="pref_away_when_screen_off">Away when screen is off</string>
+	<string name="pref_away_when_screen_off_summary">Marks your resource as away when the screen is turned off</string>
+	<string name="pref_xa_on_silent_mode">Not available in silent mode</string>
+	<string name="pref_xa_on_silent_mode_summary">Marks your resource as not available when device is in silent mode</string>
+	<string name="pref_show_connection_options">Extended connection settings</string>
+	<string name="pref_show_connection_options_summary">Show hostname and port settings when setting up an account</string>
+	<string name="hostname_example">xmpp.example.com</string>
+	<string name="action_add_account_with_certificate">Add account with certificate</string>
+	<string name="unable_to_parse_certificate">Unable to parse certificate</string>
+	<string name="authenticate_with_certificate">Leave empty to authenticate w/ certificate</string>
+	<string name="mam_prefs">Archiving preferences</string>
+	<string name="server_side_mam_prefs">Server-side archiving preferences</string>
+	<string name="fetching_mam_prefs">Fetching archiving preferences. Please wait…</string>
+	<string name="unable_to_fetch_mam_prefs">Unable to fetch archiving preferences</string>
+	<string name="captcha_ocr">Captcha text</string>
+	<string name="captcha_required">Captcha required</string>
+	<string name="captcha_hint">enter the text from the image</string>
+	<string name="certificate_chain_is_not_trusted">Certificate chain is not trusted</string>
+	<string name="jid_does_not_match_certificate">Jabber ID does not match certificate</string>
+	<string name="action_renew_certificate">Renew certificate</string>
+	<string name="error_fetching_omemo_key">Error fetching OMEMO key!</string>
+	<string name="verified_omemo_key_with_certificate">Verified OMEMO key with certificate!</string>
+	<string name="device_does_not_support_certificates">Your device does not support the selection of client certificates!</string>
+	<string name="pref_connection_options">Connection</string>
+	<string name="account_settings_hostname">Hostname</string>
+	<string name="account_settings_port">Port</string>
+	<string name="not_a_valid_port">This is not a valid port number</string>
+	<string name="not_valid_hostname">This is not a valid hostname</string>
+	<string name="connected_accounts">%1$d of %2$d accounts connected</string>
+	<plurals name="x_messages">
+		<item quantity="one">%d message</item>
+		<item quantity="other">%d messages</item>
+	</plurals>
+	<string name="shared_file_with_x">Shared file with %s</string>
+	<string name="shared_image_with_x">Shared image with %s</string>
+	<string name="no_storage_permission">Conversations need access to external storage</string>
+	<string name="sync_with_contacts">Synchronize with contacts</string>
+	<string name="sync_with_contacts_long">Conversations wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nConversations will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string>
+	<string name="certificate_information">Certificate Information</string>
+	<string name="certificate_subject">Subject</string>
+	<string name="certificate_issuer">Issuer</string>
+	<string name="certificate_cn">Common Name</string>
+	<string name="certificate_o">Organization</string>
+	<string name="certificate_sha1">SHA-1</string>
+	<string name="certicate_info_not_available">(Not available)</string>
+	<string name="certificate_not_found">No certificate found</string>
+	<string name="notify_on_all_messages">Notify on all messages</string>
+	<string name="notify_only_when_highlighted">Notify only when highlighted</string>
+	<string name="notify_never">Notifications disabled</string>
+	<string name="notify_paused">Notifications paused</string>
+	<string name="always">Always</string>
+	<string name="automatically">Automatically</string>
+	<string name="battery_optimizations_enabled">Battery optimizations enabled</string>
+	<string name="battery_optimizations_enabled_explained">Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\nIt is recommended to disable those.</string>
+	<string name="battery_optimizations_enabled_dialog">Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string>
+	<string name="disable">Disable</string>
+	<string name="selection_too_large">The selected area is too large</string>
+	<string name="no_accounts">(No activated accounts)</string>
+	<string name="this_field_is_required">This field is required</string>
+	<string name="retry_decryption">Retry decryption</string>
+	<string name="pref_omemo_enabled_summary">Enable OMEMO?</string>
+	<string name="pref_omemo_enabled_title">Enable OMEMO</string>
 </resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index b98a37fc..e8572d9d 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -4,8 +4,18 @@
         <item name="android:layout_height">1.5dp</item>
         <item name="android:background">@color/black12</item>
     </style>
-    <style name="Tag">
-
+    <style name="MD">
+        <item name="animationVelocity">6</item>
+        <item name="insetBottom">16dp</item>
+        <item name="insetTop">16dp</item>
+        <item name="insetLeft">16dp</item>
+        <item name="insetRight">16dp</item>
+        <item name="measureFactor">1.4</item>
+        <item name="offDrawable">@drawable/switch_back_off</item>
+        <item name="onDrawable">@drawable/switch_back_on</item>
+        <item name="thumbDrawable">@drawable/switch_thumb</item>
+        <item name="thumb_margin">-17dp</item>
+        <item name="android:padding">16dp</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 5c67203b..0f8b95bb 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -18,6 +18,7 @@
         <item name="attr/icon_download">@drawable/ic_action_download</item>
         <item name="attr/icon_edit">@drawable/ic_action_edit</item>
         <item name="attr/icon_edit_dark">@drawable/ic_action_edit_dark</item>
+        <item name="attr/icon_done">@drawable/ic_action_done</item>
 
         <item name="attr/icon_group">@drawable/ic_action_group</item>
         <item name="attr/icon_new">@drawable/ic_action_new</item>
@@ -38,8 +39,8 @@
     </style>
 
     <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
-        <item name="android:background">@color/green500</item>
-        <item name="android:backgroundStacked">@color/green700</item>
+        <item name="android:background">@color/primary</item>
+        <item name="android:backgroundStacked">@color/primary_dark</item>
         <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
         <item name="android:icon">@android:color/transparent</item>
     </style>