diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml
index 9890e04f0..8df12624a 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -192,6 +192,7 @@
     <string name="nc_diagnose_app_users_amount">Registered users</string>
     <string name="nc_diagnose_app_version_title">App version</string>
     <string name="nc_diagnose_battery_optimization_ignored">Battery optimization is ignored, all fine</string>
+    <string name="nc_diagnose_battery_optimization_not_ignored">Battery optimization is enabled which might cause issues. You should disable battery optimization!</string>
     <string name="nc_diagnose_battery_optimization_title">Battery settings</string>
     <string name="nc_diagnose_device_name_title">Device</string>
     <string name="nc_diagnose_dialog_open_checklist">Open troubleshooting checklist</string>
@@ -333,6 +334,7 @@
     <string name="nc_notification_channel_uploads">Uploads</string>
     <string name="nc_notification_channel_uploads_description">Notify about upload progress</string>
     <string name="nc_notification_settings">Notification settings</string>
+    <string name="nc_notification_warning">Notifications are not set up correctly</string>
     <string name="nc_notifications_troubleshooting_dialog_text">Notification permission and battery settings are correctly set up to receive notifications. If you have problems to receive notifications anyway, please check if the notification channels for calls and messages are enabled. Further help can be found at DontKillMyApp.com or at the troubleshooting checklist. If this does not help, please go to diagnosis screen and send a bug report.</string>
     <string name="nc_notifications_troubleshooting_dialog_title">Notification troubleshooting</string>
     <string name="nc_notify_me_always">Always notify</string>
@@ -429,6 +431,7 @@
     <string name="nc_settings_advanced_title">Advanced</string>
     <string name="nc_settings_appearance">Appearance</string>
     <string name="nc_settings_call_ringtone">Calls</string>
+    <string name="nc_settings_contact_admin_of">Please contact the administrator of</string>
     <string name="nc_settings_diagnose_subtitle">Open diagnosis screen to check settings or create bug report</string>
     <string name="nc_settings_diagnose_title">Diagnosis</string>
     <string name="nc_settings_incognito_keyboard_desc">Instructs keyboard to disable personalized learning (without guarantees)</string>
@@ -469,6 +472,7 @@
     <string name="nc_settings_server_almost_eol">The server version is very old and will not be supported in the next release!</string>
     <string name="nc_settings_server_eol">The server version is too old and not supported by this version of the Android app</string>
     <string name="nc_settings_server_eol_title">Unsupported server</string>
+    <string name="nc_settings_server_notification_app_not_installed_title">Server notifications app not installed</string>
     <string name="nc_settings_theme_battery_saver">Set by Battery Saver</string>
     <string name="nc_settings_theme_dark">Dark</string>
     <string name="nc_settings_theme_follow_system">Use system default</string>
@@ -494,6 +498,8 @@
     <string name="nc_shared_items_empty">No shared items</string>
     <string name="nc_shared_items_location">Location</string>
     <string name="nc_shared_location">Shared location</string>
+    <string name="nc_show_notification_warning_description">When notifications are not set up correctly, show a warning</string>
+    <string name="nc_show_notification_warning_title">Show notification warning</string>
     <string name="nc_sort_by">Sort by</string>
     <string name="nc_start_time">Start time</string>
     <string name="nc_switch_account">Switch account</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 68d9fe74b..5ca1c3896 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -192,6 +192,7 @@
     <string name="nc_diagnose_app_users_amount">Registrierte Benutzer</string>
     <string name="nc_diagnose_app_version_title">App-Version</string>
     <string name="nc_diagnose_battery_optimization_ignored">Batterieoptimierung wird ignoriert, alles in Ordnung</string>
+    <string name="nc_diagnose_battery_optimization_not_ignored">Die Batterieoptimierung ist aktiviert und könnte Probleme verursachen. Dies sollte geändert werden!</string>
     <string name="nc_diagnose_battery_optimization_title">Batterie-Einstellungen</string>
     <string name="nc_diagnose_device_name_title">Gerät</string>
     <string name="nc_diagnose_dialog_open_checklist">Checkliste zur Fehlerbehebung öffnen</string>
@@ -333,6 +334,7 @@
     <string name="nc_notification_channel_uploads">Uploads</string>
     <string name="nc_notification_channel_uploads_description">Über den Hochlade-Fortschritt benachrichtigen</string>
     <string name="nc_notification_settings">Benachrichtigungseinstellungen</string>
+    <string name="nc_notification_warning">Benachrichtigungen sind nicht korrekt konfiguriert</string>
     <string name="nc_notifications_troubleshooting_dialog_text">Benachrichtigungsberechtigung und Akkueinstellungen sind korrekt eingerichtet, um Benachrichtigungen zu erhalten. Sollten Sie trotzdem Probleme mit den Benachrichtigungen haben, prüfen Sie bitte, ob die Benachrichtigungskanäle für Anrufe und Nachrichten aktiviert sind. Weitere Hilfe finden Sie unter DontKillMyApp.com oder in der Checkliste zur Fehlerbehebung. Wenn dies nicht hilft, gehen Sie bitte zur Diagnoseseite und senden Sie einen Fehlerbericht.</string>
     <string name="nc_notifications_troubleshooting_dialog_title">Fehlerbehebung bei Benachrichtigungen</string>
     <string name="nc_notify_me_always">Immer benachrichtigen</string>
@@ -429,6 +431,7 @@
     <string name="nc_settings_advanced_title">Erweitert</string>
     <string name="nc_settings_appearance">Aussehen</string>
     <string name="nc_settings_call_ringtone">Anrufe</string>
+    <string name="nc_settings_contact_admin_of">Bitte kontaktieren Sie den Administrator von</string>
     <string name="nc_settings_diagnose_subtitle">Die Diagnoseseite öffnen, um die Einstellungen zu überprüfen oder einen Fehlerbericht zu erstellen</string>
     <string name="nc_settings_diagnose_title">Diagnose</string>
     <string name="nc_settings_incognito_keyboard_desc">Weist die Tastatur an, das personalisierte Lernen zu deaktivieren (ohne Garantien)</string>
@@ -469,6 +472,7 @@
     <string name="nc_settings_server_almost_eol">Die Serverversion ist sehr alt und wird ab dem nächsten Update nicht mehr unterstützt</string>
     <string name="nc_settings_server_eol">Die Serverversion ist zu alt und wird von dieser Version der Android-App nicht unterstützt</string>
     <string name="nc_settings_server_eol_title">Nicht unterstützter Server</string>
+    <string name="nc_settings_server_notification_app_not_installed_title">Server Benachrichtigungs App ist nicht installiert</string>
     <string name="nc_settings_theme_battery_saver">Durch Energiesparmodus gesetzt</string>
     <string name="nc_settings_theme_dark">Dunkel</string>
     <string name="nc_settings_theme_follow_system">Systemstandard verwenden</string>
@@ -494,6 +498,8 @@
     <string name="nc_shared_items_empty">Keine geteilten Elemente</string>
     <string name="nc_shared_items_location">Ort</string>
     <string name="nc_shared_location">Geteilter Ort</string>
+    <string name="nc_show_notification_warning_description">Wenn Benachrichtigungen nicht korrekt konfiguriert sind, zeige eine Warnung</string>
+    <string name="nc_show_notification_warning_title">Zeige Benachrichtigungs Warnung</string>
     <string name="nc_sort_by">Sortiere nach</string>
     <string name="nc_start_time">Startzeit</string>
     <string name="nc_switch_account">Konto wechseln</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index d4067b4d8..ac4768a64 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -192,6 +192,7 @@
     <string name="nc_diagnose_app_users_amount">已註冊用戶</string>
     <string name="nc_diagnose_app_version_title">應用程式版本</string>
     <string name="nc_diagnose_battery_optimization_ignored">略過電池優化，所有都好</string>
+    <string name="nc_diagnose_battery_optimization_not_ignored">電池最佳化已啟用，這可能會造成問題。您應該停用電池最佳化！</string>
     <string name="nc_diagnose_battery_optimization_title">電池設定</string>
     <string name="nc_diagnose_device_name_title">裝置</string>
     <string name="nc_diagnose_dialog_open_checklist">打開排憂解難清單：</string>
@@ -333,6 +334,7 @@
     <string name="nc_notification_channel_uploads">上傳</string>
     <string name="nc_notification_channel_uploads_description">通知上傳進度</string>
     <string name="nc_notification_settings">通知設定</string>
+    <string name="nc_notification_warning">通知設定不正確</string>
     <string name="nc_notifications_troubleshooting_dialog_text">通知權限和電池設定已正確設置以接收通知。如果您仍然無法接收通知，請檢查是否已啟用通話和訊息的通知通道。您可以在 DontKillMyApp.com 或故障排除檢查清單中找到進一步的幫助。如果這些方法無法解決問題，請轉到診斷畫面並發送錯誤報告。</string>
     <string name="nc_notifications_troubleshooting_dialog_title">解決通知問題</string>
     <string name="nc_notify_me_always">一律通知</string>
@@ -429,6 +431,7 @@
     <string name="nc_settings_advanced_title">進階</string>
     <string name="nc_settings_appearance">外觀</string>
     <string name="nc_settings_call_ringtone">通話</string>
+    <string name="nc_settings_contact_admin_of">請聯絡以下服務的管理員：</string>
     <string name="nc_settings_diagnose_subtitle">打開診斷畫面以檢查設定或建立錯誤報告</string>
     <string name="nc_settings_diagnose_title">診斷</string>
     <string name="nc_settings_incognito_keyboard_desc">指示鍵盤禁用個性化學習（無保證）</string>
@@ -469,6 +472,7 @@
     <string name="nc_settings_server_almost_eol">伺服器版本非常舊，下一發布將不再支持版本！</string>
     <string name="nc_settings_server_eol">伺服器版本太舊，此版本的Android應用程式不支持該伺服器版本</string>
     <string name="nc_settings_server_eol_title">不支援伺服器</string>
+    <string name="nc_settings_server_notification_app_not_installed_title">伺服器通知應用程式未安裝</string>
     <string name="nc_settings_theme_battery_saver">由省電模式設定</string>
     <string name="nc_settings_theme_dark">深色</string>
     <string name="nc_settings_theme_follow_system">使用系統預設</string>
@@ -494,6 +498,8 @@
     <string name="nc_shared_items_empty">沒有已分享的項目</string>
     <string name="nc_shared_items_location">位置</string>
     <string name="nc_shared_location">分享了的位置</string>
+    <string name="nc_show_notification_warning_description">通知未正確設定時，顯示警告</string>
+    <string name="nc_show_notification_warning_title">顯示通知警告</string>
     <string name="nc_sort_by">排序方式</string>
     <string name="nc_start_time">開始時間</string>
     <string name="nc_switch_account">切換帳戶</string>