aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res/values/strings.xml')
-rw-r--r--src/main/res/values/strings.xml26
1 files changed, 18 insertions, 8 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 62b415cf3..34c227331 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -75,7 +75,7 @@
<string name="sharing_files_please_wait">Sharing files. Please wait…</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="clear_histor_msg">Are you sure you want to delete all messages within this conversation?\n\n<b>Warning:</b> This will not delete copies of those messages that are 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 device</string>
@@ -295,8 +295,8 @@
<string name="send_again">Send again</string>
<string name="file_url">File URL</string>
<string name="url_copied_to_clipboard">URL copied to clipboard</string>
- <string name="scan_qr_code">Scan barcode</string>
- <string name="show_qr_code">Show barcode</string>
+ <string name="scan_qr_code">Scan QR code</string>
+ <string name="show_qr_code">Show QR code</string>
<string name="show_block_list">Show block list</string>
<string name="account_details">Account details</string>
<string name="verify_otr">Verify OTR</string>
@@ -611,19 +611,19 @@
<string name="this_device_has_been_verified">This device has been verified</string>
<string name="copy_fingerprint">Copy fingerprint</string>
<string name="all_omemo_keys_have_been_verified">All OMEMO keys have been verified</string>
- <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Barcode does not contain fingerprints for this conversation.</string>
+ <string name="barcode_does_not_contain_fingerprints_for_this_conversation">QR code does not contain fingerprints for this conversation.</string>
<string name="verified_fingerprints">Verified fingerprints</string>
- <string name="use_camera_icon_to_scan_barcode">Use the camera to scan a contacts barcode</string>
+ <string name="use_camera_icon_to_scan_barcode">Use the camera to scan a contacts QR code</string>
<string name="please_wait_for_keys_to_be_fetched">Please wait for keys to be fetched</string>
- <string name="share_as_barcode">Share as Barcode</string>
+ <string name="share_as_barcode">Share as QR code</string>
<string name="share_as_uri">Share as XMPP URI</string>
<string name="share_as_http">Share as HTTP link</string>
<string name="blindly_trusted_omemo_keys">Blindly trusted OMEMO keys</string>
<string name="pref_blind_trust_before_verification">Blind Trust Before Verification</string>
<string name="pref_blind_trust_before_verification_summary">Automatically trust all new devices from contacts that haven’t been verified before.</string>
<string name="not_trusted">Untrusted</string>
- <string name="invalid_barcode">Invalid barcode</string>
- <string name="verify_with_qr_code">verify with barcode</string>
+ <string name="invalid_barcode">Invalid QR code</string>
+ <string name="verify_with_qr_code">verify with QR code</string>
<string name="i_followed_this_link_from_a_trusted_source">I followed this link from a trusted source</string>
<string name="verifying_omemo_keys_trusted_source">You are about to verify the OMEMO keys of %1$s after clicking a link. This is only secure if you followed this link from a trusted source where only %2$s could have published this link.</string>
<string name="verify_omemo_keys">Verify OMEMO fingerprints</string>
@@ -826,4 +826,14 @@
<string name="action_group_details">Group details</string>
<string name="view_media">View media</string>
<string name="media_browser">Media browser</string>
+ <string name="account_status_stream_opening_error">Stream opening error</string>
+ <string name="action_open">Open</string>
+ <string name="action_delete">Delete</string>
+ <string name="security_violation_not_attaching_file">File omitted due to security violation.</string>
+ <string name="delete_file_dialog">Delete file</string>
+ <string name="delete_file_dialog_msg">Are you sure you want to delete this file?\n\n<b>Warning:</b> This will not delete copies of this file that are stored on other devices or servers. </string>
+ <string name="cancelled">cancelled</string>
+ <string name="remote_server_timeout">Remote server timeout</string>
+ <string name="already_drafting_message">You are already drafting a message.</string>
+
</resources>