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

Merge branch 'develop' into element_4090

Browse Source 
# Conflicts:
#	CHANGES.rst
This commit is contained in:
Stefan Ceriu
2021-07-13 11:30:16 +03:00
parent 8ff42fec54 216dcd87ca
commit ca582c21f2
73 changed files with 1932 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Assets/en.lproj/Vector.strings
+13
View File
@@ -710,6 +710,7 @@ Tap the + to start adding people.";
"room_details_topic" = "Topic";
"room_details_favourite_tag" = "Favourite";
"room_details_low_priority_tag" = "Low priority";
"room_details_notifs" = "Notifications";
"room_details_mute_notifs" = "Mute notifications";
"room_details_direct_chat" = "Direct Chat";
"room_details_access_section"="Who can access this room?";
@@ -772,6 +773,17 @@ Tap the + to start adding people.";
"room_details_copy_room_address" = "Copy Room Address";
"room_details_copy_room_url" = "Copy Room URL";
// Room Notification Settings
"room_notifs_settings_notify_me_for" = "Notify me for";
"room_notifs_settings_all_messages" = "All Messages";
"room_notifs_settings_mentions_and_keywords" = "Mentions and Keywords only";
"room_notifs_settings_none" = "None";
"room_notifs_settings_done_action" = "Done";
"room_notifs_settings_cancel_action" = "Cancel";
"room_notifs_settings_manage_notifications" = "You can manage notifications in %@";
"room_notifs_settings_account_settings" = "Account settings";
"room_notifs_settings_encrypted_room_notice" = "Please note that mentions & keyword notifications are not available in encrypted rooms on mobile.";
// Group Details
"group_details_title" = "Community Details";
"group_details_home" = "Home";
@@ -1375,6 +1387,7 @@ Tap the + to start adding people.";
"key_verification_verify_qr_code_information_other_device" = "Scan the code below to verify:";
"key_verification_verify_qr_code_emoji_information" = "Verify by comparing unique emoji.";
"key_verification_verify_qr_code_scan_code_action" = "Scan their code";
"key_verification_verify_qr_code_scan_code_other_device_action" = "Scan with this device";
"key_verification_verify_qr_code_cannot_scan_action" = "Can't scan?";
"key_verification_verify_qr_code_start_emoji_action" = "Verify by emoji";