diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 2a14137..9353461 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -29,7 +29,6 @@
     <string name="add_dialog_use_another_server">Използване на друг сървър</string>
     <string name="add_dialog_use_another_server_description">Можете да се абонирате за теми от друг сървър. Въведете адреса на сървъра по-долу.</string>
     <string name="add_dialog_login_description">Тази тема изисква да влезете. Въведете потребителско име и парола.</string>
-    <string name="detail_deep_link_subscribed_toast_message">Абонирахте се за темата %1$s</string>
     <string name="detail_clear_dialog_message">Наистина ли искате да премахнете всички известия в темата\?</string>
     <string name="detail_delete_dialog_message">Наистина ли желаете да се отпишете от темата и да премахнете всички получени известия\?</string>
     <string name="settings_notifications_muted_until_title">Спиране на известията</string>
@@ -52,10 +51,8 @@
 \nПаролите винаги се премахват, но не са изброени тук.</string>
     <string name="settings_advanced_export_logs_scrub_dialog_empty">Не са променени никакви теми/имена на хостове, може би нямате абонаменти\?</string>
     <string name="user_dialog_description_add">Тук можете да добавите потребител, който да свържете с дадена тема.</string>
-    <string name="app_name">Ntfy</string>
     <string name="channel_notifications_min_name">Известия (минимален приоритет)</string>
     <string name="channel_subscriber_notification_instant_text_one">Абонирани сте за тема с незабавно доставяне</string>
-    <string name="app_base_url">https://ntfy.sh</string>
     <string name="notification_dialog_muted_forever_toast_message">Известията са изключени</string>
     <string name="channel_subscriber_notification_title">Слушане на входящи известия</string>
     <string name="channel_subscriber_notification_instant_text_two">Абонирани сте за две теми с незабавно доставяне</string>
@@ -80,8 +77,6 @@
     <string name="main_item_status_text_not_one">%1$d известия</string>
     <string name="main_item_date_yesterday">вчера</string>
     <string name="main_add_button_description">Добавяне на абонамент</string>
-    <string name="main_menu_docs_url">https://ntfy.sh/docs</string>
-    <string name="main_menu_report_bug_url">https://github.com/binwiederhier/ntfy/issues</string>
     <string name="main_action_mode_delete_dialog_permanently_delete">Безвъзвратно премахване</string>
     <string name="main_item_status_unified_push">%1$s (UnifiedPush)</string>
     <string name="main_item_status_reconnecting">Повторно свързване…</string>
@@ -95,7 +90,6 @@
     <string name="add_dialog_error_connection_failed">Грешка при свързване: %1$s</string>
     <string name="add_dialog_login_password_hint">Парола</string>
     <string name="add_dialog_login_new_user">Нов потребител</string>
-    <string name="main_banner_json_stream_button_learn_more_url">https://ntfy.sh/docs/deprecations</string>
     <string name="add_dialog_login_title">Изисква се вход</string>
     <string name="add_dialog_login_username_hint">Потребител</string>
     <string name="add_dialog_login_error_not_authorized">Неуспешен вход. Потребителят %1$s няма достъп.</string>
@@ -214,4 +208,4 @@
     <string name="settings_backup_restore_restore_title">Възстановяване от файл</string>
     <string name="detail_menu_enable_instant">Включване на незабавното доставяне</string>
     <string name="detail_instant_delivery_disabled">Незабавното доставяне е изключено</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 49c6a84..649228c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -5,8 +5,6 @@
     <string name="channel_notifications_high_name">Benachrichtigungen (Hohe Priorität)</string>
     <string name="channel_notifications_max_name">Benachrichtigungen (Max. Priorität)</string>
     <string name="channel_subscriber_service_name">Abo Service</string>
-    <string name="app_name">Ntfy</string>
-    <string name="app_base_url">https://ntfy.sh</string>
     <string name="channel_notifications_min_name">Benachrichtigungen (Min. Priorität)</string>
     <string name="channel_subscriber_notification_title">Warte auf Benachrichtigungen</string>
     <string name="channel_subscriber_notification_instant_text_one">Du hast ein Sofortnachrichten-Thema abonniert</string>
@@ -31,9 +29,7 @@
     <string name="main_menu_notifications_disabled_forever">Benachrichtigungen deaktiviert</string>
     <string name="channel_subscriber_notification_instant_text">Du hast Sofortnachrichten-Themen abonniert</string>
     <string name="main_menu_report_bug_title">Fehler melden</string>
-    <string name="main_menu_report_bug_url">https://github.com/binwiederhier/ntfy/issues</string>
     <string name="main_menu_docs_title">Dokumentation lesen</string>
-    <string name="main_menu_docs_url">https://ntfy.sh/docs</string>
     <string name="main_menu_rate_title">App bewerten ⭐</string>
     <string name="main_action_mode_menu_unsubscribe">Abmelden</string>
     <string name="main_action_mode_delete_dialog_permanently_delete">Endgültig löschen</string>
@@ -51,8 +47,6 @@
     <string name="main_banner_battery_button_fix_now">Jetzt beheben</string>
     <string name="main_banner_json_stream_button_remind_later">Später fragen</string>
     <string name="main_banner_json_stream_button_learn_more">Mehr erfahren</string>
-    <string name="main_banner_json_stream_button_learn_more_url">https://ntfy.sh/docs/deprecations</string>
-    <string name="main_banner_json_stream_button_enable_ws">Jetzt aktivieren</string>
     <string name="add_dialog_title">Thema abonnieren</string>
     <string name="add_dialog_description_below">Themen sind vielleicht nicht kennwort-geschützt, also wähle einen schwer zu erratenden Namen. Nach dem Abonnieren kannst Du Benachrichtigungen POSTen/PUTen.</string>
     <string name="add_dialog_topic_name_hint">Themenname, z.B. phils_alerts</string>
@@ -298,9 +292,9 @@
     <string name="settings_backup_restore_backup_failed">Sicherung fehlgeschlagen: %1$s</string>
     <string name="settings_advanced_export_logs_title">Logs kopieren/hochladen</string>
     <string name="settings_advanced_export_logs_summary">Logs in die Zwischenablage kopieren oder auf nopaste.net hochladen (betrieben vom ntfy-Autor). Servernamen und Themen können zensiert werden, Benachrichtigungen niemals.</string>
-    <string name="settings_advanced_export_logs_scrub_dialog_text">Die folgenden Themen/Servernamen wurden durch Obstnamen ersetzt, so dass Du das Logs bedenkenlos teilen kannst:
+    <string name="settings_advanced_export_logs_scrub_dialog_text">Die folgenden Themen/Servernamen wurden durch Obstnamen ersetzt, sodass Du die Log-Datei bedenkenlos teilen kannst:
 \n
 \n%1$s
 \n
 \nKennwörter werden immer ersetzt, aber nicht hier aufgelistet.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2c497cc..ad9357e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -32,16 +32,12 @@
     <string name="main_item_status_reconnecting">reconectando…</string>
     <string name="main_item_date_yesterday">ayer</string>
     <string name="main_add_button_description">Agregar suscripción</string>
-    <string name="app_name">Ntfy</string>
-    <string name="app_base_url">https://ntfy.sh</string>
     <string name="main_how_to_link">Para obtener instrucciones más detalladas, consulte el sitio web y la documentación de ntfy.sh.</string>
     <string name="main_banner_battery_text">La optimización de la batería debe deshabilitarse para evitar problemas con la entrega de notificaciones.</string>
     <string name="main_banner_battery_button_remind_later">Preguntar más tarde</string>
     <string name="main_banner_battery_button_fix_now">Corregir ahora</string>
     <string name="main_banner_json_stream_button_dismiss">Descartar</string>
     <string name="main_banner_json_stream_button_learn_more">Más información</string>
-    <string name="main_banner_json_stream_button_learn_more_url">https://ntfy.sh/docs/deprecations</string>
-    <string name="main_banner_json_stream_button_enable_ws">Habilitar ahora</string>
     <string name="add_dialog_title">Suscribirse al tópico</string>
     <string name="add_dialog_description_below">Los tópicos podrían no estar protegidos por contraseña, así que elija un nombre que no sea fácil de adivinar. Una vez suscrito, puedes enviar notificaciones con PUT/POST.</string>
     <string name="add_dialog_topic_name_hint">Nombre del tópico, p. ej. phils_alerts</string>
@@ -173,7 +169,6 @@
     <string name="settings_general_dark_mode_entry_light">Modo claro</string>
     <string name="settings_general_dark_mode_entry_dark">Modo oscuro</string>
     <string name="settings_backup_restore_header">Respaldo y Restauración</string>
-    <string name="settings_backup_restore_backup_key">Respaldo</string>
     <string name="settings_backup_restore_backup_title">Respaldar en un archivo</string>
     <string name="settings_backup_restore_backup_summary">Exportar configuración, notificaciones y usuarios</string>
     <string name="settings_backup_restore_backup_entry_everything">Todo</string>
@@ -181,7 +176,6 @@
     <string name="settings_backup_restore_backup_entry_settings_only">Sólo ajustes</string>
     <string name="settings_backup_restore_backup_successful">Respaldo exitoso</string>
     <string name="settings_backup_restore_backup_failed">El respaldo falló: %1$s</string>
-    <string name="settings_backup_restore_restore_key">Restaurar</string>
     <string name="settings_backup_restore_restore_title">Restaurar desde un archivo</string>
     <string name="settings_backup_restore_restore_successful">Restauración exitosa</string>
     <string name="settings_backup_restore_restore_failed">La restauración ha fallado: %1$s</string>
@@ -216,7 +210,6 @@
     <string name="settings_advanced_connection_protocol_summary_ws">Utilizar WebSockets para conectarse al servidor. Esta opción es experimental. Háganos saber si consume menos batería o es inestable.</string>
     <string name="settings_advanced_connection_protocol_entry_jsonhttp">JSON stream sobre HTTP</string>
     <string name="settings_advanced_connection_protocol_entry_ws">WebSockets</string>
-    <string name="settings_about_version_key">Versión</string>
     <string name="settings_about_version_title">Versión</string>
     <string name="settings_about_version_format">ntfy %1$s (%2$s)</string>
     <string name="settings_about_version_copied_to_clipboard_message">Copiado al portapapeles</string>
@@ -257,7 +250,6 @@
     <string name="share_topic_title">Compartir con</string>
     <string name="notification_dialog_enabled_toast_message">Notificaciones re-habilitadas</string>
     <string name="settings_notifications_auto_delete_summary_three_months">Eliminar automáticamente las notificaciones después de 3 meses</string>
-    <string name="detail_deep_link_subscribed_toast_message">Suscrito al tópico %1$s</string>
     <string name="detail_item_cannot_open_not_found">No se puede abrir el archivo adjunto: El archivo puede haber sido borrado, o no hay ninguna aplicación para abrir el archivo.</string>
     <string name="detail_menu_notifications_disabled_forever">Notificaciones deshabilitadas</string>
     <string name="notification_dialog_2h">2 horas</string>
@@ -292,7 +284,6 @@
     <string name="settings_notifications_auto_download_10m">Si es más pequeño que 10 MB</string>
     <string name="settings_general_users_prefs_user_add_summary">Crear un nuevo usuario para un nuevo servidor</string>
     <string name="settings_general_dark_mode_summary_system">Usar el valor predeterminado del sistema</string>
-    <string name="main_menu_docs_url">https://ntfy.sh/docs</string>
     <string name="settings_about_header">Acerca de</string>
     <string name="user_dialog_base_url_hint">URL del servidor</string>
     <string name="main_menu_rate_title">Califica esta aplicación ⭐</string>
@@ -303,6 +294,5 @@
     <string name="detail_how_to_link">Para obtener instrucciones más detalladas, consulte el sitio web y la documentación de ntfy.sh.</string>
     <string name="main_menu_settings_title">Ajustes</string>
     <string name="main_menu_report_bug_title">Reportar un error</string>
-    <string name="main_menu_report_bug_url">https://github.com/binwiederhier/ntfy/issues</string>
     <string name="add_dialog_instant_delivery">Entrega instantánea en modo doze</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 451662b..e0aad3c 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -16,13 +16,10 @@
     <string name="channel_subscriber_notification_noinstant_text_four">Du abonnerer på fire emner</string>
     <string name="refresh_message_result">%1$d merknad(er) mottatt</string>
     <string name="channel_notifications_max_name">Merknader (maks.-prioritet)</string>
-    <string name="app_name">Ntfy</string>
-    <string name="app_base_url">https://ntfy.sh</string>
     <string name="refresh_message_error_one">Kunne ikke gjenoppfriske abonnementet: %1$s</string>
     <string name="main_menu_notifications_enabled">Merknader påslått</string>
     <string name="main_menu_notifications_disabled_forever">Merknader avslått</string>
     <string name="main_menu_docs_title">Les dokumentasjonen</string>
-    <string name="main_menu_docs_url">https://ntfy.sh/docs</string>
     <string name="main_menu_rate_title">Vurder programmet ⭐</string>
     <string name="main_action_mode_menu_unsubscribe">Opphev abonnement</string>
     <string name="main_action_mode_delete_dialog_permanently_delete">Slett for godt</string>
@@ -34,7 +31,6 @@
     <string name="main_add_button_description">Legg til abonnement</string>
     <string name="main_banner_json_stream_button_remind_later">Spør senere</string>
     <string name="main_banner_json_stream_button_learn_more">Lær mer</string>
-    <string name="main_banner_json_stream_button_enable_ws">Skru på nå</string>
     <string name="add_dialog_title">Abonner på emnet</string>
     <string name="add_dialog_topic_name_hint">Emnenavn, f.eks. halgeirs_varsler</string>
     <string name="add_dialog_use_another_server">Bruk en annen tjener</string>
@@ -49,7 +45,6 @@
     <string name="add_dialog_description_below">Det kan hende emner ikke er passordsbeskyttet, så velg et navn som ikke er enkelt å gjette. Når du har abonnert kan du utføre PUT/POST av merknader.</string>
     <string name="add_dialog_use_another_server_description">Du kan abonnere på emner fra en annen tjener. Skriv inn tjener-nettadressen nedenfor.</string>
     <string name="main_item_status_unified_push">%1$s (UnifiedPush)</string>
-    <string name="main_banner_json_stream_button_learn_more_url">https://ntfy.sh/docs/deprecations</string>
     <string name="add_dialog_button_login">Logg inn</string>
     <string name="add_dialog_error_connection_failed">Tilkobling mislyktes: %1$s</string>
     <string name="add_dialog_login_username_hint">Brukernavn</string>
@@ -243,7 +238,6 @@
     <string name="main_menu_notifications_disabled_until">Merknader avslått til %1$s</string>
     <string name="add_dialog_login_title">Innlogging kreves</string>
     <string name="main_menu_report_bug_title">Innrapporter en feil</string>
-    <string name="main_menu_report_bug_url">https://github.com/binwiederhier/ntfy/issues</string>
     <string name="add_dialog_button_subscribe">Abonner</string>
     <string name="detail_clear_dialog_permanently_delete">Slett for godt</string>
     <string name="detail_item_tags">Etiketter: %1$s</string>
@@ -317,4 +311,4 @@
     <string name="main_unified_push_toast">Dette abonnementet håndteres av %1$s via UnifiedPush</string>
     <string name="add_dialog_foreground_description">Umiddelbar levering er alltid påskrudd for andre verter enn %1$s.</string>
     <string name="main_banner_json_stream_text">Fra Juni 2022 vil Vev-socketer bli brukt til å kommunisere med ntfy-tjenerne. Forsikre deg om at du har satt opp din selvtjente tjener for å støtte det. For å sjekke om vev-socket-støtte fungerer, kan du skru det på i innstillingene under «Tilkoblingsprotokoll».</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0bbe35a..6e589cd 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Ntfy</string>
     <string name="channel_notifications_min_name">Notifikacje (Minimalny Priorytet)</string>
-    <string name="app_base_url">https://ntfy.sh</string>
     <string name="channel_notifications_low_name">Notifikacje (Niskii priorytet)</string>
     <string name="channel_notifications_default_name">Notifikacje (domyślny priorytet)</string>
     <string name="channel_notifications_max_name">Notifikacje (Maksymalny priorytet)</string>
     <string name="channel_subscriber_notification_title">Oczekiwanie powiadomień przychodzących</string>
     <string name="channel_subscriber_notification_instant_text">Subskrybujesz tematy związane z natychmiastową dostawą</string>
     <string name="channel_notifications_high_name">Notifikacje (Wysoki Priorytet)</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 5f6ecc7..b4c744c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -2,8 +2,6 @@
 <resources>
     <string name="main_item_status_text_one">%1$d bildirim</string>
     <string name="detail_how_to_intro">Bu konuya bildirim göndermek için konu URL\'sine PUT veya POST göndermeniz yeterlidir.</string>
-    <string name="app_name">Ntfy</string>
-    <string name="app_base_url">https://ntfy.sh</string>
     <string name="channel_notifications_low_name">Bildirimler (Düşük Öncelik)</string>
     <string name="channel_notifications_default_name">Bildirimler (Öntanımlı Öncelik)</string>
     <string name="channel_subscriber_service_name">Abonelik Hizmeti</string>
@@ -30,7 +28,6 @@
     <string name="main_menu_notifications_disabled_forever">Bildirimler devre dışı bırakıldı</string>
     <string name="main_menu_settings_title">Ayarlar</string>
     <string name="main_menu_report_bug_title">Hata bildir</string>
-    <string name="main_menu_report_bug_url">https://github.com/binwiederhier/ntfy/issues</string>
     <string name="main_menu_docs_title">Belgeleri oku</string>
     <string name="main_menu_rate_title">Bu uygulamayı değerlendir ⭐</string>
     <string name="main_action_mode_menu_unsubscribe">Abonelikten çık</string>
@@ -46,7 +43,6 @@
     <string name="main_banner_battery_text">Bildirim teslimiyle ilgili sorunları önlemek için pil iyileştirmesi devre dışı bırakılmalıdır.</string>
     <string name="main_banner_json_stream_button_remind_later">Daha sonra sor</string>
     <string name="main_banner_json_stream_button_dismiss">Kapat</string>
-    <string name="main_banner_json_stream_button_enable_ws">Şimdi etkinleştir</string>
     <string name="add_dialog_title">Konuya abone ol</string>
     <string name="add_dialog_topic_name_hint">Konu adı, örn. benim_uyarilarim</string>
     <string name="add_dialog_use_another_server">Başka bir sunucu kullan</string>
@@ -215,7 +211,6 @@
     <string name="channel_subscriber_notification_noinstant_text_three">Üç konuya abone oldunuz</string>
     <string name="refresh_message_result">%1$d bildirim alındı</string>
     <string name="main_action_mode_delete_dialog_cancel">İptal</string>
-    <string name="main_banner_json_stream_button_learn_more_url">https://ntfy.sh/docs/deprecations</string>
     <string name="add_dialog_login_username_hint">Kullanıcı adı</string>
     <string name="detail_item_menu_delete">Dosyayı sil</string>
     <string name="detail_item_download_info_deleted_expires_x">silindi, bağlantının süresi doluyor: %1$s</string>
@@ -223,7 +218,6 @@
     <string name="main_banner_battery_button_remind_later">Daha sonra sor</string>
     <string name="add_dialog_description_below">Konular parola korumalı olmayabilir, bu nedenle tahmin edilmesi kolay olmayan bir ad seçin. Abone olduktan sonra PUT/POST bildirimleri yapabilirsiniz.</string>
     <string name="detail_delete_dialog_cancel">İptal</string>
-    <string name="main_menu_docs_url">https://ntfy.sh/docs</string>
     <string name="main_item_date_yesterday">dün</string>
     <string name="main_banner_battery_button_dismiss">Kapat</string>
     <string name="main_banner_battery_button_fix_now">Şimdi düzelt</string>
@@ -317,4 +311,4 @@
     <string name="settings_advanced_export_logs_entry_upload_original">Karşıya yükle ve bağlantıyı kopyala</string>
     <string name="settings_advanced_export_logs_error_uploading">Günlükler karşıya yüklenirken hata oluştu: %1$s</string>
     <string name="settings_advanced_connection_protocol_entry_ws">WebSockets</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 68d41f0..7165c2b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -52,8 +52,7 @@
     <string name="main_banner_json_stream_button_remind_later">稍后再问</string>
     <string name="main_banner_json_stream_button_dismiss">暂时不管</string>
     <string name="main_banner_json_stream_button_learn_more">详情</string>
-    <string name="main_banner_json_stream_button_enable_ws">立即开启</string>
     <string name="add_dialog_title">订阅主题</string>
     <string name="add_dialog_description_below">主题可能没输密码就能看到，所以起个隐晦些的名字吧。订阅后就可以 PUT 或者 POST 通知了。</string>
     <string name="add_dialog_topic_name_hint">主题名称，比如：小飞的提醒</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e456a2f..bca4787 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,54 +1,54 @@
 <resources>
     <!-- Main app-->
-    <string name="app_name">Ntfy</string>
-    <string name="app_base_url">https://ntfy.sh</string> <!-- If changed, you must also change google-services.json! -->
+    <string name="app_name" translatable="false">Ntfy</string>
+    <string name="app_base_url" translatable="false">https://ntfy.sh</string> <!-- If changed, you must also change google-services.json! -->
 
     <!-- Notification channels -->
-    <string name="channel_notifications_min_name">Notifications (Min Priority)</string>
-    <string name="channel_notifications_low_name">Notifications (Low Priority)</string>
-    <string name="channel_notifications_default_name">Notifications (Default Priority)</string>
-    <string name="channel_notifications_high_name">Notifications (High Priority)</string>
-    <string name="channel_notifications_max_name">Notifications (Max Priority)</string>
+    <string name="channel_notifications_min_name">Notifications (min priority)</string>
+    <string name="channel_notifications_low_name">Notifications (low priority)</string>
+    <string name="channel_notifications_default_name">Notifications (default priority)</string>
+    <string name="channel_notifications_high_name">Notifications (high priority)</string>
+    <string name="channel_notifications_max_name">Notifications (max priority)</string>
     <string name="channel_subscriber_service_name">Subscription Service</string>
     <string name="channel_subscriber_notification_title">Listening for incoming notifications</string>
-    <string name="channel_subscriber_notification_instant_text">You are subscribed to instant delivery topics</string>
-    <string name="channel_subscriber_notification_instant_text_one">You are subscribed to one instant delivery topic</string>
-    <string name="channel_subscriber_notification_instant_text_two">You are subscribed to two instant delivery topics</string>
-    <string name="channel_subscriber_notification_instant_text_three">You are subscribed to three instant delivery topics</string>
-    <string name="channel_subscriber_notification_instant_text_four">You are subscribed to four instant delivery topics</string>
-    <string name="channel_subscriber_notification_instant_text_more">You are subscribed to %1$d instant delivery topics</string>
-    <string name="channel_subscriber_notification_noinstant_text">You are subscribed to topics</string>
-    <string name="channel_subscriber_notification_noinstant_text_one">You are subscribed to one topic</string>
-    <string name="channel_subscriber_notification_noinstant_text_two">You are subscribed to two topics</string>
-    <string name="channel_subscriber_notification_noinstant_text_three">You are subscribed to three topics</string>
-    <string name="channel_subscriber_notification_noinstant_text_four">You are subscribed to four topics</string>
-    <string name="channel_subscriber_notification_noinstant_text_more">You are subscribed to %1$d topics</string>
+    <string name="channel_subscriber_notification_instant_text">Subscribed to instant delivery topics</string>
+    <string name="channel_subscriber_notification_instant_text_one">Subscribed to one instant delivery topic</string>
+    <string name="channel_subscriber_notification_instant_text_two">Subscribed to two instant delivery topics</string>
+    <string name="channel_subscriber_notification_instant_text_three">Subscribed to three instant delivery topics</string>
+    <string name="channel_subscriber_notification_instant_text_four">Subscribed to four instant delivery topics</string>
+    <string name="channel_subscriber_notification_instant_text_more">Subscribed to %1$d instant delivery topics</string>
+    <string name="channel_subscriber_notification_noinstant_text">Subscribed to topics</string>
+    <string name="channel_subscriber_notification_noinstant_text_one">Subscribed to one topic</string>
+    <string name="channel_subscriber_notification_noinstant_text_two">Subscribed to two topics</string>
+    <string name="channel_subscriber_notification_noinstant_text_three">Subscribed to three topics</string>
+    <string name="channel_subscriber_notification_noinstant_text_four">Subscribed to four topics</string>
+    <string name="channel_subscriber_notification_noinstant_text_more">Subscribed to %1$d topics</string>
 
     <!-- Common refresh toasts -->
     <string name="refresh_message_result">%1$d notification(s) received</string>
-    <string name="refresh_message_no_results">Everything is up-to-date</string>
-    <string name="refresh_message_error">%1$d subscription(s) could not be refreshed\n\n%2$s</string>
-    <string name="refresh_message_error_one">Subscription could not be refreshed: %1$s</string>
+    <string name="refresh_message_no_results">Everything is up to date</string>
+    <string name="refresh_message_error">Could not refresh %1$d subscriptions\n\n%2$s</string>
+    <string name="refresh_message_error_one">Could not refresh subscription: %1$s</string>
 
     <!-- Main activity: Action bar -->
     <string name="main_action_bar_title">Subscribed topics</string>
-    <string name="main_menu_notifications_enabled">Notifications enabled</string>
-    <string name="main_menu_notifications_disabled_forever">Notifications disabled</string>
-    <string name="main_menu_notifications_disabled_until">Notifications disabled until %1$s</string>
+    <string name="main_menu_notifications_enabled">Notifications on</string>
+    <string name="main_menu_notifications_disabled_forever">Notifications paused</string>
+    <string name="main_menu_notifications_disabled_until">Notifications paused until %1$s</string>
     <string name="main_menu_settings_title">Settings</string>
     <string name="main_menu_report_bug_title">Report a bug</string>
-    <string name="main_menu_report_bug_url">https://github.com/binwiederhier/ntfy/issues</string>
+    <string name="main_menu_report_bug_url" translatable="false">https://github.com/binwiederhier/ntfy/issues</string>
     <string name="main_menu_docs_title">Read the docs</string>
-    <string name="main_menu_docs_url">https://ntfy.sh/docs</string>
-    <string name="main_menu_rate_title">Rate this app ⭐</string>
+    <string name="main_menu_docs_url" translatable="false">https://ntfy.sh/docs</string>
+    <string name="main_menu_rate_title">Rate the app ⭐</string>
 
     <!-- Main activity: Action mode -->
     <string name="main_action_mode_menu_unsubscribe">Unsubscribe</string>
     <string name="main_action_mode_delete_dialog_message">
-        Do you really want to unsubscribe from the selected topic(s) and
-        permanently delete all the notifications you received?
+        Unsubscribe from the selected topic(s) and
+        permanently delete all notifications?
     </string>
-    <string name="main_action_mode_delete_dialog_permanently_delete">Permanently delete</string>
+    <string name="main_action_mode_delete_dialog_permanently_delete">Delete permanently</string>
     <string name="main_action_mode_delete_dialog_cancel">Cancel</string>
 
     <!-- Main activity: List and such -->
@@ -60,43 +60,43 @@
     <string name="main_add_button_description">Add subscription</string>
     <string name="main_no_subscriptions_text">It looks like you don\'t have any subscriptions yet.</string>
     <string name="main_how_to_intro">
-        Click the button below to create or subscribe to a topic. After that, you can send
-        messages via PUT or POST and you\'ll receive notifications on your phone.
+        Click the + to create or subscribe to a topic.
+        Afterwards you receive notifications on your device
+        when sending messages via PUT or POST.
     </string>
-    <string name="main_how_to_link">For more detailed instructions, check out the ntfy.sh website and documentation.
+    <string name="main_how_to_link">Detailed instructions available on ntfy.sh, and in the docs.
     </string>
     <string name="main_unified_push_toast">This subscription is managed by %1$s via UnifiedPush</string>
 
     <!-- Main activity: Battery banner -->
-    <string name="main_banner_battery_text">Battery optimization should be disabled to avoid issues with notification delivery.</string>
+    <string name="main_banner_battery_text">Battery optimization should be off for the app to avoid notification delivery issues.</string>
     <string name="main_banner_battery_button_remind_later">Ask later</string>
     <string name="main_banner_battery_button_dismiss">Dismiss</string>
     <string name="main_banner_battery_button_fix_now">Fix now</string>
 
     <!-- Main activity: JSON stream banner -->
-    <string name="main_banner_json_stream_text">Starting June 2022, WebSockets will be used to communicate with the ntfy servers. Be sure to configure your selfhosted server to support it. To check if WebSocket support is working, enable it in the Settings under Connection protocol.</string>
+    <string name="main_banner_json_stream_text">Switch to WebSockets in Settings / \"Connection protocol\" now to ensure you can communicate with your selfhosted ntfy server after June 2022.</string>
     <string name="main_banner_json_stream_button_remind_later">Ask later</string>
     <string name="main_banner_json_stream_button_dismiss">Dismiss</string>
     <string name="main_banner_json_stream_button_learn_more">Learn more</string>
-    <string name="main_banner_json_stream_button_learn_more_url">https://ntfy.sh/docs/deprecations</string>
-    <string name="main_banner_json_stream_button_enable_ws">Enable now</string>
+    <string name="main_banner_json_stream_button_learn_more_url" translatable="false">https://ntfy.sh/docs/deprecations</string>
 
     <!-- Add dialog -->
     <string name="add_dialog_title">Subscribe to topic</string>
     <string name="add_dialog_description_below">
-        Topics may not be password-protected, so choose a name that\'s not easy to
-        guess. Once subscribed, you can PUT/POST notifications.
+        Topics may not be password-protected, so choose a name that is hard to guess.
+        Once subscribed, you can PUT/POST notifications.
     </string>
     <string name="add_dialog_topic_name_hint">Topic name, e.g. phils_alerts</string>
     <string name="add_dialog_use_another_server">Use another server</string>
-    <string name="add_dialog_use_another_server_description">You can subscribe to topics from another server. Type the server URL below.</string>
+    <string name="add_dialog_use_another_server_description">Enter server URLs below to subscribe to topics from other servers.</string>
     <string name="add_dialog_instant_delivery">Instant delivery in doze mode</string>
-    <string name="add_dialog_instant_delivery_description">Ensures that messages are immediately delivered, even if the device is inactive.</string>
-    <string name="add_dialog_foreground_description">Instant delivery is always enabled for hosts other than %1$s.</string>
+    <string name="add_dialog_instant_delivery_description">Ensures messages are delivered immediately, even if the device is inactive.</string>
+    <string name="add_dialog_foreground_description">Instant delivery is always on for hosts other than %1$s.</string>
     <string name="add_dialog_button_cancel">Cancel</string>
     <string name="add_dialog_button_subscribe">Subscribe</string>
     <string name="add_dialog_button_back">Back</string>
-    <string name="add_dialog_button_login">Login</string>
+    <string name="add_dialog_button_login">Log in</string>
     <string name="add_dialog_error_connection_failed">Connection failed: %1$s</string>
     <string name="add_dialog_login_title">Login required</string>
     <string name="add_dialog_login_description">This topic requires you to login. Please type in a username and password.</string>
@@ -106,34 +106,33 @@
     <string name="add_dialog_login_new_user">New user</string>
 
     <!-- Detail activity -->
-    <string name="detail_deep_link_subscribed_toast_message">Subscribed to topic %1$s</string>
     <string name="detail_no_notifications_text">You haven\'t received any notifications for this topic yet.</string>
     <string name="detail_how_to_intro">To send notifications to this topic, simply PUT or POST to the topic URL.
     </string>
     <string name="detail_how_to_example"><![CDATA[ Example (using curl):<br/><tt>$ curl -d \"Hi\" %1$s</tt> ]]></string>
-    <string name="detail_how_to_link">For more detailed instructions, check out the ntfy.sh website and documentation.
+    <string name="detail_how_to_link">Detailed instructions available on ntfy.sh, and in the docs.
     </string>
-    <string name="detail_clear_dialog_message">Do you really want to delete all of the notifications in this topic?
+    <string name="detail_clear_dialog_message">Delete all of the notifications in this topic?
     </string>
-    <string name="detail_clear_dialog_permanently_delete">Permanently delete</string>
+    <string name="detail_clear_dialog_permanently_delete">Delete permanently</string>
     <string name="detail_clear_dialog_cancel">Cancel</string>
     <string name="detail_delete_dialog_message">
-        Do you really want to unsubscribe from this topic and delete all of the
-        notifications you received?
+        Unsubscribe from this topic and delete
+        all received notifications?
     </string>
-    <string name="detail_delete_dialog_permanently_delete">Permanently delete</string>
+    <string name="detail_delete_dialog_permanently_delete">Delete permanently</string>
     <string name="detail_delete_dialog_cancel">Cancel</string>
-    <string name="detail_test_title">Test: You can set a title if you like</string>
-    <string name="detail_test_message">This is a test notification from the Ntfy Android app. It has a priority of %1$d.
-        If you send another one, it may look different.
+    <string name="detail_test_title">Test: You can set a title if you like.</string>
+    <string name="detail_test_message">This is a test notification from the ntfy Android app. It has a level %1$d priority.
+        If you send another, it may look different.
     </string>
     <string name="detail_test_message_error">Cannot send message: %1$s</string>
-    <string name="detail_test_message_error_unauthorized_anon">Cannot send message: Anonymous publishing not allowed</string>
-    <string name="detail_test_message_error_unauthorized_user">Cannot send message: User %1$s not authorized</string>
-    <string name="detail_test_message_error_too_large">Cannot send message: Attachment too large</string>
+    <string name="detail_test_message_error_unauthorized_anon">Cannot send message: Anonymous publishing not allowed.</string>
+    <string name="detail_test_message_error_unauthorized_user">Cannot send message: The user \"%1$s\" is not authorized.</string>
+    <string name="detail_test_message_error_too_large">Cannot send message: The attachment is too big.</string>
     <string name="detail_copied_to_clipboard_message">Copied to clipboard</string>
-    <string name="detail_instant_delivery_enabled">Instant delivery enabled</string>
-    <string name="detail_instant_delivery_disabled">Instant delivery disabled</string>
+    <string name="detail_instant_delivery_enabled">Instant delivery on</string>
+    <string name="detail_instant_delivery_disabled">Instant delivery off</string>
     <string name="detail_item_tags">Tags: %1$s</string>
     <string name="detail_item_snack_deleted">Notification deleted</string>
     <string name="detail_item_snack_undo">Undo</string>
@@ -143,17 +142,17 @@
     <string name="detail_item_menu_cancel">Cancel download</string>
     <string name="detail_item_menu_save_file">Save file</string>
     <string name="detail_item_menu_copy_url">Copy URL</string>
-    <string name="detail_item_menu_copy_url_copied">Copied URL to clipboard</string>
+    <string name="detail_item_menu_copy_url_copied">URL copied to clipboard</string>
     <string name="detail_item_menu_copy_contents">Copy notification</string>
-    <string name="detail_item_menu_copy_contents_copied">Copied notification clipboard</string>
-    <string name="detail_item_saved_successfully">Saved as %1$s to Downloads folder</string>
-    <string name="detail_item_cannot_download">Cannot open or download attachment. Link expired and no local file found.</string>
+    <string name="detail_item_menu_copy_contents_copied">Notification copied to clipboard</string>
+    <string name="detail_item_saved_successfully">Saved as \"%1$s\" in the \"Downloads\" folder</string>
+    <string name="detail_item_cannot_download">Cannot open or download attachment. The link expired and no local file could be found.</string>
     <string name="detail_item_cannot_open">Cannot open attachment: %1$s</string>
-    <string name="detail_item_cannot_open_not_found">Cannot open attachment: File may have been deleted, or there is no app to open the file.</string>
-    <string name="detail_item_cannot_open_click_url">Cannot open click URL: %1$s</string>
+    <string name="detail_item_cannot_open_not_found">Cannot open attachment: The file may have been deleted, or no installed app can open the file.</string>
+    <string name="detail_item_cannot_open_click_url">Cannot open URL: %1$s</string>
     <string name="detail_item_cannot_save">Cannot save attachment: %1$s</string>
     <string name="detail_item_cannot_delete">Cannot delete attachment: %1$s</string>
-    <string name="detail_item_download_failed">Attachment download failed: %1$s</string>
+    <string name="detail_item_download_failed">Could not download attachment: %1$s</string>
     <string name="detail_item_download_info_not_downloaded">not downloaded</string>
     <string name="detail_item_download_info_not_downloaded_expired">not downloaded, link expired</string>
     <string name="detail_item_download_info_not_downloaded_expires_x">not downloaded, expires %1$s</string>
@@ -166,11 +165,11 @@
     <string name="detail_item_download_info_download_failed_expires_x">download failed, link expires %1$s</string>
 
     <!-- Detail activity: Action bar -->
-    <string name="detail_menu_notifications_enabled">Notifications enabled</string>
-    <string name="detail_menu_notifications_disabled_forever">Notifications disabled</string>
-    <string name="detail_menu_notifications_disabled_until">Notifications disabled until %1$s</string>
+    <string name="detail_menu_notifications_enabled">Notifications on</string>
+    <string name="detail_menu_notifications_disabled_forever">Notifications paused</string>
+    <string name="detail_menu_notifications_disabled_until">Notifications paused until %1$s</string>
     <string name="detail_menu_enable_instant">Enable instant delivery</string>
-    <string name="detail_menu_disable_instant">Disable instant delivery</string>
+    <string name="detail_menu_disable_instant">Turn off instant delivery</string>
     <string name="detail_menu_test">Send test notification</string>
     <string name="detail_menu_copy_url">Copy topic address</string>
     <string name="detail_menu_clear">Clear all notifications</string>
@@ -181,9 +180,9 @@
     <string name="detail_action_mode_menu_copy">Copy</string>
     <string name="detail_action_mode_menu_delete">Delete</string>
     <string name="detail_action_mode_delete_dialog_message">
-        Do you really want to permanently delete the selected notification(s)?
+        Delete the selected notification(s) permanently?
     </string>
-    <string name="detail_action_mode_delete_dialog_permanently_delete">Permanently delete</string>
+    <string name="detail_action_mode_delete_dialog_permanently_delete">Delete permanently</string>
     <string name="detail_action_mode_delete_dialog_cancel">Cancel</string>
 
     <!-- Detail settings -->
@@ -194,20 +193,20 @@
     <string name="share_title">Share</string>
     <string name="share_menu_send">Share</string>
     <string name="share_content_title">Message preview</string>
-    <string name="share_content_text_hint">Add the content you\'d like to share here</string>
+    <string name="share_content_text_hint">Add content to share here</string>
     <string name="share_content_image_text">An image was shared with you</string>
     <string name="share_content_image_error">Cannot read image: %1$s</string>
     <string name="share_content_file_text">A file was shared with you</string>
-    <string name="share_content_file_error">Cannot read file infos: %1$s</string>
+    <string name="share_content_file_error">Cannot read file info: %1$s</string>
     <string name="share_topic_title">Share to</string>
     <string name="share_suggested_topics">Suggested topics</string>
-    <string name="share_successful">Message successfully published</string>
+    <string name="share_successful">Message published</string>
 
     <!-- Notification dialog -->
     <string name="notification_dialog_title">Pause notifications</string>
     <string name="notification_dialog_cancel">Cancel</string>
     <string name="notification_dialog_save">Save</string>
-    <string name="notification_dialog_enabled_toast_message">Notifications re-enabled</string>
+    <string name="notification_dialog_enabled_toast_message">Notifications resumed</string>
     <string name="notification_dialog_muted_forever_toast_message">Notifications paused</string>
     <string name="notification_dialog_muted_until_toast_message">Notifications paused until %1$s</string>
     <string name="notification_dialog_show_all">Show all notifications</string>
@@ -216,7 +215,7 @@
     <string name="notification_dialog_2h">2 hours</string>
     <string name="notification_dialog_8h">8 hours</string>
     <string name="notification_dialog_tomorrow">Until tomorrow</string>
-    <string name="notification_dialog_forever">Until re-enabled</string>
+    <string name="notification_dialog_forever">Until resumed</string>
 
     <!-- Notification popup -->
     <string name="notification_popup_action_open">Open</string>
@@ -225,41 +224,41 @@
     <string name="notification_popup_action_cancel">Cancel</string>
     <string name="notification_popup_file">%1$s\nFile: %2$s</string>
     <string name="notification_popup_file_downloading">Downloading %1$s, %2$d%%\n%3$s</string>
-    <string name="notification_popup_file_download_successful">%1$s\nFile: %2$s, download successful</string>
+    <string name="notification_popup_file_download_successful">%1$s\nFile: %2$s, downloaded</string>
     <string name="notification_popup_file_download_failed">%1$s\nFile: %2$s, download failed</string>
 
     <!-- Settings -->
     <string name="settings_title">Settings</string>
     <string name="settings_notifications_header">Notifications</string>
-    <string name="settings_notifications_muted_until_key">MutedUntil</string>
+    <string name="settings_notifications_muted_until_key" translatable="false">MutedUntil</string>
     <string name="settings_notifications_muted_until_title">Pause notifications</string>
-    <string name="settings_notifications_muted_until_show_all">All notifications will be displayed</string>
-    <string name="settings_notifications_muted_until_forever">Notifications muted until re-enabled</string>
-    <string name="settings_notifications_muted_until_x">Notifications muted until %1$s</string>
-    <string name="settings_notifications_min_priority_key">MinPriority</string>
+    <string name="settings_notifications_muted_until_show_all">Showing all notifications</string>
+    <string name="settings_notifications_muted_until_forever">Notifications paused until resumed</string>
+    <string name="settings_notifications_muted_until_x">Notifications paused until %1$s</string>
+    <string name="settings_notifications_min_priority_key" translatable="false">MinPriority</string>
     <string name="settings_notifications_min_priority_title">Minimum priority</string>
-    <string name="settings_notifications_min_priority_summary_any">Notifications of all priorities are shown</string>
-    <string name="settings_notifications_min_priority_summary_x_or_higher">Show notifications if priority is %1$d (%2$s) or higher</string>
+    <string name="settings_notifications_min_priority_summary_any">Showing all notifications</string>
+    <string name="settings_notifications_min_priority_summary_x_or_higher">Show notifications if priority is %1$d (%2$s) or above</string>
     <string name="settings_notifications_min_priority_summary_max">Show notifications if priority is 5 (max)</string>
     <string name="settings_notifications_min_priority_min">Any priority</string>
-    <string name="settings_notifications_min_priority_low">Low priority and higher</string>
-    <string name="settings_notifications_min_priority_default">Default priority and higher</string>
-    <string name="settings_notifications_min_priority_high">High priority and higher</string>
+    <string name="settings_notifications_min_priority_low">Low priority and above</string>
+    <string name="settings_notifications_min_priority_default">Default priority and above</string>
+    <string name="settings_notifications_min_priority_high">High priority and above</string>
     <string name="settings_notifications_min_priority_max">Only max priority</string>
-    <string name="settings_notifications_auto_download_key">AutoDownload</string>
+    <string name="settings_notifications_auto_download_key" translatable="false">AutoDownload</string>
     <string name="settings_notifications_auto_download_title">Download attachments</string>
-    <string name="settings_notifications_auto_download_summary_always">Automatically download all attachments</string>
-    <string name="settings_notifications_auto_download_summary_never">Never download attachments automatically</string>
+    <string name="settings_notifications_auto_download_summary_always">Auto-download all attachments</string>
+    <string name="settings_notifications_auto_download_summary_never">Never auto-download attachments</string>
     <string name="settings_notifications_auto_download_summary_smaller_than_x">Auto-download attachments up to %1$s</string>
-    <string name="settings_notifications_auto_download_never">Never download automatically</string>
-    <string name="settings_notifications_auto_download_always">Always download automatically</string>
-    <string name="settings_notifications_auto_download_100k">If smaller than 100 KB</string>
-    <string name="settings_notifications_auto_download_500k">If smaller than 500 KB</string>
-    <string name="settings_notifications_auto_download_1m">If smaller than 1 MB</string>
-    <string name="settings_notifications_auto_download_5m">If smaller than 5 MB</string>
-    <string name="settings_notifications_auto_download_10m">If smaller than 10 MB</string>
-    <string name="settings_notifications_auto_download_50m">If smaller than 50 MB</string>
-    <string name="settings_notifications_auto_delete_key">AutoDelete</string>
+    <string name="settings_notifications_auto_download_never">Never auto-download anything</string>
+    <string name="settings_notifications_auto_download_always">Auto-download everything</string>
+    <string name="settings_notifications_auto_download_100k">If below 100 kB</string>
+    <string name="settings_notifications_auto_download_500k">If below 500 kB</string>
+    <string name="settings_notifications_auto_download_1m">If below 1 MB</string>
+    <string name="settings_notifications_auto_download_5m">If below 5 MB</string>
+    <string name="settings_notifications_auto_download_10m">If below 10 MB</string>
+    <string name="settings_notifications_auto_download_50m">If below 50 MB</string>
+    <string name="settings_notifications_auto_delete_key" translatable="false">AutoDelete</string>
     <string name="settings_notifications_auto_delete_title">Delete notifications</string>
     <string name="settings_notifications_auto_delete_summary_never">Never automatically delete notifications</string>
     <string name="settings_notifications_auto_delete_summary_one_day">Auto-delete notifications after one day</string>
@@ -274,11 +273,11 @@
     <string name="settings_notifications_auto_delete_one_month">After one month</string>
     <string name="settings_notifications_auto_delete_three_months">After 3 months</string>
     <string name="settings_general_header">General</string>
-    <string name="settings_general_default_base_url_key">DefaultBaseURL</string>
+    <string name="settings_general_default_base_url_key" translatable="false">DefaultBaseURL</string>
     <string name="settings_general_default_base_url_title">Default server</string>
-    <string name="settings_general_default_base_url_message">To use your own server as a default when subscribing to new topics and/or sharing to topics, enter the server base URL.</string>
+    <string name="settings_general_default_base_url_message">Enter your server\'s root URL to use your own server as a default when subscribing to new topics and/or sharing to topics.</string>
     <string name="settings_general_default_base_url_default_summary">%1$s (default)</string>
-    <string name="settings_general_users_key">ManageUsers</string>
+    <string name="settings_general_users_key" translatable="false">ManageUsers</string>
     <string name="settings_general_users_title">Manage users</string>
     <string name="settings_general_users_summary">Add/remove users for protected topics</string>
     <string name="settings_general_users_prefs_title">Users</string>
@@ -288,63 +287,63 @@
     <string name="settings_general_users_prefs_user_add">Add users</string>
     <string name="settings_general_users_prefs_user_add_title">Add new user</string>
     <string name="settings_general_users_prefs_user_add_summary">Create a new user for a new server</string>
-    <string name="settings_general_dark_mode_key">DarkMode</string>
+    <string name="settings_general_dark_mode_key" translatable="false">DarkMode</string>
     <string name="settings_general_dark_mode_title">Dark mode</string>
-    <string name="settings_general_dark_mode_summary_system">Use the system default</string>
-    <string name="settings_general_dark_mode_summary_light">Light mode is enabled</string>
-    <string name="settings_general_dark_mode_summary_dark">Dark mode is enabled. Are you a vampire?</string>
+    <string name="settings_general_dark_mode_summary_system">Using the system default</string>
+    <string name="settings_general_dark_mode_summary_light">Light mode on</string>
+    <string name="settings_general_dark_mode_summary_dark">Dark mode on. Are you a vampire?</string>
     <string name="settings_general_dark_mode_entry_system">Use system default</string>
     <string name="settings_general_dark_mode_entry_light">Light mode</string>
     <string name="settings_general_dark_mode_entry_dark">Dark mode</string>
     <string name="settings_backup_restore_header">Backup &amp; Restore</string>
-    <string name="settings_backup_restore_backup_key">Backup</string>
-    <string name="settings_backup_restore_backup_title">Backup to file</string>
-    <string name="settings_backup_restore_backup_summary">Export config, notifications and users</string>
+    <string name="settings_backup_restore_backup_key" translatable="false">Backup</string>
+    <string name="settings_backup_restore_backup_title">Back up to file</string>
+    <string name="settings_backup_restore_backup_summary">Export config, notifications, and users</string>
     <string name="settings_backup_restore_backup_entry_everything">Everything</string>
     <string name="settings_backup_restore_backup_entry_everything_no_users">Everything, except users</string>
     <string name="settings_backup_restore_backup_entry_settings_only">Settings only</string>
-    <string name="settings_backup_restore_backup_successful">Backup successful</string>
+    <string name="settings_backup_restore_backup_successful">Backup created</string>
     <string name="settings_backup_restore_backup_failed">Backup failed: %1$s</string>
-    <string name="settings_backup_restore_restore_key">Restore</string>
+    <string name="settings_backup_restore_restore_key" translatable="false">Restore</string>
     <string name="settings_backup_restore_restore_title">Restore from file</string>
     <string name="settings_backup_restore_restore_summary">Import config, notifications and users</string>
     <string name="settings_backup_restore_restore_successful">Restore successful</string>
     <string name="settings_backup_restore_restore_failed">Restore failed: %1$s</string>
     <string name="settings_advanced_header">Advanced</string>
-    <string name="settings_advanced_broadcast_key">BroadcastEnabled</string>
+    <string name="settings_advanced_broadcast_key" translatable="false">BroadcastEnabled</string>
     <string name="settings_advanced_broadcast_title">Broadcast messages</string>
     <string name="settings_advanced_broadcast_summary_enabled">Apps can receive incoming notifications as broadcasts</string>
     <string name="settings_advanced_broadcast_summary_disabled">Apps cannot receive notifications as broadcasts</string>
-    <string name="settings_advanced_record_logs_key">RecordLogs</string>
+    <string name="settings_advanced_record_logs_key" translatable="false">RecordLogs</string>
     <string name="settings_advanced_record_logs_title">Record logs</string>
-    <string name="settings_advanced_record_logs_summary_enabled">Logs are currently being recorded to your device. Up to 1,000 log entries are stored.</string>
-    <string name="settings_advanced_record_logs_summary_disabled">Enable log recording, so you can share the logs later. This is useful for diagnosing issues.</string>
-    <string name="settings_advanced_export_logs_key">ExportLogs</string>
+    <string name="settings_advanced_record_logs_summary_enabled">Logging (up to 1,000 entries) to device …</string>
+    <string name="settings_advanced_record_logs_summary_disabled">Turn on logging so you can share logs later to diagnose issues.</string>
+    <string name="settings_advanced_export_logs_key" translatable="false">ExportLogs</string>
     <string name="settings_advanced_export_logs_title">Copy/upload logs</string>
-    <string name="settings_advanced_export_logs_summary">Copy logs to the clipboard, or upload to nopaste.net (owned by ntfy author). Hostnames and topics can be censored, notifications will never be.</string>
+    <string name="settings_advanced_export_logs_summary">Copy logs to the clipboard, or upload to nopaste.net (owned by the ntfy author). Hostnames and topics can be censored, notifications will never be.</string>
     <string name="settings_advanced_export_logs_entry_copy_original">Copy to clipboard</string>
     <string name="settings_advanced_export_logs_entry_copy_scrubbed">Copy to clipboard (censored)</string>
-    <string name="settings_advanced_export_logs_entry_upload_original">Upload &amp; copy link</string>
-    <string name="settings_advanced_export_logs_entry_upload_scrubbed">Upload &amp; copy link (censored)</string>
+    <string name="settings_advanced_export_logs_entry_upload_original">Upload and copy link</string>
+    <string name="settings_advanced_export_logs_entry_upload_scrubbed">Upload and copy link (censored)</string>
     <string name="settings_advanced_export_logs_copied_logs">Logs copied to clipboard</string>
     <string name="settings_advanced_export_logs_uploading">Uploading log …</string>
-    <string name="settings_advanced_export_logs_copied_url">Logs uploaded &amp; URL copied</string>
-    <string name="settings_advanced_export_logs_error_uploading">Error uploading logs: %1$s</string>
-    <string name="settings_advanced_export_logs_scrub_dialog_text">The following topics/hostnames were replaced with fruit names, so you can share the log without worry:\n\n%1$s\n\nPasswords are always scrubbed but not listed here.</string>
-    <string name="settings_advanced_export_logs_scrub_dialog_empty">No topics/hostnames were redacted, maybe you don\'t have any subscriptions?</string>
-    <string name="settings_advanced_export_logs_scrub_dialog_button_ok">Got it</string>
-    <string name="settings_advanced_clear_logs_key">ClearLogs</string>
+    <string name="settings_advanced_export_logs_copied_url">Logs uploaded and URL copied</string>
+    <string name="settings_advanced_export_logs_error_uploading">Could not upload logs: %1$s</string>
+    <string name="settings_advanced_export_logs_scrub_dialog_text">These topics/hostnames were replaced with fruit names, so you can share the log without worry:\n\n%1$s\n\nPasswords are scrubbed, but not listed here.</string>
+    <string name="settings_advanced_export_logs_scrub_dialog_empty">No topics/hostnames were redacted. Maybe you don\'t have any subscriptions?</string>
+    <string name="settings_advanced_export_logs_scrub_dialog_button_ok">OK</string>
+    <string name="settings_advanced_clear_logs_key" translatable="false">ClearLogs</string>
     <string name="settings_advanced_clear_logs_title">Clear logs</string>
     <string name="settings_advanced_clear_logs_summary">Delete previously recorded logs, and start over</string>
-    <string name="settings_advanced_clear_logs_deleted_toast">Logs successfully deleted</string>
-    <string name="settings_advanced_connection_protocol_key">ConnectionProtocol</string>
+    <string name="settings_advanced_clear_logs_deleted_toast">Logs deleted</string>
+    <string name="settings_advanced_connection_protocol_key" translatable="false">ConnectionProtocol</string>
     <string name="settings_advanced_connection_protocol_title">Connection protocol</string>
-    <string name="settings_advanced_connection_protocol_summary_jsonhttp">Use a JSON stream over HTTP to connect to the server. This is the tried and true method, though it may consume more battery.</string>
-    <string name="settings_advanced_connection_protocol_summary_ws">Use WebSockets to connect to the server. This option is experimental. Let us know if it consumes less battery or is unstable.</string>
+    <string name="settings_advanced_connection_protocol_summary_jsonhttp">Use a JSON stream over HTTP to connect to the server. This method is deprecated and will be removed in June 2022.</string>
+    <string name="settings_advanced_connection_protocol_summary_ws">Use WebSockets to connect to the server. This will become the default in June 2022.</string>
     <string name="settings_advanced_connection_protocol_entry_jsonhttp">JSON stream over HTTP</string>
     <string name="settings_advanced_connection_protocol_entry_ws">WebSockets</string>
     <string name="settings_about_header">About</string>
-    <string name="settings_about_version_key">Version</string>
+    <string name="settings_about_version_key" translatable="false">Version</string>
     <string name="settings_about_version_title">Version</string>
     <string name="settings_about_version_format">ntfy %1$s (%2$s)</string>
     <string name="settings_about_version_copied_to_clipboard_message">Copied to clipboard</string>
@@ -352,12 +351,12 @@
     <!-- User add/edit dialog -->
     <string name="user_dialog_title_add">Add user</string>
     <string name="user_dialog_title_edit">Edit user</string>
-    <string name="user_dialog_description_add">You can add a user here that you can later associate with a specific topic.</string>
-    <string name="user_dialog_description_edit">You may edit username/password for the selected user, or delete it entirely.</string>
+    <string name="user_dialog_description_add">You can add a user here. All topics for the given server will use this user.</string>
+    <string name="user_dialog_description_edit">You may edit username/password for the selected user, or delete it.</string>
     <string name="user_dialog_base_url_hint">Server URL</string>
     <string name="user_dialog_username_hint">Username</string>
     <string name="user_dialog_password_hint_add">Password</string>
-    <string name="user_dialog_password_hint_edit">Password (unchanged if blank)</string>
+    <string name="user_dialog_password_hint_edit">Password (unchanged if left blank)</string>
     <string name="user_dialog_button_add">Add user</string>
     <string name="user_dialog_button_cancel">Cancel</string>
     <string name="user_dialog_button_delete">Delete user</string>