Merge branch 'develop' into element_4642

This commit is contained in:
ismailgulek
2021-08-04 10:57:34 +03:00
committed by GitHub
30 changed files with 143 additions and 45 deletions
+3 -1
View File
@@ -492,11 +492,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";