refactor

2026-03-21 21:37:29 +00:00 · 2026-02-18 16:03:43 +01:00
parent 77bb948bf2
commit 2be61e8b1c
73 changed files with 1691 additions and 1556 deletions
--- a/commafeed-client/src/app/tree/tree.test.ts
+++ b/commafeed-client/src/app/tree/tree.test.ts
@@ -27,7 +27,7 @@ const createFeed = (id: number, unread: number): Subscription => ({
    feedUrl: "",
    feedLink: "",
    iconUrl: "",
-    notifyOnNewEntries: true,
+    pushNotificationsEnabled: true,
 })

 const root = createCategory("root")
--- a/commafeed-client/src/app/types.ts
+++ b/commafeed-client/src/app/types.ts
@@ -29,7 +29,7 @@ export interface Subscription {
    newestItemTime?: number
    filter?: string
    filterLegacy?: string
-    notifyOnNewEntries: boolean
+    pushNotificationsEnabled: boolean
 }

 export interface Category {
@@ -111,7 +111,7 @@ export interface FeedModificationRequest {
    categoryId?: string
    position?: number
    filter?: string
-    notifyOnNewEntries?: boolean
+    pushNotificationsEnabled: boolean
 }

 export interface GetEntriesRequest {
@@ -238,6 +238,7 @@ export interface ServerInfo {
    forceRefreshCooldownDuration: number
    initialSetupRequired: boolean
    minimumPasswordLength: number
+    pushNotificationsEnabled: boolean
 }

 export interface SharingSettings {
@@ -251,14 +252,13 @@ export interface SharingSettings {
    buffer: boolean
 }

-export type NotificationService = "disabled" | "ntfy" | "gotify" | "pushover"
+export type PushNotificationType = "ntfy" | "gotify" | "pushover"

-export interface NotificationSettings {
-    enabled: boolean
-    type?: Exclude<NotificationService, "disabled">
+export interface PushNotificationSettings {
+    type?: PushNotificationType
    serverUrl?: string
-    token?: string
-    userKey?: string
+    userId?: string
+    userSecret?: string
    topic?: string
 }

@@ -284,7 +284,7 @@ export interface Settings {
    disablePullToRefresh: boolean
    primaryColor?: string
    sharingSettings: SharingSettings
-    notificationSettings: NotificationSettings
+    pushNotificationSettings: PushNotificationSettings
 }

 export interface LocalSettings {
@@ -304,7 +304,7 @@ export interface SubscribeRequest {
    url: string
    title: string
    categoryId?: string
-    notifyOnNewEntries: boolean
+    pushNotificationsEnabled: boolean
 }

 export interface TagRequest {
--- a/commafeed-client/src/app/user/slice.ts
+++ b/commafeed-client/src/app/user/slice.ts
@@ -151,10 +151,7 @@ export const userSlice = createSlice({
        })
        builder.addCase(changeNotificationSettings.pending, (state, action) => {
            if (!state.settings) return
-            state.settings.notificationSettings = {
-                ...state.settings.notificationSettings,
-                ...action.meta.arg,
-            }
+            state.settings.pushNotificationSettings = action.meta.arg
        })

        builder.addMatcher(
--- a/commafeed-client/src/app/user/thunks.ts
+++ b/commafeed-client/src/app/user/thunks.ts
@@ -1,7 +1,7 @@
 import { createAppAsyncThunk } from "@/app/async-thunk"
 import { client } from "@/app/client"
 import { reloadEntries } from "@/app/entries/thunks"
-import type { IconDisplayMode, NotificationSettings, ReadingMode, ReadingOrder, ScrollMode, SharingSettings } from "@/app/types"
+import type { IconDisplayMode, PushNotificationSettings, ReadingMode, ReadingOrder, ScrollMode, SharingSettings } from "@/app/types"

 export const reloadSettings = createAppAsyncThunk("settings/reload", async () => await client.user.getSettings().then(r => r.data))

@@ -160,15 +160,12 @@ export const changeSharingSetting = createAppAsyncThunk(

 export const changeNotificationSettings = createAppAsyncThunk(
    "settings/notificationSettings",
-    (notificationUpdate: Partial<NotificationSettings>, thunkApi) => {
+    (pushNotificationSettings: PushNotificationSettings, thunkApi) => {
        const { settings } = thunkApi.getState().user
        if (!settings) return
        client.user.saveSettings({
            ...settings,
-            notificationSettings: {
-                ...settings.notificationSettings,
-                ...notificationUpdate,
-            },
+            pushNotificationSettings,
        })
    }
 )
--- a/commafeed-client/src/components/ReceivePushNotificationsChechbox.tsx
+++ b/commafeed-client/src/components/ReceivePushNotificationsChechbox.tsx
@@ -0,0 +1,19 @@
+import { Trans } from "@lingui/react/macro"
+import { Checkbox, type CheckboxProps } from "@mantine/core"
+import type { ReactNode } from "react"
+import { useAppSelector } from "@/app/store"
+
+export const ReceivePushNotificationsChechbox = (props: CheckboxProps) => {
+    const pushNotificationsEnabled = useAppSelector(state => state.server.serverInfos?.pushNotificationsEnabled)
+    const pushNotificationsConfigured = useAppSelector(state => !!state.user.settings?.pushNotificationSettings.type)
+
+    const disabled = !pushNotificationsEnabled || !pushNotificationsConfigured
+    let description: ReactNode = ""
+    if (!pushNotificationsEnabled) {
+        description = <Trans>Push notifications are not enabled on this CommaFeed instance.</Trans>
+    } else if (!pushNotificationsConfigured) {
+        description = <Trans>Push notifications are not configured in your user settings.</Trans>
+    }
+
+    return <Checkbox label={<Trans>Receive push notifications</Trans>} disabled={disabled} description={description} {...props} />
+}
--- a/commafeed-client/src/components/content/add/Subscribe.tsx
+++ b/commafeed-client/src/components/content/add/Subscribe.tsx
@@ -1,5 +1,5 @@
 import { Trans } from "@lingui/react/macro"
-import { Box, Button, Checkbox, Group, Stack, Stepper, TextInput } from "@mantine/core"
+import { Box, Button, Group, Stack, Stepper, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { useState } from "react"
 import { useAsyncCallback } from "react-async-hook"
@@ -11,6 +11,7 @@ import { useAppDispatch } from "@/app/store"
 import { reloadTree } from "@/app/tree/thunks"
 import type { FeedInfoRequest, SubscribeRequest } from "@/app/types"
 import { Alert } from "@/components/Alert"
+import { ReceivePushNotificationsChechbox } from "@/components/ReceivePushNotificationsChechbox"
 import { CategorySelect } from "./CategorySelect"

 export function Subscribe() {
@@ -28,7 +29,7 @@ export function Subscribe() {
            url: "",
            title: "",
            categoryId: Constants.categories.all.id,
-            notifyOnNewEntries: true,
+            pushNotificationsEnabled: false,
        },
    })

@@ -104,9 +105,8 @@ export function Subscribe() {
                            <TextInput label={<Trans>Feed URL</Trans>} {...step1Form.getInputProps("url")} disabled />
                            <TextInput label={<Trans>Feed name</Trans>} {...step1Form.getInputProps("title")} required autoFocus />
                            <CategorySelect label={<Trans>Category</Trans>} {...step1Form.getInputProps("categoryId")} clearable />
-                            <Checkbox
-                                label={<Trans>Receive notifications</Trans>}
-                                {...step1Form.getInputProps("notifyOnNewEntries", { type: "checkbox" })}
+                            <ReceivePushNotificationsChechbox
+                                {...step1Form.getInputProps("pushNotificationsEnabled", { type: "checkbox" })}
                            />
                        </Stack>
                    </Stepper.Step>
--- a/commafeed-client/src/components/settings/NotificationSettings.tsx
+++ b/commafeed-client/src/components/settings/NotificationSettings.tsx
@@ -1,125 +0,0 @@
-import { Trans } from "@lingui/react/macro"
-import { Select, Stack, TextInput } from "@mantine/core"
-import { useEffect, useState } from "react"
-import { useAppDispatch, useAppSelector } from "@/app/store"
-import type { NotificationService as NotificationServiceType, NotificationSettings as NotificationSettingsType } from "@/app/types"
-import { changeNotificationSettings } from "@/app/user/thunks"
-
-function useDebouncedSave(value: string, settingsKey: string, dispatch: ReturnType<typeof useAppDispatch>) {
-    const [localValue, setLocalValue] = useState(value)
-
-    useEffect(() => {
-        setLocalValue(value)
-    }, [value])
-
-    const onBlur = async () => {
-        if (localValue !== value) {
-            await dispatch(changeNotificationSettings({ [settingsKey]: localValue }))
-        }
-    }
-
-    return { localValue, setLocalValue, onBlur }
-}
-
-function toServiceValue(settings?: NotificationSettingsType): NotificationServiceType {
-    if (settings?.enabled && settings.type) {
-        return settings.type
-    }
-    return "disabled"
-}
-
-export function NotificationSettings() {
-    const notificationSettings = useAppSelector(state => state.user.settings?.notificationSettings)
-    const dispatch = useAppDispatch()
-
-    const serviceValue = toServiceValue(notificationSettings)
-
-    const serverUrl = useDebouncedSave(notificationSettings?.serverUrl ?? "", "serverUrl", dispatch)
-    const token = useDebouncedSave(notificationSettings?.token ?? "", "token", dispatch)
-    const userKey = useDebouncedSave(notificationSettings?.userKey ?? "", "userKey", dispatch)
-    const topic = useDebouncedSave(notificationSettings?.topic ?? "", "topic", dispatch)
-
-    const onServiceChange = async (value: string | null) => {
-        if (value === "disabled" || !value) {
-            await dispatch(changeNotificationSettings({ enabled: false, type: undefined }))
-        } else {
-            await dispatch(changeNotificationSettings({ enabled: true, type: value as Exclude<NotificationServiceType, "disabled"> }))
-        }
-    }
-
-    return (
-        <Stack>
-            <Select
-                label={<Trans>Notification service</Trans>}
-                data={[
-                    { value: "disabled", label: "Disabled" },
-                    { value: "ntfy", label: "ntfy" },
-                    { value: "gotify", label: "Gotify" },
-                    { value: "pushover", label: "Pushover" },
-                ]}
-                value={serviceValue}
-                onChange={onServiceChange}
-            />
-
-            {serviceValue === "ntfy" && (
-                <>
-                    <TextInput
-                        label={<Trans>Server URL</Trans>}
-                        placeholder="https://ntfy.sh"
-                        value={serverUrl.localValue}
-                        onChange={e => serverUrl.setLocalValue(e.currentTarget.value)}
-                        onBlur={serverUrl.onBlur}
-                    />
-                    <TextInput
-                        label={<Trans>Topic</Trans>}
-                        placeholder="commafeed"
-                        value={topic.localValue}
-                        onChange={e => topic.setLocalValue(e.currentTarget.value)}
-                        onBlur={topic.onBlur}
-                    />
-                    <TextInput
-                        label={<Trans>Access token (optional)</Trans>}
-                        value={token.localValue}
-                        onChange={e => token.setLocalValue(e.currentTarget.value)}
-                        onBlur={token.onBlur}
-                    />
-                </>
-            )}
-
-            {serviceValue === "gotify" && (
-                <>
-                    <TextInput
-                        label={<Trans>Server URL</Trans>}
-                        placeholder="https://gotify.example.com"
-                        value={serverUrl.localValue}
-                        onChange={e => serverUrl.setLocalValue(e.currentTarget.value)}
-                        onBlur={serverUrl.onBlur}
-                    />
-                    <TextInput
-                        label={<Trans>App token</Trans>}
-                        value={token.localValue}
-                        onChange={e => token.setLocalValue(e.currentTarget.value)}
-                        onBlur={token.onBlur}
-                    />
-                </>
-            )}
-
-            {serviceValue === "pushover" && (
-                <>
-                    <TextInput
-                        label={<Trans>API token</Trans>}
-                        value={token.localValue}
-                        onChange={e => token.setLocalValue(e.currentTarget.value)}
-                        onBlur={token.onBlur}
-                    />
-                    <TextInput
-                        label={<Trans>User key</Trans>}
-                        value={userKey.localValue}
-                        onChange={e => userKey.setLocalValue(e.currentTarget.value)}
-                        onBlur={userKey.onBlur}
-                    />
-                </>
-            )}
-        </Stack>
-    )
-}
--- a/commafeed-client/src/components/settings/PushNotificationSettings.tsx
+++ b/commafeed-client/src/components/settings/PushNotificationSettings.tsx
@@ -0,0 +1,93 @@
+import { useLingui } from "@lingui/react"
+import { Trans } from "@lingui/react/macro"
+import { Button, Group, Select, Stack, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { useEffect } from "react"
+import { TbDeviceFloppy } from "react-icons/tb"
+import { redirectToSelectedSource } from "@/app/redirect/thunks"
+import { useAppDispatch, useAppSelector } from "@/app/store"
+import type { PushNotificationSettings as PushNotificationSettingsModel } from "@/app/types"
+import { changeNotificationSettings } from "@/app/user/thunks"
+
+export function PushNotificationSettings() {
+    const notificationSettings = useAppSelector(state => state.user.settings?.pushNotificationSettings)
+    const pushNotificationsEnabled = useAppSelector(state => state.server.serverInfos?.pushNotificationsEnabled)
+    const { _ } = useLingui()
+    const dispatch = useAppDispatch()
+
+    const form = useForm<PushNotificationSettingsModel>()
+    useEffect(() => {
+        if (notificationSettings) form.initialize(notificationSettings)
+    }, [form.initialize, notificationSettings])
+
+    const handleSubmit = (values: PushNotificationSettingsModel) => {
+        dispatch(changeNotificationSettings(values))
+    }
+
+    const typeInputProps = form.getInputProps("type")
+
+    if (!pushNotificationsEnabled) {
+        return <Trans>Push notifications are not enabled on this CommaFeed instance.</Trans>
+    }
+    return (
+        <form onSubmit={form.onSubmit(handleSubmit)}>
+            <Stack>
+                <Select
+                    label={<Trans>Push notification service</Trans>}
+                    data={[
+                        { value: "ntfy", label: "ntfy" },
+                        { value: "gotify", label: "Gotify" },
+                        { value: "pushover", label: "Pushover" },
+                    ]}
+                    clearable
+                    {...typeInputProps}
+                    onChange={value => {
+                        typeInputProps.onChange(value)
+                        form.setFieldValue("serverUrl", "")
+                        form.setFieldValue("topic", "")
+                        form.setFieldValue("userSecret", "")
+                        form.setFieldValue("userId", "")
+                    }}
+                />
+                {form.values.type === "ntfy" && (
+                    <>
+                        <TextInput
+                            label={<Trans>Server URL</Trans>}
+                            placeholder="https://ntfy.sh"
+                            required
+                            {...form.getInputProps("serverUrl")}
+                        />
+                        <TextInput label={<Trans>Topic</Trans>} placeholder="commafeed" required {...form.getInputProps("topic")} />
+                        <TextInput label={<Trans>Access token</Trans>} {...form.getInputProps("userSecret")} />
+                    </>
+                )}
+                {form.values.type === "gotify" && (
+                    <>
+                        <TextInput
+                            label={<Trans>Server URL</Trans>}
+                            placeholder="https://gotify.example.com"
+                            required
+                            {...form.getInputProps("serverUrl")}
+                        />
+                        <TextInput label={<Trans>App token</Trans>} required {...form.getInputProps("userSecret")} />
+                    </>
+                )}
+                {form.values.type === "pushover" && (
+                    <>
+                        <TextInput label={<Trans>User key</Trans>} required {...form.getInputProps("userId")} />
+                        <TextInput label={<Trans>API token</Trans>} required {...form.getInputProps("userSecret")} />
+                    </>
+                )}
+
+                <Group>
+                    <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>
+                        <Trans>Cancel</Trans>
+                    </Button>
+                    <Button type="submit" leftSection={<TbDeviceFloppy size={16} />}>
+                        <Trans>Save</Trans>
+                    </Button>
+                </Group>
+            </Stack>
+        </form>
+    )
+}
--- a/commafeed-client/src/locales/ar/messages.po
+++ b/commafeed-client/src/locales/ar/messages.po
@@ -34,8 +34,8 @@ msgstr "<0> هل تحتاج إلى حساب؟ </0> <1> اشترك! </ 1>"
 msgid "About"
 msgstr "حول"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "مفتاح API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "لم يتم العثور على شيء"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "الأقدم أولا"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "الملف الشخصي"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "إلغاء النجم"
 msgid "Unsubscribe"
 msgstr "إلغاء الاشتراك"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/ca/messages.po
+++ b/commafeed-client/src/locales/ca/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Necessites un compte?</0><1>Registreu-vos!</1>"
 msgid "About"
 msgstr "Sobre"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr "Anunci"
 msgid "API key"
 msgstr "Clau API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr "No hi ha opcions de compartició disponibles."
 msgid "Nothing found"
 msgstr "No s'ha trobat res"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "el més vell primer"
@@ -827,9 +820,25 @@ msgstr "Color primari"
 msgid "Profile"
 msgstr "Perfil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr "Clic dret"
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr "Selecciona el següent canal/categoria no llegit"
 msgid "Select previous unread feed/category"
 msgstr "Selecciona el canal/categoria anterior sense llegir"

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr "Canvia la barra lateral"
 msgid "Toggle starred status of current entry"
 msgstr "Commuta l'estat destacat de l'entrada actual"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Desestrellar"
 msgid "Unsubscribe"
 msgstr "Donar-se de baixa"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/cs/messages.po
+++ b/commafeed-client/src/locales/cs/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Potřebujete účet?</0><1>Zaregistrujte se!</1>"
 msgid "About"
 msgstr "Asi"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "Klíč API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Nic nebylo nalezeno"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Nejdříve nejstarší"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Odstranit hvězdu"
 msgid "Unsubscribe"
 msgstr "Odhlásit odběr"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/cy/messages.po
+++ b/commafeed-client/src/locales/cy/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Angen cyfrif?</0><1>Ymunwch!</1>"
 msgid "About"
 msgstr "Ynghylch"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "Allwedd API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Dim wedi'i ddarganfod"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Hynaf yn gyntaf"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Proffil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "dad-seren"
 msgid "Unsubscribe"
 msgstr "Dad-danysgrifio"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/da/messages.po
+++ b/commafeed-client/src/locales/da/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Har du brug for en konto?</0><1>Tilmeld dig!</1>"
 msgid "About"
 msgstr "Omkring"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "API-nøgle"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Intet fundet"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Ældst først"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr ""
 msgid "Unsubscribe"
 msgstr "Afmeld"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/de/messages.po
+++ b/commafeed-client/src/locales/de/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Benötigen Sie ein Konto?</0><1>Hier geht's zur Registrierung!</1>"
 msgid "About"
 msgstr "Über"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr "Ankündigung"
 msgid "API key"
 msgstr "API-Schlüssel"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Nichts gefunden"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Älteste zuerst"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr "Rechtsklick"
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr "Sidebar an- und ausschalten"
 msgid "Toggle starred status of current entry"
 msgstr "Markierungsstatus des aktuellen Eintrags ändern"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Stern entfernen"
 msgid "Unsubscribe"
 msgstr "Abbestellen"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/en/messages.po
+++ b/commafeed-client/src/locales/en/messages.po
@@ -34,9 +34,9 @@ msgstr "<0>Need an account?</0><1>Sign up!</1>"
 msgid "About"
 msgstr "About"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
-msgstr "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
+msgstr "Access token"

 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Actions"
@@ -98,11 +98,11 @@ msgstr "Announcement"
 msgid "API key"
 msgstr "API key"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr "API token"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr "App token"

@@ -170,6 +170,7 @@ msgstr "Build a filter expression to indicate what you want to read. Entries tha
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr "No sharing options available."
 msgid "Nothing found"
 msgstr "Nothing found"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr "Notification service"
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr "Notifications"
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Oldest first"
@@ -827,10 +820,26 @@ msgstr "Primary color"
 msgid "Profile"
 msgstr "Profile"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
-msgstr "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr "Push notification service"
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr "Push notifications"
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr "Push notifications are not configured in your user settings."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr "Push notifications are not enabled on this CommaFeed instance."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
+msgstr "Receive push notifications"

 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Recover password"
@@ -866,6 +875,7 @@ msgstr "Right click"
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr "Select next unread feed/category"
 msgid "Select previous unread feed/category"
 msgstr "Select previous unread feed/category"

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr "Server URL"

@@ -1080,7 +1090,7 @@ msgstr "Toggle sidebar"
 msgid "Toggle starred status of current entry"
 msgstr "Toggle starred status of current entry"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr "Topic"

@@ -1107,7 +1117,7 @@ msgstr "Unstar"
 msgid "Unsubscribe"
 msgstr "Unsubscribe"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr "User key"

--- a/commafeed-client/src/locales/es/messages.po
+++ b/commafeed-client/src/locales/es/messages.po
@@ -35,8 +35,8 @@ msgstr "<0>¿Necesitas una cuenta?</0><1>¡Regístrate!</1>"
 msgid "About"
 msgstr "Acerca de"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -99,11 +99,11 @@ msgstr "Anuncio"
 msgid "API key"
 msgstr "Clave API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -171,6 +171,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -679,14 +680,6 @@ msgstr "No hay opciones para compartir disponibles."
 msgid "Nothing found"
 msgstr "Nada encontrado"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Las más antiguas primero"
@@ -828,9 +821,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Perfil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -867,6 +876,7 @@ msgstr "Clic derecho"
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -899,8 +909,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1081,7 +1091,7 @@ msgstr "Alternar barra lateral"
 msgid "Toggle starred status of current entry"
 msgstr "Alternar estado destacado de la entrada actual"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1108,7 +1118,7 @@ msgstr "Desmarcar"
 msgid "Unsubscribe"
 msgstr "Cancelar suscripción"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/fa/messages.po
+++ b/commafeed-client/src/locales/fa/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>به یک حساب نیاز دارید؟</0><1>ثبت نام کنید
 msgid "About"
 msgstr "در مورد"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "کلید API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "چیزی پیدا نشد"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "قدیمی ترین اول"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "نمایه"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr ""
 msgid "Unsubscribe"
 msgstr "لغو اشتراک"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/fi/messages.po
+++ b/commafeed-client/src/locales/fi/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Tarvitsetko tilin?</0><1>Rekisteröidy!</1>"
 msgid "About"
 msgstr "Noin"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "API-avain"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Mitään ei löytynyt"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Vanhin ensin"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profiili"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Poista tähti"
 msgid "Unsubscribe"
 msgstr "Peruuta tilaus"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/fr/messages.po
+++ b/commafeed-client/src/locales/fr/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Besoin d'un compte ?</0><1>Enregistrez-vous !</1>"
 msgid "About"
 msgstr "À propos"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr "Annonces"
 msgid "API key"
 msgstr "Clé API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr "Aucune option de partage disponible"
 msgid "Nothing found"
 msgstr "Aucun résultat"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Du plus ancien au plus récent"
@@ -827,9 +820,25 @@ msgstr "Couleur d'ambiance"
 msgid "Profile"
 msgstr "Profil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr "Clic droit"
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr "Sélectionner l'article non lu suivant/la catégorie non lue suivante"
 msgid "Select previous unread feed/category"
 msgstr "Sélectionner l'article non lu précédent/la catégorie non lue précédente"

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr "Montrer/cacher la barre latérale"
 msgid "Toggle starred status of current entry"
 msgstr "Montrer/cacher le statut favori de l'entrée"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Retirer des favoris"
 msgid "Unsubscribe"
 msgstr "Se désabonner"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/gl/messages.po
+++ b/commafeed-client/src/locales/gl/messages.po
@@ -35,8 +35,8 @@ msgstr "<0>Necesitas unha conta?</0><1>Crea unha!</1>"
 msgid "About"
 msgstr "Sobre"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -99,11 +99,11 @@ msgstr "Anuncio"
 msgid "API key"
 msgstr "Clave API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -171,6 +171,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -679,14 +680,6 @@ msgstr "Non hai opcións para poder compartir."
 msgid "Nothing found"
 msgstr "Non se atopou nada"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Primeiro o máis antigo"
@@ -828,9 +821,25 @@ msgstr "Cor destacada"
 msgid "Profile"
 msgstr "Perfil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -867,6 +876,7 @@ msgstr "Botón dereito"
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -899,8 +909,8 @@ msgstr "Seleccionar a seguinte canle/categoría sen ler"
 msgid "Select previous unread feed/category"
 msgstr "Seleccionar a canle/categoría anterior sen ler"

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1081,7 +1091,7 @@ msgstr "Activación do panel lateral"
 msgid "Toggle starred status of current entry"
 msgstr "Activación do marcado con estrela do artigo actual"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1108,7 +1118,7 @@ msgstr "Retirar estrela"
 msgid "Unsubscribe"
 msgstr "Cancelar a subscrición"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/hu/messages.po
+++ b/commafeed-client/src/locales/hu/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Fiókra van szüksége?</0><1>Regisztráljon!</1>"
 msgid "About"
 msgstr "Kb"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "API kulcs"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Semmi sem található"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "A legidősebb első"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr ""
 msgid "Unsubscribe"
 msgstr "Leiratkozás"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/id/messages.po
+++ b/commafeed-client/src/locales/id/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Butuh akun?</0><1>Daftar!</1>"
 msgid "About"
 msgstr "Tentang"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "kunci API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Tidak ada yang ditemukan"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Tertua dulu"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Hapus bintang"
 msgid "Unsubscribe"
 msgstr "Berhenti berlangganan"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/it/messages.po
+++ b/commafeed-client/src/locales/it/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Hai bisogno di un account?</0><1>Registrati!</1>"
 msgid "About"
 msgstr "Circa"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "Chiave API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Non è stato trovato nulla"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Il più vecchio prima"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profilo"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Elimina le stelle"
 msgid "Unsubscribe"
 msgstr "Annulla iscrizione"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/ja/messages.po
+++ b/commafeed-client/src/locales/ja/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>アカウントが必要ですか?</0><1>サインアップ!</1>"
 msgid "About"
 msgstr "About"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr "お知らせ"
 msgid "API key"
 msgstr "APIキー"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr "共有オプションは利用できません。"
 msgid "Nothing found"
 msgstr "何も見つかりませんでした"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "古い順"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "プロフィール"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr "右クリック"
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr "サイドバーを切り替える"
 msgid "Toggle starred status of current entry"
 msgstr "現在のエントリーのスターステータスを切り替える"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "スターを外す"
 msgid "Unsubscribe"
 msgstr "退会"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/ko/messages.po
+++ b/commafeed-client/src/locales/ko/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>계정이 필요하십니까?</0><1>가입하세요!</1>"
 msgid "About"
 msgstr "정보"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "API 키"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "아무것도 찾을 수 없습니다"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "가장 오래된 것부터"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "프로필"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "별표 제거"
 msgid "Unsubscribe"
 msgstr "구독 취소"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/ms/messages.po
+++ b/commafeed-client/src/locales/ms/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Perlukan akaun?</0><1>Daftar!</1>"
 msgid "About"
 msgstr "Mengenai"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "Kunci API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Tiada apa-apa dijumpai"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Tertua dahulu"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Nyahbintang"
 msgid "Unsubscribe"
 msgstr "Nyahlanggan"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/nb/messages.po
+++ b/commafeed-client/src/locales/nb/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Trenger du en konto?</0><1>Registrer deg!</1>"
 msgid "About"
 msgstr "Omtrent"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "API-nøkkel"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Ingenting funnet"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Eldste først"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Fjern stjerne"
 msgid "Unsubscribe"
 msgstr "Avslutt abonnementet"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/nl/messages.po
+++ b/commafeed-client/src/locales/nl/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Een account nodig?</0><1>Meld je aan!</1>"
 msgid "About"
 msgstr "Over"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "API-sleutel"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Niets gevonden"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Oudste eerst"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profiel"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Sterren uit"
 msgid "Unsubscribe"
 msgstr "Afmelden"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/nn/messages.po
+++ b/commafeed-client/src/locales/nn/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Trenger du en konto?</0><1>Registrer deg!</1>"
 msgid "About"
 msgstr "Omtrent"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "API-nøkkel"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Ingenting funnet"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Eldste først"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Fjern stjerne"
 msgid "Unsubscribe"
 msgstr "Avslutt abonnementet"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/pl/messages.po
+++ b/commafeed-client/src/locales/pl/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Potrzebujesz konta?</0><1>Zarejestruj się!</1>"
 msgid "About"
 msgstr "O"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "klucz API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Nic nie znaleziono"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Najstarsze jako pierwsze"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr ""
 msgid "Unsubscribe"
 msgstr "Anuluj subskrypcję"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/pt/messages.po
+++ b/commafeed-client/src/locales/pt/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Precisa de uma conta?</0><1>Inscreva-se!</1>"
 msgid "About"
 msgstr "Sobre"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr "Aviso"
 msgid "API key"
 msgstr "chave de API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr "Nenhuma opção de compartilhamento disponível"
 msgid "Nothing found"
 msgstr "Nada encontrado"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Mais antigo primeiro"
@@ -827,9 +820,25 @@ msgstr "Cor primária"
 msgid "Profile"
 msgstr "Perfil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr "Clique com o botão direito"
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr "Selecionar próximo feed/categoria não lido"
 msgid "Select previous unread feed/category"
 msgstr "Selecionar feed/categoria não lido anterior"

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr "Alternar barra lateral"
 msgid "Toggle starred status of current entry"
 msgstr "Alternar estrela da entrada atual"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Desestrelar"
 msgid "Unsubscribe"
 msgstr "Cancelar inscrição"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/ru/messages.po
+++ b/commafeed-client/src/locales/ru/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Нужен аккаунт?</0><1>Зарегистрируйтесь!<
 msgid "About"
 msgstr "О CommaFeed"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr "Объявление"
 msgid "API key"
 msgstr "Ключ API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Ничего не найдено"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Сначала самые старые"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Профиль"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr "Правый клик"
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr "Переключить боковую панель"
 msgid "Toggle starred status of current entry"
 msgstr "Переключение статуса избранное для текущей записи"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Удалить из избранного"
 msgid "Unsubscribe"
 msgstr "Отписаться"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/sk/messages.po
+++ b/commafeed-client/src/locales/sk/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Potrebujete účet?</0><1>Zaregistrujte sa!</1>"
 msgid "About"
 msgstr "Asi"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "Kľúč API"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Nič sa nenašlo"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Najprv najstarší"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Odobrať hviezdičku"
 msgid "Unsubscribe"
 msgstr "Zrušte odber"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/sv/messages.po
+++ b/commafeed-client/src/locales/sv/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Behöver du ett konto?</0><1>Registrera dig!</1>"
 msgid "About"
 msgstr "Ungefär"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr ""
 msgid "API key"
 msgstr "API-nyckel"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Inget hittades"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Äldst först"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr ""
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr ""
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr ""
 msgid "Unsubscribe"
 msgstr "Avregistrera"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/tr/messages.po
+++ b/commafeed-client/src/locales/tr/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>Bir hesaba mı ihtiyacınız var?</0><1>Kaydolun!</1>"
 msgid "About"
 msgstr "Hakkında"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr "Duyuru"
 msgid "API key"
 msgstr "API anahtarı"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr "Hiçbir şey bulunamadı"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "Önce en eski"
@@ -827,9 +820,25 @@ msgstr ""
 msgid "Profile"
 msgstr "Profil"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr "Sağ tık"
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr ""
 msgid "Select previous unread feed/category"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr "Kenar çubuğunu göster/gizle"
 msgid "Toggle starred status of current entry"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "Yıldızı kaldır"
 msgid "Unsubscribe"
 msgstr "Aboneliği iptal et"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/locales/zh/messages.po
+++ b/commafeed-client/src/locales/zh/messages.po
@@ -34,8 +34,8 @@ msgstr "<0>需要一个帐户？</0><1>注册！</1>"
 msgid "About"
 msgstr "关于"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Access token (optional)"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
 msgstr ""

 #: src/pages/admin/AdminUsersPage.tsx
@@ -98,11 +98,11 @@ msgstr "公告"
 msgid "API key"
 msgstr "API 密钥"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "API token"
 msgstr ""

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "App token"
 msgstr ""

@@ -170,6 +170,7 @@ msgstr ""
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/admin/AdminUsersPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
@@ -678,14 +679,6 @@ msgstr "没有可用的分享选项"
 msgid "Nothing found"
 msgstr "没有找到"

-#: src/components/settings/NotificationSettings.tsx
-msgid "Notification service"
-msgstr ""
-
-#: src/pages/app/SettingsPage.tsx
-msgid "Notifications"
-msgstr ""
-
 #: src/pages/app/AboutPage.tsx
 msgid "Oldest first"
 msgstr "最早的优先"
@@ -827,9 +820,25 @@ msgstr "主颜色"
 msgid "Profile"
 msgstr "配置文件"

-#: src/components/content/add/Subscribe.tsx
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Receive notifications"
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr ""
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr ""
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
 msgstr ""

 #: src/pages/auth/PasswordRecoveryPage.tsx
@@ -866,6 +875,7 @@ msgstr "右键单击"
 #: src/components/admin/UserEdit.tsx
 #: src/components/settings/CustomCodeSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Save"
@@ -898,8 +908,8 @@ msgstr "选择下一个未读信息流/类别"
 msgid "Select previous unread feed/category"
 msgstr "选择上一个未读信息流/类别"

-#: src/components/settings/NotificationSettings.tsx
-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Server URL"
 msgstr ""

@@ -1080,7 +1090,7 @@ msgstr "切换侧边栏"
 msgid "Toggle starred status of current entry"
 msgstr "切换当前条目的星标状态"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "Topic"
 msgstr ""

@@ -1107,7 +1117,7 @@ msgstr "取消星标"
 msgid "Unsubscribe"
 msgstr "取消订阅"

-#: src/components/settings/NotificationSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
 msgid "User key"
 msgstr ""

--- a/commafeed-client/src/pages/admin/MetricsPage.tsx
+++ b/commafeed-client/src/pages/admin/MetricsPage.tsx
@@ -19,10 +19,8 @@ const shownGauges: Record<string, string> = {
    "com.commafeed.backend.feed.FeedRefreshEngine.queue.size": "Feed Refresh Engine queue size",
    "com.commafeed.backend.feed.FeedRefreshEngine.worker.active": "Feed Refresh Engine active HTTP workers",
    "com.commafeed.backend.feed.FeedRefreshEngine.updater.active": "Feed Refresh Engine active database update workers",
-    "com.commafeed.backend.HttpGetter.pool.max": "HttpGetter max pool size",
-    "com.commafeed.backend.HttpGetter.pool.size": "HttpGetter current pool size",
-    "com.commafeed.backend.HttpGetter.pool.leased": "HttpGetter active connections",
-    "com.commafeed.backend.HttpGetter.pool.pending": "HttpGetter waiting for a connection",
+    "com.commafeed.backend.feed.FeedRefreshEngine.notifier.active": "Feed Refresh Engine active push notifications workers",
+    "com.commafeed.backend.feed.FeedRefreshEngine.notifier.queue": "Feed Refresh Engine queued push notifications workers",
    "com.commafeed.backend.HttpGetter.cache.size": "HttpGetter cached entries",
    "com.commafeed.backend.HttpGetter.cache.memoryUsage": "HttpGetter cache memory usage",
    "com.commafeed.frontend.ws.WebSocketSessions.users": "WebSocket users",
--- a/commafeed-client/src/pages/app/FeedDetailsPage.tsx
+++ b/commafeed-client/src/pages/app/FeedDetailsPage.tsx
@@ -3,7 +3,6 @@ import {
    Anchor,
    Box,
    Button,
-    Checkbox,
    Code,
    Container,
    Divider,
@@ -31,6 +30,7 @@ import { Alert } from "@/components/Alert"
 import { CategorySelect } from "@/components/content/add/CategorySelect"
 import { FilteringExpressionEditor } from "@/components/content/edit/FilteringExpressionEditor"
 import { Loader } from "@/components/Loader"
+import { ReceivePushNotificationsChechbox } from "@/components/ReceivePushNotificationsChechbox"
 import { RelativeDate } from "@/components/RelativeDate"

 export function FeedDetailsPage() {
@@ -143,6 +143,7 @@ export function FeedDetailsPage() {
                    <TextInput label={<Trans>Name</Trans>} {...form.getInputProps("name")} required />
                    <CategorySelect label={<Trans>Category</Trans>} {...form.getInputProps("categoryId")} clearable />
                    <NumberInput label={<Trans>Position</Trans>} {...form.getInputProps("position")} required min={0} />
+                    <ReceivePushNotificationsChechbox {...form.getInputProps("pushNotificationsEnabled", { type: "checkbox" })} />
                    <Input.Wrapper
                        label={<Trans>Filtering expression</Trans>}
                        description={
@@ -164,10 +165,6 @@ export function FeedDetailsPage() {
                            <FilteringExpressionEditor initialValue={feed.filter} onChange={value => form.setFieldValue("filter", value)} />
                        </Box>
                    </Input.Wrapper>
-                    <Checkbox
-                        label={<Trans>Receive notifications</Trans>}
-                        {...form.getInputProps("notifyOnNewEntries", { type: "checkbox" })}
-                    />

                    <Group>
                        <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>
--- a/commafeed-client/src/pages/app/SettingsPage.tsx
+++ b/commafeed-client/src/pages/app/SettingsPage.tsx
@@ -3,8 +3,8 @@ import { Container, Tabs } from "@mantine/core"
 import { TbBell, TbCode, TbPhoto, TbUser } from "react-icons/tb"
 import { CustomCodeSettings } from "@/components/settings/CustomCodeSettings"
 import { DisplaySettings } from "@/components/settings/DisplaySettings"
-import { NotificationSettings } from "@/components/settings/NotificationSettings"
 import { ProfileSettings } from "@/components/settings/ProfileSettings"
+import { PushNotificationSettings } from "@/components/settings/PushNotificationSettings"

 export function SettingsPage() {
    return (
@@ -14,8 +14,8 @@ export function SettingsPage() {
                    <Tabs.Tab value="display" leftSection={<TbPhoto size={16} />}>
                        <Trans>Display</Trans>
                    </Tabs.Tab>
-                    <Tabs.Tab value="notifications" leftSection={<TbBell size={16} />}>
-                        <Trans>Notifications</Trans>
+                    <Tabs.Tab value="push-notifications" leftSection={<TbBell size={16} />}>
+                        <Trans>Push notifications</Trans>
                    </Tabs.Tab>
                    <Tabs.Tab value="customCode" leftSection={<TbCode size={16} />}>
                        <Trans>Custom code</Trans>
@@ -29,8 +29,8 @@ export function SettingsPage() {
                    <DisplaySettings />
                </Tabs.Panel>

-                <Tabs.Panel value="notifications" pt="xl">
-                    <NotificationSettings />
+                <Tabs.Panel value="push-notifications" pt="xl">
+                    <PushNotificationSettings />
                </Tabs.Panel>

                <Tabs.Panel value="customCode" pt="xl">