felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 00:52:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
manuroe
2020-04-29 09:16:40 +02:00
parent bc367b6334 9808c550c7
commit 4f762cb7cf
11 changed files with 247 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Assets/en.lproj/Vector.strings
+7 -5
View File
@@ -1038,7 +1038,7 @@
"key_verification_other_session_title" = "Verify session";
"key_verification_new_session_title" = "Verify your new session";
"key_verification_this_session_title" = "Verify this session";
"key_verification_user_title" = "verify them";
"key_verification_user_title" = "Verify them";
"device_verification_security_advice_emoji" = "Compare the unique emoji, ensuring they appear in the same order.";
"device_verification_security_advice_number" = "Compare the numbers, ensuring they appear in the same order.";
"device_verification_cancelled" = "The other party cancelled the verification.";
@@ -1093,14 +1093,16 @@
// Device
"device_verification_verified_title" = "Verified!";
"device_verification_verified_description_1" = "You've successfully verified this session.";
"device_verification_verified_description_2" = "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.";
"device_verification_verified_got_it_button" = "Got it";
"key_verification_verified_new_session_title" = "New session verified!";
"key_verification_verified_other_session_information" = "You can now read secure messages on your other session, and other users will know they can trust it.";
"key_verification_verified_new_session_information" = "You can now read secure messages on your new device, and other users will know they can trust it.";
"key_verification_verified_this_session_information" = "You can now read secure messages on this device, and other users will know they can trust it.";
// User
"key_verification_verified_user_description_1" = "You’ve successfully verified this user.";
"key_verification_verified_user_description_2" = "Messages with this user in this room are end-to-end encrypted and can’t be read by third parties.";
"key_verification_verified_user_information" = "Messages with this user are end-to-end encrypted and can't be read by third parties.";
// MARK: Emoji
"device_verification_emoji_dog" = "Dog";