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

Merge branch 'develop' into riot_2918

Browse Source 
# Conflicts:
#	Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift
This commit is contained in:
SBiOSoftWhare
2020-03-30 09:55:40 +02:00
parent eb940c29eb ba64f7a232
commit edd80b0493
6 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Assets/en.lproj/Vector.strings
+1
View File
@@ -260,6 +260,7 @@
"room_participants_action_security_status_verified" = "Verified";
"room_participants_action_security_status_verify" = "Verify";
"room_participants_action_security_status_warning" = "Warning";
"room_participants_action_security_status_loading" = "Loading…";
"room_participants_security_loading" = "Loading…";
"room_participants_security_information_room_not_encrypted" = "Messages in this room are not end-to-end encrypted.";