Merge branch 'siacs/master' into development

1 files changed, 18 insertions, 13 deletions

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 404e7a02a..982c3ab84 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
 	<string name="app_name" translatable="false">Pix-Art Messenger</string>
 	<string name="action_settings">Settings</string>
 	<string name="action_add">New conversation</string>
@@ -104,7 +103,7 @@
 	<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_notification_settings">Notification Settings</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>
@@ -113,12 +112,12 @@
 	<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 Options</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 Pix-Art Messenger</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_ui_options">UI Options</string>
+	<string name="pref_ui_options">UI</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>
@@ -278,12 +277,14 @@
 	<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_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 options</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 Pix-Art Messenger</string>
 	<string name="pref_about_conversations_summary">Build and licensing information</string>
@@ -465,7 +466,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>
@@ -541,19 +542,20 @@
 	<string name="download_started">Download started</string>
 	<string name="account_status_tor_unavailable">Tor network unavailable</string>
 	<string name="server_info_broken">Broken</string>
-	<string name="pref_presence_settings">Presence settings</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="update_info">Pix-Art Messenger is checking for an update. If an update is available you will be asked, if you want to update your version. The update process is downloading and installing the new version automatically.</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 options</string>
-	<string name="pref_show_connection_options_summary">Show hostname and port options when setting up an account</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>
@@ -570,7 +572,7 @@
 	<string name="pref_plugins_summary">Download plugins for Pix-Art Messenger</string>
 	<string name="pref_plugin_location">Share-Location</string>
 	<string name="pref_plugin_location_summary">Send and receive locations</string>
-	<string name="pref_connection_options">Connection options</string>
+	<string name="pref_connection_options">Connection</string>
 	<string name="pref_use_tor">Connect via Tor</string>
 	<string name="pref_use_tor_summary">Tunnel all connections through the Tor network. Requires Orbot</string>
 	<string name="account_settings_hostname">Hostname</string>
@@ -594,7 +596,7 @@
 	<string name="certificate_issuer">Issuer</string>
 	<string name="certificate_cn">Common Name</string>
 	<string name="certificate_o">Organization</string>
-	<string name="certificate_sha1">SHA1</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>
@@ -602,7 +604,7 @@
 	<string name="notify_never">Notifications disabled</string>
 	<string name="notify_paused">Notifications paused</string>
 	<string name="pref_picture_compression">Compress Pictures</string>
-	<string name="pref_picture_compression_summary">Resize and compressed pictures</string>
+	<string name="pref_picture_compression_summary">Resize and compress pictures</string>
 	<string name="always">Always</string>
 	<string name="automatically">Automatically</string>
 	<string name="battery_optimizations_enabled">Battery optimizations enabled</string>
@@ -616,4 +618,7 @@
 	<string name="no_accounts">(No activated accounts)</string>
 	<string name="this_field_is_required">This field is required</string>
 	<string name="no_participants">No participants</string>
+	<string name="correct_message">Correct message</string>
+	<string name="send_corrected_message">Send corrected message</string>
+>>>>>>> refs/heads/pr/73
 </resources>