6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Crypto

Browse Source
This commit is contained in:
Benoit Marty
2019-05-16 10:23:57 +02:00
committed by Benoit Marty
parent 6aae943e77
commit 1436667e7d
303 changed files with 25671 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/res/values/integers.xml
View File

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="default_animation_duration">500</integer>
<integer name="rtl_mirror_flip">0</integer>
<integer name="splash_animation_velocity">750</integer>
<integer name="number_of_emoji_per_line">4</integer>
</resources>

58
vector/src/main/res/values/strings.xml
View File

@ -30,6 +30,7 @@
<string name="title_activity_choose_sticker">Send a sticker</string>
<string name="title_activity_keys_backup_setup">Key Backup</string>
<string name="title_activity_keys_backup_restore">Use Key Backup</string>
<string name="title_activity_verify_device">Verify device</string>
<!-- Signing out screen -->
@ -993,6 +994,7 @@
<string name="encryption_information_blocked">Blacklisted</string>
<string name="encryption_information_unknown_device">unknown device</string>
<string name="encryption_information_unknown_ip">unknown ip</string>
<string name="encryption_information_none">none</string>
<string name="encryption_information_verify">Verify</string>
@ -1100,10 +1102,20 @@
<!-- share keys -->
<string name="you_added_a_new_device">You added a new device \'%s\', which is requesting encryption keys.</string>
<string name="you_added_a_new_device_with_info">A new device is requesting encryption keys.\nDevice name: %1$s\nLast seen: %2$s\nIf you didn’t log in on another device, ignore this request.</string>
<string name="your_unverified_device_requesting">Your unverified device \'%s\' is requesting encryption keys.</string>
<string name="your_unverified_device_requesting_with_info">An unverified device is requesting encryption keys.\nDevice name: %1$s\nLast seen: %2$s\nIf you didn’t log in on another device, ignore this request.</string>
<string name="start_verification">Start verification</string>
<!-- Keep the label as small as possible-->
<string name="start_verification_short_label">Verify</string>
<string name="share_without_verifying">Share without verifying</string>
<!-- Keep the label as small as possible-->
<string name="share_without_verifying_short_label">Share</string>
<string name="key_share_request">Key Share Request</string>
<string name="ignore_request">Ignore request</string>
<!-- Keep the label as small as possible-->
<string name="ignore_request_short_label">Ignore</string>
<!-- conference call -->
<string name="conference_call_warning_title">Warning!</string>
@ -1399,7 +1411,51 @@ Why choose Riot.im?
<string name="autodiscover_invalid_response">Invalid homeserver discovery response</string>
<string name="autodiscover_well_known_autofill_dialog_title">"Autocomplete Server Options</string>
<string name="autodiscover_well_known_autofill_dialog_message">Riot detected a custom server configuration for your userId domain \"%s\":\n%s</string>
<string name="autodiscover_well_known_autofill_dialog_message">Riot detected a custom server configuration for your userId domain \"%1$s\":\n%2$s</string>
<string name="autodiscover_well_known_autofill_confirm">Use Config</string>
<string name="sas_verify_title">Verify by comparing a short text string.</string>
<string name="sas_security_advise">For maximum security, we recommend you do this in person or use another trusted means of communication.</string>
<string name="sas_verify_start_button_title">Begin Verifying</string>
<string name="sas_incoming_request_title">Incoming Verification Request</string>
<string name="sas_incoming_request_description">Verify this device to mark it as trusted. Trusting devices of partners gives you extra peace of mind when using end-to-end encrypted messages."</string>
<string name="sas_incoming_request_description_2">Verifying this device will mark it as trusted, and also mark your device as trusted to the partner."</string>
<string name="sas_emoji_description">Verify this device by confirming the following emoji appear on the screen of the partner"</string>
<string name="sas_decimal_description">Verify this device by confirming the following numbers appear on the screen of the partner"</string>
<string name="sas_incoming_verification_request_dialog">You received an incoming verification request.</string>
<string name="sas_view_request_action">View request</string>
<string name="sas_waiting_for_partner">Waiting for partner to confirm…</string>
<string name="sas_verified">Verified!</string>
<string name="sas_verified_successful">You\'ve successfully verified this device.</string>
<string name="sas_verified_successful_description">Secure messages with this user are end-to-end encrypted and not able to be read by third parties.</string>
<string name="sas_got_it">Got it</string>
<string name="sas_verifying_keys">Nothing appearing? Not all clients supports interactive verification yet. Use legacy verification.</string>
<string name="sas_legacy_verification_button_title">Use legacy verification.</string>
<string name="sas_verification_request_notification_channel_title">Key Verification</string>
<string name="sas_cancelled_dialog_title">Request Cancelled</string>
<string name="sas_cancelled_by_other">The other party cancelled the verification.\n%s</string>
<string name="sas_cancelled_by_me">The verification is canceled.\nReason: %s</string>
<string name="sas_verification_request_notification_channel">Interactive Device Verification</string>
<string name="sas_incoming_request_notif_title">Verification Request</string>
<string name="sas_incoming_request_notif_content">%s wants to verify your device</string>
<!-- SAS Errors -->
<string name="sas_error_m_user">The user cancelled the verification</string>
<string name="sas_error_m_timeout">The verification process timed out</string>
<string name="sas_error_m_unknown_transaction">The device does not know about that transaction</string>
<string name="sas_error_m_unknown_method">The device can’t agree on a key agreement, hash, MAC, or SAS method</string>
<string name="sas_error_m_mismatched_commitment">The hash commitment did not match</string>
<string name="sas_error_m_mismatched_sas">The SAS did not match</string>
<string name="sas_error_m_unexpected_message">The device received an unexpected message</string>
<string name="sas_error_m_invalid_message">An invalid message was received</string>
<string name="sas_error_m_key_mismatch">Key mismatch</string>
<string name="sas_error_m_user_error">User mismatch</string>
<string name="sas_error_unknown">Unknown Error</string>
</resources>

8
vector/src/main/res/values/styles_riot.xml
View File

@ -136,6 +136,14 @@
<item name="colorControlHighlight">?colorAccent</item>
</style>
<style name="AlerterButton" parent="Widget.AppCompat.Button.Borderless.Colored">
<item name="colorAccent">@android:color/white</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">false</item>
<item name="colorControlHighlight">@android:color/white</item>
</style>
<style name="VectorSearches.EditText" parent="Widget.AppCompat.EditText">
<item name="android:textCursorDrawable">@drawable/searches_cursor_background</item>
<item name="android:background">@android:color/transparent</item>