Merge branch 'patch-1' of github.com:StoyanDimitrov/ntfy-android into strings-strings-strings

This commit is contained in:
Philipp Heckel 2022-03-27 15:05:48 -04:00
commit 9ddb390a39

View file

@ -33,8 +33,8 @@
<!-- Main activity: Action bar -->
<string name="main_action_bar_title">Subscribed topics</string>
<string name="main_menu_notifications_enabled">Notifications on</string>
<string name="main_menu_notifications_disabled_forever">Notifications off</string>
<string name="main_menu_notifications_disabled_until">Notifications off until %1$s</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" translatable="false">https://github.com/binwiederhier/ntfy/issues</string>
@ -167,8 +167,8 @@
<!-- Detail activity: Action bar -->
<string name="detail_menu_notifications_enabled">Notifications on</string>
<string name="detail_menu_notifications_disabled_forever">Notifications off</string>
<string name="detail_menu_notifications_disabled_until">Notifications off until %1$s</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">Turn off instant delivery</string>
<string name="detail_menu_test">Send test notification</string>
@ -207,7 +207,7 @@
<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 +216,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>
@ -234,8 +234,8 @@
<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">Showing all notifications</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_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">Showing all notifications</string>