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

Merge branch 'develop' into doug/4479_media_size_selection

Browse Source 
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
This commit is contained in:
Doug
2021-08-16 10:01:54 +01:00
parent abd1bd2a41 5b50d07d79
commit 7dea78bae9
151 changed files with 2364 additions and 2270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Assets/en.lproj/Vector.strings
+15 -9
View File
@@ -495,11 +495,13 @@ Tap the + to start adding people.";
"settings_security" = "SECURITY";
"settings_enable_push_notif" = "Notifications on this device";
"settings_device_notifications" = "Device notifications";
"settings_show_decrypted_content" = "Show decrypted content";
"settings_global_settings_info" = "Global notification settings are available on your %@ web client";
"settings_pin_rooms_with_missed_notif" = "Pin rooms with missed notifications";
"settings_pin_rooms_with_unread" = "Pin rooms with unread messages";
"settings_on_denied_notification" = "Notifications are denied for %@, please allow them in your device settings";
"settings_notifications_disabled_alert_title" = "Notifications disabled";
"settings_notifications_disabled_alert_message" = "To enable notifications, go to your device settings.";
//"settings_enable_all_notif" = "Enable all notifications";
//"settings_messages_my_display_name" = "Msg containing my display name";
//"settings_messages_my_user_name" = "Msg containing my user name";
@@ -555,7 +557,7 @@ Tap the + to start adding people.";
"settings_fail_to_update_password" = "Fail to update password";
"settings_password_updated" = "Your password has been updated";
"settings_add_3pid_password_title_email" = "Add email adress";
"settings_add_3pid_password_title_email" = "Add email address";
"settings_add_3pid_password_title_msidsn" = "Add phone number";
"settings_add_3pid_password_message" = "To continue, please enter your password";
"settings_add_3pid_invalid_password_message" = "Invalid credentials";
@@ -847,14 +849,17 @@ Tap the + to start adding people.";
"event_formatter_rerequest_keys_part1_link" = "Re-request encryption keys";
"event_formatter_rerequest_keys_part2" = " from your other sessions.";
"event_formatter_message_edited_mention" = "(edited)";
"event_formatter_call_voice" = "Voice call";
"event_formatter_call_video" = "Video call";
"event_formatter_call_connecting" = "Connecting…";
"event_formatter_call_ringing" = "Ringing…";
"event_formatter_call_has_ended" = "Ended %@";
"event_formatter_call_you_currently_in" = "Active call";
"event_formatter_call_you_declined" = "You declined this call";
"event_formatter_call_you_missed" = "You missed this call";
"event_formatter_call_has_ended" = "Call ended";
"event_formatter_call_has_ended_with_time" = "Call ended • %@";
"event_formatter_call_incoming_voice" = "Incoming voice call";
"event_formatter_call_incoming_video" = "Incoming video call";
"event_formatter_call_active_voice" = "Active voice call";
"event_formatter_call_active_video" = "Active video call";
"event_formatter_call_you_declined" = "Call declined";
"event_formatter_call_missed_voice" = "Missed voice call";
"event_formatter_call_missed_video" = "Missed video call";
"event_formatter_call_connection_failed" = "Connection failed";
"event_formatter_call_back" = "Call back";
"event_formatter_call_decline" = "Decline";
@@ -1689,4 +1694,5 @@ Tap the + to start adding people.";
"voice_message_release_to_send" = "Hold to record, release to send";
"voice_message_remaining_recording_time" = "%@s left";
"voice_message_stop_locked_mode_recording" = "Tap on the wavelength to stop and playback";
"voice_message_stop_locked_mode_recording" = "Tap on your recording to stop or listen";
"voice_message_lock_screen_placeholder" = "Voice message";