Merge branch 'develop' into doug/4484_contacts_access

This commit is contained in:
Doug
2021-08-11 17:15:23 +01:00
57 changed files with 1240 additions and 1516 deletions
+4 -2
View File
@@ -554,7 +554,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";
@@ -848,7 +848,8 @@ Tap the + to start adding people.";
"event_formatter_message_edited_mention" = "(edited)";
"event_formatter_call_connecting" = "Connecting…";
"event_formatter_call_ringing" = "Ringing…";
"event_formatter_call_has_ended" = "Call ended %@";
"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";
@@ -1691,3 +1692,4 @@ 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 your recording to stop or listen";
"voice_message_lock_screen_placeholder" = "Voice message";