release 7.3.0

fix(deps): update dependency org.apache.commons:commons-collections4 to v4.6.0

.github/stale.yml

@@ -7,6 +7,7 @@ exemptLabels:
   - pinned
   - security
   - enhancement
+  - feature-request
   - bug
 # Label to use when marking an issue as stale
 staleLabel: wontfix

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 25
   DOCKER_BUILD_SUMMARY: false
 
 jobs:
@@ -23,18 +23,24 @@ jobs:
     steps:
       # Checkout
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
 
       # Setup
       - name: Set up GraalVM
-        uses: graalvm/setup-graalvm@7f488cf82a3629ee755e4e97342c01d6bed318fa # v1
+        uses: graalvm/setup-graalvm@5298d94fb55a4f185c602eeac5de1b553882abe2 # v1.6.4
         with:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: "graalvm"
           cache: "maven"
 
+      - name: Set up NodeJS cache
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        with:
+          cache: "npm"
+          cache-dependency-path: 'commafeed-client/package-lock.json'
+
       - name: Install Playwright dependencies
         run: sudo apt-get install -y libgbm1
         if: matrix.os != 'windows-latest'
@@ -48,39 +54,39 @@ jobs:
         run: mkdir -p target/pages/documentation/custom-css
 
       - name: Convert readme file to html
-        uses: jaywcjlove/markdown-to-html-cli@d2c8ffd676de1801e2586904bc540a938e4bc480 # v5.0.3
+        uses: jaywcjlove/markdown-to-html-cli@cff9330af4ca8048b197a76d9eb1db189c2a7cee # v5.0.4
         with:
           source: README.md
           output: target/pages/index.html
 
       - name: Convert config documentation to html
-        uses: jaywcjlove/markdown-to-html-cli@d2c8ffd676de1801e2586904bc540a938e4bc480 # v5.0.3
+        uses: jaywcjlove/markdown-to-html-cli@cff9330af4ca8048b197a76d9eb1db189c2a7cee # v5.0.4
         with:
           source: commafeed-server/target/quarkus-generated-doc/config/commafeed-server.md
           output: target/pages/documentation/index.html
 
       - name: Convert custom css documentation to html
-        uses: jaywcjlove/markdown-to-html-cli@d2c8ffd676de1801e2586904bc540a938e4bc480 # v5.0.3
+        uses: jaywcjlove/markdown-to-html-cli@cff9330af4ca8048b197a76d9eb1db189c2a7cee # v5.0.4
         with:
           source: documentation/CUSTOMCSS.md
           output: target/pages/documentation/custom-css/index.html
 
       # Upload artifacts
       - name: Upload cross-platform app
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         if: matrix.os == 'ubuntu-latest' # we only need to upload the cross-platform artifact once per database
         with:
           name: commafeed-${{ matrix.database }}-jvm
           path: commafeed-server/target/commafeed-*.zip
 
       - name: Upload native executable
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: commafeed-${{ matrix.database }}-${{ runner.os }}-${{ runner.arch }}
           path: commafeed-server/target/commafeed-*-runner*
 
       - name: Upload pages
-        uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3
+        uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
         if: matrix.os == 'ubuntu-latest' && matrix.database == 'h2' # we only need to upload the pages once
         with:
           path: target/pages
@@ -98,23 +104,23 @@ jobs:
     steps:
       # Checkout
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
 
       # Setup
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3
+        uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
 
       - name: Install required packages
         run: sudo apt-get install -y rename unzip
 
       # Prepare artifacts
       - name: Download artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           pattern: commafeed-${{ matrix.database }}-*
           path: ./artifacts
@@ -135,7 +141,7 @@ jobs:
 
       # Docker
       - name: Login to Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3
+        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
         if: ${{ env.DOCKERHUB_USERNAME != '' }}
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -143,7 +149,7 @@ jobs:
 
       ## build but don't push for PRs and renovate
       - name: Docker build - native
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
         with:
           context: .
           file: commafeed-server/src/main/docker/Dockerfile.native
@@ -151,7 +157,7 @@ jobs:
           platforms: linux/amd64,linux/arm64/v8
 
       - name: Docker build - jvm
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
         with:
           context: .
           file: commafeed-server/src/main/docker/Dockerfile.jvm
@@ -160,7 +166,7 @@ jobs:
 
       ## build and push tag
       - name: Docker build and push tag - native
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
         if: ${{ github.ref_type == 'tag' }}
         with:
           context: .
@@ -172,7 +178,7 @@ jobs:
             athou/commafeed:${{ github.ref_name }}-${{ matrix.database }}
 
       - name: Docker build and push tag - jvm
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
         if: ${{ github.ref_type == 'tag' }}
         with:
           context: .
@@ -185,7 +191,7 @@ jobs:
 
       ## build and push master
       - name: Docker build and push master - native
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
         if: ${{ github.ref_name == 'master' }}
         with:
           context: .
@@ -195,7 +201,7 @@ jobs:
           tags: athou/commafeed:master-${{ matrix.database }}
 
       - name: Docker build and push master - jvm
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
         if: ${{ github.ref_name == 'master' }}
         with:
           context: .
@@ -215,12 +221,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
 
       - name: Download artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           pattern: commafeed-*
           path: ./artifacts
@@ -230,13 +236,13 @@ jobs:
         run: chmod +x artifacts/*-runner
 
       - name: Extract Changelog Entry
-        uses: mindsers/changelog-reader-action@32aa5b4c155d76c94e4ec883a223c947b2f02656 # v2
+        uses: mindsers/changelog-reader-action@1faaf50aa09d5793d9a100819973df801febfb31 # v2.4.0
         id: changelog_reader
         with:
           version: ${{ github.ref_name }}
 
       - name: Create GitHub release
-        uses: ncipollo/release-action@bcfe5470707e8832e12347755757cec0eb3c22af # v1
+        uses: ncipollo/release-action@339a81892b84b4eeb0f6e744e4574d79d0d9b8dd # v1.21.0
         with:
           name: CommaFeed ${{ github.ref_name }}
           body: ${{ steps.changelog_reader.outputs.changes }}
@@ -249,12 +255,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
 
       - name: Update Docker Hub Description
-        uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4
+        uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # v5.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -274,5 +280,5 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
 
     steps:
-      - uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4
+      - uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0
         id: deployment

.github/workflows/scorecard.yml

@@ -1,78 +0,0 @@
-# This workflow uses actions that are not certified by GitHub. They are provided
-# by a third-party and are governed by separate terms of service, privacy
-# policy, and support documentation.
-
-name: Scorecard supply-chain security
-on:
-  # For Branch-Protection check. Only the default branch is supported. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
-  branch_protection_rule:
-  # To guarantee Maintained check is occasionally updated. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
-  schedule:
-    - cron: '42 13 * * 4'
-  push:
-    branches: [ "master" ]
-
-# Declare default permissions as read only.
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecard analysis
-    runs-on: ubuntu-latest
-    # `publish_results: true` only works when run from the default branch. conditional can be removed if disabled.
-    if: github.event.repository.default_branch == github.ref_name || github.event_name == 'pull_request'
-    permissions:
-      # Needed to upload the results to code-scanning dashboard.
-      security-events: write
-      # Needed to publish results and get a badge (see publish_results below).
-      id-token: write
-      # Uncomment the permissions below if installing in a private repository.
-      # contents: read
-      # actions: read
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
-          # - you want to enable the Branch-Protection check on a *public* repository, or
-          # - you are installing Scorecard on a *private* repository
-          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
-          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
-
-          # Public repositories:
-          #   - Publish results to OpenSSF REST API for easy access by consumers
-          #   - Allows the repository to include the Scorecard badge.
-          #   - See https://github.com/ossf/scorecard-action#publishing-results.
-          # For private repositories:
-          #   - `publish_results` will always be set to `false`, regardless
-          #     of the value entered here.
-          publish_results: true
-
-          # (Optional) Uncomment file_mode if you have a .gitattributes with files marked export-ignore
-          # file_mode: git
-
-      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
-      # format to the repository Actions tab.
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard (optional).
-      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
-        with:
-          sarif_file: results.sarif

.github/workflows/sonar.yml

@@ -1,41 +0,0 @@
-name: SonarQube
-
-permissions:
-  contents: read
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [ opened, synchronize, reopened ]
-
-env:
-  JAVA_VERSION: 21
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      # Checkout
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          fetch-depth: 0
-
-      # Setup
-      - name: Set up JDK
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
-          distribution: "temurin"
-          cache: "maven"
-
-      - name: Install Playwright dependencies
-        run: sudo apt-get install -y libgbm1
-
-      # Run test coverage and SonarQube analysis
-      - name: Analyze with SonarQube
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn --batch-mode verify sonar:sonar -Dsonar.projectKey=Athou_commafeed

.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
+wrapperVersion=3.3.4
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip

CHANGELOG.md

@@ -1,5 +1,85 @@
 # Changelog
 
+## [7.3.0]
+
+- Add support for the Google Reader API for native mobile apps that don't support the Fever API
+- The profile menu now works again on mobile when action buttons are at the bottom of the screen
+- More SSRF protection regarding IPv6
+- Changed the default value of `blockLocalAddresses` to make CommaFeed more secure out-of-the-box. See the "Access to
+  local address blocked" section of the README if you subscribe to feeds that are only available on your local network.
+
+## [7.2.1]
+
+- correctly handle favicons hosted at the root of the domain for feeds with non-default ports
+- prevent XXS injections in third party apps. The CommaFeed React client was already stripping malicious "javascript:" URLs, they are now filtered during feed parsing and no longer stored in the database/served through the REST API.
+
+## [7.2.0]
+
+- Add support for icons declared in feeds. This is useful for feeds exposed by RSS bridges (#2048)
+- Search now also works for starred entries (#2217)
+- The error message when subscribing to a feed is now properly displayed again
+- Small performance improvements to the feed refresh engine
+- Removed the Pocket sharing feature because the Pocket service has been discontinued
+- Prevent the image proxy feature to access any URL to avoid SSRF attacks
+- Strengthened the SSRF protection by also blocking ULA and CGNAT ranges
+- Prevent DDOS attacks by filtering OPML files during imports
+
+## [7.1.0]
+
+- Display the unread count in the header on mobile, since the tree is hidden by default and the unread count is not visible otherwise (#2055)
+- The feed refresh engine is now a little bit more performant (#2089)
+- On shutdown, give the feed refresh engine some time to finish refreshing feeds before killing it. This is controlled by the new `commafeed.shutdown-timeout` setting, which defaults to 2 seconds
+
+## [7.0.0]
+
+- Replaced the JEXL filter expression for marking feed entries as read automatically with a user-friendly visual query builder. Expressions are now evaluated with Common Expression Language, which is safer than JEXL and sanboxed by default.
+- Added a per-feed setting for sending push notifications to ntfy, Gotify or Pushover when new feed entries are discovered (#1610)
+- Added a per-feed setting for marking entries as read after a number of days (#2041)
+- The default value of `commafeed.http-client.block-local-addresses` is now false, allowing users to subscribe to feeds only available on their local network. This may be a security risk (SSRF) if your instance is accessible by untrusted users, so you may want to set it to true if you host a public instance of CommaFeed with user registeration enabled.
+- When `commafeed.http-client.block-local-addresses` is enabled, SSRF is now also mitigated by blocking public websites redirecting to local ones.
+
+## [6.2.0]
+
+- Starred entries are no longer deleted after a certain amount of time, they are now kept indefinitely. The new `commafeed.database.cleanup.keep-starred-entries` setting can be disabled to restore the previous behavior if you want to keep deleting starred entries during normal entries cleanup (#1581)
+
+## [6.1.1]
+
+- Fix old starred entries not loading if they were marked as read (#2031)
+
+## [6.1.0]
+
+- When clicking on the password reset link, a random password is no longer generated automatically. The user is now redirected to a page where they can set their own password (#2023)
+- Use browser preferred language instead of English when using CommaFeed for the first time (#2018)
+- The profile menu is now closed when scrolling the page (#2019)
+- The "disable pull to refresh" feature is now disabled by default (#2030)
+
+## [6.0.0]
+
+- When booting CommaFeed for the first time, the default "admin" account is no longer created automatically. A setup wizard will guide you through the creation of an admin account
+- Default password complexity requirements have been lowered for local network deployments, where strict password rules are often unnecessary. The `commafeed.users.strict-password-policy` setting has been replaced by `commafeed.users.minimum-password-length` with a default value of `4` (#1916)
+- Email addresses are no longer required when creating users and when they update their profile. The `commafeed.users.email-address-required` setting has been added to restore the previous behavior (#1914)
+- Java 25+ is now required to build and run CommaFeed
+
+## [5.12.1]
+
+- The favicon is now crispier (#1978)
+- The ReadKit iOS app now works via the Fever API (#1602)
+
+## [5.12.0]
+
+- Added a setting to disable the "disable pull to refresh" feature because it messes with some browsers (#1168)
+- Emojis in feeds are now correctly displayed (#1955)
+- Don't show "Star/Unstar" in the context menu if the entry is too old to be starred (#1935)
+- Invalid relative urls in feeds no longer prevent those feeds from being parsed (#1939)
+- Fix an issue that could prevent large feeds from being parsed when using Java 24+ (#1961)
+- Enforce user password validation when created in the admin view (#1937)
+- The process in the docker native image is now called "commafeed" instead of "application"
+
+## [5.11.1]
+
+- The search limit of 3 characters has been removed (#1887)
+- Fix an issue that caused feed filtering expressions to be incorrectly converted to lowercase when saving them (#1899)
+
 ## [5.11.0]
 
 - Add an option to navigate to the next unread category/feed when marking all entries as read (#1807)

README.md

@@ -15,8 +15,9 @@ Google Reader inspired self-hosted RSS reader, based on Quarkus and React/TypeSc
 - Supports thousands of users and millions of feeds
 - OPML import/export
 - REST API
-- Fever-compatible API for native mobile apps
+- Fever and Google Reader API for native mobile apps
 - Can automatically mark articles as read based on user-defined rules
+- Push notifications when new articles are published
 - Highly customizable with [custom CSS](https://athou.github.io/commafeed/documentation/custom-css) and JavaScript
 - [Browser extension](https://github.com/Athou/commafeed-browser-extension)
 - Compiles to native code for blazing fast startup and low memory usage
@@ -26,11 +27,18 @@ Google Reader inspired self-hosted RSS reader, based on Quarkus and React/TypeSc
     - MySQL
     - MariaDB
 
-## Deployment
+## Usage
+
+### Public instance
+
+A free public instance is available at https://www.commafeed.com.
+
+It has no ads, no tracking, and your data is never exploited or sold to third parties. The service is funded entirely through donations.
+However, this public instance does have a few limitations compared to self-hosted setups, outlined [here](https://github.com/Athou/commafeed/discussions/1567).
 
 ### Docker
 
-Docker is the easiest way to get started with CommaFeed.
+Docker is the easiest way to get started with self-hosted CommaFeed.
 
 Docker images are built automatically and are available at https://hub.docker.com/r/athou/commafeed
 
@@ -62,8 +70,8 @@ memory usage.
     ./mvnw clean package [-P<database> [-Pnative]] [-DskipTests]
 
 - `<database>` can be one of `h2`, `postgresql`, `mysql` or `mariadb`. The default is `h2`.
-- `-Pnative` compiles the application to native code. This requires GraalVM to be installed (`GRAALVM_HOME` environment
+- `-Pnative` compiles the application to native code. This requires either GraalVM to be installed (`GRAALVM_HOME` environment
-  variable pointing to a GraalVM installation).
+  variable pointing to a GraalVM installation) or a container environment to be available (docker/podman/...).
 - `-DskipTests` to speed up the build process by skipping tests.
 
 When the build is complete:
@@ -103,7 +111,7 @@ There are multiple ways to configure CommaFeed:
 - Environment variables (keys in UPPER_CASE)
 - a `.env` file in the working directory (keys in UPPER_CASE)
 
-The properties file is recommended because CommaFeed will be able to warn about invalid properties and typos.
+When in doubt, the properties file is recommended because CommaFeed will be able to warn about invalid properties and typos.
 
 All [CommaFeed settings](https://athou.github.io/commafeed/documentation) are optional and have sensible default values.
 
@@ -113,7 +121,6 @@ meaning that you will have to log back in after each restart of the application.
 All other Quarkus settings can be found [here](https://quarkus.io/guides/all-config).
 
 When started, the server will listen on http://localhost:8082.
-The default user is `admin` and the default password is `admin`.
 
 ### Updates
 
@@ -152,6 +159,14 @@ named [Semeru](https://developer.ibm.com/languages/java/semeru-runtimes/download
 This is the JVM used in
 the [Docker image](https://github.com/Athou/commafeed/blob/master/commafeed-server/src/main/docker/Dockerfile.jvm).
 
+## FAQ
+
+### Getting "Access to local address blocked" when adding a feed
+
+CommaFeed blocks access to local resources by default to prevent [SSRF](https://en.wikipedia.org/wiki/Server-side_request_forgery) attacks.
+If you want to subscribe to feeds that are only available on your local network, you can disable this security measure by setting the `commafeed.http-client.block-local-addresses` variable to `false`.
+Do this only if you trust all users of your CommaFeed instance not to access private resources.
+
 ## Translation
 
 Files for internationalization are

commafeed-client/.gitignore

@@ -23,9 +23,6 @@ dist-ssr
 *.sln
 *.sw?
 
-# rollup-plugin-visualizer
-/stats.html
-
 # vite
 vite.config.ts.timestamp-*.mjs
 

commafeed-client/biome.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://biomejs.dev/schemas/2.1.3/schema.json",
+    "$schema": "https://biomejs.dev/schemas/2.5.7/schema.json",
     "formatter": {
         "indentStyle": "space",
         "indentWidth": 4,

commafeed-client/index.html

@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="favicon.svg" />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
     <link rel="manifest" href="manifest.json" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />

commafeed-client/lingui.config.ts

@@ -1,4 +1,5 @@
 import type { LinguiConfig } from "@lingui/conf"
+import { formatter } from "@lingui/format-po"
 
 const config: LinguiConfig = {
     locales: [
@@ -38,11 +39,9 @@ const config: LinguiConfig = {
             exclude: ["src/locales/**"],
         },
     ],
-    format: "po",
+    format: formatter({
-    formatOptions: {
-        origins: true,
         lineNumbers: false,
-    },
+    }),
     sourceLocale: "en",
     fallbackLocales: {
         default: "en",

commafeed-client/package.json

@@ -15,69 +15,71 @@
         "i18n:extract": "lingui extract --clean"
     },
     "dependencies": {
-        "@emotion/react": "^11.14.0",
+        "@emotion/react": "11.14.0",
-        "@fontsource/open-sans": "^5.2.6",
+        "@fontsource/open-sans": "5.3.0",
-        "@lingui/core": "^5.4.0",
+        "@lingui/core": "6.6.0",
-        "@lingui/react": "^5.4.0",
+        "@lingui/react": "6.6.0",
-        "@mantine/core": "^8.2.3",
+        "@mantine/core": "9.5.1",
-        "@mantine/form": "^8.2.3",
+        "@mantine/dates": "9.5.1",
-        "@mantine/hooks": "^8.2.3",
+        "@mantine/form": "9.5.1",
-        "@mantine/modals": "^8.2.3",
+        "@mantine/hooks": "9.5.1",
-        "@mantine/notifications": "^8.2.3",
+        "@mantine/modals": "9.5.1",
-        "@mantine/spotlight": "^8.2.3",
+        "@mantine/notifications": "9.5.1",
-        "@monaco-editor/react": "^4.7.0",
+        "@mantine/spotlight": "9.5.1",
-        "@reduxjs/toolkit": "^2.8.2",
+        "@monaco-editor/react": "4.7.0",
-        "axios": "^1.11.0",
+        "@react-querybuilder/mantine": "8.22.3",
-        "dayjs": "^1.11.13",
+        "@reduxjs/toolkit": "2.12.0",
-        "escape-string-regexp": "^5.0.0",
+        "@rolldown/plugin-babel": "0.2.3",
-        "interweave": "^13.1.1",
+        "axios": "1.19.0",
-        "monaco-editor": "^0.52.2",
+        "dayjs": "1.11.21",
-        "mousetrap": "^1.6.5",
+        "escape-string-regexp": "5.0.0",
-        "react": "^19.1.1",
+        "interweave": "13.1.1",
-        "react-async-hook": "^4.0.0",
+        "monaco-editor": "0.56.0",
-        "react-contexify": "^6.0.0",
+        "mousetrap": "1.6.5",
-        "react-device-detect": "^2.2.3",
+        "react": "19.2.8",
-        "react-dom": "^19.1.1",
+        "react-async-hook": "4.0.0",
-        "react-draggable": "^4.5.0",
+        "react-contexify": "6.0.0",
-        "react-icons": "^5.5.0",
+        "react-dom": "19.2.8",
-        "react-infinite-scroller": "^1.2.6",
+        "react-draggable": "4.7.1",
-        "react-redux": "^9.2.0",
+        "react-icons": "5.7.0",
-        "react-router-dom": "^7.7.1",
+        "react-infinite-scroller": "1.2.6",
-        "react-swipeable": "^7.0.2",
+        "react-querybuilder": "8.22.3",
-        "style-to-object": "^1.0.9",
+        "react-redux": "9.3.0",
-        "throttle-debounce": "^5.0.2",
+        "react-router-dom": "7.18.2",
-        "tinycon": "^0.6.8",
+        "react-swipeable": "7.0.2",
-        "tss-react": "^4.9.19",
+        "style-to-object": "2.0.2",
-        "websocket-heartbeat-js": "^1.1.3"
+        "throttle-debounce": "5.0.2",
+        "tinycon": "0.6.8",
+        "tss-react": "4.9.21",
+        "websocket-heartbeat-js": "1.1.3"
     },
     "devDependencies": {
-        "@biomejs/biome": "^2.1.3",
+        "@babel/types": "^8.0.4",
-        "@lingui/babel-plugin-lingui-macro": "^5.4.0",
+        "@biomejs/biome": "2.5.7",
-        "@lingui/cli": "^5.4.0",
+        "@lingui/babel-plugin-lingui-macro": "6.6.0",
-        "@lingui/vite-plugin": "^5.4.0",
+        "@lingui/cli": "6.6.0",
-        "@testing-library/jest-dom": "^6.6.4",
+        "@lingui/vite-plugin": "6.6.0",
-        "@testing-library/react": "^16.3.0",
+        "@testing-library/jest-dom": "7.0.0",
-        "@testing-library/user-event": "^14.6.1",
+        "@testing-library/react": "16.3.2",
-        "@types/mousetrap": "^1.6.15",
+        "@testing-library/user-event": "14.6.3",
-        "@types/react": "^19.1.9",
+        "@types/mousetrap": "1.6.15",
-        "@types/react-dom": "^19.1.7",
+        "@types/react": "19.2.18",
-        "@types/react-infinite-scroller": "^1.2.5",
+        "@types/react-dom": "19.2.4",
-        "@types/throttle-debounce": "^5.0.2",
+        "@types/react-infinite-scroller": "1.2.5",
-        "@types/tinycon": "^0.6.7",
+        "@types/throttle-debounce": "5.0.2",
-        "@vitejs/plugin-react": "^4.7.0",
+        "@types/tinycon": "0.6.7",
-        "babel-plugin-macros": "^3.1.0",
+        "@vitejs/plugin-react": "6.0.5",
-        "babel-plugin-react-compiler": "^19.1.0-rc.2",
+        "babel-plugin-react-compiler": "1.0.0",
-        "jsdom": "^26.1.0",
+        "jsdom": "30.0.1",
-        "rollup-plugin-visualizer": "^6.0.3",
+        "typescript": "7.0.2",
-        "typescript": "^5.9.2",
+        "vite": "8.2.1",
-        "vite": "^7.0.6",
+        "vite-plugin-checker": "0.14.5",
-        "vite-plugin-checker": "^0.10.2",
+        "vitest": "4.1.10",
-        "vite-tsconfig-paths": "^5.1.4",
+        "yaml": "2.9.0"
-        "vitest": "^3.2.4"
     },
     "overrides": {
         "react-infinite-scroller": {
-            "react": "^19.1.1"
+            "react": "19.2.8"
         }
     }
 }

commafeed-client/pom.xml

@@ -6,19 +6,16 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>5.11.0</version>
+		<version>7.3.0</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>
 
 	<properties>
-		<sonar.sources>package.json,src</sonar.sources>
-		<sonar.coverage.exclusions>**/*</sonar.coverage.exclusions>
-
 		<!-- renovate: datasource=node-version depName=node -->
-		<node.version>v22.18.0</node.version>
+		<node.version>v24.19.0</node.version>
 		<!-- renovate: datasource=npm depName=npm -->
-		<npm.version>11.5.2</npm.version>
+		<npm.version>12.0.2</npm.version>
 	</properties>
 
 	<build>
@@ -26,7 +23,7 @@
 			<plugin>
 				<groupId>com.github.eirslett</groupId>
 				<artifactId>frontend-maven-plugin</artifactId>
-				<version>1.15.1</version>
+				<version>2.0.2</version>
 				<?m2e ignore?>
 				<executions>
 					<execution>
@@ -75,7 +72,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.3.1</version>
+				<version>3.5.0</version>
 				<executions>
 					<execution>
 						<id>copy web interface to resources</id>
@@ -97,4 +94,49 @@
 			</plugin>
 		</plugins>
 	</build>
+
+	<profiles>
+		<!-- This profile is used to kill the Biome process on Windows -->
+		<!-- npm ci can fail if Biome is running (e.g., in the IDE) because it locks some files -->
+		<profile>
+			<id>kill-biome</id>
+			<activation>
+				<os>
+					<family>Windows</family>
+				</os>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<version>3.6.3</version>
+						<executions>
+							<execution>
+								<id>kill-biome</id>
+								<phase>initialize</phase>
+								<goals>
+									<goal>exec</goal>
+								</goals>
+								<configuration>
+									<executable>taskkill</executable>
+									<arguments>
+										<argument>/F</argument>
+										<argument>/IM</argument>
+										<argument>biome.exe</argument>
+									</arguments>
+									<successCodes>
+										<successCode>0</successCode>
+										<!-- taskkill returns 128 if the process is not found, which is fine in this case -->
+										<successCode>128</successCode>
+									</successCodes>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
 </project>

commafeed-client/public/favicon.svg

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+		height="393.84613"
+		width="393.84613"
+		viewBox="0 0 5.0480766 5.0480766"
+		version="1.1"
+		id="svg3"
+		xmlns="http://www.w3.org/2000/svg">
+	<title>CommaFeed favicon</title>
+	<defs
+			id="defs3" />
+	<rect
+			fill="#f88a14"
+			rx="0.53846151"
+			ry="0.53846151"
+			height="5.0480766"
+			width="5.0480766"
+			id="rect1"
+			x="0"
+			y="0"
+			style="stroke-width:0.769231" />
+	<path
+			d="m 1.3450904,0.64548657 c 2.9002,0 2.9002,2.91010003 2.9002,2.91010003"
+			fill="none"
+			stroke="#ffffff"
+			stroke-linecap="round"
+			stroke-width="0.78125"
+			id="path1" />
+	<path
+			d="m 1.3377904,1.9915866 c 1.5705,-0.00908 1.5705,1.5639 1.5705,1.5639"
+			fill="none"
+			stroke="#ffffff"
+			stroke-linecap="round"
+			stroke-width="0.78125"
+			id="path2" />
+	<path
+			d="m 2.0192904,3.5227866 c 0,0.23366 -0.10712,0.47418 -0.24663,0.6537 -0.1814,0.2333 -0.5705,0.5618 -0.6913,0.5653 0.0402,-0.0662 0.263,-0.5654 0.2563,-0.5654 -0.36423004,0 -0.65950004,-0.29265 -0.65950004,-0.65365 0,-0.361 0.29527,-0.65365 0.65950004,-0.65365 0.36423,0 0.68159,0.29265 0.68159,0.65365 z"
+			fill="#ffffff"
+			id="path3" />
+</svg>

commafeed-client/src/App.tsx

@@ -1,24 +1,19 @@
 import { i18n } from "@lingui/core"
 import { I18nProvider } from "@lingui/react"
-import { MantineProvider } from "@mantine/core"
+import { MantineProvider, v8CssVariablesResolver } from "@mantine/core"
 import { ModalsProvider } from "@mantine/modals"
 import { Notifications } from "@mantine/notifications"
 import type React from "react"
-import { useEffect, useState } from "react"
+import { useEffect } from "react"
-import { isSafari } from "react-device-detect"
 import { HashRouter, Navigate, Route, Routes, useNavigate } from "react-router-dom"
-import Tinycon from "tinycon"
 import { Constants } from "@/app/constants"
 import { redirectTo } from "@/app/redirect/slice"
+import { redirectToInitialSetup } from "@/app/redirect/thunks"
 import { reloadServerInfos } from "@/app/server/thunks"
 import { useAppDispatch, useAppSelector } from "@/app/store"
-import { categoryUnreadCount } from "@/app/utils"
-import { DisablePullToRefresh } from "@/components/DisablePullToRefresh"
 import { ErrorBoundary } from "@/components/ErrorBoundary"
 import { Header } from "@/components/header/Header"
 import { Tree } from "@/components/sidebar/Tree"
-import { useAppLoading } from "@/hooks/useAppLoading"
-import { useBrowserExtension } from "@/hooks/useBrowserExtension"
 import { useI18n } from "@/i18n"
 import { AdminUsersPage } from "@/pages/admin/AdminUsersPage"
 import { MetricsPage } from "@/pages/admin/MetricsPage"
@@ -31,8 +26,10 @@ import { FeedEntriesPage } from "@/pages/app/FeedEntriesPage"
 import Layout from "@/pages/app/Layout"
 import { SettingsPage } from "@/pages/app/SettingsPage"
 import { TagDetailsPage } from "@/pages/app/TagDetailsPage"
+import { InitialSetupPage } from "@/pages/auth/InitialSetupPage"
 import { LoginPage } from "@/pages/auth/LoginPage"
 import { PasswordRecoveryPage } from "@/pages/auth/PasswordRecoveryPage"
+import { PasswordResetPage } from "@/pages/auth/PasswordResetPage"
 import { RegistrationPage } from "@/pages/auth/RegistrationPage"
 import { WelcomePage } from "@/pages/WelcomePage"
 
@@ -46,6 +43,8 @@ function Providers(
         <I18nProvider i18n={i18n}>
             <MantineProvider
                 defaultColorScheme="auto"
+                // keep using css variables from mantine v8
+                cssVariablesResolver={v8CssVariablesResolver}
                 theme={{
                     primaryColor: primaryColor,
                     fontFamily: "Open Sans",
@@ -83,9 +82,11 @@ function AppRoutes() {
         <Routes>
             <Route path="/" element={<Navigate to={`/app/category/${Constants.categories.all.id}`} replace />} />
             <Route path="welcome" element={<WelcomePage />} />
+            <Route path="setup" element={<InitialSetupPage />} />
             <Route path="login" element={<LoginPage />} />
             <Route path="register" element={<RegistrationPage />} />
             <Route path="passwordRecovery" element={<PasswordRecoveryPage />} />
+            <Route path="passwordReset" element={<PasswordResetPage />} />
             <Route path="app" element={<Layout header={<Header />} sidebar={<Tree />} sidebarVisible={sidebarVisible} />}>
                 <Route path="category">
                     <Route path=":id" element={<FeedEntriesPage sourceType="category" />} />
@@ -113,6 +114,18 @@ function AppRoutes() {
     )
 }
 
+function InitialSetupHandler() {
+    const serverInfos = useAppSelector(state => state.server.serverInfos)
+    const dispatch = useAppDispatch()
+    useEffect(() => {
+        if (serverInfos?.initialSetupRequired) {
+            dispatch(redirectToInitialSetup())
+        }
+    }, [serverInfos, dispatch])
+
+    return null
+}
+
 function RedirectHandler() {
     const target = useAppSelector(state => state.redirect.to)
     const dispatch = useAppDispatch()
@@ -128,78 +141,8 @@ function RedirectHandler() {
     return null
 }
 
-function UnreadCountTitleHandler({
-    enabled,
-}: Readonly<{
-    enabled?: boolean
-}>) {
-    const root = useAppSelector(state => state.tree.rootCategory)
-    const unreadCount = categoryUnreadCount(root)
-    return <title>{enabled && unreadCount > 0 ? `(${unreadCount}) CommaFeed` : "CommaFeed"}</title>
-}
-
-function UnreadCountFaviconHandler({ enabled }: { enabled?: boolean }) {
-    const root = useAppSelector(state => state.tree.rootCategory)
-    const unreadCount = categoryUnreadCount(root)
-    useEffect(() => {
-        if (enabled && unreadCount > 0) {
-            Tinycon.setBubble(unreadCount)
-        } else {
-            Tinycon.reset()
-        }
-    }, [unreadCount, enabled])
-
-    return null
-}
-
-function BrowserExtensionBadgeUnreadCountHandler() {
-    const root = useAppSelector(state => state.tree.rootCategory)
-    const { setBadgeUnreadCount } = useBrowserExtension()
-    useEffect(() => {
-        if (!root) return
-        const unreadCount = categoryUnreadCount(root)
-        setBadgeUnreadCount(unreadCount)
-    }, [root, setBadgeUnreadCount])
-
-    return null
-}
-
-function CustomJsHandler() {
-    const [scriptLoaded, setScriptLoaded] = useState(false)
-    const { loading } = useAppLoading()
-
-    useEffect(() => {
-        if (scriptLoaded || loading) {
-            return
-        }
-
-        const script = document.createElement("script")
-        script.src = "custom_js.js"
-        script.async = true
-        document.body.appendChild(script)
-
-        setScriptLoaded(true)
-    }, [scriptLoaded, loading])
-
-    return null
-}
-
-function CustomCssHandler() {
-    useEffect(() => {
-        const link = document.createElement("link")
-        link.rel = "stylesheet"
-        link.type = "text/css"
-        link.href = "custom_css.css"
-        document.head.appendChild(link)
-    }, [])
-
-    return null
-}
-
 export function App() {
     useI18n()
-    const unreadCountTitle = useAppSelector(state => state.user.settings?.unreadCountTitle)
-    const unreadCountFavicon = useAppSelector(state => state.user.settings?.unreadCountFavicon)
     const dispatch = useAppDispatch()
 
     useEffect(() => {
@@ -208,19 +151,8 @@ export function App() {
 
     return (
         <Providers>
-            <UnreadCountTitleHandler enabled={unreadCountTitle} />
-            <UnreadCountFaviconHandler enabled={unreadCountFavicon} />
-            <BrowserExtensionBadgeUnreadCountHandler />
-            <CustomJsHandler />
-            <CustomCssHandler />
-
-            {/* disable pull-to-refresh as it messes with vertical scrolling
-                        safari behaves weirdly when overscroll-behavior is set to none so we disable it only for other browsers
-                        https://github.com/Athou/commafeed/issues/1168
-                    */}
-            {!isSafari && <DisablePullToRefresh />}
-
             <HashRouter>
+                <InitialSetupHandler />
                 <RedirectHandler />
                 <AppRoutes />
             </HashRouter>

commafeed-client/src/app/client.ts

@@ -12,12 +12,15 @@ import type {
     FeedModificationRequest,
     GetEntriesPaginatedRequest,
     IDRequest,
+    InitialSetupRequest,
     LoginRequest,
     MarkRequest,
     Metrics,
     MultipleMarkRequest,
+    PasswordResetConfirmationRequest,
     PasswordResetRequest,
     ProfileModificationRequest,
+    PushNotificationSettings,
     RegistrationRequest,
     ServerInfo,
     Settings,
@@ -32,16 +35,17 @@ const axiosInstance = axios.create({ baseURL: "./rest", withCredentials: true })
 axiosInstance.interceptors.response.use(
     response => response,
     error => {
-        if (isAuthenticationError(error)) {
+        if (isAuthenticationError(error) && window.location.hash !== "#/login") {
             const data = error.response?.data
             window.location.hash = data?.allowRegistrations ? "/welcome" : "/login"
+            window.location.reload()
         }
         throw error
     }
 )
 
 function isAuthenticationError(error: unknown): error is AxiosError<AuthenticationError> {
-    return axios.isAxiosError(error) && !!error.response && [401, 403].includes(error.response.status)
+    return axios.isAxiosError(error) && error.response?.status === 401
 }
 
 export const client = {
@@ -93,9 +97,13 @@ export const client = {
             })
         },
         register: async (req: RegistrationRequest) => await axiosInstance.post("user/register", req),
+        initialSetup: async (req: InitialSetupRequest) => await axiosInstance.post("user/initialSetup", req),
         passwordReset: async (req: PasswordResetRequest) => await axiosInstance.post("user/passwordReset", req),
+        passwordResetCallback: async (req: PasswordResetConfirmationRequest) => await axiosInstance.post("user/passwordResetCallback", req),
         getSettings: async () => await axiosInstance.get<Settings>("user/settings"),
         saveSettings: async (settings: Settings) => await axiosInstance.post("user/settings", settings),
+        sendTestPushNotification: async (settings: PushNotificationSettings) =>
+            await axiosInstance.post("user/pushNotificationTest", settings),
         getProfile: async () => await axiosInstance.get<UserModel>("user/profile"),
         saveProfile: async (req: ProfileModificationRequest) => await axiosInstance.post("user/profile", req),
         deleteProfile: async () => await axiosInstance.post("user/profile/deleteAccount"),

commafeed-client/src/app/constants.ts

@@ -1,6 +1,6 @@
 import type { IconType } from "react-icons"
 import { FaAt } from "react-icons/fa"
-import { SiBuffer, SiFacebook, SiGmail, SiInstapaper, SiPocket, SiTumblr, SiX } from "react-icons/si"
+import { SiBuffer, SiFacebook, SiGmail, SiInstapaper, SiTumblr, SiX } from "react-icons/si"
 import type { Category, Entry, SharingSettings } from "./types"
 
 const categories: Record<string, Omit<Category, "name">> = {
@@ -58,12 +58,6 @@ const sharing: {
         color: "#375672",
         url: (url, desc) => `https://www.tumblr.com/share/link?url=${url}&name=${desc}`,
     },
-    pocket: {
-        label: "Pocket",
-        icon: SiPocket,
-        color: "#EF4154",
-        url: (url, desc) => `https://getpocket.com/save?url=${url}&title=${desc}`,
-    },
     instapaper: {
         label: "Instapaper",
         icon: SiInstapaper,

commafeed-client/src/app/entries/thunks.ts

@@ -40,7 +40,9 @@ export const loadMoreEntries = createAppAsyncThunk("entries/loadMore", async (_,
     const state = thunkApi.getState()
     const { source } = state.entries
     const offset =
-        state.user.settings?.readingMode === "all" ? state.entries.entries.length : state.entries.entries.filter(e => !e.read).length
+        state.user.settings?.readingMode === "all" || (source.type === "category" && source.id === "starred")
+            ? state.entries.entries.length
+            : state.entries.entries.filter(e => !e.read).length
     const endpoint = getEndpoint(state.entries.source.type)
     const result = await endpoint(buildGetEntriesPaginatedRequest(state, source, offset))
     return result.data

commafeed-client/src/app/redirect/thunks.ts

@@ -6,6 +6,8 @@ export const redirectToLogin = createAppAsyncThunk("redirect/login", (_, thunkAp
 
 export const redirectToRegistration = createAppAsyncThunk("redirect/register", (_, thunkApi) => thunkApi.dispatch(redirectTo("/register")))
 
+export const redirectToInitialSetup = createAppAsyncThunk("redirect/initialSetup", (_, thunkApi) => thunkApi.dispatch(redirectTo("/setup")))
+
 export const redirectToApiDocumentation = createAppAsyncThunk("redirect/api", () => {
     window.location.href = "api-documentation/"
 })

commafeed-client/src/app/store.ts

@@ -1,5 +1,5 @@
 import { configureStore } from "@reduxjs/toolkit"
-import { type TypedUseSelectorHook, useDispatch, useSelector } from "react-redux"
+import { shallowEqual, type TypedUseSelectorHook, useDispatch, useSelector } from "react-redux"
 import { entriesSlice } from "@/app/entries/slice"
 import { redirectSlice } from "@/app/redirect/slice"
 import { serverSlice } from "@/app/server/slice"
@@ -41,3 +41,4 @@ export type AppDispatch = typeof store.dispatch
 
 export const useAppDispatch: () => AppDispatch = useDispatch
 export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector
+export const useShallowEqualAppSelector: TypedUseSelectorHook<RootState> = selector => useSelector(selector, shallowEqual)

commafeed-client/src/app/tree/tree.test.ts

@@ -27,6 +27,7 @@ const createFeed = (id: number, unread: number): Subscription => ({
     feedUrl: "",
     feedLink: "",
     iconUrl: "",
+    pushNotificationsEnabled: true,
 })
 
 const root = createCategory("root")

commafeed-client/src/app/types.ts

@@ -28,6 +28,9 @@ export interface Subscription {
     position: number
     newestItemTime?: number
     filter?: string
+    filterLegacy?: string
+    pushNotificationsEnabled: boolean
+    autoMarkAsReadAfterDays?: number
 }
 
 export interface Category {
@@ -109,6 +112,8 @@ export interface FeedModificationRequest {
     categoryId?: string
     position?: number
     filter?: string
+    pushNotificationsEnabled: boolean
+    autoMarkAsReadAfterDays?: number
 }
 
 export interface GetEntriesRequest {
@@ -196,6 +201,12 @@ export interface PasswordResetRequest {
     email: string
 }
 
+export interface PasswordResetConfirmationRequest {
+    email: string
+    token: string
+    password: string
+}
+
 export interface ProfileModificationRequest {
     currentPassword: string
     email: string
@@ -209,17 +220,27 @@ export interface RegistrationRequest {
     email: string
 }
 
+export interface InitialSetupRequest {
+    name: string
+    password: string
+    email?: string
+}
+
 export interface ServerInfo {
     announcement?: string
     version: string
     gitCommit: string
     allowRegistrations: boolean
+    emailAddressRequired: boolean
     smtpEnabled: boolean
     demoAccountEnabled: boolean
     websocketEnabled: boolean
     websocketPingInterval: number
     treeReloadInterval: number
     forceRefreshCooldownDuration: number
+    initialSetupRequired: boolean
+    minimumPasswordLength: number
+    pushNotificationsEnabled: boolean
 }
 
 export interface SharingSettings {
@@ -228,13 +249,22 @@ export interface SharingSettings {
     facebook: boolean
     twitter: boolean
     tumblr: boolean
-    pocket: boolean
     instapaper: boolean
     buffer: boolean
 }
 
+export type PushNotificationType = "ntfy" | "gotify" | "pushover"
+
+export interface PushNotificationSettings {
+    type?: PushNotificationType
+    serverUrl?: string
+    userId?: string
+    userSecret?: string
+    topic?: string
+}
+
 export interface Settings {
-    language: string
+    language?: string
     readingMode: ReadingMode
     readingOrder: ReadingOrder
     showRead: boolean
@@ -252,8 +282,10 @@ export interface Settings {
     mobileFooter: boolean
     unreadCountTitle: boolean
     unreadCountFavicon: boolean
+    disablePullToRefresh: boolean
     primaryColor?: string
     sharingSettings: SharingSettings
+    pushNotificationSettings: PushNotificationSettings
 }
 
 export interface LocalSettings {

commafeed-client/src/app/user/slice.ts

@@ -1,30 +1,8 @@
 import { t } from "@lingui/core/macro"
 import { showNotification } from "@mantine/notifications"
-import { createSlice, isAnyOf, type PayloadAction } from "@reduxjs/toolkit"
+import { createSlice, type PayloadAction } from "@reduxjs/toolkit"
 import type { LocalSettings, Settings, UserModel, ViewMode } from "@/app/types"
-import {
+import { changeSettings, reloadProfile, reloadSettings, reloadTags } from "./thunks"
-    changeCustomContextMenu,
-    changeEntriesToKeepOnTopWhenScrolling,
-    changeExternalLinkIconDisplayMode,
-    changeLanguage,
-    changeMarkAllAsReadConfirmation,
-    changeMarkAllAsReadNavigateToUnread,
-    changeMobileFooter,
-    changePrimaryColor,
-    changeReadingMode,
-    changeReadingOrder,
-    changeScrollMarks,
-    changeScrollMode,
-    changeScrollSpeed,
-    changeSharingSetting,
-    changeShowRead,
-    changeStarIconDisplayMode,
-    changeUnreadCountFavicon,
-    changeUnreadCountTitle,
-    reloadProfile,
-    reloadSettings,
-    reloadTags,
-} from "./thunks"
 
 interface UserState {
     settings?: Settings
@@ -71,104 +49,16 @@ export const userSlice = createSlice({
         builder.addCase(reloadTags.fulfilled, (state, action) => {
             state.tags = action.payload
         })
-        builder.addCase(changeReadingMode.pending, (state, action) => {
+        builder.addCase(changeSettings.pending, (state, action) => {
             if (!state.settings) return
-            state.settings.readingMode = action.meta.arg
+            state.settings = { ...state.settings, ...action.meta.arg }
         })
-        builder.addCase(changeReadingOrder.pending, (state, action) => {
+        builder.addCase(changeSettings.fulfilled, () => {
-            if (!state.settings) return
+            showNotification({
-            state.settings.readingOrder = action.meta.arg
+                message: t`Settings saved.`,
+                color: "green",
+            })
         })
-        builder.addCase(changeLanguage.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.language = action.meta.arg
-        })
-        builder.addCase(changeScrollSpeed.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.scrollSpeed = action.meta.arg ? 400 : 0
-        })
-        builder.addCase(changeShowRead.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.showRead = action.meta.arg
-        })
-        builder.addCase(changeScrollMarks.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.scrollMarks = action.meta.arg
-        })
-        builder.addCase(changeScrollMode.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.scrollMode = action.meta.arg
-        })
-        builder.addCase(changeEntriesToKeepOnTopWhenScrolling.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.entriesToKeepOnTopWhenScrolling = action.meta.arg
-        })
-        builder.addCase(changeStarIconDisplayMode.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.starIconDisplayMode = action.meta.arg
-        })
-        builder.addCase(changeExternalLinkIconDisplayMode.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.externalLinkIconDisplayMode = action.meta.arg
-        })
-        builder.addCase(changeMarkAllAsReadConfirmation.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.markAllAsReadConfirmation = action.meta.arg
-        })
-        builder.addCase(changeMarkAllAsReadNavigateToUnread.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.markAllAsReadNavigateToNextUnread = action.meta.arg
-        })
-        builder.addCase(changeCustomContextMenu.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.customContextMenu = action.meta.arg
-        })
-        builder.addCase(changeMobileFooter.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.mobileFooter = action.meta.arg
-        })
-        builder.addCase(changeUnreadCountTitle.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.unreadCountTitle = action.meta.arg
-        })
-        builder.addCase(changeUnreadCountFavicon.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.unreadCountFavicon = action.meta.arg
-        })
-        builder.addCase(changePrimaryColor.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.primaryColor = action.meta.arg
-        })
-        builder.addCase(changeSharingSetting.pending, (state, action) => {
-            if (!state.settings) return
-            state.settings.sharingSettings[action.meta.arg.site] = action.meta.arg.value
-        })
-        builder.addMatcher(
-            isAnyOf(
-                changeLanguage.fulfilled,
-                changeScrollSpeed.fulfilled,
-                changeShowRead.fulfilled,
-                changeScrollMarks.fulfilled,
-                changeScrollMode.fulfilled,
-                changeEntriesToKeepOnTopWhenScrolling.fulfilled,
-                changeStarIconDisplayMode.fulfilled,
-                changeExternalLinkIconDisplayMode.fulfilled,
-                changeMarkAllAsReadConfirmation.fulfilled,
-                changeMarkAllAsReadNavigateToUnread.fulfilled,
-                changeCustomContextMenu.fulfilled,
-                changeMobileFooter.fulfilled,
-                changeUnreadCountTitle.fulfilled,
-                changeUnreadCountFavicon.fulfilled,
-                changePrimaryColor.fulfilled,
-                changeSharingSetting.fulfilled
-            ),
-            () => {
-                showNotification({
-                    message: t`Settings saved.`,
-                    color: "green",
-                })
-            }
-        )
     },
 })
 

commafeed-client/src/app/user/thunks.ts

@@ -1,7 +1,6 @@
 import { createAppAsyncThunk } from "@/app/async-thunk"
 import { client } from "@/app/client"
-import { reloadEntries } from "@/app/entries/thunks"
+import type { Settings } from "@/app/types"
-import type { IconDisplayMode, ReadingMode, ReadingOrder, ScrollMode, SharingSettings } from "@/app/types"
 
 export const reloadSettings = createAppAsyncThunk("settings/reload", async () => await client.user.getSettings().then(r => r.data))
 
@@ -9,142 +8,8 @@ export const reloadProfile = createAppAsyncThunk("profile/reload", async () => a
 
 export const reloadTags = createAppAsyncThunk("entries/tags", async () => await client.entry.getTags().then(r => r.data))
 
-export const changeReadingMode = createAppAsyncThunk("settings/readingMode", (readingMode: ReadingMode, thunkApi) => {
+export const changeSettings = createAppAsyncThunk("settings/change", async (newSettings: Partial<Settings>, thunkApi) => {
     const { settings } = thunkApi.getState().user
     if (!settings) return
-    client.user.saveSettings({ ...settings, readingMode })
+    await client.user.saveSettings({ ...settings, ...newSettings })
-    thunkApi.dispatch(reloadEntries())
 })
-
-export const changeReadingOrder = createAppAsyncThunk("settings/readingOrder", (readingOrder: ReadingOrder, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, readingOrder })
-    thunkApi.dispatch(reloadEntries())
-})
-
-export const changeLanguage = createAppAsyncThunk("settings/language", (language: string, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, language })
-})
-
-export const changeScrollSpeed = createAppAsyncThunk("settings/scrollSpeed", (speed: boolean, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, scrollSpeed: speed ? 400 : 0 })
-})
-
-export const changeShowRead = createAppAsyncThunk("settings/showRead", (showRead: boolean, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, showRead })
-})
-
-export const changeScrollMarks = createAppAsyncThunk("settings/scrollMarks", (scrollMarks: boolean, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, scrollMarks })
-})
-
-export const changeScrollMode = createAppAsyncThunk("settings/scrollMode", (scrollMode: ScrollMode, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, scrollMode })
-})
-
-export const changeEntriesToKeepOnTopWhenScrolling = createAppAsyncThunk(
-    "settings/entriesToKeepOnTopWhenScrolling",
-    (entriesToKeepOnTopWhenScrolling: number, thunkApi) => {
-        const { settings } = thunkApi.getState().user
-        if (!settings) return
-        client.user.saveSettings({ ...settings, entriesToKeepOnTopWhenScrolling })
-    }
-)
-
-export const changeStarIconDisplayMode = createAppAsyncThunk(
-    "settings/starIconDisplayMode",
-    (starIconDisplayMode: IconDisplayMode, thunkApi) => {
-        const { settings } = thunkApi.getState().user
-        if (!settings) return
-        client.user.saveSettings({ ...settings, starIconDisplayMode })
-    }
-)
-
-export const changeExternalLinkIconDisplayMode = createAppAsyncThunk(
-    "settings/externalLinkIconDisplayMode",
-    (externalLinkIconDisplayMode: IconDisplayMode, thunkApi) => {
-        const { settings } = thunkApi.getState().user
-        if (!settings) return
-        client.user.saveSettings({ ...settings, externalLinkIconDisplayMode })
-    }
-)
-
-export const changeMarkAllAsReadConfirmation = createAppAsyncThunk(
-    "settings/markAllAsReadConfirmation",
-    (markAllAsReadConfirmation: boolean, thunkApi) => {
-        const { settings } = thunkApi.getState().user
-        if (!settings) return
-        client.user.saveSettings({ ...settings, markAllAsReadConfirmation })
-    }
-)
-
-export const changeMarkAllAsReadNavigateToUnread = createAppAsyncThunk(
-    "settings/markAllAsReadNavigateToUnread",
-    (markAllAsReadNavigateToNextUnread: boolean, thunkApi) => {
-        const { settings } = thunkApi.getState().user
-        if (!settings) return
-        client.user.saveSettings({ ...settings, markAllAsReadNavigateToNextUnread })
-    }
-)
-
-export const changeCustomContextMenu = createAppAsyncThunk("settings/customContextMenu", (customContextMenu: boolean, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, customContextMenu })
-})
-
-export const changeMobileFooter = createAppAsyncThunk("settings/mobileFooter", (mobileFooter: boolean, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, mobileFooter })
-})
-
-export const changeUnreadCountTitle = createAppAsyncThunk("settings/unreadCountTitle", (unreadCountTitle: boolean, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, unreadCountTitle })
-})
-
-export const changeUnreadCountFavicon = createAppAsyncThunk("settings/unreadCountFavicon", (unreadCountFavicon: boolean, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, unreadCountFavicon })
-})
-
-export const changePrimaryColor = createAppAsyncThunk("settings/primaryColor", (primaryColor: string, thunkApi) => {
-    const { settings } = thunkApi.getState().user
-    if (!settings) return
-    client.user.saveSettings({ ...settings, primaryColor })
-})
-
-export const changeSharingSetting = createAppAsyncThunk(
-    "settings/sharingSetting",
-    (
-        sharingSetting: {
-            site: keyof SharingSettings
-            value: boolean
-        },
-        thunkApi
-    ) => {
-        const { settings } = thunkApi.getState().user
-        if (!settings) return
-        client.user.saveSettings({
-            ...settings,
-            sharingSettings: {
-                ...settings.sharingSettings,
-                [sharingSetting.site]: sharingSetting.value,
-            },
-        })
-    }
-)

commafeed-client/src/assets/logo.svg

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg height="512" width="512" viewBox="0 0 6.5625 6.5625" xmlns="http://www.w3.org/2000/svg">
+	<title>CommaFeed logo</title>
 	<rect fill="#f88a14" rx="0.7" ry="0.7" height="6.5625" width="6.5625" />
 	<path d="m1.9761,1.5289c2.9002,0,2.9002,2.9101,2.9002,2.9101" fill="none" stroke="#FFF" stroke-linecap="round"
-		  stroke-width="0.78125" />
+	      stroke-width="0.78125" />
 	<path d="m1.9688,2.875c1.5705-0.00908,1.5705,1.5639,1.5705,1.5639" fill="none" stroke="#FFF" stroke-linecap="round"
-		  stroke-width="0.78125" />
+	      stroke-width="0.78125" />
 	<path d="m2.6503,4.4062c0,0.23366-0.10712,0.47418-0.24663,0.6537-0.1814,0.2333-0.5705,0.5618-0.6913,0.5653,0.0402-0.0662,0.263-0.5654,0.2563-0.5654-0.36423,0-0.6595-0.29265-0.6595-0.65365s0.29527-0.65365,0.6595-0.65365,0.68159,0.29265,0.68159,0.65365z"
-		  fill="#FFF" />
+	      fill="#FFF" />
 </svg>

commafeed-client/src/components/ActionButton.tsx

@@ -1,7 +1,6 @@
 import type { MessageDescriptor } from "@lingui/core"
 import { useLingui } from "@lingui/react"
-import { ActionIcon, Box, Button, type ButtonVariant, Tooltip, useMantineTheme } from "@mantine/core"
+import { ActionIcon, type ActionIconVariant, Box, Button, type ButtonVariant, Tooltip, useMantineTheme } from "@mantine/core"
-import type { ActionIconVariant } from "@mantine/core/lib/components/ActionIcon/ActionIcon"
 import { forwardRef, type MouseEventHandler, type ReactNode } from "react"
 import { Constants } from "@/app/constants"
 import { useActionButton } from "@/hooks/useActionButton"

commafeed-client/src/components/DisablePullToRefresh.css

@@ -1,4 +0,0 @@
-html,
-body {
-    overscroll-behavior: none;
-}

commafeed-client/src/components/DisablePullToRefresh.tsx

@@ -1,4 +1,3 @@
-export const DisablePullToRefresh = () => {
+export const DisablePullToRefresh = ({ enabled }: { enabled: boolean | undefined }) => {
-    import("./DisablePullToRefresh.css")
+    return enabled ? <style>{`html, body { overscroll-behavior: none; }`}</style> : null
-    return null
 }

commafeed-client/src/components/ImageWithPlaceholderWhileLoading.tsx

@@ -14,6 +14,7 @@ interface ImageWithPlaceholderWhileLoadingProps {
     placeholderHeight?: number
     placeholderBackgroundColor?: string
     placeholderIconSize?: number
+    onError?: (e: React.SyntheticEvent<HTMLImageElement, Event>) => void
 }
 
 const useStyles = tss
@@ -44,6 +45,7 @@ export function ImageWithPlaceholderWhileLoading({
     title,
     width,
     style,
+    onError,
 }: Readonly<ImageWithPlaceholderWhileLoadingProps>) {
     const { classes } = useStyles({
         placeholderWidth,
@@ -70,6 +72,7 @@ export function ImageWithPlaceholderWhileLoading({
                 width={width}
                 height={height}
                 onLoad={() => setLoading(false)}
+                onError={onError}
                 style={{
                     ...style,
                     display: loading ? "none" : (style?.display ?? "initial"),

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} />
+}

commafeed-client/src/components/code/RichCodeEditor.tsx

@@ -7,11 +7,11 @@ const init = async () => {
         async getWorker(_, label) {
             let worker: typeof import("*?worker")
             if (label === "css") {
-                worker = await import("monaco-editor/esm/vs/language/css/css.worker?worker")
+                worker = await import("monaco-editor/language/css/css.worker?worker")
             } else if (label === "javascript") {
-                worker = await import("monaco-editor/esm/vs/language/typescript/ts.worker?worker")
+                worker = await import("monaco-editor/language/typescript/ts.worker?worker")
             } else {
-                worker = await import("monaco-editor/esm/vs/editor/editor.worker?worker")
+                worker = await import("monaco-editor/editor/editor.worker?worker")
             }
             return new worker.default()
         },

commafeed-client/src/components/content/FeedEntry.tsx

@@ -145,6 +145,7 @@ export function FeedEntry(props: Readonly<FeedEntryProps>) {
             component="article"
             id={Constants.dom.entryId(props.entry)}
             data-id={props.entry.id}
+            data-feed-id={props.entry.feedId}
             withBorder
             radius={borderRadius}
             className={cx(classes.paper, {

commafeed-client/src/components/content/FeedEntryContextMenu.tsx

@@ -61,19 +61,21 @@ export function FeedEntryContextMenu(props: Readonly<FeedEntryContextMenuProps>)
 
             <Separator />
 
-            <Item onClick={async () => await dispatch(starEntry({ entry: props.entry, starred: !props.entry.starred }))}>
-                <Group>
-                    {props.entry.starred ? <TbStarOff size={iconSize} /> : <TbStar size={iconSize} />}
-                    {props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>}
-                </Group>
-            </Item>
             {props.entry.markable && (
-                <Item onClick={async () => await dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))}>
+                <>
-                    <Group>
+                    <Item onClick={async () => await dispatch(starEntry({ entry: props.entry, starred: !props.entry.starred }))}>
-                        {props.entry.read ? <TbMail size={iconSize} /> : <TbMailOpened size={iconSize} />}
+                        <Group>
-                        {props.entry.read ? <Trans>Keep unread</Trans> : <Trans>Mark as read</Trans>}
+                            {props.entry.starred ? <TbStarOff size={iconSize} /> : <TbStar size={iconSize} />}
-                    </Group>
+                            {props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>}
-                </Item>
+                        </Group>
+                    </Item>
+                    <Item onClick={async () => await dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))}>
+                        <Group>
+                            {props.entry.read ? <TbMail size={iconSize} /> : <TbMailOpened size={iconSize} />}
+                            {props.entry.read ? <Trans>Keep unread</Trans> : <Trans>Mark as read</Trans>}
+                        </Group>
+                    </Item>
+                </>
             )}
             <Item onClick={async () => await dispatch(markEntriesUpToEntry(props.entry))}>
                 <Group>

commafeed-client/src/components/content/FeedFavicon.tsx

@@ -1,3 +1,5 @@
+import { useTimeout } from "@mantine/hooks"
+import { useState } from "react"
 import { ImageWithPlaceholderWhileLoading } from "@/components/ImageWithPlaceholderWhileLoading"
 
 export interface FeedFaviconProps {
@@ -6,9 +8,23 @@ export interface FeedFaviconProps {
 }
 
 export function FeedFavicon({ url, size = 18 }: Readonly<FeedFaviconProps>) {
+    // the backend always returns a favicon except when the feed has never been fetched
+    // this can happen when the user subscribes to a feed, the feed is added to the tree but the feed has not been fetched yet
+    // in this case we retry every second up to 3 times until the feed is fetched and the favicon is available
+    const [timestamp, setTimestamp] = useState(0)
+    const [retryCount, setRetryCount] = useState(0)
+    const { start: retry } = useTimeout(() => setTimestamp(Date.now()), 1000)
+
+    const urlWithTimestamp = url + (timestamp === 0 ? "" : `?t=${timestamp}`)
+    const handleError = () => {
+        if (retryCount < 3) {
+            setRetryCount(c => c + 1)
+            retry()
+        }
+    }
     return (
         <ImageWithPlaceholderWhileLoading
-            src={url}
+            src={urlWithTimestamp}
             alt="feed favicon"
             width={size}
             height={size}
@@ -16,6 +32,7 @@ export function FeedFavicon({ url, size = 18 }: Readonly<FeedFaviconProps>) {
             placeholderHeight={size}
             placeholderBackgroundColor="inherit"
             placeholderIconSize={size}
+            onError={handleError}
         />
     )
 }

commafeed-client/src/components/content/add/CategorySelect.tsx

@@ -1,7 +1,6 @@
 import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
-import { Select, type SelectProps } from "@mantine/core"
+import { type ComboboxItem, Select, type SelectProps } from "@mantine/core"
-import type { ComboboxItem } from "@mantine/core/lib/components/Combobox/Combobox.types"
 import { Constants } from "@/app/constants"
 import { useAppSelector } from "@/app/store"
 import type { Category } from "@/app/types"

commafeed-client/src/components/content/edit/FilteringExpressionEditor.tsx

@@ -0,0 +1,118 @@
+import { Stack } from "@mantine/core"
+import { MantineValueSelector, QueryBuilderMantine } from "@react-querybuilder/mantine"
+import {
+    type CombinatorSelectorProps,
+    defaultOperators,
+    defaultRuleProcessorCEL,
+    type Field,
+    type FormatQueryOptions,
+    formatQuery,
+    QueryBuilder,
+    type RuleGroupType,
+} from "react-querybuilder"
+import { isCELIdentifier, isCELMember, isCELStringLiteral, parseCEL } from "react-querybuilder/parseCEL"
+import "react-querybuilder/dist/query-builder.css"
+
+const fields: Field[] = [
+    { name: "title", label: "Title" },
+    { name: "content", label: "Content" },
+    { name: "url", label: "URL" },
+    { name: "author", label: "Author" },
+    { name: "categories", label: "Categories" },
+    { name: "titleLower", label: "Title (lower case)" },
+    { name: "contentLower", label: "Content (lower case)" },
+    { name: "urlLower", label: "URL  (lower case)" },
+    { name: "authorLower", label: "Author (lower case)" },
+    { name: "categoriesLower", label: "Categories (lower case)" },
+]
+
+const textOperators = new Set(["=", "!=", "contains", "beginsWith", "endsWith", "doesNotContain", "doesNotBeginWith", "doesNotEndWith"])
+
+function toCelString(query: RuleGroupType): string {
+    if (query.rules.length === 0) {
+        return ""
+    }
+
+    const celFormatOptions: FormatQueryOptions = {
+        format: "cel",
+        ruleProcessor: (rule, options, meta) => {
+            if (rule.operator === "matches") {
+                const escapedValue = String(rule.value).replaceAll("\\", "\\\\").replaceAll('"', String.raw`\"`)
+                return `${rule.field}.matches("${escapedValue}")`
+            }
+
+            return defaultRuleProcessorCEL(rule, options, meta)
+        },
+    }
+
+    return formatQuery(query, celFormatOptions)
+}
+
+function fromCelString(celString: string): RuleGroupType {
+    return parseCEL(celString ?? "", {
+        customExpressionHandler: expr => {
+            if (
+                isCELMember(expr) &&
+                expr.right?.value === "matches" &&
+                expr.left &&
+                isCELIdentifier(expr.left) &&
+                expr.list &&
+                isCELStringLiteral(expr.list.value[0])
+            ) {
+                return {
+                    field: expr.left.value,
+                    operator: "matches",
+                    value: JSON.parse(expr.list.value[0].value),
+                }
+            }
+
+            return null
+        },
+    })
+}
+
+const getOperators = () => {
+    const filteredDefault = defaultOperators.filter(op => textOperators.has(op.name))
+    return [
+        ...filteredDefault,
+        {
+            name: "matches",
+            label: "matches pattern",
+        },
+    ]
+}
+
+function CombinatorSelector(props: Readonly<CombinatorSelectorProps>) {
+    if (props.rules.length === 0) {
+        return null
+    }
+    return <MantineValueSelector {...props} />
+}
+
+interface FilteringExpressionEditorProps {
+    initialValue: string | undefined
+    onChange: (value: string) => void
+}
+
+export function FilteringExpressionEditor({ initialValue, onChange }: Readonly<FilteringExpressionEditorProps>) {
+    const handleQueryChange = (newQuery: RuleGroupType) => {
+        onChange(toCelString(newQuery))
+    }
+
+    return (
+        <Stack gap="sm">
+            <QueryBuilderMantine>
+                <QueryBuilder
+                    fields={fields}
+                    defaultQuery={fromCelString(initialValue ?? "")}
+                    onQueryChange={handleQueryChange}
+                    getOperators={getOperators}
+                    addRuleToNewGroups
+                    resetOnFieldChange={false}
+                    controlClassnames={{ queryBuilder: "queryBuilder-branches" }}
+                    controlElements={{ combinatorSelector: CombinatorSelector }}
+                />
+            </QueryBuilderMantine>
+        </Stack>
+    )
+}

commafeed-client/src/components/content/header/FeedEntryTitle.tsx

@@ -1,20 +1,30 @@
 import { Highlight } from "@mantine/core"
 import { useAppSelector } from "@/app/store"
 import type { Entry } from "@/app/types"
+import { tss } from "@/tss"
 
 export interface FeedEntryTitleProps {
     entry: Entry
 }
 
+const useStyles = tss.create(() => ({
+    content: {
+        textWrap: "inherit",
+    },
+}))
+
 export function FeedEntryTitle(props: Readonly<FeedEntryTitleProps>) {
     const search = useAppSelector(state => state.entries.search)
     const keywords = search?.split(" ")
+
+    const { classes } = useStyles()
     return (
         <Highlight
             inherit
             highlight={keywords ?? ""}
             // make sure ellipsis is shown when title is too long
             span
+            className={classes.content}
         >
             {props.entry.title}
         </Highlight>

commafeed-client/src/components/header/Header.tsx

@@ -19,7 +19,7 @@ import {
 } from "react-icons/tb"
 import { markAllAsReadWithConfirmationIfRequired, reloadEntries, search, selectNextEntry, selectPreviousEntry } from "@/app/entries/thunks"
 import { useAppDispatch, useAppSelector } from "@/app/store"
-import { changeReadingMode, changeReadingOrder } from "@/app/user/thunks"
+import { changeSettings } from "@/app/user/thunks"
 import { ActionButton } from "@/components/ActionButton"
 import { Loader } from "@/components/Loader"
 import { useActionButton } from "@/hooks/useActionButton"
@@ -63,11 +63,7 @@ export function Header() {
     const dispatch = useAppDispatch()
     const { _ } = useLingui()
 
-    const searchForm = useForm<{ search: string }>({
+    const searchForm = useForm<{ search: string }>()
-        validate: {
-            search: value => (value.length > 0 && value.length < 3 ? _(msg`Search requires at least 3 characters`) : null),
-        },
-    })
     const { setValues } = searchForm
 
     useEffect(() => {
@@ -77,6 +73,25 @@ export function Header() {
     }, [setValues, searchFromStore])
 
     if (!settings) return <Loader />
+
+    const toggleReadingMode = async () => {
+        await dispatch(
+            changeSettings({
+                readingMode: settings.readingMode === "all" ? "unread" : "all",
+            })
+        )
+        dispatch(reloadEntries())
+    }
+
+    const toggleReadingOrder = async () => {
+        await dispatch(
+            changeSettings({
+                readingOrder: settings.readingOrder === "asc" ? "desc" : "asc",
+            })
+        )
+        dispatch(reloadEntries())
+    }
+
     return (
         <Center className="cf-toolbar-wrapper">
             <HeaderToolbar>
@@ -125,12 +140,12 @@ export function Header() {
                 <ActionButton
                     icon={settings.readingMode === "all" ? <TbEye size={iconSize} /> : <TbEyeOff size={iconSize} />}
                     label={settings.readingMode === "all" ? msg`All` : msg`Unread`}
-                    onClick={async () => await dispatch(changeReadingMode(settings.readingMode === "all" ? "unread" : "all"))}
+                    onClick={toggleReadingMode}
                 />
                 <ActionButton
                     icon={settings.readingOrder === "asc" ? <TbSortAscending size={iconSize} /> : <TbSortDescending size={iconSize} />}
                     label={settings.readingOrder === "asc" ? msg`Asc` : msg`Desc`}
-                    onClick={async () => await dispatch(changeReadingOrder(settings.readingOrder === "asc" ? "desc" : "asc"))}
+                    onClick={toggleReadingOrder}
                 />
 
                 <Popover>

commafeed-client/src/components/header/ProfileMenu.tsx

@@ -12,7 +12,7 @@ import {
 } from "@mantine/core"
 import { showNotification } from "@mantine/notifications"
 import dayjs from "dayjs"
-import { type ReactNode, useState } from "react"
+import { type ReactNode, useEffect, useState } from "react"
 import {
     TbChartLine,
     TbHeartFilled,
@@ -29,6 +29,7 @@ import {
     TbUsers,
     TbWorldDownload,
 } from "react-icons/tb"
+import { throttle } from "throttle-debounce"
 import { client } from "@/app/client"
 import { redirectToAbout, redirectToAdminUsers, redirectToDonate, redirectToMetrics, redirectToSettings } from "@/app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "@/app/store"
@@ -96,6 +97,14 @@ const viewModeData: ViewModeControlItem[] = [
 
 export function ProfileMenu(props: Readonly<ProfileMenuProps>) {
     const [opened, setOpened] = useState(false)
+
+    // close profile menu on scroll
+    useEffect(() => {
+        const listener = throttle(100, () => setOpened(false))
+        window.addEventListener("scroll", listener)
+        return () => window.removeEventListener("scroll", listener)
+    }, [])
+
     const now = useNow()
     const profile = useAppSelector(state => state.user.profile)
     const admin = useAppSelector(state => state.user.profile?.admin)
@@ -115,7 +124,7 @@ export function ProfileMenu(props: Readonly<ProfileMenuProps>) {
     }
 
     return (
-        <Menu position="bottom-end" closeOnItemClick={false} opened={opened} onChange={setOpened}>
+        <Menu position="bottom-end" closeOnItemClick={false} opened={opened} onChange={setOpened} preventPositionChangeWhenVisible={false}>
             <Menu.Target>{props.control}</Menu.Target>
             <Menu.Dropdown>
                 {profile && <Menu.Label>{profile.name}</Menu.Label>}

commafeed-client/src/components/settings/DisplaySettings.tsx

@@ -1,49 +1,29 @@
 import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
 import { Trans } from "@lingui/react/macro"
-import { Box, Divider, Group, NumberInput, Radio, Select, type SelectProps, SimpleGrid, Stack, Switch } from "@mantine/core"
+import {
-import type { ComboboxData } from "@mantine/core/lib/components/Combobox/Combobox.types"
+    Box,
+    type ComboboxData,
+    Divider,
+    Group,
+    Loader,
+    NumberInput,
+    Radio,
+    Select,
+    type SelectProps,
+    SimpleGrid,
+    Stack,
+    Switch,
+} from "@mantine/core"
 import type { ReactNode } from "react"
 import { Constants } from "@/app/constants"
 import { useAppDispatch, useAppSelector } from "@/app/store"
 import type { IconDisplayMode, ScrollMode, SharingSettings } from "@/app/types"
-import {
+import { changeSettings } from "@/app/user/thunks"
-    changeCustomContextMenu,
-    changeEntriesToKeepOnTopWhenScrolling,
-    changeExternalLinkIconDisplayMode,
-    changeLanguage,
-    changeMarkAllAsReadConfirmation,
-    changeMarkAllAsReadNavigateToUnread,
-    changeMobileFooter,
-    changePrimaryColor,
-    changeScrollMarks,
-    changeScrollMode,
-    changeScrollSpeed,
-    changeSharingSetting,
-    changeShowRead,
-    changeStarIconDisplayMode,
-    changeUnreadCountFavicon,
-    changeUnreadCountTitle,
-} from "@/app/user/thunks"
 import { locales } from "@/i18n"
 
 export function DisplaySettings() {
-    const language = useAppSelector(state => state.user.settings?.language)
+    const settings = useAppSelector(state => state.user.settings)
-    const scrollSpeed = useAppSelector(state => state.user.settings?.scrollSpeed)
-    const showRead = useAppSelector(state => state.user.settings?.showRead)
-    const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
-    const scrollMode = useAppSelector(state => state.user.settings?.scrollMode)
-    const entriesToKeepOnTop = useAppSelector(state => state.user.settings?.entriesToKeepOnTopWhenScrolling)
-    const starIconDisplayMode = useAppSelector(state => state.user.settings?.starIconDisplayMode)
-    const externalLinkIconDisplayMode = useAppSelector(state => state.user.settings?.externalLinkIconDisplayMode)
-    const markAllAsReadConfirmation = useAppSelector(state => state.user.settings?.markAllAsReadConfirmation)
-    const markAllAsReadNavigateToNextUnread = useAppSelector(state => state.user.settings?.markAllAsReadNavigateToNextUnread)
-    const customContextMenu = useAppSelector(state => state.user.settings?.customContextMenu)
-    const mobileFooter = useAppSelector(state => state.user.settings?.mobileFooter)
-    const unreadCountTitle = useAppSelector(state => state.user.settings?.unreadCountTitle)
-    const unreadCountFavicon = useAppSelector(state => state.user.settings?.unreadCountFavicon)
-    const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
-    const primaryColor = useAppSelector(state => state.user.settings?.primaryColor) || Constants.theme.defaultPrimaryColor
     const { _ } = useLingui()
     const dispatch = useAppDispatch()
 
@@ -95,94 +75,66 @@ export function DisplaySettings() {
         </Group>
     )
 
+    if (!settings) return <Loader />
     return (
         <Stack>
             <Divider label={<Trans>Display</Trans>} labelPosition="center" />
 
             <Select
                 label={<Trans>Language</Trans>}
-                value={language}
+                value={settings.language}
                 data={locales.map(l => ({
                     value: l.key,
                     label: l.label,
                 }))}
-                onChange={async s => await (s && dispatch(changeLanguage(s)))}
+                onChange={language => language && dispatch(changeSettings({ language }))}
             />
 
             <Select
                 label={<Trans>Primary color</Trans>}
                 data={colorData}
-                value={primaryColor}
+                value={settings.primaryColor}
-                onChange={async value => value && (await dispatch(changePrimaryColor(value)))}
+                onChange={primaryColor => primaryColor && dispatch(changeSettings({ primaryColor }))}
                 renderOption={colorRenderer}
             />
 
             <Switch
                 label={<Trans>Show feeds and categories with no unread entries</Trans>}
-                checked={showRead}
+                checked={settings.showRead}
-                onChange={async e => await dispatch(changeShowRead(e.currentTarget.checked))}
+                onChange={e => dispatch(changeSettings({ showRead: e.currentTarget.checked }))}
             />
 
             <Switch
                 label={<Trans>Show confirmation when marking all entries as read</Trans>}
-                checked={markAllAsReadConfirmation}
+                checked={settings.markAllAsReadConfirmation}
-                onChange={async e => await dispatch(changeMarkAllAsReadConfirmation(e.currentTarget.checked))}
+                onChange={e => dispatch(changeSettings({ markAllAsReadConfirmation: e.currentTarget.checked }))}
             />
 
             <Switch
                 label={<Trans>Navigate to the next category/feed with unread entries when marking all entries as read</Trans>}
-                checked={markAllAsReadNavigateToNextUnread}
+                checked={settings.markAllAsReadNavigateToNextUnread}
-                onChange={async e => await dispatch(changeMarkAllAsReadNavigateToUnread(e.currentTarget.checked))}
+                onChange={e => dispatch(changeSettings({ markAllAsReadNavigateToNextUnread: e.currentTarget.checked }))}
             />
 
             <Switch
                 label={<Trans>On mobile, show action buttons at the bottom of the screen</Trans>}
-                checked={mobileFooter}
+                checked={settings.mobileFooter}
-                onChange={async e => await dispatch(changeMobileFooter(e.currentTarget.checked))}
+                onChange={e => dispatch(changeSettings({ mobileFooter: e.currentTarget.checked }))}
-            />
-
-            <Divider label={<Trans>Browser tab</Trans>} labelPosition="center" />
-
-            <Switch
-                label={<Trans>Show unread count in tab title</Trans>}
-                checked={unreadCountTitle}
-                onChange={async e => await dispatch(changeUnreadCountTitle(e.currentTarget.checked))}
-            />
-
-            <Switch
-                label={<Trans>Show unread count in tab favicon</Trans>}
-                checked={unreadCountFavicon}
-                onChange={async e => await dispatch(changeUnreadCountFavicon(e.currentTarget.checked))}
-            />
-
-            <Divider label={<Trans>Entry headers</Trans>} labelPosition="center" />
-
-            <Select
-                label={<Trans>Show star icon</Trans>}
-                value={starIconDisplayMode}
-                data={displayModeData}
-                onChange={async s => await dispatch(changeStarIconDisplayMode(s as IconDisplayMode))}
-            />
-
-            <Select
-                label={<Trans>Show external link icon</Trans>}
-                value={externalLinkIconDisplayMode}
-                data={displayModeData}
-                onChange={async s => await dispatch(changeExternalLinkIconDisplayMode(s as IconDisplayMode))}
-            />
-
-            <Switch
-                label={<Trans>Show CommaFeed's own context menu on right click</Trans>}
-                checked={customContextMenu}
-                onChange={async e => await dispatch(changeCustomContextMenu(e.currentTarget.checked))}
             />
 
             <Divider label={<Trans>Scrolling</Trans>} labelPosition="center" />
 
+            <Switch
+                label={<Trans>Disable "Pull to refresh" browser behavior</Trans>}
+                description={<Trans>This setting can cause scrolling issues on some browsers (e.g. Safari)</Trans>}
+                checked={settings.disablePullToRefresh}
+                onChange={e => dispatch(changeSettings({ disablePullToRefresh: e.currentTarget.checked }))}
+            />
+
             <Radio.Group
                 label={<Trans>Scroll selected entry to the top of the page</Trans>}
-                value={scrollMode}
+                value={settings.scrollMode}
-                onChange={async value => await dispatch(changeScrollMode(value as ScrollMode))}
+                onChange={value => dispatch(changeSettings({ scrollMode: value }))}
             >
                 <Group mt="xs">
                     {Object.entries(scrollModeOptions).map(e => (
@@ -195,20 +147,56 @@ export function DisplaySettings() {
                 label={<Trans>Entries to keep above the selected entry when scrolling</Trans>}
                 description={<Trans>Only applies to compact, cozy and detailed modes</Trans>}
                 min={0}
-                value={entriesToKeepOnTop}
+                value={settings.entriesToKeepOnTopWhenScrolling}
-                onChange={async value => await dispatch(changeEntriesToKeepOnTopWhenScrolling(+value))}
+                onChange={value => dispatch(changeSettings({ entriesToKeepOnTopWhenScrolling: +value }))}
             />
 
             <Switch
                 label={<Trans>Scroll smoothly when navigating between entries</Trans>}
-                checked={scrollSpeed ? scrollSpeed > 0 : false}
+                checked={settings.scrollSpeed ? settings.scrollSpeed > 0 : false}
-                onChange={async e => await dispatch(changeScrollSpeed(e.currentTarget.checked))}
+                onChange={e => dispatch(changeSettings({ scrollSpeed: e.currentTarget.checked ? 400 : 0 }))}
             />
 
             <Switch
                 label={<Trans>In expanded view, scrolling through entries mark them as read</Trans>}
-                checked={scrollMarks}
+                checked={settings.scrollMarks}
-                onChange={async e => await dispatch(changeScrollMarks(e.currentTarget.checked))}
+                onChange={e => dispatch(changeSettings({ scrollMarks: e.currentTarget.checked }))}
+            />
+
+            <Divider label={<Trans>Browser tab</Trans>} labelPosition="center" />
+
+            <Switch
+                label={<Trans>Show unread count in tab title</Trans>}
+                checked={settings.unreadCountTitle}
+                onChange={e => dispatch(changeSettings({ unreadCountTitle: e.currentTarget.checked }))}
+            />
+
+            <Switch
+                label={<Trans>Show unread count in tab favicon</Trans>}
+                checked={settings.unreadCountFavicon}
+                onChange={e => dispatch(changeSettings({ unreadCountFavicon: e.currentTarget.checked }))}
+            />
+
+            <Divider label={<Trans>Entry headers</Trans>} labelPosition="center" />
+
+            <Select
+                label={<Trans>Show star icon</Trans>}
+                value={settings.starIconDisplayMode}
+                data={displayModeData}
+                onChange={value => dispatch(changeSettings({ starIconDisplayMode: value as IconDisplayMode }))}
+            />
+
+            <Select
+                label={<Trans>Show external link icon</Trans>}
+                value={settings.externalLinkIconDisplayMode}
+                data={displayModeData}
+                onChange={value => dispatch(changeSettings({ externalLinkIconDisplayMode: value as IconDisplayMode }))}
+            />
+
+            <Switch
+                label={<Trans>Show CommaFeed's own context menu on right click</Trans>}
+                checked={settings.customContextMenu}
+                onChange={e => dispatch(changeSettings({ customContextMenu: e.currentTarget.checked }))}
             />
 
             <Divider label={<Trans>Sharing sites</Trans>} labelPosition="center" />
@@ -218,12 +206,14 @@ export function DisplaySettings() {
                     <Switch
                         key={site}
                         label={Constants.sharing[site].label}
-                        checked={sharingSettings?.[site]}
+                        checked={settings.sharingSettings[site]}
-                        onChange={async e =>
+                        onChange={e =>
-                            await dispatch(
+                            dispatch(
-                                changeSharingSetting({
+                                changeSettings({
-                                    site,
+                                    sharingSettings: {
-                                    value: e.currentTarget.checked,
+                                        ...settings.sharingSettings,
+                                        [site]: e.currentTarget.checked,
+                                    },
                                 })
                             )
                         }

commafeed-client/src/components/settings/ProfileSettings.tsx

@@ -1,4 +1,3 @@
-import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
 import { Trans } from "@lingui/react/macro"
 import { Anchor, Box, Button, Checkbox, Divider, Group, Input, PasswordInput, Stack, Text, TextInput } from "@mantine/core"
@@ -13,6 +12,7 @@ import { useAppDispatch, useAppSelector } from "@/app/store"
 import type { ProfileModificationRequest } from "@/app/types"
 import { reloadProfile } from "@/app/user/thunks"
 import { Alert } from "@/components/Alert"
+import { useValidationRules } from "@/hooks/useValidationRules"
 
 interface FormData extends ProfileModificationRequest {
     newPasswordConfirmation?: string
@@ -20,13 +20,17 @@ interface FormData extends ProfileModificationRequest {
 
 export function ProfileSettings() {
     const profile = useAppSelector(state => state.user.profile)
+    const serverInfos = useAppSelector(state => state.server.serverInfos)
     const dispatch = useAppDispatch()
     const { _ } = useLingui()
+    const validationRules = useValidationRules()
 
     const form = useForm<FormData>({
         validate: {
-            newPasswordConfirmation: (value, values) => (value !== values.newPassword ? _(msg`Passwords do not match`) : null),
+            newPassword: validationRules.password,
+            newPasswordConfirmation: (value, values) => validationRules.passwordConfirmation(value, values.newPassword),
         },
+        validateInputOnChange: true,
     })
     const { setValues } = form
 
@@ -87,8 +91,8 @@ export function ProfileSettings() {
                         label={<Trans>API key</Trans>}
                         description={
                             <Trans>
-                                This is your API key. It can be used for some read-only API operations and grants access to the Fever API.
+                                This is your API key. It can be used for some read-only API operations and grants access to the Fever API
-                                Use the form at the bottom of the page to generate a new API key
+                                and the Google Reader API. Use the form at the bottom of the page to generate a new API key
                             </Trans>
                         }
                         readOnly
@@ -126,6 +130,22 @@ export function ProfileSettings() {
                         </Box>
                     </Input.Wrapper>
 
+                    <Input.Wrapper
+                        label={<Trans>Google Reader API</Trans>}
+                        description={
+                            <Trans>
+                                CommaFeed is compatible with the Google Reader API. Use the following URL in your Google Reader-compatible
+                                mobile client. Login with your username and your <u>API key</u>.
+                            </Trans>
+                        }
+                    >
+                        <Box>
+                            <Anchor href="rest/googlereader" target="_blank">
+                                <Trans>Google Reader API URL</Trans>
+                            </Anchor>
+                        </Box>
+                    </Input.Wrapper>
+
                     <Divider />
 
                     <PasswordInput
@@ -134,7 +154,12 @@ export function ProfileSettings() {
                         required
                         {...form.getInputProps("currentPassword")}
                     />
-                    <TextInput type="email" label={<Trans>E-mail</Trans>} {...form.getInputProps("email")} required />
+                    <TextInput
+                        type="email"
+                        label={<Trans>E-mail</Trans>}
+                        {...form.getInputProps("email")}
+                        required={serverInfos?.emailAddressRequired}
+                    />
                     <PasswordInput
                         label={<Trans>New password</Trans>}
                         description={<Trans>Changing password will generate a new API key</Trans>}

commafeed-client/src/components/settings/PushNotificationSettings.tsx

@@ -0,0 +1,124 @@
+import { msg } from "@lingui/core/macro"
+import { useLingui } from "@lingui/react"
+import { Trans } from "@lingui/react/macro"
+import { Button, Divider, Group, Select, Stack, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { useEffect } from "react"
+import { useAsyncCallback } from "react-async-hook"
+import { TbDeviceFloppy, TbSend } from "react-icons/tb"
+import { client, errorToStrings } from "@/app/client"
+import { redirectToSelectedSource } from "@/app/redirect/thunks"
+import { useAppDispatch, useAppSelector } from "@/app/store"
+import type { PushNotificationSettings as PushNotificationSettingsModel } from "@/app/types"
+import { changeSettings } from "@/app/user/thunks"
+import { Alert } from "@/components/Alert"
+
+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(changeSettings({ pushNotificationSettings: values }))
+    }
+
+    const sendTestPushNotification = useAsyncCallback(client.user.sendTestPushNotification)
+
+    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>
+                {sendTestPushNotification.status === "success" && (
+                    <Alert level="success" messages={[_(msg`Test notification sent successfully.`)]} />
+                )}
+
+                {sendTestPushNotification.status === "error" && (
+                    <Alert level="error" messages={errorToStrings(sendTestPushNotification.error)} />
+                )}
+
+                <Select
+                    label={<Trans>Push notification service</Trans>}
+                    description={
+                        <Trans>
+                            Receive push notifications when new feed entries are discovered. Enable "Receive push notifications" in the
+                            settings of each feed for which you want to receive notifications.
+                        </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>
+
+                    <Divider orientation="vertical" />
+
+                    <Button
+                        variant="outline"
+                        leftSection={<TbSend size={16} />}
+                        onClick={() => sendTestPushNotification.execute(form.values)}
+                        loading={sendTestPushNotification.loading}
+                    >
+                        <Trans>Test</Trans>
+                    </Button>
+                </Group>
+            </Stack>
+        </form>
+    )
+}

commafeed-client/src/components/sidebar/Tree.tsx

@@ -95,6 +95,7 @@ export function Tree() {
             expanded={false}
             level={0}
             hasError={false}
+            hasWarning={false}
             onClick={categoryClicked}
         />
     )
@@ -110,6 +111,7 @@ export function Tree() {
             expanded={false}
             level={0}
             hasError={false}
+            hasWarning={false}
             onClick={categoryClicked}
         />
     )
@@ -118,6 +120,7 @@ export function Tree() {
         if (!isCategoryDisplayed(category)) return null
 
         const hasError = !category.expanded && flattenCategoryTree(category).some(c => c.feeds.some(f => f.errorCount > errorThreshold))
+        const hasWarning = !category.expanded && flattenCategoryTree(category).some(c => c.feeds.some(f => !!f.filterLegacy))
         return (
             <TreeNode
                 id={category.id}
@@ -130,6 +133,7 @@ export function Tree() {
                 expanded={category.expanded}
                 level={level}
                 hasError={hasError}
+                hasWarning={hasWarning}
                 onClick={categoryClicked}
                 onIconClick={e => categoryIconClicked(e, category)}
                 key={category.id}
@@ -151,6 +155,7 @@ export function Tree() {
                 selected={source.type === "feed" && source.id === String(feed.id)}
                 level={level}
                 hasError={feed.errorCount > errorThreshold}
+                hasWarning={!!feed.filterLegacy}
                 onClick={feedClicked}
                 key={feed.id}
             />
@@ -168,6 +173,7 @@ export function Tree() {
             selected={source.type === "tag" && source.id === tag}
             level={0}
             hasError={false}
+            hasWarning={false}
             onClick={tagClicked}
             key={tag}
         />

commafeed-client/src/components/sidebar/TreeNode.tsx

@@ -15,6 +15,7 @@ interface TreeNodeProps {
     expanded?: boolean
     level: number
     hasError: boolean
+    hasWarning: boolean
     hasNewEntries: boolean
     onClick: (e: React.MouseEvent, id: string) => void
     onIconClick?: (e: React.MouseEvent, id: string) => void
@@ -24,15 +25,18 @@ const useStyles = tss
     .withParams<{
         selected: boolean
         hasError: boolean
+        hasWarning: boolean
         hasUnread: boolean
     }>()
-    .create(({ theme, colorScheme, selected, hasError, hasUnread }) => {
+    .create(({ theme, colorScheme, selected, hasError, hasWarning, hasUnread }) => {
         let backgroundColor = "inherit"
         if (selected) backgroundColor = colorScheme === "dark" ? theme.colors.dark[4] : theme.colors.gray[1]
 
         let color: string
         if (hasError) {
             color = theme.colors.red[6]
+        } else if (hasWarning) {
+            color = theme.colors.yellow[6]
         } else if (colorScheme === "dark") {
             color = hasUnread ? theme.colors.dark[0] : theme.colors.dark[3]
         } else {
@@ -63,6 +67,7 @@ export function TreeNode(props: Readonly<TreeNodeProps>) {
     const { classes } = useStyles({
         selected: props.selected,
         hasError: props.hasError,
+        hasWarning: props.hasWarning,
         hasUnread: props.unread > 0,
     })
     return (

commafeed-client/src/components/sidebar/UnreadCount.tsx

@@ -6,7 +6,11 @@ const useStyles = tss.create(() => ({
     badge: {
         width: "3.2rem",
         // for some reason, mantine Badge has "cursor: 'default'"
-        cursor: "pointer",
+        cursor: "inherit",
+    },
+    indicator: {
+        // ensure the indicator is not shown above the app header
+        zIndex: 0,
     },
 }))
 
@@ -23,7 +27,15 @@ export function UnreadCount(
     const count = props.unreadCount >= 10000 ? "10k+" : props.unreadCount
     return (
         <Tooltip label={props.unreadCount} disabled={props.unreadCount === count} openDelay={Constants.tooltip.delay}>
-            <Indicator disabled={!props.showIndicator} size={4} offset={10} position="middle-start">
+            <Indicator
+                disabled={!props.showIndicator}
+                size={4}
+                offset={10}
+                position="middle-start"
+                classNames={{
+                    indicator: classes.indicator,
+                }}
+            >
                 <Badge className={`${classes.badge} cf-badge`} variant="light" fullWidth>
                     {count}
                 </Badge>

commafeed-client/src/globals.d.ts

@@ -0,0 +1,3 @@
+// required because of noUncheckedSideEffectImports
+// https://www.typescriptlang.org/tsconfig/#noUncheckedSideEffectImports
+declare module "@fontsource/open-sans"

commafeed-client/src/hooks/useValidationRules.ts

@@ -0,0 +1,17 @@
+import { msg } from "@lingui/core/macro"
+import { useLingui } from "@lingui/react"
+import { useAppSelector } from "@/app/store"
+
+export function useValidationRules() {
+    const minimumPasswordLength = useAppSelector(state => state.server.serverInfos?.minimumPasswordLength)
+    const { _ } = useLingui()
+
+    return {
+        password: (value: string | undefined) =>
+            value && minimumPasswordLength && value.length < minimumPasswordLength
+                ? _(msg`Password must be at least ${minimumPasswordLength} characters`)
+                : null,
+        passwordConfirmation: (newPasswordConfirmation: string | undefined, newPassword: string | undefined) =>
+            newPasswordConfirmation && newPasswordConfirmation !== newPassword ? _(msg`Passwords do not match`) : null,
+    }
+}

commafeed-client/src/locales/ca/messages.po

@@ -17,10 +17,6 @@ msgstr ""
 msgid "<0>CommaFeed is an open-source project. Sources are hosted on </0><1>GitHub</1>."
 msgstr "<0>CommaFeed és un projecte de codi obert. El codi font està allotjat a </0><1>GitHub</1>."
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "<0>Complete syntax is available </0><1>here</1><2>.</2>"
-msgstr "<0>La sintaxi completa està disponible </0><1>aquí</1><2>.</2>"
-
 #: src/pages/auth/RegistrationPage.tsx
 msgid "<0>Have an account?</0><1>Log in!</1>"
 msgstr "<0>Teniu un compte?</0><1>Inicieu la sessió!</1>"
@@ -33,18 +29,22 @@ msgstr "<0>Ei,</0><1> sóc la Jérémie de Bèlgica i fa més de 10 anys que tre
 msgid "<0>Need an account?</0><1>Sign up!</1>"
 msgstr "<0>Necessites un compte?</0><1>Registreu-vos!</1>"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "About"
 msgstr "Sobre"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
+msgstr "Token d'accés"
+
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Actions"
 msgstr "Accions"
 
 #: src/components/content/add/AddCategory.tsx
 msgid "Add"
-msgstr "Afegir"
+msgstr "Afegeix"
 
 #: src/pages/app/AddPage.tsx
 msgid "Add category"
@@ -54,21 +54,24 @@ msgstr "Afegeix categoria"
 msgid "Add user"
 msgstr "Afegeix usuari"
 
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/header/ProfileMenu.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Admin"
 msgstr "Administrador"
 
-#: src/pages/app/FeedEntriesPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Admin user name"
-#: src/components/sidebar/Tree.tsx
+msgstr "Nom d'usuari de l'administrador"
-#: src/components/header/Header.tsx
+
 #: src/components/content/add/CategorySelect.tsx
+#: src/components/header/Header.tsx
+#: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "All"
 msgstr "Tot"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Always"
 msgstr "Sempre"
@@ -83,7 +86,7 @@ msgstr "Un fitxer opml és un fitxer XML que conté URL i categories de canals.
 
 #: src/components/content/add/Subscribe.tsx
 msgid "Analyze feed"
-msgstr "Analitzar el feed"
+msgstr "Analitza el canal"
 
 #: src/components/AnnouncementDialog.tsx
 msgid "Announcement"
@@ -91,11 +94,19 @@ msgstr "Anunci"
 
 #: src/components/settings/ProfileSettings.tsx
 msgid "API key"
-msgstr "clau API"
+msgstr "Clau API"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "API token"
+msgstr "Token d'API"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "App token"
+msgstr "Token d'aplicació"
 
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Are you sure you want to delete category <0>{categoryName}</0>?"
-msgstr "Estàs segur que vols suprimir la categoria <0>{categoryName}</0>?"
+msgstr "Esteu segur que voleu suprimir la categoria <0>{categoryName}</0>?"
 
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Are you sure you want to delete user <0>{userName}</0> ?"
@@ -115,61 +126,63 @@ msgstr "Esteu segur que voleu marcar les entrades més antigues de {threshold} d
 
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Are you sure you want to unsubscribe from <0>{feedName}</0>?"
-msgstr "Estàs segur que vols cancel·lar la subscripció a <0>{feedName}</0>?"
+msgstr "Esteu segur que voleu cancel·lar la subscripció a <0>{feedName}</0>?"
 
 #: src/components/header/Header.tsx
 msgid "Asc"
 msgstr "Asc"
 
 #: src/pages/app/FeedDetailsPage.tsx
-msgid "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+msgid "Auto-mark as read"
-msgstr "Les variables disponibles són \"títol\", \"contingut\", \"url\" \"autor\" i \"categories\" i el seu contingut es converteix en minúscules per facilitar la comparació de cadenes."
+msgstr "Marcar com a llegit automàticament"
 
 #: src/components/content/add/Subscribe.tsx
 msgid "Back"
 msgstr "Enrere"
 
 #: src/pages/auth/PasswordRecoveryPage.tsx
+#: src/pages/auth/PasswordResetPage.tsx
 msgid "Back to log in"
-msgstr "Tornar a iniciar sessió"
+msgstr "Torna a iniciar sessió"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Blue"
 msgstr "Blau"
 
+#: src/pages/app/AboutPage.tsx
+msgid "Browser extension"
+msgstr "Extensió del navegador"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Browser extension required for Chrome"
 msgstr "Extensió del navegador necessària per a Chrome"
 
-#: src/pages/app/AboutPage.tsx
-msgid "Browser extention"
-msgstr "Extensió del navegador"
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "Browser tab"
 msgstr "Pestanya del navegador"
 
-#: src/pages/app/TagDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
+msgid "Build a filter expression to indicate what you want to read. Entries that don't match will be marked as read automatically."
-#: src/pages/app/CategoryDetailsPage.tsx
+msgstr "Creeu una expressió de filtratge per indicar què voleu llegir. Les entrades que no coincideixin es marcaran com a llegides automàticament."
-#: src/pages/app/CategoryDetailsPage.tsx
+
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
-#: src/components/content/add/ImportOpml.tsx
-#: src/components/content/add/AddCategory.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
+#: src/components/settings/CustomCodeSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/pages/app/FeedDetailsPage.tsx
+#: src/components/content/add/AddCategory.tsx
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/AboutPage.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Category"
 msgstr "Categoria"
 
@@ -197,6 +210,10 @@ msgstr "Versió de l'extensió del navegador CommaFeed {browserExtensionVersion}
 msgid "CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client. Login with your username and your <0>API key</0>."
 msgstr "CommaFeed és compatible amb l'API Fever. Utilitzeu l'URL següent al vostre client mòbil compatible amb Fever. Inicieu sessió amb el vostre nom d'usuari i la vostra <0>clau API</0>."
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "CommaFeed is compatible with the Google Reader API. Use the following URL in your Google Reader-compatible mobile client. Login with your username and your <0>API key</0>."
+msgstr "CommaFeed és compatible amb l'API de Google Reader. Utilitzeu l'URL següent al vostre client mòbil compatible amb Google Reader. Inicieu sessió amb el vostre nom d'usuari i la vostra <0>clau API</0>."
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed next unread item"
 msgstr "CommaFeed següent element no llegit"
@@ -209,11 +226,11 @@ msgstr "CommaFeed versió {version} ({version})."
 msgid "Compact"
 msgstr "Compacte"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Confirm"
 msgstr "Confirma"
 
@@ -221,10 +238,18 @@ msgstr "Confirma"
 msgid "Confirm password"
 msgstr "Confirmeu la contrasenya"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Confirm Password"
+msgstr "Confirma la contrasenya"
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Cozy"
 msgstr "Acollidor"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Create Admin Account"
+msgstr "Crea un compte d'administrador"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -249,8 +274,8 @@ msgstr "Codi JS personalitzat que s'executarà en carregar la pàgina"
 msgid "Cyan"
 msgstr "Cian"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
 msgid "Dark"
 msgstr "Fosc"
 
@@ -258,11 +283,14 @@ msgstr "Fosc"
 msgid "Date created"
 msgstr "Data de creació"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "days"
+msgstr "dies"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 msgid "Delete account"
 msgstr "Suprimeix el compte"
@@ -283,14 +311,18 @@ msgstr "Desc"
 msgid "Detailed"
 msgstr "Detallat"
 
-#: src/pages/app/SettingsPage.tsx
 #: src/components/settings/DisplaySettings.tsx
+msgid "Disable \"Pull to refresh\" browser behavior"
+msgstr "Desactiva el comportament \"Arrossega per actualitzar\"\\ del navegador"
+
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
+#: src/pages/app/SettingsPage.tsx
 msgid "Display"
 msgstr "Mostra"
 
-#: src/pages/app/DonatePage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/DonatePage.tsx
 msgid "Donate"
 msgstr "Donar"
 
@@ -302,15 +334,14 @@ msgstr "Descarrega"
 msgid "Drag link to bookmark bar"
 msgstr "Arrossegueu l'enllaç a la barra d'adreces d'interès"
 
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "E-mail"
 msgstr "Correu electrònic"
 
-#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/auth/RegistrationPage.tsx
 msgid "E-mail address"
 msgstr "Adreça de correu electrònic"
@@ -319,10 +350,10 @@ msgstr "Adreça de correu electrònic"
 msgid "Edit user"
 msgstr "Edita l'usuari"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Enabled"
-msgstr "activat"
+msgstr "Activat"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Enter"
@@ -344,10 +375,6 @@ msgstr "Encapçalaments d'entrada"
 msgid "Error"
 msgstr "Error"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Example: {example}."
-msgstr "Exemple: {exemple}."
-
 #: src/components/header/ProfileMenu.tsx
 msgid "Expanded"
 msgstr "Ampliat"
@@ -356,8 +383,8 @@ msgstr "Ampliat"
 msgid "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
 msgstr "exporteu les vostres subscripcions i categories com a fitxer OPML que es pot importar a altres serveis de lectura de feeds"
 
-#: src/pages/WelcomePage.tsx
 #: src/components/header/Header.tsx
+#: src/pages/WelcomePage.tsx
 msgid "Extension options"
 msgstr "Opcions de l'extensió"
 
@@ -365,9 +392,8 @@ msgstr "Opcions de l'extensió"
 msgid "Feed name"
 msgstr "Nom del canal"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Feed URL"
 msgstr "URL del canal"
 
@@ -399,9 +425,9 @@ msgstr "La recuperació forçada de feeds encara no està disponible."
 msgid "Forgot password?"
 msgstr "Heu oblidat la contrasenya?"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generate an API key in your profile first."
 msgstr "primer genereu una clau API al vostre perfil."
 
@@ -409,9 +435,9 @@ msgstr "primer genereu una clau API al vostre perfil."
 msgid "Generate new API key"
 msgstr "Genera una nova clau d'API"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generated feed url"
 msgstr "URL del feed generat"
 
@@ -430,7 +456,15 @@ msgstr "Vés a la documentació de l'API."
 
 #: src/pages/app/AboutPage.tsx
 msgid "Goodies"
-msgstr "Bones"
+msgstr "Extres"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API"
+msgstr ""
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API URL"
+msgstr ""
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Grape"
@@ -448,10 +482,6 @@ msgstr "Verd"
 msgid "Id"
 msgstr "Id"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
-msgstr "Si no està buida, una expressió que s'avalua com a \"vertader\" o \"fals\". "
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "If the entry doesn't entirely fit on the screen"
 msgstr "Si l'entrada no encaixa del tot a la pantalla"
@@ -472,13 +502,21 @@ msgstr "En la vista ampliada, en desplaçar-se per les entrades, es marquen com
 msgid "Indigo"
 msgstr "Indi"
 
-#: src/components/content/FeedEntryFooter.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Initial Setup"
+msgstr "Configuració inicial"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Invalid password reset link. Please request a new one."
+msgstr "L'enllaç de restabliment de la contrasenya no és vàlid. Sol·liciteu-ne un de nou."
+
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Keep unread"
 msgstr "Mantenir sense llegir"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/FeedEntries.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
@@ -506,9 +544,9 @@ msgstr "Clar"
 msgid "Lime"
 msgstr "Llima"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Link"
 msgstr "Enllaç"
 
@@ -532,9 +570,8 @@ msgstr "S'estan carregant les subscripcions..."
 msgid "Loading tags..."
 msgstr "Carregant les etiquetes..."
 
+#: src/pages/auth/LoginPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 msgid "Log in"
 msgstr "Inicia sessió"
 
@@ -546,8 +583,8 @@ msgstr "Tanca sessió"
 msgid "Long press"
 msgstr "Prem llargament la tecla"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Manage users"
 msgstr "Gestionar usuaris"
 
@@ -555,21 +592,25 @@ msgstr "Gestionar usuaris"
 msgid "Mark all as read"
 msgstr "Marca-ho tot com a llegit"
 
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
 msgid "Mark all entries as read"
 msgstr "Marqueu totes les entrades com a llegides"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read"
 msgstr "Marca com a llegit"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read up to here"
 msgstr "Marca com a llegit fins aquí"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Mark entries in this feed as read after this number of days. Leave empty to disable."
+msgstr "Marca les entrades d'aquest feed com a llegides després d'aquest nombre de dies. Deixeu-ho buit per desactivar-lo."
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Metrics"
 msgstr "mètriques"
@@ -586,15 +627,15 @@ msgstr "Mou la pàgina cap avall"
 msgid "Move the page up"
 msgstr "Mou la pàgina cap amunt"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/components/RelativeDate.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "N/A"
 msgstr "No es coneix"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Name"
 msgstr "Nom"
 
@@ -606,7 +647,6 @@ msgstr "Navegueu a una subscripció introduint-ne el nom"
 msgid "Navigate to the next category/feed with unread entries when marking all entries as read"
 msgstr "Navega a la següent categoria/canal amb entrades no llegides quan es marquen totes les entrades com a llegides"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Never"
 msgstr "Mai"
@@ -615,12 +655,16 @@ msgstr "Mai"
 msgid "New password"
 msgstr "Contrasenya nova"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "New Password"
+msgstr "Contrasenya nova"
+
 #: src/pages/app/AboutPage.tsx
 msgid "Newest first"
 msgstr "El més nou primer"
 
-#: src/components/header/Header.tsx
 #: src/components/content/add/Subscribe.tsx
+#: src/components/header/Header.tsx
 msgid "Next"
 msgstr "Següent"
 
@@ -650,7 +694,7 @@ msgstr "el més vell primer"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On desktop"
-msgstr "A l'scriptori"
+msgstr "A l'escriptori"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On mobile"
@@ -717,7 +761,6 @@ msgstr "OPML"
 msgid "OPML export"
 msgstr "Exportació OPML"
 
-#: src/components/content/add/ImportOpml.tsx
 #: src/components/content/add/ImportOpml.tsx
 msgid "OPML file"
 msgstr "Fitxer OPML"
@@ -742,19 +785,22 @@ msgstr "pares"
 msgid "Parent Category"
 msgstr "Categoria pare"
 
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
 msgid "Password"
 msgstr "Contrasenya"
 
+#: src/hooks/useValidationRules.ts
+msgid "Password must be at least {minimumPasswordLength} characters"
+msgstr "La contrasenya ha de tenir almenys {minimumPasswordLength} caràcters"
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Password Recovery"
 msgstr "Recuperació de contrasenya"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
 msgid "Passwords do not match"
 msgstr "Les contrasenyes no coincideixen"
 
@@ -762,8 +808,8 @@ msgstr "Les contrasenyes no coincideixen"
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Position"
 msgstr "Posició"
 
@@ -779,6 +825,31 @@ msgstr "Color primari"
 msgid "Profile"
 msgstr "Perfil"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr "Servei de notificacions push"
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr "Notificacions push"
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr "Les notificacions push no estan configurades a la vostra configuració d'usuari."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr "Les notificacions push no estan activades en aquesta instància de CommaFeed."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
+msgstr "Rep notificacions push"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Receive push notifications when new feed entries are discovered. Enable \"Receive push notifications\" in the settings of each feed for which you want to receive notifications."
+msgstr "Rebre notificacions push quan es descobreixin noves entrades de feed. Activeu \"Rep notificacions push\" a la configuració de cada feed per al qual vulgueu rebre notificacions."
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Recover password"
 msgstr "Recuperar la contrasenya"
@@ -787,8 +858,8 @@ msgstr "Recuperar la contrasenya"
 msgid "Red"
 msgstr "Vermell"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/header/Header.tsx
+#: src/components/KeyboardShortcutsHelp.tsx
 msgid "Refresh"
 msgstr "Actualitzar"
 
@@ -796,20 +867,24 @@ msgstr "Actualitzar"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Els registres estan tancats en aquesta instància de CommaFeed"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Reset Password"
+msgstr "Restableix la contrasenya"
+
 #: src/pages/app/AboutPage.tsx
 msgid "REST API"
 msgstr "API REST"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr "Clic dret"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
 #: 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"
 msgstr "Desa"
 
@@ -825,17 +900,11 @@ msgstr "Desplaceu-vos suaument quan navegueu entre entrades"
 msgid "Scrolling"
 msgstr "Desplaçament"
 
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/header/Header.tsx
 #: src/components/header/Header.tsx
+#: src/components/sidebar/TreeSearch.tsx
 msgid "Search"
 msgstr "Cerca"
 
-#: src/components/header/Header.tsx
-msgid "Search requires at least 3 characters"
-msgstr "La cerca requereix almenys 3 caràcters"
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select next unread feed/category"
 msgstr "Selecciona el següent canal/categoria no llegit"
@@ -844,6 +913,10 @@ 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/PushNotificationSettings.tsx
+msgid "Server URL"
+msgstr "URL del servidor"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Set focus on next entry without opening it"
 msgstr "Posa el focus a la següent entrada sense obrir-la"
@@ -868,8 +941,6 @@ msgstr "Comparteix"
 msgid "Sharing sites"
 msgstr "Compartir a altres llocs web"
 
-#: src/components/KeyboardShortcutsHelp.tsx
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Shift"
 msgstr "canvi"
@@ -918,9 +989,8 @@ msgstr "Mostra el recompte de no llegits a la icona de favorits de la pestanya"
 msgid "Show unread count in tab title"
 msgstr "Mostra el recompte de no llegits al títol de la pestanya"
 
+#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
 msgid "Sign up"
 msgstr "Registra't"
 
@@ -928,26 +998,24 @@ msgstr "Registra't"
 msgid "Something bad just happened..."
 msgstr "Acaba de passar una cosa dolenta..."
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Space"
 msgstr "Espai"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Star"
 msgstr "Estrella"
 
-#: src/pages/app/FeedEntriesPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
 #: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "Starred"
 msgstr "Estrellat"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/AddPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Subscribe"
 msgstr "Subscriu-te"
 
@@ -979,7 +1047,6 @@ msgstr "Canvia al tema clar"
 msgid "System"
 msgstr "Sistema"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryFooter.tsx
 msgid "Tags"
 msgstr "Etiquetes"
@@ -988,6 +1055,14 @@ msgstr "Etiquetes"
 msgid "Teal"
 msgstr "Blau verdós"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test"
+msgstr "Prova"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test notification sent successfully."
+msgstr "La notificació de prova s'ha enviat correctament."
+
 #: src/components/content/add/Subscribe.tsx
 msgid "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
 msgstr "l'URL del canal al qual us voleu subscriure. "
@@ -996,9 +1071,18 @@ msgstr "l'URL del canal al qual us voleu subscriure. "
 msgid "Theme"
 msgstr "Tema"
 
+#. placeholder {0}: feed.filterLegacy
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "This feed has a legacy filter that cannot be edited and is not applied. Please recreate the filter using the new expression editor. The legacy filter expression was: <0>{0}</0>"
+msgstr "Aquest feed té un filtre heretat que no es pot editar i no s'aplica. Torneu a crear el filtre amb el nou editor d'expressions. L'expressió del filtre heretat era: <0>{0}</0>"
+
 #: src/components/settings/ProfileSettings.tsx
-msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API. Use the form at the bottom of the page to generate a new API key"
+msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API and the Google Reader API. Use the form at the bottom of the page to generate a new API key"
-msgstr "Aquesta és la vostra clau de l'API. Es pot utilitzar per a algunes operacions de l'API de només lectura i permet accedir a l'API Fever. Utilitzeu el formulari de la part inferior de la pàgina per generar una nova clau d'API."
+msgstr "Aquesta és la vostra clau API. Es pot utilitzar per a algunes operacions de l'API de només lectura i dona accés a l'API Fever i a l'API de Google Reader. Utilitzeu el formulari a la part inferior de la pàgina per generar una nova clau API"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "This setting can cause scrolling issues on some browsers (e.g. Safari)"
+msgstr "Aquesta configuració pot causar problemes de desplaçament en alguns navegadors (per exemple, Safari)"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Toggle read status of current entry"
@@ -1012,6 +1096,10 @@ msgstr "Canvia la barra lateral"
 msgid "Toggle starred status of current entry"
 msgstr "Commuta l'estat destacat de l'entrada actual"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Topic"
+msgstr "Tema"
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Try out CommaFeed with the demo account: demo/demo"
 msgstr "Proveu CommaFeed amb el compte de demostració: demo/demo"
@@ -1024,22 +1112,24 @@ msgstr "Prova la demostració!"
 msgid "Unread"
 msgstr "Sense llegir"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Unstar"
 msgstr "Desestrellar"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Unsubscribe"
 msgstr "Donar-se de baixa"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "User key"
+msgstr "Clau d'usuari"
+
 #: src/components/settings/ProfileSettings.tsx
 msgid "User name"
 msgstr "Nom d'usuari"
 
-#: src/pages/auth/LoginPage.tsx
 #: src/pages/auth/LoginPage.tsx
 msgid "User Name or E-mail"
 msgstr "Nom d'usuari o correu electrònic"
@@ -1056,6 +1146,10 @@ msgstr "Avís"
 msgid "Website"
 msgstr "Lloc web"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Welcome! This appears to be the first time you're running CommaFeed. Please create an administrator account to get started."
+msgstr "Benvingut! Sembla que aquesta és la primera vegada que executeu CommaFeed. Creeu un compte d'administrador per començar."
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Yellow"
 msgstr "Groc"
@@ -1067,3 +1161,7 @@ msgstr "Encara no teniu cap subscripció. "
 #: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr "Els vostres feeds s'han posat a la cua per actualitzar-los."
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Your password has been changed. You can now log in with your new password."
+msgstr "La vostra contrasenya s'ha canviat. Ara podeu iniciar la sessió amb la vostra nova contrasenya."

commafeed-client/src/locales/de/messages.po

@@ -17,10 +17,6 @@ msgstr ""
 msgid "<0>CommaFeed is an open-source project. Sources are hosted on </0><1>GitHub</1>."
 msgstr "<0>CommaFeed ist ein Open Source Projekt. Der Quellcode wird auf auf </0><1>GitHub</1> gehostet."
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "<0>Complete syntax is available </0><1>here</1><2>.</2>"
-msgstr "<0>Die vollständige Syntax ist </0><1>hier</1> verfügbar<2>.</2>"
-
 #: src/pages/auth/RegistrationPage.tsx
 msgid "<0>Have an account?</0><1>Log in!</1>"
 msgstr "<0>Haben Sie ein Konto?</0><1>Melden Sie sich an!</1>"
@@ -33,11 +29,15 @@ msgstr "<0>Hey,</0><1>Ich bin Jérémie aus Belgien und arbeite seit über 10 Ja
 msgid "<0>Need an account?</0><1>Sign up!</1>"
 msgstr "<0>Benötigen Sie ein Konto?</0><1>Hier geht's zur Registrierung!</1>"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "About"
 msgstr "Über"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
+msgstr "Zugriffstoken"
+
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Actions"
 msgstr "Aktionen"
@@ -54,21 +54,24 @@ msgstr "Kategorie hinzufügen"
 msgid "Add user"
 msgstr "Benutzer hinzufügen"
 
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/header/ProfileMenu.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Admin"
 msgstr "Verwaltung"
 
-#: src/pages/app/FeedEntriesPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Admin user name"
-#: src/components/sidebar/Tree.tsx
+msgstr "Administrator-Benutzername"
-#: src/components/header/Header.tsx
+
 #: src/components/content/add/CategorySelect.tsx
+#: src/components/header/Header.tsx
+#: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "All"
 msgstr "Alle"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Always"
 msgstr "Immer"
@@ -93,6 +96,14 @@ msgstr "Ankündigung"
 msgid "API key"
 msgstr "API-Schlüssel"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "API token"
+msgstr "API-Token"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "App token"
+msgstr "App-Token"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Are you sure you want to delete category <0>{categoryName}</0>?"
 msgstr "Sind Sie sicher, dass Sie die Kategorie <0>{categoryName}</0> löschen möchten?"
@@ -122,54 +133,56 @@ msgid "Asc"
 msgstr "Aufsteigend"
 
 #: src/pages/app/FeedDetailsPage.tsx
-msgid "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+msgid "Auto-mark as read"
-msgstr "Verfügbare Variablen sind „Titel“, „Inhalt“, „URL“, „Autor“ und „Kategorien“, und ihr Inhalt wird in Kleinbuchstaben umgewandelt, um den String-Vergleich zu erleichtern."
+msgstr "Automatisch als gelesen markieren"
 
 #: src/components/content/add/Subscribe.tsx
 msgid "Back"
 msgstr "Zurück"
 
 #: src/pages/auth/PasswordRecoveryPage.tsx
+#: src/pages/auth/PasswordResetPage.tsx
 msgid "Back to log in"
 msgstr "Zurück zum Login"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Blue"
-msgstr ""
+msgstr "Blau"
+
+#: src/pages/app/AboutPage.tsx
+msgid "Browser extension"
+msgstr "Browser-Erweiterung"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Browser extension required for Chrome"
 msgstr "Browser-Erweiterung für Chrome benötigt"
 
-#: src/pages/app/AboutPage.tsx
-msgid "Browser extention"
-msgstr "Browser-Erweiterung"
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "Browser tab"
-msgstr ""
+msgstr "Browsertab"
 
-#: src/pages/app/TagDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
+msgid "Build a filter expression to indicate what you want to read. Entries that don't match will be marked as read automatically."
-#: src/pages/app/CategoryDetailsPage.tsx
+msgstr "Erstellen Sie einen Filterausdruck, um anzugeben, was Sie lesen möchten. Einträge, die nicht übereinstimmen, werden automatisch als gelesen markiert."
-#: src/pages/app/CategoryDetailsPage.tsx
+
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
-#: src/components/content/add/ImportOpml.tsx
-#: src/components/content/add/AddCategory.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
+#: src/components/settings/CustomCodeSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/pages/app/FeedDetailsPage.tsx
+#: src/components/content/add/AddCategory.tsx
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/AboutPage.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Category"
 msgstr "Kategorie"
 
@@ -187,7 +200,7 @@ msgstr "Menü schließen"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Cmd"
-msgstr ""
+msgstr "Befehl"
 
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
@@ -197,6 +210,10 @@ msgstr "CommaFeed Browser Erweiterung Version {browserExtensionVersion}."
 msgid "CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client. Login with your username and your <0>API key</0>."
 msgstr "CommaFeed ist mit der Fever-API kompatibel. Verwenden Sie die folgende URL in Ihrem Fever-kompatiblen mobilen Client. Melden Sie sich mit Ihrem Benutzernamen und Ihrem <0>API-Schlüssel</0> an."
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "CommaFeed is compatible with the Google Reader API. Use the following URL in your Google Reader-compatible mobile client. Login with your username and your <0>API key</0>."
+msgstr "CommaFeed ist mit der Google-Reader-API kompatibel. Verwenden Sie die folgende URL in Ihrem Google-Reader-kompatiblen mobilen Client. Melden Sie sich mit Ihrem Benutzernamen und Ihrem <0>API-Schlüssel</0> an."
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed next unread item"
 msgstr "CommaFeed nächstes ungelesenes Element"
@@ -209,11 +226,11 @@ msgstr "CommaFeed version {version} ({revision})."
 msgid "Compact"
 msgstr "Kompakt"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Confirm"
 msgstr "Bestätigen"
 
@@ -221,10 +238,18 @@ msgstr "Bestätigen"
 msgid "Confirm password"
 msgstr "Passwort bestätigen"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Confirm Password"
+msgstr "Passwort bestätigen"
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Cozy"
 msgstr "Gemütlich"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Create Admin Account"
+msgstr "Administrator-Konto erstellen"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Ctrl"
 msgstr "Strg"
@@ -247,10 +272,10 @@ msgstr "Einer JS Code der beim Laden der Seite ausgeführt wird"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Cyan"
-msgstr ""
+msgstr "Cyan"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
 msgid "Dark"
 msgstr "Dunkel"
 
@@ -258,11 +283,14 @@ msgstr "Dunkel"
 msgid "Date created"
 msgstr "Erstellungsdatum"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "days"
+msgstr "Tage"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 msgid "Delete account"
 msgstr "Konto löschen"
@@ -283,14 +311,18 @@ msgstr "Beschr"
 msgid "Detailed"
 msgstr "Detailliert"
 
-#: src/pages/app/SettingsPage.tsx
 #: src/components/settings/DisplaySettings.tsx
+msgid "Disable \"Pull to refresh\" browser behavior"
+msgstr "Browser-Verhalten \"Zum Aktualisieren ziehen\" deaktivieren"
+
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
+#: src/pages/app/SettingsPage.tsx
 msgid "Display"
 msgstr "Anzeige"
 
-#: src/pages/app/DonatePage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/DonatePage.tsx
 msgid "Donate"
 msgstr "Spenden"
 
@@ -302,15 +334,14 @@ msgstr "Herunterladen"
 msgid "Drag link to bookmark bar"
 msgstr "Link in Lesezeichenleiste ziehen"
 
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/auth/RegistrationPage.tsx
 msgid "E-mail address"
 msgstr "E-Mail-Adresse"
@@ -319,8 +350,8 @@ msgstr "E-Mail-Adresse"
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Enabled"
 msgstr "Aktiviert"
 
@@ -334,20 +365,16 @@ msgstr "Geben Sie Ihr aktuelles Passwort ein, um die Profileinstellungen zu änd
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entries to keep above the selected entry when scrolling"
-msgstr ""
+msgstr "Anzahl der Einträge, die beim Scrollen über dem ausgewählten Eintrag bleiben sollen"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entry headers"
-msgstr ""
+msgstr "Eintragsüberschriften"
 
 #: src/components/Alert.tsx
 msgid "Error"
 msgstr "Fehler"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Example: {example}."
-msgstr "Beispiel: {example}."
-
 #: src/components/header/ProfileMenu.tsx
 msgid "Expanded"
 msgstr "Erweitert"
@@ -356,8 +383,8 @@ msgstr "Erweitert"
 msgid "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
 msgstr "Exportieren Sie Ihre Abonnements und Kategorien als OPML-Datei, die in andere Feed-Lesedienste importiert werden kann"
 
-#: src/pages/WelcomePage.tsx
 #: src/components/header/Header.tsx
+#: src/pages/WelcomePage.tsx
 msgid "Extension options"
 msgstr "Erweiterungsoptionen"
 
@@ -365,9 +392,8 @@ msgstr "Erweiterungsoptionen"
 msgid "Feed name"
 msgstr "Feedname"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Feed URL"
 msgstr "Feed-URL"
 
@@ -377,11 +403,11 @@ msgstr "Alle Feeds jetzt abrufen"
 
 #: src/components/settings/ProfileSettings.tsx
 msgid "Fever API"
-msgstr ""
+msgstr "Fever-API"
 
 #: src/components/settings/ProfileSettings.tsx
 msgid "Fever API URL"
-msgstr ""
+msgstr "Fever-API-URL"
 
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Filtering expression"
@@ -389,19 +415,19 @@ msgstr "Filterausdruck"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Font size"
-msgstr ""
+msgstr "Schriftgröße"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Force fetching feeds is not yet available."
-msgstr ""
+msgstr "Das Erzwingen des Feed-Abrufs ist noch nicht verfügbar."
 
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Passwort vergessen?"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generate an API key in your profile first."
 msgstr "Generieren Sie zuerst einen API-Schlüssel in Ihrem Profil."
 
@@ -409,9 +435,9 @@ msgstr "Generieren Sie zuerst einen API-Schlüssel in Ihrem Profil."
 msgid "Generate new API key"
 msgstr "Neuen API-Schlüssel generieren"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generated feed url"
 msgstr "Generierte Feed-URL"
 
@@ -432,25 +458,29 @@ msgstr "Gehen Sie zur API-Dokumentation."
 msgid "Goodies"
 msgstr "Goodies"
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API"
+msgstr ""
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API URL"
+msgstr ""
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Grape"
-msgstr ""
+msgstr "Traube"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Gray"
-msgstr ""
+msgstr "Grau"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Green"
-msgstr ""
+msgstr "Grün"
 
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Id"
-msgstr ""
+msgstr "ID"
-
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
-msgstr "Wenn nicht leer, ein Ausdruck, der als „wahr“ oder „falsch“ ausgewertet wird."
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "If the entry doesn't entirely fit on the screen"
@@ -470,15 +500,23 @@ msgstr "In der erweiterten Ansicht werden Einträge beim Scrollen als gelesen ma
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Indigo"
-msgstr ""
+msgstr "Indigo"
+
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Initial Setup"
+msgstr "Ersteinrichtung"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Invalid password reset link. Please request a new one."
+msgstr "Ungültiger Link zum Zurücksetzen des Passworts. Bitte fordern Sie einen neuen an."
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Keep unread"
 msgstr "Ungelesen lassen"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/FeedEntries.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "Keyboard shortcuts"
 msgstr "Tastaturkürzel"
 
@@ -504,17 +542,17 @@ msgstr "Hell"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Lime"
-msgstr ""
+msgstr "Limette"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Link"
 msgstr "Verbindung"
 
 #: src/components/settings/CustomCodeSettings.tsx
 msgid "Link to the documentation"
-msgstr ""
+msgstr "Link zur Dokumentation"
 
 #: src/hooks/useAppLoading.ts
 msgid "Loading profile..."
@@ -532,9 +570,8 @@ msgstr "Abonnements werden geladen..."
 msgid "Loading tags..."
 msgstr "Tags werden geladen..."
 
+#: src/pages/auth/LoginPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 msgid "Log in"
 msgstr "Einloggen"
 
@@ -546,8 +583,8 @@ msgstr "Abmelden"
 msgid "Long press"
 msgstr "Langer Tastendruck"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Manage users"
 msgstr "Benutzer verwalten"
 
@@ -555,21 +592,25 @@ msgstr "Benutzer verwalten"
 msgid "Mark all as read"
 msgstr "Alle als gelesen markieren"
 
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
 msgid "Mark all entries as read"
 msgstr "Alle Einträge als gelesen markieren"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read up to here"
 msgstr "Bis hierhin als gelesen markieren"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Mark entries in this feed as read after this number of days. Leave empty to disable."
+msgstr "Markieren Sie Einträge in diesem Feed nach dieser Anzahl von Tagen als gelesen. Leer lassen zum Deaktivieren."
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Metrics"
 msgstr "Metriken"
@@ -586,17 +627,17 @@ msgstr "Seite nach unten verschieben"
 msgid "Move the page up"
 msgstr "Bewege die Seite nach oben"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/components/RelativeDate.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "N/A"
 msgstr "n.v."
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Name"
-msgstr ""
+msgstr "Name"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Navigate to a subscription by entering its name"
@@ -604,9 +645,8 @@ msgstr "Navigieren Sie zu einem Abonnement, indem Sie seinen Namen eingeben"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Navigate to the next category/feed with unread entries when marking all entries as read"
-msgstr ""
+msgstr "Navigieren Sie zum nächsten Feed/Kategorie mit ungelesenen Einträgen, wenn Sie alle Einträge als gelesen markieren"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Never"
 msgstr "Niemals"
@@ -615,12 +655,16 @@ msgstr "Niemals"
 msgid "New password"
 msgstr "Neues Passwort"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "New Password"
+msgstr "Neues Passwort"
+
 #: src/pages/app/AboutPage.tsx
 msgid "Newest first"
 msgstr "Neueste zuerst"
 
-#: src/components/header/Header.tsx
 #: src/components/content/add/Subscribe.tsx
+#: src/components/header/Header.tsx
 msgid "Next"
 msgstr "Weiter"
 
@@ -638,7 +682,7 @@ msgstr "Keine weiteren Einträge"
 
 #: src/components/content/ShareButtons.tsx
 msgid "No sharing options available."
-msgstr ""
+msgstr "Keine Optionen zum Teilen verfügbar."
 
 #: src/components/sidebar/TreeSearch.tsx
 msgid "Nothing found"
@@ -650,11 +694,11 @@ msgstr "Älteste zuerst"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On desktop"
-msgstr ""
+msgstr "Auf dem Desktop"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On mobile"
-msgstr ""
+msgstr "Auf dem Handy"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On mobile, show action buttons at the bottom of the screen"
@@ -662,7 +706,7 @@ msgstr "Auf mobilen Geräten die Aktion-Buttons am unteren Ende des Bildschirms
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Only applies to compact, cozy and detailed modes"
-msgstr ""
+msgstr "Gilt nur für die Modi Kompakt, Gemütlich und Detailliert"
 
 #: src/pages/ErrorPage.tsx
 msgid "Oops!"
@@ -711,24 +755,23 @@ msgstr "Aktuellen Eintrag öffnen/schließen"
 
 #: src/pages/app/AddPage.tsx
 msgid "OPML"
-msgstr ""
+msgstr "OPML"
 
 #: src/components/settings/ProfileSettings.tsx
 msgid "OPML export"
 msgstr "OPML-Export"
 
-#: src/components/content/add/ImportOpml.tsx
 #: src/components/content/add/ImportOpml.tsx
 msgid "OPML file"
 msgstr "OPML-Datei"
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "OPML file is required"
-msgstr ""
+msgstr "OPML-Datei ist erforderlich"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Orange"
-msgstr ""
+msgstr "Orange"
 
 #: src/pages/app/AboutPage.tsx
 msgid "Order"
@@ -742,28 +785,31 @@ msgstr "Übergeordnet"
 msgid "Parent Category"
 msgstr "Übergeordnete Kategorie"
 
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
 msgid "Password"
 msgstr "Passwort"
 
+#: src/hooks/useValidationRules.ts
+msgid "Password must be at least {minimumPasswordLength} characters"
+msgstr "Passwort muss mindestens {minimumPasswordLength} Zeichen lang sein"
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Password Recovery"
 msgstr "Passwortwiederherstellung"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Pink"
-msgstr ""
+msgstr "Rosa"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Position"
 msgstr "Position"
 
@@ -773,22 +819,47 @@ msgstr "Vorheriges"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Primary color"
-msgstr ""
+msgstr "Primärfarbe"
 
 #: src/pages/app/SettingsPage.tsx
 msgid "Profile"
 msgstr "Profil"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr "Push-Benachrichtigungsdienst"
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr "Push-Benachrichtigungen"
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr "Push-Benachrichtigungen sind in Ihren Benutzereinstellungen nicht konfiguriert."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr "Push-Benachrichtigungen sind auf dieser CommaFeed-Instanz nicht aktiviert."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
+msgstr "Push-Benachrichtigungen erhalten"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Receive push notifications when new feed entries are discovered. Enable \"Receive push notifications\" in the settings of each feed for which you want to receive notifications."
+msgstr "Erhalten Sie Push-Benachrichtigungen, wenn neue Feed-Einträge entdeckt werden. Aktivieren Sie \"Push-Benachrichtigungen erhalten\" in den Einstellungen jedes Feeds, für den Sie Benachrichtigungen erhalten möchten."
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Recover password"
 msgstr "Kennwort wiederherstellen"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Red"
-msgstr ""
+msgstr "Rot"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/header/Header.tsx
+#: src/components/KeyboardShortcutsHelp.tsx
 msgid "Refresh"
 msgstr "Aktualisieren"
 
@@ -796,20 +867,24 @@ msgstr "Aktualisieren"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Registrierungen sind für diese CommaFeed-Instanz geschlossen"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Reset Password"
+msgstr "Passwort zurücksetzen"
+
 #: src/pages/app/AboutPage.tsx
 msgid "REST API"
 msgstr "REST-API"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr "Rechtsklick"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
 #: 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"
 msgstr "Speichern"
 
@@ -825,24 +900,22 @@ msgstr "Schnelles Scrollen beim Navigieren zwischen Einträgen"
 msgid "Scrolling"
 msgstr "Scrollen"
 
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/header/Header.tsx
 #: src/components/header/Header.tsx
+#: src/components/sidebar/TreeSearch.tsx
 msgid "Search"
 msgstr "Suche"
 
-#: src/components/header/Header.tsx
-msgid "Search requires at least 3 characters"
-msgstr "Suche erfordert mindestens 3 Zeichen"
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select next unread feed/category"
-msgstr ""
+msgstr "Nächsten ungelesenen Feed/Kategorie auswählen"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select previous unread feed/category"
-msgstr ""
+msgstr "Vorherigen ungelesenen Feed/Kategorie auswählen"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Server URL"
+msgstr "Server-URL"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Set focus on next entry without opening it"
@@ -868,8 +941,6 @@ msgstr "Teilen"
 msgid "Sharing sites"
 msgstr "Seiten teilen"
 
-#: src/components/KeyboardShortcutsHelp.tsx
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Shift"
 msgstr "Verschiebung"
@@ -892,7 +963,7 @@ msgstr "Eintragsmenü anzeigen (Handy)"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show external link icon"
-msgstr ""
+msgstr "Symbol für externen Link anzeigen"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show feeds and categories with no unread entries"
@@ -908,19 +979,18 @@ msgstr "Natives Menü anzeigen (Desktop)"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show star icon"
-msgstr ""
+msgstr "Stern-Symbol anzeigen"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show unread count in tab favicon"
-msgstr ""
+msgstr "Anzahl ungelesener Nachrichten im Tab-Favicon anzeigen"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show unread count in tab title"
-msgstr ""
+msgstr "Anzahl ungelesener Nachrichten im Tab-Titel anzeigen"
 
+#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
 msgid "Sign up"
 msgstr "Melden Sie sich an"
 
@@ -928,26 +998,24 @@ msgstr "Melden Sie sich an"
 msgid "Something bad just happened..."
 msgstr "Etwas Schlimmes ist gerade passiert..."
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Space"
 msgstr "Raum"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Star"
 msgstr "Stern"
 
-#: src/pages/app/FeedEntriesPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
 #: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "Starred"
 msgstr "Markiert"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/AddPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Subscribe"
 msgstr "Abonnieren"
 
@@ -977,16 +1045,23 @@ msgstr "Zum Lightmode wechseln"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "System"
-msgstr ""
+msgstr "System"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryFooter.tsx
 msgid "Tags"
-msgstr ""
+msgstr "Tags"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Teal"
-msgstr ""
+msgstr "Blaugrün"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test"
+msgstr "Test"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test notification sent successfully."
+msgstr "Testbenachrichtigung erfolgreich gesendet."
 
 #: src/components/content/add/Subscribe.tsx
 msgid "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
@@ -996,9 +1071,18 @@ msgstr "Die URL für den Feed, den Sie abonnieren möchten. "
 msgid "Theme"
 msgstr "Thema"
 
+#. placeholder {0}: feed.filterLegacy
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "This feed has a legacy filter that cannot be edited and is not applied. Please recreate the filter using the new expression editor. The legacy filter expression was: <0>{0}</0>"
+msgstr "Dieser Feed verfügt über einen veralteten Filter, der nicht bearbeitet werden kann und nicht angewendet wird. Bitte erstellen Sie den Filter mit dem neuen Ausdruckseditor neu. Der veraltete Filterausdruck war: <0>{0}</0>"
+
 #: src/components/settings/ProfileSettings.tsx
-msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API. Use the form at the bottom of the page to generate a new API key"
+msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API and the Google Reader API. Use the form at the bottom of the page to generate a new API key"
-msgstr "Dies ist Ihr API-Schlüssel. Er kann für einige schreibgeschützte API-Vorgänge verwendet werden und ermöglicht den Zugriff auf die Fever-API. Verwenden Sie das Formular unten auf der Seite, um einen neuen API-Schlüssel zu generieren"
+msgstr "Dies ist Ihr API-Schlüssel. Er kann für einige schreibgeschützte API-Vorgänge verwendet werden und gewährt Zugriff auf die Fever-API und die Google-Reader-API. Verwenden Sie das Formular am Ende der Seite, um einen neuen API-Schlüssel zu generieren"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "This setting can cause scrolling issues on some browsers (e.g. Safari)"
+msgstr "Diese Einstellung kann auf einigen Browsern (z. B. Safari) zu Scrollproblemen führen"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Toggle read status of current entry"
@@ -1012,6 +1096,10 @@ msgstr "Sidebar an- und ausschalten"
 msgid "Toggle starred status of current entry"
 msgstr "Markierungsstatus des aktuellen Eintrags ändern"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Topic"
+msgstr "Thema"
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Try out CommaFeed with the demo account: demo/demo"
 msgstr "Testen Sie CommaFeed mit dem Demokonto: demo/demo"
@@ -1024,29 +1112,31 @@ msgstr "Testen Sie die Demo!"
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Unstar"
 msgstr "Stern entfernen"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "User key"
+msgstr "Benutzerschlüssel"
+
 #: src/components/settings/ProfileSettings.tsx
 msgid "User name"
 msgstr "Benutzername"
 
-#: src/pages/auth/LoginPage.tsx
 #: src/pages/auth/LoginPage.tsx
 msgid "User Name or E-mail"
 msgstr "Benutzername oder E-Mail"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Violet"
-msgstr ""
+msgstr "Violett"
 
 #: src/components/Alert.tsx
 msgid "Warning"
@@ -1056,9 +1146,13 @@ msgstr "Warnung"
 msgid "Website"
 msgstr "Webseite"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Welcome! This appears to be the first time you're running CommaFeed. Please create an administrator account to get started."
+msgstr "Willkommen! Dies scheint das erste Mal zu sein, dass Sie CommaFeed ausführen. Bitte erstellen Sie ein Administrator-Konto, um zu beginnen."
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Yellow"
-msgstr ""
+msgstr "Gelb"
 
 #: src/pages/app/FeedEntriesPage.tsx
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
@@ -1067,3 +1161,7 @@ msgstr "Sie haben noch keine Abonnements."
 #: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr "Ihr Feed wurde für die Aktualisierung eingereiht."
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Your password has been changed. You can now log in with your new password."
+msgstr "Ihr Passwort wurde geändert. Sie können sich nun mit Ihrem neuen Passwort anmelden."

commafeed-client/src/locales/en/messages.po

@@ -17,10 +17,6 @@ msgstr ""
 msgid "<0>CommaFeed is an open-source project. Sources are hosted on </0><1>GitHub</1>."
 msgstr "<0>CommaFeed is an open-source project. Sources are hosted on </0><1>GitHub</1>."
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "<0>Complete syntax is available </0><1>here</1><2>.</2>"
-msgstr "<0>Complete syntax is available </0><1>here</1><2>.</2>"
-
 #: src/pages/auth/RegistrationPage.tsx
 msgid "<0>Have an account?</0><1>Log in!</1>"
 msgstr "<0>Have an account?</0><1>Log in!</1>"
@@ -33,11 +29,15 @@ msgstr "<0>Hey,</0><1>I'm Jérémie from Belgium and I've been working on CommaF
 msgid "<0>Need an account?</0><1>Sign up!</1>"
 msgstr "<0>Need an account?</0><1>Sign up!</1>"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "About"
 msgstr "About"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
+msgstr "Access token"
+
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Actions"
 msgstr "Actions"
@@ -54,21 +54,24 @@ msgstr "Add category"
 msgid "Add user"
 msgstr "Add user"
 
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/header/ProfileMenu.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Admin"
 msgstr "Admin"
 
-#: src/pages/app/FeedEntriesPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Admin user name"
-#: src/components/sidebar/Tree.tsx
+msgstr "Admin user name"
-#: src/components/header/Header.tsx
+
 #: src/components/content/add/CategorySelect.tsx
+#: src/components/header/Header.tsx
+#: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "All"
 msgstr "All"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Always"
 msgstr "Always"
@@ -93,6 +96,14 @@ msgstr "Announcement"
 msgid "API key"
 msgstr "API key"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "API token"
+msgstr "API token"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "App token"
+msgstr "App token"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Are you sure you want to delete category <0>{categoryName}</0>?"
 msgstr "Are you sure you want to delete category <0>{categoryName}</0>?"
@@ -122,14 +133,15 @@ msgid "Asc"
 msgstr "Asc"
 
 #: src/pages/app/FeedDetailsPage.tsx
-msgid "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+msgid "Auto-mark as read"
-msgstr "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+msgstr "Auto-mark as read"
 
 #: src/components/content/add/Subscribe.tsx
 msgid "Back"
 msgstr "Back"
 
 #: src/pages/auth/PasswordRecoveryPage.tsx
+#: src/pages/auth/PasswordResetPage.tsx
 msgid "Back to log in"
 msgstr "Back to log in"
 
@@ -137,39 +149,40 @@ msgstr "Back to log in"
 msgid "Blue"
 msgstr "Blue"
 
+#: src/pages/app/AboutPage.tsx
+msgid "Browser extension"
+msgstr "Browser extension"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Browser extension required for Chrome"
 msgstr "Browser extension required for Chrome"
 
-#: src/pages/app/AboutPage.tsx
-msgid "Browser extention"
-msgstr "Browser extention"
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "Browser tab"
 msgstr "Browser tab"
 
-#: src/pages/app/TagDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
+msgid "Build a filter expression to indicate what you want to read. Entries that don't match will be marked as read automatically."
-#: src/pages/app/CategoryDetailsPage.tsx
+msgstr "Build a filter expression to indicate what you want to read. Entries that don't match will be marked as read automatically."
-#: src/pages/app/CategoryDetailsPage.tsx
+
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
-#: src/components/content/add/ImportOpml.tsx
-#: src/components/content/add/AddCategory.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
+#: src/components/settings/CustomCodeSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/pages/app/FeedDetailsPage.tsx
+#: src/components/content/add/AddCategory.tsx
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/AboutPage.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Category"
 msgstr "Category"
 
@@ -197,6 +210,10 @@ msgstr "CommaFeed browser extension version {browserExtensionVersion}."
 msgid "CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client. Login with your username and your <0>API key</0>."
 msgstr "CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client. Login with your username and your <0>API key</0>."
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "CommaFeed is compatible with the Google Reader API. Use the following URL in your Google Reader-compatible mobile client. Login with your username and your <0>API key</0>."
+msgstr "CommaFeed is compatible with the Google Reader API. Use the following URL in your Google Reader-compatible mobile client. Login with your username and your <0>API key</0>."
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed next unread item"
 msgstr "CommaFeed next unread item"
@@ -209,11 +226,11 @@ msgstr "CommaFeed version {version} ({revision})."
 msgid "Compact"
 msgstr "Compact"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Confirm"
 msgstr "Confirm"
 
@@ -221,10 +238,18 @@ msgstr "Confirm"
 msgid "Confirm password"
 msgstr "Confirm password"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Confirm Password"
+msgstr "Confirm Password"
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Cozy"
 msgstr "Cozy"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Create Admin Account"
+msgstr "Create Admin Account"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -249,8 +274,8 @@ msgstr "Custom JS code that will be executed on page load"
 msgid "Cyan"
 msgstr "Cyan"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
 msgid "Dark"
 msgstr "Dark"
 
@@ -258,11 +283,14 @@ msgstr "Dark"
 msgid "Date created"
 msgstr "Date created"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "days"
+msgstr "days"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Delete"
 msgstr "Delete"
 
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 msgid "Delete account"
 msgstr "Delete account"
@@ -283,14 +311,18 @@ msgstr "Desc"
 msgid "Detailed"
 msgstr "Detailed"
 
-#: src/pages/app/SettingsPage.tsx
 #: src/components/settings/DisplaySettings.tsx
+msgid "Disable \"Pull to refresh\" browser behavior"
+msgstr "Disable \"Pull to refresh\" browser behavior"
+
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
+#: src/pages/app/SettingsPage.tsx
 msgid "Display"
 msgstr "Display"
 
-#: src/pages/app/DonatePage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/DonatePage.tsx
 msgid "Donate"
 msgstr "Donate"
 
@@ -302,15 +334,14 @@ msgstr "Download"
 msgid "Drag link to bookmark bar"
 msgstr "Drag link to bookmark bar"
 
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "E-mail"
 msgstr "E-mail"
 
-#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/auth/RegistrationPage.tsx
 msgid "E-mail address"
 msgstr "E-mail address"
@@ -319,8 +350,8 @@ msgstr "E-mail address"
 msgid "Edit user"
 msgstr "Edit user"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Enabled"
 msgstr "Enabled"
 
@@ -344,10 +375,6 @@ msgstr "Entry headers"
 msgid "Error"
 msgstr "Error"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Example: {example}."
-msgstr "Example: {example}."
-
 #: src/components/header/ProfileMenu.tsx
 msgid "Expanded"
 msgstr "Expanded"
@@ -356,8 +383,8 @@ msgstr "Expanded"
 msgid "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
 msgstr "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
 
-#: src/pages/WelcomePage.tsx
 #: src/components/header/Header.tsx
+#: src/pages/WelcomePage.tsx
 msgid "Extension options"
 msgstr "Extension options"
 
@@ -365,9 +392,8 @@ msgstr "Extension options"
 msgid "Feed name"
 msgstr "Feed name"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Feed URL"
 msgstr "Feed URL"
 
@@ -399,9 +425,9 @@ msgstr "Force fetching feeds is not yet available."
 msgid "Forgot password?"
 msgstr "Forgot password?"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generate an API key in your profile first."
 msgstr "Generate an API key in your profile first."
 
@@ -409,9 +435,9 @@ msgstr "Generate an API key in your profile first."
 msgid "Generate new API key"
 msgstr "Generate new API key"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generated feed url"
 msgstr "Generated feed url"
 
@@ -432,6 +458,14 @@ msgstr "Go to the API documentation."
 msgid "Goodies"
 msgstr "Goodies"
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API"
+msgstr "Google Reader API"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API URL"
+msgstr "Google Reader API URL"
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Grape"
 msgstr "Grape"
@@ -448,10 +482,6 @@ msgstr "Green"
 msgid "Id"
 msgstr "Id"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
-msgstr "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "If the entry doesn't entirely fit on the screen"
 msgstr "If the entry doesn't entirely fit on the screen"
@@ -472,13 +502,21 @@ msgstr "In expanded view, scrolling through entries mark them as read"
 msgid "Indigo"
 msgstr "Indigo"
 
-#: src/components/content/FeedEntryFooter.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Initial Setup"
+msgstr "Initial Setup"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Invalid password reset link. Please request a new one."
+msgstr "Invalid password reset link. Please request a new one."
+
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Keep unread"
 msgstr "Keep unread"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/FeedEntries.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "Keyboard shortcuts"
 msgstr "Keyboard shortcuts"
 
@@ -506,9 +544,9 @@ msgstr "Light"
 msgid "Lime"
 msgstr "Lime"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Link"
 msgstr "Link"
 
@@ -532,9 +570,8 @@ msgstr "Loading subscriptions..."
 msgid "Loading tags..."
 msgstr "Loading tags..."
 
+#: src/pages/auth/LoginPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 msgid "Log in"
 msgstr "Log in"
 
@@ -546,8 +583,8 @@ msgstr "Logout"
 msgid "Long press"
 msgstr "Long press"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Manage users"
 msgstr "Manage users"
 
@@ -555,21 +592,25 @@ msgstr "Manage users"
 msgid "Mark all as read"
 msgstr "Mark all as read"
 
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
 msgid "Mark all entries as read"
 msgstr "Mark all entries as read"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read"
 msgstr "Mark as read"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read up to here"
 msgstr "Mark as read up to here"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Mark entries in this feed as read after this number of days. Leave empty to disable."
+msgstr "Mark entries in this feed as read after this number of days. Leave empty to disable."
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Metrics"
 msgstr "Metrics"
@@ -586,15 +627,15 @@ msgstr "Move the page down"
 msgid "Move the page up"
 msgstr "Move the page up"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/components/RelativeDate.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "N/A"
 msgstr "N/A"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Name"
 msgstr "Name"
 
@@ -606,7 +647,6 @@ msgstr "Navigate to a subscription by entering its name"
 msgid "Navigate to the next category/feed with unread entries when marking all entries as read"
 msgstr "Navigate to the next category/feed with unread entries when marking all entries as read"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Never"
 msgstr "Never"
@@ -615,12 +655,16 @@ msgstr "Never"
 msgid "New password"
 msgstr "New password"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "New Password"
+msgstr "New Password"
+
 #: src/pages/app/AboutPage.tsx
 msgid "Newest first"
 msgstr "Newest first"
 
-#: src/components/header/Header.tsx
 #: src/components/content/add/Subscribe.tsx
+#: src/components/header/Header.tsx
 msgid "Next"
 msgstr "Next"
 
@@ -717,7 +761,6 @@ msgstr "OPML"
 msgid "OPML export"
 msgstr "OPML export"
 
-#: src/components/content/add/ImportOpml.tsx
 #: src/components/content/add/ImportOpml.tsx
 msgid "OPML file"
 msgstr "OPML file"
@@ -742,19 +785,22 @@ msgstr "Parent"
 msgid "Parent Category"
 msgstr "Parent Category"
 
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
 msgid "Password"
 msgstr "Password"
 
+#: src/hooks/useValidationRules.ts
+msgid "Password must be at least {minimumPasswordLength} characters"
+msgstr "Password must be at least {minimumPasswordLength} characters"
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Password Recovery"
 msgstr "Password Recovery"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
@@ -762,8 +808,8 @@ msgstr "Passwords do not match"
 msgid "Pink"
 msgstr "Pink"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Position"
 msgstr "Position"
 
@@ -779,6 +825,31 @@ msgstr "Primary color"
 msgid "Profile"
 msgstr "Profile"
 
+#: 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/components/settings/PushNotificationSettings.tsx
+msgid "Receive push notifications when new feed entries are discovered. Enable \"Receive push notifications\" in the settings of each feed for which you want to receive notifications."
+msgstr "Receive push notifications when new feed entries are discovered. Enable \"Receive push notifications\" in the settings of each feed for which you want to receive notifications."
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Recover password"
 msgstr "Recover password"
@@ -787,8 +858,8 @@ msgstr "Recover password"
 msgid "Red"
 msgstr "Red"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/header/Header.tsx
+#: src/components/KeyboardShortcutsHelp.tsx
 msgid "Refresh"
 msgstr "Refresh"
 
@@ -796,20 +867,24 @@ msgstr "Refresh"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Registrations are closed on this CommaFeed instance"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Reset Password"
+msgstr "Reset Password"
+
 #: src/pages/app/AboutPage.tsx
 msgid "REST API"
 msgstr "REST API"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr "Right click"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
 #: 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"
 msgstr "Save"
 
@@ -825,17 +900,11 @@ msgstr "Scroll smoothly when navigating between entries"
 msgid "Scrolling"
 msgstr "Scrolling"
 
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/header/Header.tsx
 #: src/components/header/Header.tsx
+#: src/components/sidebar/TreeSearch.tsx
 msgid "Search"
 msgstr "Search"
 
-#: src/components/header/Header.tsx
-msgid "Search requires at least 3 characters"
-msgstr "Search requires at least 3 characters"
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select next unread feed/category"
 msgstr "Select next unread feed/category"
@@ -844,6 +913,10 @@ msgstr "Select next unread feed/category"
 msgid "Select previous unread feed/category"
 msgstr "Select previous unread feed/category"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Server URL"
+msgstr "Server URL"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Set focus on next entry without opening it"
 msgstr "Set focus on next entry without opening it"
@@ -868,8 +941,6 @@ msgstr "Share"
 msgid "Sharing sites"
 msgstr "Sharing sites"
 
-#: src/components/KeyboardShortcutsHelp.tsx
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Shift"
 msgstr "Shift"
@@ -918,9 +989,8 @@ msgstr "Show unread count in tab favicon"
 msgid "Show unread count in tab title"
 msgstr "Show unread count in tab title"
 
+#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
 msgid "Sign up"
 msgstr "Sign up"
 
@@ -928,26 +998,24 @@ msgstr "Sign up"
 msgid "Something bad just happened..."
 msgstr "Something bad just happened..."
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Space"
 msgstr "Space"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Star"
 msgstr "Star"
 
-#: src/pages/app/FeedEntriesPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
 #: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "Starred"
 msgstr "Starred"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/AddPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Subscribe"
 msgstr "Subscribe"
 
@@ -979,7 +1047,6 @@ msgstr "Switch to light theme"
 msgid "System"
 msgstr "System"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryFooter.tsx
 msgid "Tags"
 msgstr "Tags"
@@ -988,6 +1055,14 @@ msgstr "Tags"
 msgid "Teal"
 msgstr "Teal"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test"
+msgstr "Test"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test notification sent successfully."
+msgstr "Test notification sent successfully."
+
 #: src/components/content/add/Subscribe.tsx
 msgid "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
 msgstr "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
@@ -996,9 +1071,18 @@ msgstr "The URL for the feed you want to subscribe to. You can also use the webs
 msgid "Theme"
 msgstr "Theme"
 
+#. placeholder {0}: feed.filterLegacy
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "This feed has a legacy filter that cannot be edited and is not applied. Please recreate the filter using the new expression editor. The legacy filter expression was: <0>{0}</0>"
+msgstr "This feed has a legacy filter that cannot be edited and is not applied. Please recreate the filter using the new expression editor. The legacy filter expression was: <0>{0}</0>"
+
 #: src/components/settings/ProfileSettings.tsx
-msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API. Use the form at the bottom of the page to generate a new API key"
+msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API and the Google Reader API. Use the form at the bottom of the page to generate a new API key"
-msgstr "This is your API key. It can be used for some read-only API operations and grants access to the Fever API. Use the form at the bottom of the page to generate a new API key"
+msgstr "This is your API key. It can be used for some read-only API operations and grants access to the Fever API and the Google Reader API. Use the form at the bottom of the page to generate a new API key"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "This setting can cause scrolling issues on some browsers (e.g. Safari)"
+msgstr "This setting can cause scrolling issues on some browsers (e.g. Safari)"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Toggle read status of current entry"
@@ -1012,6 +1096,10 @@ msgstr "Toggle sidebar"
 msgid "Toggle starred status of current entry"
 msgstr "Toggle starred status of current entry"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Topic"
+msgstr "Topic"
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Try out CommaFeed with the demo account: demo/demo"
 msgstr "Try out CommaFeed with the demo account: demo/demo"
@@ -1024,22 +1112,24 @@ msgstr "Try the demo!"
 msgid "Unread"
 msgstr "Unread"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Unstar"
 msgstr "Unstar"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "User key"
+msgstr "User key"
+
 #: src/components/settings/ProfileSettings.tsx
 msgid "User name"
 msgstr "User name"
 
-#: src/pages/auth/LoginPage.tsx
 #: src/pages/auth/LoginPage.tsx
 msgid "User Name or E-mail"
 msgstr "User Name or E-mail"
@@ -1056,6 +1146,10 @@ msgstr "Warning"
 msgid "Website"
 msgstr "Website"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Welcome! This appears to be the first time you're running CommaFeed. Please create an administrator account to get started."
+msgstr "Welcome! This appears to be the first time you're running CommaFeed. Please create an administrator account to get started."
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Yellow"
 msgstr "Yellow"
@@ -1067,3 +1161,7 @@ msgstr "You don't have any subscriptions yet. Why not try adding one by clicking
 #: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr "Your feeds have been queued for refresh."
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Your password has been changed. You can now log in with your new password."
+msgstr "Your password has been changed. You can now log in with your new password."

commafeed-client/src/locales/es/messages.po

@@ -18,10 +18,6 @@ msgstr ""
 msgid "<0>CommaFeed is an open-source project. Sources are hosted on </0><1>GitHub</1>."
 msgstr "<0>CommaFeed es un proyecto de código abierto. El código fuente está hospedado en </0><1>GitHub</1>."
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "<0>Complete syntax is available </0><1>here</1><2>.</2>"
-msgstr "<0>La sintaxis completa está disponible </0><1>aquí</1><2>.</2>"
-
 #: src/pages/auth/RegistrationPage.tsx
 msgid "<0>Have an account?</0><1>Log in!</1>"
 msgstr "<0>¿Tienes una cuenta?</0><1>¡Inicia sesión!</1>"
@@ -34,11 +30,15 @@ msgstr "<0>Hola,</0><1>Soy Jérémie de Bélgica y he estado trabajando en Comma
 msgid "<0>Need an account?</0><1>Sign up!</1>"
 msgstr "<0>¿Necesitas una cuenta?</0><1>¡Regístrate!</1>"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "About"
 msgstr "Acerca de"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
+msgstr "Token de acceso"
+
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Actions"
 msgstr "Acciones"
@@ -55,21 +55,24 @@ msgstr "Añadir categoría"
 msgid "Add user"
 msgstr "Añadir usuario"
 
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/header/ProfileMenu.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Admin"
 msgstr "Administrador"
 
-#: src/pages/app/FeedEntriesPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Admin user name"
-#: src/components/sidebar/Tree.tsx
+msgstr "Nombre de usuario administrador"
-#: src/components/header/Header.tsx
+
 #: src/components/content/add/CategorySelect.tsx
+#: src/components/header/Header.tsx
+#: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "All"
 msgstr "Todo"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Always"
 msgstr "Siempre"
@@ -94,6 +97,14 @@ msgstr "Anuncio"
 msgid "API key"
 msgstr "Clave API"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "API token"
+msgstr "Token de API"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "App token"
+msgstr "Token de aplicación"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Are you sure you want to delete category <0>{categoryName}</0>?"
 msgstr "¿Estás seguro de que deseas eliminar la categoría <0>{categoryName}</0>?"
@@ -123,54 +134,56 @@ msgid "Asc"
 msgstr "Asc"
 
 #: src/pages/app/FeedDetailsPage.tsx
-msgid "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+msgid "Auto-mark as read"
-msgstr "Las variables disponibles son 'título', 'contenido', 'url', 'autor' y 'categorías' y su contenido se convierte a minúsculas para facilitar la comparación de cadenas."
+msgstr "Marcar como leído automáticamente"
 
 #: src/components/content/add/Subscribe.tsx
 msgid "Back"
 msgstr "Atrás"
 
 #: src/pages/auth/PasswordRecoveryPage.tsx
+#: src/pages/auth/PasswordResetPage.tsx
 msgid "Back to log in"
 msgstr "Volver a iniciar sesión"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Blue"
-msgstr ""
+msgstr "Azul"
+
+#: src/pages/app/AboutPage.tsx
+msgid "Browser extension"
+msgstr "Extensión del navegador"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Browser extension required for Chrome"
 msgstr "Se requiere extensión de navegador para Chrome"
 
-#: src/pages/app/AboutPage.tsx
-msgid "Browser extention"
-msgstr "Extensión del navegador"
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "Browser tab"
 msgstr "Pestaña del navegador"
 
-#: src/pages/app/TagDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
+msgid "Build a filter expression to indicate what you want to read. Entries that don't match will be marked as read automatically."
-#: src/pages/app/CategoryDetailsPage.tsx
+msgstr "Crea una expresión de filtrado para indicar lo que quieres leer. Las entradas que no coincidan se marcarán como leídas automáticamente."
-#: src/pages/app/CategoryDetailsPage.tsx
+
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
-#: src/components/content/add/ImportOpml.tsx
-#: src/components/content/add/AddCategory.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
+#: src/components/settings/CustomCodeSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/pages/app/FeedDetailsPage.tsx
+#: src/components/content/add/AddCategory.tsx
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/AboutPage.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Category"
 msgstr "Categoría"
 
@@ -198,6 +211,10 @@ msgstr "Versión de la extensión del navegador CommaFeed {browserExtensionVersi
 msgid "CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client. Login with your username and your <0>API key</0>."
 msgstr "CommaFeed es compatible con Fever API. Utilice la siguiente URL en su cliente móvil compatible con Fever. Inicie sesión con su nombre de usuario y su <0>clave API</0>."
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "CommaFeed is compatible with the Google Reader API. Use the following URL in your Google Reader-compatible mobile client. Login with your username and your <0>API key</0>."
+msgstr "CommaFeed es compatible con Google Reader API. Utilice la siguiente URL en su cliente móvil compatible con Google Reader. Inicie sesión con su nombre de usuario y su <0>clave API</0>."
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed next unread item"
 msgstr "CommaFeed siguiente elemento no leído"
@@ -210,11 +227,11 @@ msgstr "Versión de CommaFeed {version} ({revision})."
 msgid "Compact"
 msgstr "Compacto"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -222,10 +239,18 @@ msgstr "Confirmar"
 msgid "Confirm password"
 msgstr "Confirmar contraseña"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Confirm Password"
+msgstr "Confirmar contraseña"
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Cozy"
 msgstr "Acogedor"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Create Admin Account"
+msgstr "Crear cuenta de administrador"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -248,10 +273,10 @@ msgstr "Código JS personalizado que se ejecutará al cargar la página"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Cyan"
-msgstr ""
+msgstr "Cian"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
 msgid "Dark"
 msgstr "Oscuro"
 
@@ -259,11 +284,14 @@ msgstr "Oscuro"
 msgid "Date created"
 msgstr "Fecha de creación"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "days"
+msgstr "días"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 msgid "Delete account"
 msgstr "Borrar cuenta"
@@ -284,14 +312,18 @@ msgstr "Desc"
 msgid "Detailed"
 msgstr "Detallado"
 
-#: src/pages/app/SettingsPage.tsx
 #: src/components/settings/DisplaySettings.tsx
+msgid "Disable \"Pull to refresh\" browser behavior"
+msgstr "Desactivar el comportamiento \"Arrastrar para actualizar\" del navegador"
+
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
+#: src/pages/app/SettingsPage.tsx
 msgid "Display"
 msgstr "Mostrar"
 
-#: src/pages/app/DonatePage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/DonatePage.tsx
 msgid "Donate"
 msgstr "Donar"
 
@@ -303,15 +335,14 @@ msgstr "Descargar"
 msgid "Drag link to bookmark bar"
 msgstr "Arrastra el enlace a la barra de marcadores"
 
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "E-mail"
 msgstr "Correo electrónico"
 
-#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/auth/RegistrationPage.tsx
 msgid "E-mail address"
 msgstr "Dirección de correo electrónico"
@@ -320,8 +351,8 @@ msgstr "Dirección de correo electrónico"
 msgid "Edit user"
 msgstr "Editar usuario"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Enabled"
 msgstr "Habilitado"
 
@@ -345,10 +376,6 @@ msgstr "Encabezados de las entradas"
 msgid "Error"
 msgstr "Error"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Example: {example}."
-msgstr "Ejemplo: {ejemplo}."
-
 #: src/components/header/ProfileMenu.tsx
 msgid "Expanded"
 msgstr "Expandido"
@@ -357,8 +384,8 @@ msgstr "Expandido"
 msgid "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
 msgstr "Exporta tus suscripciones y categorías como un archivo OPML que se puede importar en otros servicios de lectura de feeds"
 
-#: src/pages/WelcomePage.tsx
 #: src/components/header/Header.tsx
+#: src/pages/WelcomePage.tsx
 msgid "Extension options"
 msgstr "Opciones de la extensión"
 
@@ -366,9 +393,8 @@ msgstr "Opciones de la extensión"
 msgid "Feed name"
 msgstr "Nombre del feed"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Feed URL"
 msgstr "URL del feed"
 
@@ -390,19 +416,19 @@ msgstr "Expresión de filtrado"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Font size"
-msgstr ""
+msgstr "Tamaño de fuente"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Force fetching feeds is not yet available."
-msgstr ""
+msgstr "Forzar la actualización de los feeds aún no está disponible."
 
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "¿Olvidaste la contraseña?"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generate an API key in your profile first."
 msgstr "Primero genere una clave API en su perfil."
 
@@ -410,9 +436,9 @@ msgstr "Primero genere una clave API en su perfil."
 msgid "Generate new API key"
 msgstr "Generar nueva clave API"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generated feed url"
 msgstr "URL del feed generado"
 
@@ -433,26 +459,30 @@ msgstr "Ir a la documentación de la API."
 msgid "Goodies"
 msgstr "Golosinas"
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API"
+msgstr ""
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API URL"
+msgstr ""
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Grape"
-msgstr ""
+msgstr "Uva"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Gray"
-msgstr ""
+msgstr "Gris"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Green"
-msgstr ""
+msgstr "Verde"
 
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Id"
 msgstr "Identificación"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
-msgstr "Si no está vacía, una expresión que se evalúa como \"verdadera\" o \"falso\". Si es falso, las nuevas entradas de este feed se marcarán como leídas automáticamente."
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "If the entry doesn't entirely fit on the screen"
 msgstr "Si la entrada no cabe completamente en la pantalla"
@@ -471,15 +501,23 @@ msgstr "En la vista ampliada, al desplazarse por las entradas marcarlas como le
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Indigo"
-msgstr ""
+msgstr "Índigo"
+
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Initial Setup"
+msgstr "Configuración inicial"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Invalid password reset link. Please request a new one."
+msgstr "Enlace de restablecimiento de contraseña no válido. Por favor, solicita uno nuevo."
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Keep unread"
 msgstr "Mantener sin leer"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/FeedEntries.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
@@ -505,17 +543,17 @@ msgstr "Claro"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Lime"
-msgstr ""
+msgstr "Lima"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Link"
 msgstr "Enlace"
 
 #: src/components/settings/CustomCodeSettings.tsx
 msgid "Link to the documentation"
-msgstr ""
+msgstr "Enlace a la documentación"
 
 #: src/hooks/useAppLoading.ts
 msgid "Loading profile..."
@@ -533,9 +571,8 @@ msgstr "Cargando suscripciones..."
 msgid "Loading tags..."
 msgstr "Cargando etiquetas..."
 
+#: src/pages/auth/LoginPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 msgid "Log in"
 msgstr "Iniciar sesión"
 
@@ -547,8 +584,8 @@ msgstr "Cerrar sesión"
 msgid "Long press"
 msgstr "Pulsación larga"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Manage users"
 msgstr "Administrar usuarios"
 
@@ -556,21 +593,25 @@ msgstr "Administrar usuarios"
 msgid "Mark all as read"
 msgstr "Marcar todo como leído"
 
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
 msgid "Mark all entries as read"
 msgstr "Marcar todas las entradas como leídas"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read up to here"
 msgstr "Marcar como leído hasta aquí"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Mark entries in this feed as read after this number of days. Leave empty to disable."
+msgstr "Marcar las entradas de este feed como leídas después de este número de días. Dejar vacío para desactivar."
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Metrics"
 msgstr "Métricas"
@@ -587,15 +628,15 @@ msgstr "Mover la página hacia abajo"
 msgid "Move the page up"
 msgstr "Mover la página hacia arriba"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/components/RelativeDate.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "N/A"
 msgstr "N/D"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Name"
 msgstr "Nombre"
 
@@ -605,9 +646,8 @@ msgstr "Navegar a una suscripción introduciendo su nombre"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Navigate to the next category/feed with unread entries when marking all entries as read"
-msgstr ""
+msgstr "Navegar a la siguiente categoría/feed con entradas no leídas al marcar todas como leídas"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Never"
 msgstr "Nunca"
@@ -616,12 +656,16 @@ msgstr "Nunca"
 msgid "New password"
 msgstr "Nueva contraseña"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "New Password"
+msgstr "Nueva contraseña"
+
 #: src/pages/app/AboutPage.tsx
 msgid "Newest first"
 msgstr "Las más recientes primero"
 
-#: src/components/header/Header.tsx
 #: src/components/content/add/Subscribe.tsx
+#: src/components/header/Header.tsx
 msgid "Next"
 msgstr "Siguiente"
 
@@ -718,7 +762,6 @@ msgstr "OPML"
 msgid "OPML export"
 msgstr "Exportar OPML"
 
-#: src/components/content/add/ImportOpml.tsx
 #: src/components/content/add/ImportOpml.tsx
 msgid "OPML file"
 msgstr "Archivo OPML"
@@ -729,7 +772,7 @@ msgstr "Es necesario un archivo OPML"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Orange"
-msgstr ""
+msgstr "Naranja"
 
 #: src/pages/app/AboutPage.tsx
 msgid "Order"
@@ -743,28 +786,31 @@ msgstr "Padre"
 msgid "Parent Category"
 msgstr "Categoría principal"
 
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
 msgid "Password"
 msgstr "Contraseña"
 
+#: src/hooks/useValidationRules.ts
+msgid "Password must be at least {minimumPasswordLength} characters"
+msgstr "La contraseña debe tener al menos {minimumPasswordLength} caracteres"
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Password Recovery"
 msgstr "Recuperación de contraseña"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Pink"
-msgstr ""
+msgstr "Rosa"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Position"
 msgstr "Posición"
 
@@ -774,22 +820,47 @@ msgstr "Previo"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Primary color"
-msgstr ""
+msgstr "Color primario"
 
 #: src/pages/app/SettingsPage.tsx
 msgid "Profile"
 msgstr "Perfil"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr "Servicio de notificaciones push"
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr "Notificaciones push"
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr "Las notificaciones push no están configuradas en tus ajustes de usuario."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr "Las notificaciones push no están habilitadas en esta instancia de CommaFeed."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
+msgstr "Recibir notificaciones push"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Receive push notifications when new feed entries are discovered. Enable \"Receive push notifications\" in the settings of each feed for which you want to receive notifications."
+msgstr "Recibir notificaciones push cuando se descubran nuevas entradas. Activa \"Recibir notificaciones push\" en los ajustes de cada feed del que quieras recibir notificaciones."
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Recover password"
 msgstr "Recuperar contraseña"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Red"
-msgstr ""
+msgstr "Rojo"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/header/Header.tsx
+#: src/components/KeyboardShortcutsHelp.tsx
 msgid "Refresh"
 msgstr "Actualizar"
 
@@ -797,20 +868,24 @@ msgstr "Actualizar"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Los registros están cerrados en esta instancia de CommaFeed"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Reset Password"
+msgstr "Restablecer contraseña"
+
 #: src/pages/app/AboutPage.tsx
 msgid "REST API"
 msgstr "API REST"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr "Clic derecho"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
 #: 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"
 msgstr "Guardar"
 
@@ -826,24 +901,22 @@ msgstr "Desplazarse suavemente al navegar entre entradas"
 msgid "Scrolling"
 msgstr "Desplazarse"
 
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/header/Header.tsx
 #: src/components/header/Header.tsx
+#: src/components/sidebar/TreeSearch.tsx
 msgid "Search"
 msgstr "Buscar"
 
-#: src/components/header/Header.tsx
-msgid "Search requires at least 3 characters"
-msgstr "La búsqueda requiere al menos 3 caracteres"
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select next unread feed/category"
-msgstr ""
+msgstr "Seleccionar el siguiente feed/categoría no leído"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select previous unread feed/category"
-msgstr ""
+msgstr "Seleccionar el anterior feed/categoría no leído"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Server URL"
+msgstr "URL del servidor"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Set focus on next entry without opening it"
@@ -869,8 +942,6 @@ msgstr "Compartir"
 msgid "Sharing sites"
 msgstr "Compartir sitios"
 
-#: src/components/KeyboardShortcutsHelp.tsx
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Shift"
 msgstr "Shift"
@@ -919,9 +990,8 @@ msgstr "Mostrar recuento de no leídos en la pestaña favicon"
 msgid "Show unread count in tab title"
 msgstr "Mostrar recuento de no leídos en el título de la pestaña"
 
+#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
 msgid "Sign up"
 msgstr "Registrarse"
 
@@ -929,26 +999,24 @@ msgstr "Registrarse"
 msgid "Something bad just happened..."
 msgstr "Algo malo acaba de pasar..."
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Space"
 msgstr "Espacio"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Star"
 msgstr "Estrella"
 
-#: src/pages/app/FeedEntriesPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
 #: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "Starred"
 msgstr "Destacado"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/AddPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Subscribe"
 msgstr "Suscribirse"
 
@@ -980,14 +1048,21 @@ msgstr "Cambiar a tema claro"
 msgid "System"
 msgstr "Sistema"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryFooter.tsx
 msgid "Tags"
 msgstr "Etiquetas"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Teal"
-msgstr ""
+msgstr "Verde azulado"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test"
+msgstr "Probar"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test notification sent successfully."
+msgstr "Notificación de prueba enviada con éxito."
 
 #: src/components/content/add/Subscribe.tsx
 msgid "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
@@ -997,9 +1072,18 @@ msgstr "La URL del feed al que desea suscribirse. También puede utilizar la URL
 msgid "Theme"
 msgstr "Tema"
 
+#. placeholder {0}: feed.filterLegacy
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "This feed has a legacy filter that cannot be edited and is not applied. Please recreate the filter using the new expression editor. The legacy filter expression was: <0>{0}</0>"
+msgstr "Este feed tiene un filtro heredado que no se puede editar y no se aplica. Por favor, vuelve a crear el filtro usando el nuevo editor de expresiones. La expresión del filtro heredado era: <0>{0}</0>"
+
 #: src/components/settings/ProfileSettings.tsx
-msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API. Use the form at the bottom of the page to generate a new API key"
+msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API and the Google Reader API. Use the form at the bottom of the page to generate a new API key"
-msgstr "Esta es su clave API. Se puede utilizar para algunas operaciones API de solo lectura y otorga acceso a Fever API. Utilice el formulario en la parte inferior de la página para generar una nueva clave API"
+msgstr "Esta es su clave API. Se puede utilizar para algunas operaciones API de solo lectura y otorga acceso a la API Fever y a la API de Google Reader. Utilice el formulario en la parte inferior de la página para generar una nueva clave API"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "This setting can cause scrolling issues on some browsers (e.g. Safari)"
+msgstr "Este ajuste puede causar problemas de desplazamiento en algunos navegadores (por ejemplo, Safari)"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Toggle read status of current entry"
@@ -1013,6 +1097,10 @@ msgstr "Alternar barra lateral"
 msgid "Toggle starred status of current entry"
 msgstr "Alternar estado destacado de la entrada actual"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Topic"
+msgstr "Tema"
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Try out CommaFeed with the demo account: demo/demo"
 msgstr "Prueba CommaFeed con la cuenta de demostración: demo/demo"
@@ -1025,29 +1113,31 @@ msgstr "¡Prueba la demostración!"
 msgid "Unread"
 msgstr "No leído"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Unstar"
 msgstr "Desmarcar"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Unsubscribe"
 msgstr "Cancelar suscripción"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "User key"
+msgstr "Clave de usuario"
+
 #: src/components/settings/ProfileSettings.tsx
 msgid "User name"
 msgstr "Nombre de usuario"
 
-#: src/pages/auth/LoginPage.tsx
 #: src/pages/auth/LoginPage.tsx
 msgid "User Name or E-mail"
 msgstr "Nombre de usuario o correo electrónico"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Violet"
-msgstr ""
+msgstr "Violeta"
 
 #: src/components/Alert.tsx
 msgid "Warning"
@@ -1057,9 +1147,13 @@ msgstr "Advertencia"
 msgid "Website"
 msgstr "Sitio web"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Welcome! This appears to be the first time you're running CommaFeed. Please create an administrator account to get started."
+msgstr "¡Bienvenido! Parece que esta es la primera vez que ejecutas CommaFeed. Por favor, crea una cuenta de administrador para empezar."
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Yellow"
-msgstr ""
+msgstr "Amarillo"
 
 #: src/pages/app/FeedEntriesPage.tsx
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
@@ -1068,3 +1162,7 @@ msgstr "Aún no tienes ninguna suscripción. ¿Por qué no intentas agregar una
 #: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr "Tus feeds se han puesto en cola para actualizarse."
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Your password has been changed. You can now log in with your new password."
+msgstr "Tu contraseña ha sido cambiada. Ahora puedes iniciar sesión con tu nueva contraseña."

commafeed-client/src/locales/fr/messages.po

@@ -17,10 +17,6 @@ msgstr ""
 msgid "<0>CommaFeed is an open-source project. Sources are hosted on </0><1>GitHub</1>."
 msgstr "<0>CommaFeed est un projet open-source. Les sources sont hébergées sur </0><1>GitHub</1>."
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "<0>Complete syntax is available </0><1>here</1><2>.</2>"
-msgstr "<0>La syntaxe complète est disponible </0><1>ici</1><2>.</2>"
-
 #: src/pages/auth/RegistrationPage.tsx
 msgid "<0>Have an account?</0><1>Log in!</1>"
 msgstr "<0>Déjà un compte ?</0><1>Connectez-vous !</1>"
@@ -33,11 +29,15 @@ msgstr "<0>Salut,</0><1>Je m'appelle Jérémie, je suis belge, et je développe
 msgid "<0>Need an account?</0><1>Sign up!</1>"
 msgstr "<0>Besoin d'un compte ?</0><1>Enregistrez-vous !</1>"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "About"
 msgstr "À propos"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
+msgstr "Jeton d'accès"
+
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Actions"
 msgstr "Actions"
@@ -54,21 +54,24 @@ msgstr "Ajouter une catégorie"
 msgid "Add user"
 msgstr "Ajouter un utilisateur"
 
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/header/ProfileMenu.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Admin"
 msgstr "Administrateur"
 
-#: src/pages/app/FeedEntriesPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Admin user name"
-#: src/components/sidebar/Tree.tsx
+msgstr "Nom de l'administrateur"
-#: src/components/header/Header.tsx
+
 #: src/components/content/add/CategorySelect.tsx
+#: src/components/header/Header.tsx
+#: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "All"
 msgstr "Tout"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Always"
 msgstr "Toujours"
@@ -93,6 +96,14 @@ msgstr "Annonces"
 msgid "API key"
 msgstr "Clé API"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "API token"
+msgstr "Jeton API"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "App token"
+msgstr "Jeton Appli"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Are you sure you want to delete category <0>{categoryName}</0>?"
 msgstr "Êtes-vous sûr de vouloir supprimer la catégorie <0>{categoryName}</0> ?"
@@ -122,14 +133,15 @@ msgid "Asc"
 msgstr "Ascendant"
 
 #: src/pages/app/FeedDetailsPage.tsx
-msgid "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+msgid "Auto-mark as read"
-msgstr "Les variables disponibles sont 'title', 'content', 'url' 'author' et 'categories' et leur contenu est converti en minuscules pour faciliter la comparaison de chaînes."
+msgstr "Marquer automatiquement comme lu"
 
 #: src/components/content/add/Subscribe.tsx
 msgid "Back"
 msgstr "Retour"
 
 #: src/pages/auth/PasswordRecoveryPage.tsx
+#: src/pages/auth/PasswordResetPage.tsx
 msgid "Back to log in"
 msgstr "Retour à la connexion"
 
@@ -137,39 +149,40 @@ msgstr "Retour à la connexion"
 msgid "Blue"
 msgstr "Bleu"
 
+#: src/pages/app/AboutPage.tsx
+msgid "Browser extension"
+msgstr "Extension navigateur"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Browser extension required for Chrome"
 msgstr "L'extension navigateur est nécessaire sur Chrome"
 
-#: src/pages/app/AboutPage.tsx
-msgid "Browser extention"
-msgstr "Extension navigateur"
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "Browser tab"
 msgstr "Onglet navigateur"
 
-#: src/pages/app/TagDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
+msgid "Build a filter expression to indicate what you want to read. Entries that don't match will be marked as read automatically."
-#: src/pages/app/CategoryDetailsPage.tsx
+msgstr "Créez une expression régulière pour filtrer ce que vous voulez lire. Les entrées qui ne correspondent pas seront automatiquement marquées comme lues."
-#: src/pages/app/CategoryDetailsPage.tsx
+
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
-#: src/components/content/add/ImportOpml.tsx
-#: src/components/content/add/AddCategory.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
+#: src/components/settings/CustomCodeSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/pages/app/FeedDetailsPage.tsx
+#: src/components/content/add/AddCategory.tsx
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/AboutPage.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Category"
 msgstr "Catégorie"
 
@@ -197,6 +210,10 @@ msgstr "Extension CommaFeed pour navigateur version {browserExtensionVersion}."
 msgid "CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client. Login with your username and your <0>API key</0>."
 msgstr "Commafeed est compatible avec l'API Fever, en inscrivant l'URL suivante dans votre client mobile compatible. Entrez votre nom d'utilisateur habituel, et votre <0>clef API</0> comme mot de passe."
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "CommaFeed is compatible with the Google Reader API. Use the following URL in your Google Reader-compatible mobile client. Login with your username and your <0>API key</0>."
+msgstr "Commafeed est compatible avec l'API Google Reader, en inscrivant l'URL suivante dans votre client mobile compatible. Entrez votre nom d'utilisateur habituel, et votre <0>clef API</0> comme mot de passe."
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed next unread item"
 msgstr "CommaFeed prochain article non lu"
@@ -209,11 +226,11 @@ msgstr "CommaFeed version {version} ({revision})."
 msgid "Compact"
 msgstr "Compact"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -221,10 +238,18 @@ msgstr "Confirmer"
 msgid "Confirm password"
 msgstr "Confirmer le mot de passe"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Confirm Password"
+msgstr "Confirmer le mot de passe"
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Cozy"
 msgstr "Cozy"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Create Admin Account"
+msgstr "Créer un compte adminstrateur"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -249,8 +274,8 @@ msgstr "Code JS personnalisé qui sera appliqué au chargement des pages"
 msgid "Cyan"
 msgstr "Cyan"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
 msgid "Dark"
 msgstr "Foncé"
 
@@ -258,11 +283,14 @@ msgstr "Foncé"
 msgid "Date created"
 msgstr "Date de création"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "days"
+msgstr "jours"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Delete"
 msgstr "Effacer"
 
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 msgid "Delete account"
 msgstr "Effacer le compte"
@@ -283,14 +311,18 @@ msgstr "Descendant"
 msgid "Detailed"
 msgstr "Vue détaillée"
 
-#: src/pages/app/SettingsPage.tsx
 #: src/components/settings/DisplaySettings.tsx
+msgid "Disable \"Pull to refresh\" browser behavior"
+msgstr "Désactiver la fonction \"tirer pour rafraîchir\" du navigateur"
+
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
+#: src/pages/app/SettingsPage.tsx
 msgid "Display"
 msgstr "Affichage"
 
-#: src/pages/app/DonatePage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/DonatePage.tsx
 msgid "Donate"
 msgstr "Faire un don"
 
@@ -302,15 +334,14 @@ msgstr "Télécharger"
 msgid "Drag link to bookmark bar"
 msgstr "Déplacez le lien vers la barre de favoris"
 
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "E-mail"
 msgstr "E-mail"
 
-#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/auth/RegistrationPage.tsx
 msgid "E-mail address"
 msgstr "Adresse e-mail"
@@ -319,8 +350,8 @@ msgstr "Adresse e-mail"
 msgid "Edit user"
 msgstr "Modifier un utilisateur"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Enabled"
 msgstr "Actif"
 
@@ -344,10 +375,6 @@ msgstr "En-têtes de l'entrée"
 msgid "Error"
 msgstr "Erreur"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Example: {example}."
-msgstr "Exemple : {example}."
-
 #: src/components/header/ProfileMenu.tsx
 msgid "Expanded"
 msgstr "Vue étendue"
@@ -356,8 +383,8 @@ msgstr "Vue étendue"
 msgid "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
 msgstr "Exporter vos abonnements et catégories en tant que fichier OPML qui peut être importé dans d'autres services de lecture de flux"
 
-#: src/pages/WelcomePage.tsx
 #: src/components/header/Header.tsx
+#: src/pages/WelcomePage.tsx
 msgid "Extension options"
 msgstr "Options de l'extension"
 
@@ -365,9 +392,8 @@ msgstr "Options de l'extension"
 msgid "Feed name"
 msgstr "Nom du flux"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Feed URL"
 msgstr "URL du flux"
 
@@ -399,9 +425,9 @@ msgstr "La récupération forcée des flux n'est pas encore disponible."
 msgid "Forgot password?"
 msgstr "Mot de passe oublié ?"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generate an API key in your profile first."
 msgstr "Générez d'abord une clé API dans votre profil."
 
@@ -409,9 +435,9 @@ msgstr "Générez d'abord une clé API dans votre profil."
 msgid "Generate new API key"
 msgstr "Générer une nouvelle clé API"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generated feed url"
 msgstr "URL du flux généré"
 
@@ -432,6 +458,14 @@ msgstr "Aller à la documentation de l'API."
 msgid "Goodies"
 msgstr "Extensions"
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API"
+msgstr ""
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API URL"
+msgstr ""
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Grape"
 msgstr "Bordeaux"
@@ -448,10 +482,6 @@ msgstr "Vert"
 msgid "Id"
 msgstr "Identifiant"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
-msgstr "Si non vide, une expression évaluant à 'vrai' ou 'faux'. Si faux, les nouvelles entrées de ce flux seront marquées comme lues automatiquement."
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "If the entry doesn't entirely fit on the screen"
 msgstr "Si l'entrée ne tient pas entièrement sur l'écran"
@@ -472,13 +502,21 @@ msgstr "En mode de lecture étendu, marquer les éléments comme lus lorsque la
 msgid "Indigo"
 msgstr "Indigo"
 
-#: src/components/content/FeedEntryFooter.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Initial Setup"
+msgstr "Configuration initiale"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Invalid password reset link. Please request a new one."
+msgstr "Lien de réinitialisation de mot de passse invalide. Recommencez la procédure."
+
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Keep unread"
 msgstr "Garder non lu"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/FeedEntries.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
@@ -506,9 +544,9 @@ msgstr "Clair"
 msgid "Lime"
 msgstr "Jaune-vert"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Link"
 msgstr "Lien"
 
@@ -532,9 +570,8 @@ msgstr "Chargement des abonnements..."
 msgid "Loading tags..."
 msgstr "Chargement des marqueurs..."
 
+#: src/pages/auth/LoginPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 msgid "Log in"
 msgstr "Connexion"
 
@@ -546,8 +583,8 @@ msgstr "Déconnexion"
 msgid "Long press"
 msgstr "Appui long"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Manage users"
 msgstr "Gestion des utilisateurs"
 
@@ -555,21 +592,25 @@ msgstr "Gestion des utilisateurs"
 msgid "Mark all as read"
 msgstr "Tout marquer comme lu"
 
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
 msgid "Mark all entries as read"
 msgstr "Marquer toutes les entrées comme lues"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read up to here"
 msgstr "Marquer comme lu jusqu'ici"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Mark entries in this feed as read after this number of days. Leave empty to disable."
+msgstr "Marquer les entrées de ce flux comme lues après ce nombre de jours. Laissez vide pour désactiver."
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Metrics"
 msgstr "Métriques"
@@ -586,15 +627,15 @@ msgstr "Faites défiler la page vers le bas"
 msgid "Move the page up"
 msgstr "Faites défiler la page vers le haut"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/components/RelativeDate.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "N/A"
 msgstr "N/A"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Name"
 msgstr "Nom"
 
@@ -606,7 +647,6 @@ msgstr "Naviguer vers un abonnement en entrant son nom"
 msgid "Navigate to the next category/feed with unread entries when marking all entries as read"
 msgstr "Aller vers la catégorie/le flux comportant des entrées non lues suivant après avoir marqué toutes les entrées lues"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Never"
 msgstr "Jamais"
@@ -615,12 +655,16 @@ msgstr "Jamais"
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "New Password"
+msgstr "Nouveau mot de passe"
+
 #: src/pages/app/AboutPage.tsx
 msgid "Newest first"
 msgstr "Plus récent en premier"
 
-#: src/components/header/Header.tsx
 #: src/components/content/add/Subscribe.tsx
+#: src/components/header/Header.tsx
 msgid "Next"
 msgstr "Suivant"
 
@@ -717,7 +761,6 @@ msgstr "OPML"
 msgid "OPML export"
 msgstr "Export du fichier OPML"
 
-#: src/components/content/add/ImportOpml.tsx
 #: src/components/content/add/ImportOpml.tsx
 msgid "OPML file"
 msgstr "Fichier OPML"
@@ -742,19 +785,22 @@ msgstr "Parent"
 msgid "Parent Category"
 msgstr "Catégorie parente"
 
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
 msgid "Password"
 msgstr "Mot de passe"
 
+#: src/hooks/useValidationRules.ts
+msgid "Password must be at least {minimumPasswordLength} characters"
+msgstr "Le mot de passe doit mesurer au moins {minimumPasswordLength} caractères"
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Password Recovery"
 msgstr "Récupération de mot de passe"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
@@ -762,8 +808,8 @@ msgstr "Les mots de passe ne correspondent pas"
 msgid "Pink"
 msgstr "Rose"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Position"
 msgstr "Position"
 
@@ -779,6 +825,31 @@ msgstr "Couleur d'ambiance"
 msgid "Profile"
 msgstr "Profil"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr "Service de notifications Push"
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr "Notifications Push"
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr "Les notifications Push ne sont pas configurées dans vos préférences."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr "Les notifications Push ne sont pas disponibles dans cette instance CommaFeed."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
+msgstr "Envoyer des notifications Push"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Receive push notifications when new feed entries are discovered. Enable \"Receive push notifications\" in the settings of each feed for which you want to receive notifications."
+msgstr "Permet de recevoir des notifications Push quand des nouvelles entrées sont découvertes pour un flux. Activez \"Envoyer des notifications Push\" dans les paramètres des flux pour lesquels vous souhaitez être notifié."
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Recover password"
 msgstr "Récupérer le mot de passe"
@@ -787,8 +858,8 @@ msgstr "Récupérer le mot de passe"
 msgid "Red"
 msgstr "Rouge"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/header/Header.tsx
+#: src/components/KeyboardShortcutsHelp.tsx
 msgid "Refresh"
 msgstr "Rafraîchir"
 
@@ -796,20 +867,24 @@ msgstr "Rafraîchir"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Les inscriptions sont fermées sur cette instance de CommaFeed"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Reset Password"
+msgstr "Réinitialiser le mot de passe"
+
 #: src/pages/app/AboutPage.tsx
 msgid "REST API"
 msgstr "API REST"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr "Clic droit"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
 #: 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"
 msgstr "Enregistrer"
 
@@ -825,17 +900,11 @@ msgstr "Défilement animé lors de la navigation entre les entrées"
 msgid "Scrolling"
 msgstr "Défilement"
 
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/header/Header.tsx
 #: src/components/header/Header.tsx
+#: src/components/sidebar/TreeSearch.tsx
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/components/header/Header.tsx
-msgid "Search requires at least 3 characters"
-msgstr "La recherche requiert au moins 3 caractères"
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select next unread feed/category"
 msgstr "Sélectionner l'article non lu suivant/la catégorie non lue suivante"
@@ -844,6 +913,10 @@ 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/PushNotificationSettings.tsx
+msgid "Server URL"
+msgstr "URL du serveur"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Set focus on next entry without opening it"
 msgstr "Sélectionner l'article suivant sans l'ouvrir"
@@ -868,8 +941,6 @@ msgstr "Partager"
 msgid "Sharing sites"
 msgstr "Sites de partage"
 
-#: src/components/KeyboardShortcutsHelp.tsx
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Shift"
 msgstr "Maj"
@@ -918,9 +989,8 @@ msgstr "Afficher le nombre d'entrées non lues dans la favicône de l'onglet"
 msgid "Show unread count in tab title"
 msgstr "Afficher le nombre d'entrées non lues dans le titre de l'onglet"
 
+#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
 msgid "Sign up"
 msgstr "Créer un compte"
 
@@ -928,26 +998,24 @@ msgstr "Créer un compte"
 msgid "Something bad just happened..."
 msgstr "Quelque chose s'est mal passé..."
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Space"
 msgstr "Espace"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Star"
 msgstr "Ajouter aux favoris"
 
-#: src/pages/app/FeedEntriesPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
 #: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "Starred"
 msgstr "Favoris"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/AddPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Subscribe"
 msgstr "S'abonner"
 
@@ -979,7 +1047,6 @@ msgstr "Activer le mode clair"
 msgid "System"
 msgstr "Système"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryFooter.tsx
 msgid "Tags"
 msgstr "Marqueurs"
@@ -988,6 +1055,14 @@ msgstr "Marqueurs"
 msgid "Teal"
 msgstr "Bleu-vert"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test"
+msgstr "Test"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test notification sent successfully."
+msgstr "Notification de test envoyée avec succès."
+
 #: src/components/content/add/Subscribe.tsx
 msgid "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
 msgstr "L'URL du flux auquel vous souhaitez vous abonner. Vous pouvez aussi utiliser l'URL du site directement et CommaFeed va essayer de trouver le flux dans la page."
@@ -996,9 +1071,18 @@ msgstr "L'URL du flux auquel vous souhaitez vous abonner. Vous pouvez aussi util
 msgid "Theme"
 msgstr "Thème"
 
+#. placeholder {0}: feed.filterLegacy
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "This feed has a legacy filter that cannot be edited and is not applied. Please recreate the filter using the new expression editor. The legacy filter expression was: <0>{0}</0>"
+msgstr "Ce flux est configuré avec un filtre obsolète, qui ne peut être ni modifié ni appliqué. Vous devez recréer ce filtre à l'aide du nouvel éditeur d'expressions régulières. Le filtre configuré était : <0>{0}</0>"
+
 #: src/components/settings/ProfileSettings.tsx
-msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API. Use the form at the bottom of the page to generate a new API key"
+msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API and the Google Reader API. Use the form at the bottom of the page to generate a new API key"
-msgstr "Ceci est votre clef API. Elle peut être utilisée pour certaines opérations en lecture seule et donne accès à l'API Fever. Utilisez le formulaire en bas de la page pour générer une nouvelle clef API"
+msgstr "Ceci est votre clef API. Elle peut être utilisée pour certaines opérations en lecture seule et donne accès à l'API Fever et à l'API Google Reader. Utilisez le formulaire en bas de la page pour générer une nouvelle clef API"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "This setting can cause scrolling issues on some browsers (e.g. Safari)"
+msgstr "Cette fonctinnalité peut causer des problèmes de défilement sur certains navigateurs (Safari, par exemple)"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Toggle read status of current entry"
@@ -1012,6 +1096,10 @@ 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/PushNotificationSettings.tsx
+msgid "Topic"
+msgstr "Sujet"
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Try out CommaFeed with the demo account: demo/demo"
 msgstr "Essayez CommaFeed avec le compte de démonstration : demo/demo"
@@ -1024,22 +1112,24 @@ msgstr "Essayez la version de démonstration !"
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Unstar"
 msgstr "Retirer des favoris"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Unsubscribe"
 msgstr "Se désabonner"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "User key"
+msgstr "Clé utilisateur"
+
 #: src/components/settings/ProfileSettings.tsx
 msgid "User name"
 msgstr "Nom"
 
-#: src/pages/auth/LoginPage.tsx
 #: src/pages/auth/LoginPage.tsx
 msgid "User Name or E-mail"
 msgstr "Nom d'utilisateur ou e-mail"
@@ -1056,6 +1146,10 @@ msgstr "Attention"
 msgid "Website"
 msgstr "Site web"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Welcome! This appears to be the first time you're running CommaFeed. Please create an administrator account to get started."
+msgstr "Bienvenue ! Il semble que ce soit le premier démarrage de Commafeed. Avant tout, vous devez créer un compte administrateur."
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Yellow"
 msgstr "Jaune"
@@ -1067,3 +1161,7 @@ msgstr "Vous n'avez pas encore d'abonnements. Pourquoi ne pas essayer d'en ajout
 #: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr "Vos flux sont en cours de rafraîchissement"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Your password has been changed. You can now log in with your new password."
+msgstr "Votre mot de passe a été modifié. Vous pouvez vous connecter avec votre nouveau mot de passe."

commafeed-client/src/locales/ja/messages.po

@@ -17,10 +17,6 @@ msgstr ""
 msgid "<0>CommaFeed is an open-source project. Sources are hosted on </0><1>GitHub</1>."
 msgstr "<0>CommaFeed はオープンソースのプロジェクトです。 ソースは以下でホストされています </0><1>GitHub</1>。"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "<0>Complete syntax is available </0><1>here</1><2>.</2>"
-msgstr "<0>完全な syntax </0><1>こちら</1>で利用可能です<2>。</2>"
-
 #: src/pages/auth/RegistrationPage.tsx
 msgid "<0>Have an account?</0><1>Log in!</1>"
 msgstr "<0>アカウントをお持ちですか?</0><1>ログインしてください!</1>"
@@ -33,11 +29,15 @@ msgstr "<0>こんにちは、</0><1>私はベルギーのジェレミーです
 msgid "<0>Need an account?</0><1>Sign up!</1>"
 msgstr "<0>アカウントが必要ですか?</0><1>サインアップ!</1>"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "About"
 msgstr "About"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
+msgstr "アクセストークン"
+
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Actions"
 msgstr "アクション"
@@ -54,21 +54,24 @@ msgstr "カテゴリを追加"
 msgid "Add user"
 msgstr "ユーザー追加"
 
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/header/ProfileMenu.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Admin"
 msgstr "管理者"
 
-#: src/pages/app/FeedEntriesPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Admin user name"
-#: src/components/sidebar/Tree.tsx
+msgstr "管理者ユーザー名"
-#: src/components/header/Header.tsx
+
 #: src/components/content/add/CategorySelect.tsx
+#: src/components/header/Header.tsx
+#: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "All"
 msgstr "すべて"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Always"
 msgstr "常に"
@@ -93,6 +96,14 @@ msgstr "お知らせ"
 msgid "API key"
 msgstr "APIキー"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "API token"
+msgstr "APIトークン"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "App token"
+msgstr "アプリトークン"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Are you sure you want to delete category <0>{categoryName}</0>?"
 msgstr "カテゴリ <0>{categoryName}</0> を削除してもよろしいですか？"
@@ -122,54 +133,56 @@ msgid "Asc"
 msgstr "昇順"
 
 #: src/pages/app/FeedDetailsPage.tsx
-msgid "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+msgid "Auto-mark as read"
-msgstr "使用可能な変数は「title」、「content」、「url」、「author」、および「categories」であり、それらのコンテンツは文字列の比較を容易にするために小文字に変換されます。"
+msgstr "自動的に既読にする"
 
 #: src/components/content/add/Subscribe.tsx
 msgid "Back"
 msgstr "戻る"
 
 #: src/pages/auth/PasswordRecoveryPage.tsx
+#: src/pages/auth/PasswordResetPage.tsx
 msgid "Back to log in"
 msgstr "ログインに戻る"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Blue"
-msgstr ""
+msgstr "ブルー"
+
+#: src/pages/app/AboutPage.tsx
+msgid "Browser extension"
+msgstr "ブラウザー拡張"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Browser extension required for Chrome"
 msgstr "Chromeのブラウザー拡張が必要です"
 
-#: src/pages/app/AboutPage.tsx
-msgid "Browser extention"
-msgstr "ブラウザー拡張"
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "Browser tab"
 msgstr "ブラウザータブ"
 
-#: src/pages/app/TagDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
+msgid "Build a filter expression to indicate what you want to read. Entries that don't match will be marked as read automatically."
-#: src/pages/app/CategoryDetailsPage.tsx
+msgstr "読みたい内容を指定するためのフィルタ式を作成します。一致しないエントリは自動的に既読としてマークされます。"
-#: src/pages/app/CategoryDetailsPage.tsx
+
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
-#: src/components/content/add/ImportOpml.tsx
-#: src/components/content/add/AddCategory.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
+#: src/components/settings/CustomCodeSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: src/pages/app/FeedDetailsPage.tsx
+#: src/components/content/add/AddCategory.tsx
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/AboutPage.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Category"
 msgstr "カテゴリー"
 
@@ -197,6 +210,10 @@ msgstr "CommaFeed ブラウザー拡張機能のバージョンは {browserExten
 msgid "CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client. Login with your username and your <0>API key</0>."
 msgstr "CommaFeedはFever APIと互換性があります。Fever互換のモバイルクライアントで次のURLを使用してください。ユーザー名と <0>API キー</0> でログインしてください。"
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "CommaFeed is compatible with the Google Reader API. Use the following URL in your Google Reader-compatible mobile client. Login with your username and your <0>API key</0>."
+msgstr "CommaFeedはGoogle Reader APIと互換性があります。Google Reader互換のモバイルクライアントで次のURLを使用してください。ユーザー名と <0>API キー</0> でログインしてください。"
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed next unread item"
 msgstr "CommaFeed 次の未読アイテム"
@@ -209,11 +226,11 @@ msgstr "CommaFeed バージョン {version} ({revision})。"
 msgid "Compact"
 msgstr "コンパクト"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Confirm"
 msgstr "確認"
 
@@ -221,10 +238,18 @@ msgstr "確認"
 msgid "Confirm password"
 msgstr "パスワード確認"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Confirm Password"
+msgstr "パスワードの確認"
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Cozy"
 msgstr "Cozy"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Create Admin Account"
+msgstr "管理者アカウントの作成"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -247,10 +272,10 @@ msgstr "ページ読み込み時に実行されるカスタムJSコード"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Cyan"
-msgstr ""
+msgstr "シアン"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
 msgid "Dark"
 msgstr "ダーク"
 
@@ -258,11 +283,14 @@ msgstr "ダーク"
 msgid "Date created"
 msgstr "作成日"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "days"
+msgstr "日"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Delete"
 msgstr "削除"
 
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 msgid "Delete account"
 msgstr "アカウント削除"
@@ -283,14 +311,18 @@ msgstr "説明"
 msgid "Detailed"
 msgstr "詳細"
 
-#: src/pages/app/SettingsPage.tsx
 #: src/components/settings/DisplaySettings.tsx
+msgid "Disable \"Pull to refresh\" browser behavior"
+msgstr "ブラウザの「プルして更新」動作を無効にする"
+
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
+#: src/pages/app/SettingsPage.tsx
 msgid "Display"
 msgstr "ディスプレイ"
 
-#: src/pages/app/DonatePage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/DonatePage.tsx
 msgid "Donate"
 msgstr "寄付"
 
@@ -302,15 +334,14 @@ msgstr "ダウンロード"
 msgid "Drag link to bookmark bar"
 msgstr "リンクをブックマークバーにドラッグ"
 
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "E-mail"
 msgstr "メール"
 
-#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/auth/RegistrationPage.tsx
 msgid "E-mail address"
 msgstr "メールアドレス"
@@ -319,8 +350,8 @@ msgstr "メールアドレス"
 msgid "Edit user"
 msgstr "ユーザーの編集"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Enabled"
 msgstr "有効"
 
@@ -344,10 +375,6 @@ msgstr "エントリーヘッダー"
 msgid "Error"
 msgstr "エラー"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Example: {example}."
-msgstr "例: {example}."
-
 #: src/components/header/ProfileMenu.tsx
 msgid "Expanded"
 msgstr "拡張"
@@ -356,8 +383,8 @@ msgstr "拡張"
 msgid "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
 msgstr "サブスクリプションとカテゴリを、他のフィード読み取りサービスにインポートできる OPML ファイルとしてエクスポートします"
 
-#: src/pages/WelcomePage.tsx
 #: src/components/header/Header.tsx
+#: src/pages/WelcomePage.tsx
 msgid "Extension options"
 msgstr "拡張機能オプション"
 
@@ -365,9 +392,8 @@ msgstr "拡張機能オプション"
 msgid "Feed name"
 msgstr "フィード名"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Feed URL"
 msgstr "フィード URL"
 
@@ -389,7 +415,7 @@ msgstr "フィルタリング式"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Font size"
-msgstr ""
+msgstr "フォントサイズ"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Force fetching feeds is not yet available."
@@ -399,9 +425,9 @@ msgstr "フィードの強制フェッチはまだ利用できません。"
 msgid "Forgot password?"
 msgstr "パスワードをお忘れですか？"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generate an API key in your profile first."
 msgstr "最初にプロファイルでAPIキーを生成します。"
 
@@ -409,9 +435,9 @@ msgstr "最初にプロファイルでAPIキーを生成します。"
 msgid "Generate new API key"
 msgstr "新しいAPIキーを生成する"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generated feed url"
 msgstr "生成されたフィードURL"
 
@@ -432,26 +458,30 @@ msgstr "APIドキュメントに移動します。"
 msgid "Goodies"
 msgstr "グッズ"
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API"
+msgstr ""
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API URL"
+msgstr ""
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Grape"
-msgstr ""
+msgstr "グレープ"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Gray"
-msgstr ""
+msgstr "グレー"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Green"
-msgstr ""
+msgstr "グリーン"
 
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Id"
 msgstr "ID"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
-msgstr "空でない場合は、'true' または 'false' に評価される式。 'false' の場合、このフィードの新しいエントリーは自動的に既読としてマークされます。"
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "If the entry doesn't entirely fit on the screen"
 msgstr "エントリーが画面に完全に収まらない場合"
@@ -470,15 +500,23 @@ msgstr "展開ビューでエントリーをスクロールすると、それら
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Indigo"
-msgstr ""
+msgstr "インディゴ"
+
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Initial Setup"
+msgstr "初期設定"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Invalid password reset link. Please request a new one."
+msgstr "無効なパスワードリセットリンクです。新しいリンクをリクエストしてください。"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Keep unread"
 msgstr "未読のままにする"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/FeedEntries.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
@@ -504,17 +542,17 @@ msgstr "ライト"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Lime"
-msgstr ""
+msgstr "ライム"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Link"
 msgstr "リンク"
 
 #: src/components/settings/CustomCodeSettings.tsx
 msgid "Link to the documentation"
-msgstr ""
+msgstr "ドキュメントへのリンク"
 
 #: src/hooks/useAppLoading.ts
 msgid "Loading profile..."
@@ -532,9 +570,8 @@ msgstr "サブスクリプションを読み込んでいます..."
 msgid "Loading tags..."
 msgstr "タグを読み込んでいます..."
 
+#: src/pages/auth/LoginPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 msgid "Log in"
 msgstr "ログイン"
 
@@ -546,8 +583,8 @@ msgstr "ログアウト"
 msgid "Long press"
 msgstr "長押し"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Manage users"
 msgstr "ユーザーの管理"
 
@@ -555,21 +592,25 @@ msgstr "ユーザーの管理"
 msgid "Mark all as read"
 msgstr "すべて既読にする"
 
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
 msgid "Mark all entries as read"
 msgstr "すべてのエントリーを既読にする"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read"
 msgstr "既読にする"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read up to here"
 msgstr "ここまで既読にする"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Mark entries in this feed as read after this number of days. Leave empty to disable."
+msgstr "この日数経過後に、このフィードのエントリを既読としてマークします。無効にするには空のままにしてください。"
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Metrics"
 msgstr "メトリックス"
@@ -586,15 +627,15 @@ msgstr "ページを下に移動"
 msgid "Move the page up"
 msgstr "ページを上に移動"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/components/RelativeDate.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "N/A"
 msgstr "該当なし"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Name"
 msgstr "名前"
 
@@ -604,9 +645,8 @@ msgstr "名前を入力してサブスクリプションに移動します"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Navigate to the next category/feed with unread entries when marking all entries as read"
-msgstr ""
+msgstr "すべてのエントリーを既読にするとき、未読エントリーのある次のカテゴリ/フィードに移動する"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Never"
 msgstr "しない"
@@ -615,12 +655,16 @@ msgstr "しない"
 msgid "New password"
 msgstr "新しいパスワード"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "New Password"
+msgstr "新しいパスワード"
+
 #: src/pages/app/AboutPage.tsx
 msgid "Newest first"
 msgstr "最新順"
 
-#: src/components/header/Header.tsx
 #: src/components/content/add/Subscribe.tsx
+#: src/components/header/Header.tsx
 msgid "Next"
 msgstr "次へ"
 
@@ -717,7 +761,6 @@ msgstr "OPML"
 msgid "OPML export"
 msgstr "OPML エクスポート"
 
-#: src/components/content/add/ImportOpml.tsx
 #: src/components/content/add/ImportOpml.tsx
 msgid "OPML file"
 msgstr "OPMLファイル"
@@ -728,7 +771,7 @@ msgstr "OPMLファイルは必要です"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Orange"
-msgstr ""
+msgstr "オレンジ"
 
 #: src/pages/app/AboutPage.tsx
 msgid "Order"
@@ -742,28 +785,31 @@ msgstr "親"
 msgid "Parent Category"
 msgstr "親カテゴリ"
 
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
 msgid "Password"
 msgstr "パスワード"
 
+#: src/hooks/useValidationRules.ts
+msgid "Password must be at least {minimumPasswordLength} characters"
+msgstr "パスワードは {minimumPasswordLength} 文字以上である必要があります"
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Password Recovery"
 msgstr "パスワード回復"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Pink"
-msgstr ""
+msgstr "ピンク"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Position"
 msgstr "位置"
 
@@ -773,22 +819,47 @@ msgstr "前へ"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Primary color"
-msgstr ""
+msgstr "プライマリカラー"
 
 #: src/pages/app/SettingsPage.tsx
 msgid "Profile"
 msgstr "プロフィール"
 
+#: 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 "この CommaFeed インスタンスではプッシュ通知が有効になっていません。"
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
+msgstr "プッシュ通知を受け取る"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Receive push notifications when new feed entries are discovered. Enable \"Receive push notifications\" in the settings of each feed for which you want to receive notifications."
+msgstr "新しいフィードエントリが発見されたときにプッシュ通知を受け取ります。通知を受け取りたい各フィードの設定で「プッシュ通知を受け取る」を有効にしてください。"
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Recover password"
 msgstr "パスワードの回復"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Red"
-msgstr ""
+msgstr "レッド"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/header/Header.tsx
+#: src/components/KeyboardShortcutsHelp.tsx
 msgid "Refresh"
 msgstr "リフレッシュ"
 
@@ -796,20 +867,24 @@ msgstr "リフレッシュ"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "このCommaFeedインスタンスの登録は終了しています"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Reset Password"
+msgstr "パスワードをリセット"
+
 #: src/pages/app/AboutPage.tsx
 msgid "REST API"
 msgstr "REST API"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr "右クリック"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
 #: 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"
 msgstr "保存"
 
@@ -825,24 +900,22 @@ msgstr "エントリー間を移動するときにスムーズにスクロール
 msgid "Scrolling"
 msgstr "スクロール"
 
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/header/Header.tsx
 #: src/components/header/Header.tsx
+#: src/components/sidebar/TreeSearch.tsx
 msgid "Search"
 msgstr "検索"
 
-#: src/components/header/Header.tsx
-msgid "Search requires at least 3 characters"
-msgstr "検索には少なくとも3文字が必要です"
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select next unread feed/category"
-msgstr ""
+msgstr "次の未読フィード/カテゴリを選択"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select previous unread feed/category"
-msgstr ""
+msgstr "前の未読フィード/カテゴリを選択"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Server URL"
+msgstr "サーバーURL"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Set focus on next entry without opening it"
@@ -868,8 +941,6 @@ msgstr "シェア"
 msgid "Sharing sites"
 msgstr "共有サイト"
 
-#: src/components/KeyboardShortcutsHelp.tsx
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Shift"
 msgstr "Shift"
@@ -918,9 +989,8 @@ msgstr "未読数をタブのアイコンに表示する"
 msgid "Show unread count in tab title"
 msgstr "未読数をタブのタイトルに表示する"
 
+#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
 msgid "Sign up"
 msgstr "サインアップ"
 
@@ -928,26 +998,24 @@ msgstr "サインアップ"
 msgid "Something bad just happened..."
 msgstr "何か悪いことが起きました..."
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Space"
 msgstr "Space"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Star"
 msgstr "スター"
 
-#: src/pages/app/FeedEntriesPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
 #: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "Starred"
 msgstr "スター付き"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/AddPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Subscribe"
 msgstr "購読する"
 
@@ -979,14 +1047,21 @@ msgstr "ライトテーマに切り替え"
 msgid "System"
 msgstr "システム"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryFooter.tsx
 msgid "Tags"
 msgstr "タグ"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Teal"
-msgstr ""
+msgstr "ティール"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test"
+msgstr "テスト"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test notification sent successfully."
+msgstr "テスト通知が正常に送信されました。"
 
 #: src/components/content/add/Subscribe.tsx
 msgid "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
@@ -996,9 +1071,18 @@ msgstr "購読したいフィードのURL。ウェブサイトのURLを直接使
 msgid "Theme"
 msgstr "テーマ"
 
+#. placeholder {0}: feed.filterLegacy
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "This feed has a legacy filter that cannot be edited and is not applied. Please recreate the filter using the new expression editor. The legacy filter expression was: <0>{0}</0>"
+msgstr "このフィードには、編集できず適用もされない古い形式のフィルタがあります。新しい式エディタを使用してフィルタを再作成してください。古いフィルタ式は次のとおりでした: <0>{0}</0>"
+
 #: src/components/settings/ProfileSettings.tsx
-msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API. Use the form at the bottom of the page to generate a new API key"
+msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API and the Google Reader API. Use the form at the bottom of the page to generate a new API key"
-msgstr "これはあなたのAPIキーです。いくつかの読み取り専用API操作に使用できます。これにより、Fever APIへのアクセスが可能になります。ページの下部のフォームを使用して新しいAPIキーを生成します。"
+msgstr "これはあなたのAPIキーです。一部の読み取り専用API操作に使用でき、Fever APIおよびGoogle Reader APIへのアクセスを許可します。新しいAPIキーを生成するには、ページ下部のフォームを使用してください"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "This setting can cause scrolling issues on some browsers (e.g. Safari)"
+msgstr "この設定により、一部のブラウザ（Safari など）でスクロールの問題が発生する可能性があります。"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Toggle read status of current entry"
@@ -1012,6 +1096,10 @@ msgstr "サイドバーを切り替える"
 msgid "Toggle starred status of current entry"
 msgstr "現在のエントリーのスターステータスを切り替える"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Topic"
+msgstr "トピック"
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Try out CommaFeed with the demo account: demo/demo"
 msgstr "デモアカウントでCommaFeedを試す: demo/demo"
@@ -1024,29 +1112,31 @@ msgstr "デモを試す！"
 msgid "Unread"
 msgstr "未読"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Unstar"
 msgstr "スターを外す"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Unsubscribe"
 msgstr "退会"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "User key"
+msgstr "ユーザーキー"
+
 #: src/components/settings/ProfileSettings.tsx
 msgid "User name"
 msgstr "ユーザー名"
 
-#: src/pages/auth/LoginPage.tsx
 #: src/pages/auth/LoginPage.tsx
 msgid "User Name or E-mail"
 msgstr "ユーザー名またはメールアドレス"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Violet"
-msgstr ""
+msgstr "バイオレット"
 
 #: src/components/Alert.tsx
 msgid "Warning"
@@ -1056,9 +1146,13 @@ msgstr "警告"
 msgid "Website"
 msgstr "ウェブサイト"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Welcome! This appears to be the first time you're running CommaFeed. Please create an administrator account to get started."
+msgstr "ようこそ！CommaFeedを初めて実行するようです。開始するには管理者アカウントを作成してください。"
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Yellow"
-msgstr ""
+msgstr "イエロー"
 
 #: src/pages/app/FeedEntriesPage.tsx
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
@@ -1067,3 +1161,7 @@ msgstr "まだサブスクリプションがありません。上部の + 記号
 #: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr "フィードの更新がキューに登録されました。"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Your password has been changed. You can now log in with your new password."
+msgstr "パスワードが変更されました。新しいパスワードでログインできます。"

commafeed-client/src/locales/pt/messages.po

@@ -17,10 +17,6 @@ msgstr ""
 msgid "<0>CommaFeed is an open-source project. Sources are hosted on </0><1>GitHub</1>."
 msgstr "<0>CommaFeed é um projeto de código abrto. O código está hospedado no </0><1>GitHub</1>."
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "<0>Complete syntax is available </0><1>here</1><2>.</2>"
-msgstr "<0>Sintaxe completa disponível </0><1>aqui</1><2>.</2>"
-
 #: src/pages/auth/RegistrationPage.tsx
 msgid "<0>Have an account?</0><1>Log in!</1>"
 msgstr "<0>Tem uma conta?</0><1>Faça login!</1>"
@@ -33,11 +29,15 @@ msgstr "<0>Olá,</0><1>eu sou Jérémie da Bélgica e venho trabalhando no Comma
 msgid "<0>Need an account?</0><1>Sign up!</1>"
 msgstr "<0>Precisa de uma conta?</0><1>Inscreva-se!</1>"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "About"
 msgstr "Sobre"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
+msgstr "Token de acesso"
+
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Actions"
 msgstr "Ações"
@@ -54,21 +54,24 @@ msgstr "Adicionar categoria"
 msgid "Add user"
 msgstr "Adicionar usuário"
 
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/header/ProfileMenu.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Admin"
 msgstr "Administrador"
 
-#: src/pages/app/FeedEntriesPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Admin user name"
-#: src/components/sidebar/Tree.tsx
+msgstr "Nome de usuário do administrador"
-#: src/components/header/Header.tsx
+
 #: src/components/content/add/CategorySelect.tsx
+#: src/components/header/Header.tsx
+#: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "All"
 msgstr "Todos"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Always"
 msgstr "Sempre"
@@ -93,6 +96,14 @@ msgstr "Aviso"
 msgid "API key"
 msgstr "chave de API"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "API token"
+msgstr "Token de API"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "App token"
+msgstr "Token do aplicativo"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Are you sure you want to delete category <0>{categoryName}</0>?"
 msgstr "Tem certeza de que deseja excluir a categoria <0>{categoryName}</0>?"
@@ -122,14 +133,15 @@ msgid "Asc"
 msgstr "Asc"
 
 #: src/pages/app/FeedDetailsPage.tsx
-msgid "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+msgid "Auto-mark as read"
-msgstr "As variáveis ​​disponíveis são 'título', 'conteúdo', 'url' 'autor' e 'categorias' e seu conteúdo é convertido em letras minúsculas para facilitar a comparação de strings."
+msgstr "Marcar automaticamente como lido"
 
 #: src/components/content/add/Subscribe.tsx
 msgid "Back"
 msgstr "Voltar"
 
 #: src/pages/auth/PasswordRecoveryPage.tsx
+#: src/pages/auth/PasswordResetPage.tsx
 msgid "Back to log in"
 msgstr "Voltar para logar"
 
@@ -137,39 +149,40 @@ msgstr "Voltar para logar"
 msgid "Blue"
 msgstr "Azul"
 
+#: src/pages/app/AboutPage.tsx
+msgid "Browser extension"
+msgstr "Extensão do navegador"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Browser extension required for Chrome"
 msgstr "Extensão para o Chrome necessária"
 
-#: src/pages/app/AboutPage.tsx
-msgid "Browser extention"
-msgstr "Extensão do navegador"
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "Browser tab"
 msgstr "Aba do navegador"
 
-#: src/pages/app/TagDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
+msgid "Build a filter expression to indicate what you want to read. Entries that don't match will be marked as read automatically."
-#: src/pages/app/CategoryDetailsPage.tsx
+msgstr "Crie uma expressão de filtro para indicar o que você deseja ler. As entradas que não corresponderem serão marcadas como lidas automaticamente."
-#: src/pages/app/CategoryDetailsPage.tsx
+
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
-#: src/components/content/add/ImportOpml.tsx
-#: src/components/content/add/AddCategory.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
+#: src/components/settings/CustomCodeSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/pages/app/FeedDetailsPage.tsx
+#: src/components/content/add/AddCategory.tsx
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/AboutPage.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Category"
 msgstr "Categoria"
 
@@ -197,6 +210,10 @@ msgstr "Extensão de navegador CommaFeed versão {browserExtensionVersion}."
 msgid "CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client. Login with your username and your <0>API key</0>."
 msgstr "CommaFeed é compatível com a API Fever. Use a URL a seguir no seu aplicativo móvel compatível com Fever. Entre com seu nome de usuário e sua <0>chave de API</0>."
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "CommaFeed is compatible with the Google Reader API. Use the following URL in your Google Reader-compatible mobile client. Login with your username and your <0>API key</0>."
+msgstr "CommaFeed é compatível com a API Google Reader. Use a URL a seguir no seu aplicativo móvel compatível com Google Reader. Entre com seu nome de usuário e sua <0>chave de API</0>."
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed next unread item"
 msgstr "CommaFeed próximo item não lido"
@@ -209,11 +226,11 @@ msgstr "CommaFeed versão {version} ({revision})."
 msgid "Compact"
 msgstr "Compacto"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -221,10 +238,18 @@ msgstr "Confirmar"
 msgid "Confirm password"
 msgstr "Confirmar senha"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Confirm Password"
+msgstr "Confirmar senha"
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Cozy"
 msgstr "Aconchegante"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Create Admin Account"
+msgstr "Criar conta de administrador"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -249,8 +274,8 @@ msgstr "Código JS personalizado que será executado ao carregar a página"
 msgid "Cyan"
 msgstr "Ciano"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
 msgid "Dark"
 msgstr "Escuro"
 
@@ -258,11 +283,14 @@ msgstr "Escuro"
 msgid "Date created"
 msgstr "Data de criação"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "days"
+msgstr "dias"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 msgid "Delete account"
 msgstr "Excluir conta"
@@ -283,14 +311,18 @@ msgstr "Desc"
 msgid "Detailed"
 msgstr "Detalhado"
 
-#: src/pages/app/SettingsPage.tsx
 #: src/components/settings/DisplaySettings.tsx
+msgid "Disable \"Pull to refresh\" browser behavior"
+msgstr "Desativar o comportamento do navegador \"Puxar para atualizar\""
+
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
+#: src/pages/app/SettingsPage.tsx
 msgid "Display"
 msgstr "Exibir"
 
-#: src/pages/app/DonatePage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/DonatePage.tsx
 msgid "Donate"
 msgstr "Doar"
 
@@ -302,15 +334,14 @@ msgstr "Baixar"
 msgid "Drag link to bookmark bar"
 msgstr "Arraste o link para a barra de favoritos"
 
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "E-mail"
 msgstr "E-mail"
 
-#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/auth/RegistrationPage.tsx
 msgid "E-mail address"
 msgstr "Endereço de e-mail"
@@ -319,8 +350,8 @@ msgstr "Endereço de e-mail"
 msgid "Edit user"
 msgstr "Editar usuário"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Enabled"
 msgstr "Ativado"
 
@@ -344,10 +375,6 @@ msgstr "Cabeçalho das entredas"
 msgid "Error"
 msgstr "Erro"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Example: {example}."
-msgstr "Exemplo: {exemplo}."
-
 #: src/components/header/ProfileMenu.tsx
 msgid "Expanded"
 msgstr "Expandido"
@@ -356,8 +383,8 @@ msgstr "Expandido"
 msgid "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
 msgstr "Exporte suas inscrições e categorias como um arquivo OPML que pode ser importado em outros serviços de leitura de feed"
 
-#: src/pages/WelcomePage.tsx
 #: src/components/header/Header.tsx
+#: src/pages/WelcomePage.tsx
 msgid "Extension options"
 msgstr "Opções da extensão"
 
@@ -365,9 +392,8 @@ msgstr "Opções da extensão"
 msgid "Feed name"
 msgstr "Nome do feed"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Feed URL"
 msgstr "URL do feed"
 
@@ -399,9 +425,9 @@ msgstr "Forçar a atualização de feeds não está disponível."
 msgid "Forgot password?"
 msgstr "Esqueceu a senha?"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generate an API key in your profile first."
 msgstr "Gere uma chave de API em seu perfil primeiro."
 
@@ -409,9 +435,9 @@ msgstr "Gere uma chave de API em seu perfil primeiro."
 msgid "Generate new API key"
 msgstr "Gerar nova chave de API"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generated feed url"
 msgstr "URL do feed gerado"
 
@@ -432,6 +458,14 @@ msgstr "Vá para a documentação da API."
 msgid "Goodies"
 msgstr "Brindes"
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API"
+msgstr ""
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API URL"
+msgstr ""
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Grape"
 msgstr "Uva"
@@ -448,10 +482,6 @@ msgstr "Verde"
 msgid "Id"
 msgstr "ID"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
-msgstr "Se não estiver vazio, uma expressão avaliada como 'true' ou 'false'. "
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "If the entry doesn't entirely fit on the screen"
 msgstr "Se a entrafa não couber por completo na tela"
@@ -472,13 +502,21 @@ msgstr "Na visualização expandida, rolar pelas entradas marca-as como lidas"
 msgid "Indigo"
 msgstr "Índigo"
 
-#: src/components/content/FeedEntryFooter.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Initial Setup"
+msgstr "Configuração inicial"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Invalid password reset link. Please request a new one."
+msgstr "Link de redefinição de senha inválido. Solicite um novo."
+
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Keep unread"
 msgstr "Manter não lido"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/FeedEntries.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "Keyboard shortcuts"
 msgstr "Atalhos de teclado"
 
@@ -506,9 +544,9 @@ msgstr "Claro"
 msgid "Lime"
 msgstr "Lima"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Link"
 msgstr "Link"
 
@@ -532,9 +570,8 @@ msgstr "Carregando assinaturas..."
 msgid "Loading tags..."
 msgstr "Carregando tags..."
 
+#: src/pages/auth/LoginPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 msgid "Log in"
 msgstr "Entrar"
 
@@ -546,8 +583,8 @@ msgstr "Sair"
 msgid "Long press"
 msgstr "Pressione e segure"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Manage users"
 msgstr "Gerenciar usuários"
 
@@ -555,21 +592,25 @@ msgstr "Gerenciar usuários"
 msgid "Mark all as read"
 msgstr "Marcar todos como lidos"
 
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
 msgid "Mark all entries as read"
 msgstr "Marcar todas as entradas como lidas"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read up to here"
 msgstr "Marcar como lido até aqui"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Mark entries in this feed as read after this number of days. Leave empty to disable."
+msgstr "Marcar as entradas neste feed como lidas após este número de dias. Deixe vazio para desativar."
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Metrics"
 msgstr "Métricas"
@@ -586,15 +627,15 @@ msgstr "Mova a página para baixo"
 msgid "Move the page up"
 msgstr "Mover a página para cima"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/components/RelativeDate.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "N/A"
 msgstr "N/D"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Name"
 msgstr "Nome"
 
@@ -606,7 +647,6 @@ msgstr "Navegue até uma assinatura digitando seu nome"
 msgid "Navigate to the next category/feed with unread entries when marking all entries as read"
 msgstr "Navegar para a próxima categoria/feed com entradas não lidas quando todas as entrafas forem lidas"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Never"
 msgstr "Nunca"
@@ -615,12 +655,16 @@ msgstr "Nunca"
 msgid "New password"
 msgstr "Nova senha"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "New Password"
+msgstr "Nova senha"
+
 #: src/pages/app/AboutPage.tsx
 msgid "Newest first"
 msgstr "Mais novo primeiro"
 
-#: src/components/header/Header.tsx
 #: src/components/content/add/Subscribe.tsx
+#: src/components/header/Header.tsx
 msgid "Next"
 msgstr "Próximo"
 
@@ -717,7 +761,6 @@ msgstr "OPML"
 msgid "OPML export"
 msgstr "Exportação OPML"
 
-#: src/components/content/add/ImportOpml.tsx
 #: src/components/content/add/ImportOpml.tsx
 msgid "OPML file"
 msgstr "Arquivo OPML"
@@ -742,19 +785,22 @@ msgstr "Pai"
 msgid "Parent Category"
 msgstr "Categoria Pai"
 
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
 msgid "Password"
 msgstr "Senha"
 
+#: src/hooks/useValidationRules.ts
+msgid "Password must be at least {minimumPasswordLength} characters"
+msgstr "A senha deve ter pelo menos {minimumPasswordLength} caracteres"
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Password Recovery"
 msgstr "Recuperação de Senha"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
 msgid "Passwords do not match"
 msgstr "Senhas não coincidem"
 
@@ -762,8 +808,8 @@ msgstr "Senhas não coincidem"
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Position"
 msgstr "Posição"
 
@@ -779,6 +825,31 @@ msgstr "Cor primária"
 msgid "Profile"
 msgstr "Perfil"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr "Serviço de notificação push"
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr "Notificações push"
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr "As notificações push não estão configuradas nas suas configurações de usuário."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr "As notificações push não estão ativadas nesta instância do CommaFeed."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
+msgstr "Receber notificações push"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Receive push notifications when new feed entries are discovered. Enable \"Receive push notifications\" in the settings of each feed for which you want to receive notifications."
+msgstr "Receba notificações push quando novas entradas de feed forem descobertas. Ative \"Receber notificações push\" nas configurações de cada feed para o qual deseja receber notificações."
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Recover password"
 msgstr "Recuperar senha"
@@ -787,8 +858,8 @@ msgstr "Recuperar senha"
 msgid "Red"
 msgstr "Vermelho"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/header/Header.tsx
+#: src/components/KeyboardShortcutsHelp.tsx
 msgid "Refresh"
 msgstr "Atualizar"
 
@@ -796,20 +867,24 @@ msgstr "Atualizar"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Os registros estão fechados nesta instância do CommaFeed"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Reset Password"
+msgstr "Redefinir senha"
+
 #: src/pages/app/AboutPage.tsx
 msgid "REST API"
 msgstr "API REST"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr "Clique com o botão direito"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
 #: 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"
 msgstr "Salvar"
 
@@ -825,17 +900,11 @@ msgstr "Rolar suavemente ao navegar entre as entradas"
 msgid "Scrolling"
 msgstr "Deslizar"
 
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/header/Header.tsx
 #: src/components/header/Header.tsx
+#: src/components/sidebar/TreeSearch.tsx
 msgid "Search"
 msgstr "Pesquisar"
 
-#: src/components/header/Header.tsx
-msgid "Search requires at least 3 characters"
-msgstr "Pesquisa requer pelo menos 3 caracteres"
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select next unread feed/category"
 msgstr "Selecionar próximo feed/categoria não lido"
@@ -844,6 +913,10 @@ 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/PushNotificationSettings.tsx
+msgid "Server URL"
+msgstr "URL do servidor"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Set focus on next entry without opening it"
 msgstr "Definir o foco na próxima entrada sem abri-la"
@@ -868,8 +941,6 @@ msgstr "Compartilhar"
 msgid "Sharing sites"
 msgstr "Compartilhando sites"
 
-#: src/components/KeyboardShortcutsHelp.tsx
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Shift"
 msgstr "Shift"
@@ -918,9 +989,8 @@ msgstr "Mostrar contagem de não lidos no favion da aba"
 msgid "Show unread count in tab title"
 msgstr "Mostrar contagem de não lidos no título da aba"
 
+#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
 msgid "Sign up"
 msgstr "Inscreva-se"
 
@@ -928,26 +998,24 @@ msgstr "Inscreva-se"
 msgid "Something bad just happened..."
 msgstr "Algo ruim acabou de acontecer..."
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Space"
 msgstr "Espaço"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Star"
 msgstr "Estrela"
 
-#: src/pages/app/FeedEntriesPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
 #: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "Starred"
 msgstr "Com estrela"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/AddPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Subscribe"
 msgstr "Assinar"
 
@@ -979,7 +1047,6 @@ msgstr "Mudar para tema claro"
 msgid "System"
 msgstr "Sistema"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryFooter.tsx
 msgid "Tags"
 msgstr "Etiquetas"
@@ -988,6 +1055,14 @@ msgstr "Etiquetas"
 msgid "Teal"
 msgstr "Azul petróleo"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test"
+msgstr "Teste"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test notification sent successfully."
+msgstr "Notificação de teste enviada com sucesso."
+
 #: src/components/content/add/Subscribe.tsx
 msgid "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
 msgstr "A URL do feed que você deseja assinar. "
@@ -996,9 +1071,18 @@ msgstr "A URL do feed que você deseja assinar. "
 msgid "Theme"
 msgstr "Tema"
 
+#. placeholder {0}: feed.filterLegacy
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "This feed has a legacy filter that cannot be edited and is not applied. Please recreate the filter using the new expression editor. The legacy filter expression was: <0>{0}</0>"
+msgstr "Este feed tem um filtro legado que não pode ser editado e não é aplicado. Recrie o filtro usando o novo editor de expressões. A expressão do filtro legado era: <0>{0}</0>"
+
 #: src/components/settings/ProfileSettings.tsx
-msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API. Use the form at the bottom of the page to generate a new API key"
+msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API and the Google Reader API. Use the form at the bottom of the page to generate a new API key"
-msgstr "Esta é sua chave de API. Ela pode ser usada para algumas operações somente leitura da API e concede acesso à API do Fever. Use o formulário abaixo para gerar uma nova chave de API"
+msgstr "Esta é sua chave de API. Ela pode ser usada para algumas operações de API somente leitura e concede acesso à API Fever e à API Google Reader. Use o formulário na parte inferior da página para gerar uma nova chave de API"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "This setting can cause scrolling issues on some browsers (e.g. Safari)"
+msgstr "Esta configuração pode causar problemas de rolagem em alguns navegadores (ex: Safari)"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Toggle read status of current entry"
@@ -1012,6 +1096,10 @@ msgstr "Alternar barra lateral"
 msgid "Toggle starred status of current entry"
 msgstr "Alternar estrela da entrada atual"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Topic"
+msgstr "Tópico"
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Try out CommaFeed with the demo account: demo/demo"
 msgstr "Experimente o CommaFeed com a conta demo: demo/demo"
@@ -1024,22 +1112,24 @@ msgstr "Teste o demo!"
 msgid "Unread"
 msgstr "Não lido"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Unstar"
 msgstr "Desestrelar"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Unsubscribe"
 msgstr "Cancelar inscrição"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "User key"
+msgstr "Chave do usuário"
+
 #: src/components/settings/ProfileSettings.tsx
 msgid "User name"
 msgstr "Nome de usuário"
 
-#: src/pages/auth/LoginPage.tsx
 #: src/pages/auth/LoginPage.tsx
 msgid "User Name or E-mail"
 msgstr "Nome de usuário ou e-mail"
@@ -1056,6 +1146,10 @@ msgstr "Aviso"
 msgid "Website"
 msgstr "Site"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Welcome! This appears to be the first time you're running CommaFeed. Please create an administrator account to get started."
+msgstr "Bem-vindo! Esta parece ser a primeira vez que você está executando o CommaFeed. Crie uma conta de administrador para começar."
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Yellow"
 msgstr "Amarelo"
@@ -1067,3 +1161,7 @@ msgstr "Você ainda não tem nenhuma assinatura. "
 #: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr "Seus feed foram enfileirados para atualização"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Your password has been changed. You can now log in with your new password."
+msgstr "Sua senha foi alterada. Agora você pode fazer login com sua nova senha."

commafeed-client/src/locales/ru/messages.po

@@ -17,10 +17,6 @@ msgstr ""
 msgid "<0>CommaFeed is an open-source project. Sources are hosted on </0><1>GitHub</1>."
 msgstr "<0>CommaFeed - это проект с открытым исходным кодом. Исходный код доступен по адресу </0><1>GitHub</1>."
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "<0>Complete syntax is available </0><1>here</1><2>.</2>"
-msgstr "<0>Полный синтаксис доступен </0><1>здесь</1><2>.</2>"
-
 #: src/pages/auth/RegistrationPage.tsx
 msgid "<0>Have an account?</0><1>Log in!</1>"
 msgstr "<0>Есть аккаунт?</0><1>Войти!</1>"
@@ -33,11 +29,15 @@ msgstr "<0>Здравствуйте,</0><1>Я Жереми из Бельгии,
 msgid "<0>Need an account?</0><1>Sign up!</1>"
 msgstr "<0>Нужен аккаунт?</0><1>Зарегистрируйтесь!</1>"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "About"
 msgstr "О CommaFeed"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
+msgstr "Токен доступа"
+
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Actions"
 msgstr "Действия"
@@ -54,21 +54,24 @@ msgstr "Добавить категорию"
 msgid "Add user"
 msgstr "Добавить пользователя"
 
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/header/ProfileMenu.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Admin"
 msgstr "Админ"
 
-#: src/pages/app/FeedEntriesPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Admin user name"
-#: src/components/sidebar/Tree.tsx
+msgstr "Имя администратора"
-#: src/components/header/Header.tsx
+
 #: src/components/content/add/CategorySelect.tsx
+#: src/components/header/Header.tsx
+#: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "All"
 msgstr "Все"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Always"
 msgstr "Всегда"
@@ -93,6 +96,14 @@ msgstr "Объявление"
 msgid "API key"
 msgstr "Ключ API"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "API token"
+msgstr "API токен"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "App token"
+msgstr "Токен приложения"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Are you sure you want to delete category <0>{categoryName}</0>?"
 msgstr "Вы уверены, что хотите удалить категорию <0>{categoryName}</0>?"
@@ -122,54 +133,56 @@ msgid "Asc"
 msgstr "По возрастанию"
 
 #: src/pages/app/FeedDetailsPage.tsx
-msgid "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+msgid "Auto-mark as read"
-msgstr "Доступными переменными являются «заголовок», «контент», «url», «автор» и «категории», и их содержимое преобразуется в нижний регистр для облегчения сравнения строк."
+msgstr "Автоматически помечать как прочитанное"
 
 #: src/components/content/add/Subscribe.tsx
 msgid "Back"
 msgstr "Назад"
 
 #: src/pages/auth/PasswordRecoveryPage.tsx
+#: src/pages/auth/PasswordResetPage.tsx
 msgid "Back to log in"
 msgstr "Вернуться к входу"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Blue"
-msgstr ""
+msgstr "Синий"
+
+#: src/pages/app/AboutPage.tsx
+msgid "Browser extension"
+msgstr "Расширение для браузера"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Browser extension required for Chrome"
 msgstr "Для браузера Chrome требуется расширение"
 
-#: src/pages/app/AboutPage.tsx
-msgid "Browser extention"
-msgstr "Расширение для браузера"
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "Browser tab"
-msgstr ""
+msgstr "Вкладка браузера"
 
-#: src/pages/app/TagDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
+msgid "Build a filter expression to indicate what you want to read. Entries that don't match will be marked as read automatically."
-#: src/pages/app/CategoryDetailsPage.tsx
+msgstr "Создайте выражение фильтра, чтобы указать, что вы хотите читать. Записи, которые не соответствуют выражению, будут автоматически помечены как прочитанные."
-#: src/pages/app/CategoryDetailsPage.tsx
+
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
-#: src/components/content/add/ImportOpml.tsx
-#: src/components/content/add/AddCategory.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
+#: src/components/settings/CustomCodeSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/pages/app/FeedDetailsPage.tsx
+#: src/components/content/add/AddCategory.tsx
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/AboutPage.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Category"
 msgstr "Категория"
 
@@ -187,7 +200,7 @@ msgstr "Закрыть меню"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Cmd"
-msgstr ""
+msgstr "Cmd"
 
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
@@ -197,6 +210,10 @@ msgstr "Версия расширения браузера CommaFeed {browserExt
 msgid "CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client. Login with your username and your <0>API key</0>."
 msgstr "CommaFeed совместим с API Fever. Используйте следующий URL-адрес в мобильном клиенте, совместимом с Fever. Войдите в систему, указав свое имя пользователя и <0>API-ключ</0>."
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "CommaFeed is compatible with the Google Reader API. Use the following URL in your Google Reader-compatible mobile client. Login with your username and your <0>API key</0>."
+msgstr "CommaFeed совместим с API Google Reader. Используйте следующий URL-адрес в мобильном клиенте, совместимом с Google Reader. Войдите в систему, указав свое имя пользователя и <0>API-ключ</0>."
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed next unread item"
 msgstr "CommaFeed следующий непрочитанный элемент"
@@ -209,11 +226,11 @@ msgstr "CommaFeed версии {version} ({revision})."
 msgid "Compact"
 msgstr "Компактный"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Confirm"
 msgstr "Подтвердить"
 
@@ -221,10 +238,18 @@ msgstr "Подтвердить"
 msgid "Confirm password"
 msgstr "Подтвердить пароль"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Confirm Password"
+msgstr "Подтвердите пароль"
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Cozy"
 msgstr "Уютно"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Create Admin Account"
+msgstr "Создать учетную запись администратора"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -247,10 +272,10 @@ msgstr "Пользовательский JS-код, который будет в
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Cyan"
-msgstr ""
+msgstr "Голубой"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
 msgid "Dark"
 msgstr "Темная"
 
@@ -258,11 +283,14 @@ msgstr "Темная"
 msgid "Date created"
 msgstr "Дата создания"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "days"
+msgstr "дней"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 msgid "Delete account"
 msgstr "Удалить учетную запись"
@@ -283,14 +311,18 @@ msgstr "По убыванию"
 msgid "Detailed"
 msgstr "Подробно"
 
-#: src/pages/app/SettingsPage.tsx
 #: src/components/settings/DisplaySettings.tsx
+msgid "Disable \"Pull to refresh\" browser behavior"
+msgstr "Отключить поведение браузера «Потяните для обновления»"
+
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
+#: src/pages/app/SettingsPage.tsx
 msgid "Display"
 msgstr "Отображение"
 
-#: src/pages/app/DonatePage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/DonatePage.tsx
 msgid "Donate"
 msgstr "Пожертвование"
 
@@ -302,15 +334,14 @@ msgstr "Скачать"
 msgid "Drag link to bookmark bar"
 msgstr "Перетащите ссылку на панель закладок"
 
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "E-mail"
 msgstr "Электронная почта"
 
-#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/auth/RegistrationPage.tsx
 msgid "E-mail address"
 msgstr "Адрес электронной почты"
@@ -319,8 +350,8 @@ msgstr "Адрес электронной почты"
 msgid "Edit user"
 msgstr "Редактировать пользователя"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Enabled"
 msgstr "Включено"
 
@@ -334,20 +365,16 @@ msgstr "Введите текущий пароль, чтобы изменить
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entries to keep above the selected entry when scrolling"
-msgstr ""
+msgstr "Количество записей, которые должны оставаться над выбранной записью при прокрутке"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entry headers"
-msgstr ""
+msgstr "Заголовки записей"
 
 #: src/components/Alert.tsx
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Example: {example}."
-msgstr "Пример: {пример}."
-
 #: src/components/header/ProfileMenu.tsx
 msgid "Expanded"
 msgstr "Расширенный"
@@ -356,8 +383,8 @@ msgstr "Расширенный"
 msgid "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
 msgstr "Экспортируйте свои подписки и категории в виде файла OPML, который можно импортировать в другие службы чтения каналов."
 
-#: src/pages/WelcomePage.tsx
 #: src/components/header/Header.tsx
+#: src/pages/WelcomePage.tsx
 msgid "Extension options"
 msgstr "Параметры расширения"
 
@@ -365,9 +392,8 @@ msgstr "Параметры расширения"
 msgid "Feed name"
 msgstr "Имя фида"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Feed URL"
 msgstr "URL-адрес фида"
 
@@ -389,19 +415,19 @@ msgstr "Выражение фильтрации"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Font size"
-msgstr ""
+msgstr "Размер шрифта"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Force fetching feeds is not yet available."
-msgstr ""
+msgstr "Принудительное получение фидов пока недоступно."
 
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Забыли пароль?"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generate an API key in your profile first."
 msgstr "Сначала сгенерируйте ключ API в своем профиле."
 
@@ -409,9 +435,9 @@ msgstr "Сначала сгенерируйте ключ API в своем пр
 msgid "Generate new API key"
 msgstr "Создать новый ключ API"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generated feed url"
 msgstr "Сгенерированный URL фида"
 
@@ -432,26 +458,30 @@ msgstr "Перейдите к документации по API."
 msgid "Goodies"
 msgstr "Сладости"
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API"
+msgstr ""
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API URL"
+msgstr ""
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Grape"
-msgstr ""
+msgstr "Виноградный"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Gray"
-msgstr ""
+msgstr "Серый"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Green"
-msgstr ""
+msgstr "Зеленый"
 
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Id"
 msgstr "Идентификатор"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
-msgstr "Если не пусто, то выражение, оценивающееся как 'true' или 'false'. Если false, то новые записи для этой ленты будут автоматически помечаться как прочитанные."
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "If the entry doesn't entirely fit on the screen"
 msgstr "Если запись не помещается на экране полностью"
@@ -470,15 +500,23 @@ msgstr "В развернутом виде прокрутка записей п
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Indigo"
-msgstr ""
+msgstr "Индиго"
+
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Initial Setup"
+msgstr "Начальная настройка"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Invalid password reset link. Please request a new one."
+msgstr "Неверная ссылка для сброса пароля. Пожалуйста, запросите новую."
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Keep unread"
 msgstr "Оставить непрочитанным"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/FeedEntries.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "Keyboard shortcuts"
 msgstr "Сочетания клавиш"
 
@@ -504,17 +542,17 @@ msgstr "Светлая"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Lime"
-msgstr ""
+msgstr "Лаймовый"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Link"
 msgstr "Ссылка"
 
 #: src/components/settings/CustomCodeSettings.tsx
 msgid "Link to the documentation"
-msgstr ""
+msgstr "Ссылка на документацию"
 
 #: src/hooks/useAppLoading.ts
 msgid "Loading profile..."
@@ -532,9 +570,8 @@ msgstr "Загрузка подписок..."
 msgid "Loading tags..."
 msgstr "Загрузка тегов..."
 
+#: src/pages/auth/LoginPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 msgid "Log in"
 msgstr "Войти"
 
@@ -546,8 +583,8 @@ msgstr "Выйти"
 msgid "Long press"
 msgstr "Долгое нажатие"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Manage users"
 msgstr "Управление пользователями"
 
@@ -555,21 +592,25 @@ msgstr "Управление пользователями"
 msgid "Mark all as read"
 msgstr "Отметить все как прочитанное"
 
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
 msgid "Mark all entries as read"
 msgstr "Отметить все записи как прочитанные"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read"
 msgstr "Отметить как прочитанное"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read up to here"
 msgstr "Отметить как прочитанное до этого места"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Mark entries in this feed as read after this number of days. Leave empty to disable."
+msgstr "Помечать записи в этом фиде как прочитанные через указанное количество дней. Оставьте пустым, чтобы отключить."
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Metrics"
 msgstr "Метрики"
@@ -586,15 +627,15 @@ msgstr "Переместить страницу вниз"
 msgid "Move the page up"
 msgstr "Переместить страницу вверх"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/components/RelativeDate.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "N/A"
 msgstr "Н/Д"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Name"
 msgstr "Имя"
 
@@ -604,9 +645,8 @@ msgstr "Перейдите к подписке, введя ее имя."
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Navigate to the next category/feed with unread entries when marking all entries as read"
-msgstr ""
+msgstr "Переходить к следующей категории/фиду с непрочитанными записями при пометке всех записей как прочитанных"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Never"
 msgstr "Никогда"
@@ -615,12 +655,16 @@ msgstr "Никогда"
 msgid "New password"
 msgstr "Новый пароль"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "New Password"
+msgstr "Новый пароль"
+
 #: src/pages/app/AboutPage.tsx
 msgid "Newest first"
 msgstr "Сначала новые"
 
-#: src/components/header/Header.tsx
 #: src/components/content/add/Subscribe.tsx
+#: src/components/header/Header.tsx
 msgid "Next"
 msgstr "Следующий"
 
@@ -638,7 +682,7 @@ msgstr "Записей больше нет"
 
 #: src/components/content/ShareButtons.tsx
 msgid "No sharing options available."
-msgstr ""
+msgstr "Нет доступных вариантов для обмена."
 
 #: src/components/sidebar/TreeSearch.tsx
 msgid "Nothing found"
@@ -650,11 +694,11 @@ msgstr "Сначала самые старые"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On desktop"
-msgstr ""
+msgstr "На ПК"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On mobile"
-msgstr ""
+msgstr "На телефоне"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On mobile, show action buttons at the bottom of the screen"
@@ -662,7 +706,7 @@ msgstr "На мобильных устройствах отображать кн
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Only applies to compact, cozy and detailed modes"
-msgstr ""
+msgstr "Применяется только к компактному, уютному и подробному режимам"
 
 #: src/pages/ErrorPage.tsx
 msgid "Oops!"
@@ -717,7 +761,6 @@ msgstr "OPML"
 msgid "OPML export"
 msgstr "Экспорт OPML"
 
-#: src/components/content/add/ImportOpml.tsx
 #: src/components/content/add/ImportOpml.tsx
 msgid "OPML file"
 msgstr "OPML файл"
@@ -728,7 +771,7 @@ msgstr "Необходим файл OPML"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Orange"
-msgstr ""
+msgstr "Оранжевый"
 
 #: src/pages/app/AboutPage.tsx
 msgid "Order"
@@ -742,28 +785,31 @@ msgstr "Родительский"
 msgid "Parent Category"
 msgstr "Родительская категория"
 
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
 msgid "Password"
 msgstr "Пароль"
 
+#: src/hooks/useValidationRules.ts
+msgid "Password must be at least {minimumPasswordLength} characters"
+msgstr "Пароль должен содержать не менее {minimumPasswordLength} символов"
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Password Recovery"
 msgstr "Восстановление пароля"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Pink"
-msgstr ""
+msgstr "Розовый"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Position"
 msgstr "Позиция"
 
@@ -773,22 +819,47 @@ msgstr "Предыдущий"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Primary color"
-msgstr ""
+msgstr "Основной цвет"
 
 #: src/pages/app/SettingsPage.tsx
 msgid "Profile"
 msgstr "Профиль"
 
+#: 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 "Пуш-уведомления не включены в этом экземпляре CommaFeed."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
+msgstr "Получать пуш-уведомления"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Receive push notifications when new feed entries are discovered. Enable \"Receive push notifications\" in the settings of each feed for which you want to receive notifications."
+msgstr "Получайте пуш-уведомления при обнаружении новых записей в фиде. Включите «Получать пуш-уведомления» в настройках каждого фида, для которого вы хотите получать уведомления."
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Recover password"
 msgstr "Восстановить пароль"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Red"
-msgstr ""
+msgstr "Красный"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/header/Header.tsx
+#: src/components/KeyboardShortcutsHelp.tsx
 msgid "Refresh"
 msgstr "Обновить"
 
@@ -796,20 +867,24 @@ msgstr "Обновить"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Регистрация закрыта для этого экземпляра CommaFeed."
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Reset Password"
+msgstr "Сброс пароля"
+
 #: src/pages/app/AboutPage.tsx
 msgid "REST API"
 msgstr "REST API"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr "Правый клик"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
 #: 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"
 msgstr "Сохранить"
 
@@ -825,24 +900,22 @@ msgstr "Плавная прокрутка при переходе между з
 msgid "Scrolling"
 msgstr "Прокрутка"
 
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/header/Header.tsx
 #: src/components/header/Header.tsx
+#: src/components/sidebar/TreeSearch.tsx
 msgid "Search"
 msgstr "Поиск"
 
-#: src/components/header/Header.tsx
-msgid "Search requires at least 3 characters"
-msgstr "Для поиска требуется не менее 3 символов"
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select next unread feed/category"
-msgstr ""
+msgstr "Выбрать следующий непрочитанный фид/категорию"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select previous unread feed/category"
-msgstr ""
+msgstr "Выбрать предыдущий непрочитанный фид/категорию"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Server URL"
+msgstr "URL сервера"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Set focus on next entry without opening it"
@@ -868,8 +941,6 @@ msgstr "Поделиться"
 msgid "Sharing sites"
 msgstr "Обмен сайтами"
 
-#: src/components/KeyboardShortcutsHelp.tsx
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Shift"
 msgstr "Shift"
@@ -892,7 +963,7 @@ msgstr "Показать меню входа (телефон)"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show external link icon"
-msgstr ""
+msgstr "Показывать значок внешней ссылки"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show feeds and categories with no unread entries"
@@ -908,19 +979,18 @@ msgstr "Показать родное меню (ПК)"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show star icon"
-msgstr ""
+msgstr "Показывать значок звезды"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show unread count in tab favicon"
-msgstr ""
+msgstr "Показывать количество непрочитанных во вкладке favicon"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show unread count in tab title"
-msgstr ""
+msgstr "Показывать количество непрочитанных в заголовке вкладки"
 
+#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
 msgid "Sign up"
 msgstr "Зарегистрироваться"
 
@@ -928,26 +998,24 @@ msgstr "Зарегистрироваться"
 msgid "Something bad just happened..."
 msgstr "Только что случилось что-то плохое..."
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Space"
 msgstr "Пробел"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Star"
 msgstr "В избранное"
 
-#: src/pages/app/FeedEntriesPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
 #: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "Starred"
 msgstr "Избранное"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/AddPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Subscribe"
 msgstr "Подписаться"
 
@@ -979,14 +1047,21 @@ msgstr "Переключиться на светлую тему"
 msgid "System"
 msgstr "Системная"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryFooter.tsx
 msgid "Tags"
 msgstr "Теги"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Teal"
-msgstr ""
+msgstr "Бирюзовый"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test"
+msgstr "Тест"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test notification sent successfully."
+msgstr "Тестовое уведомление успешно отправлено."
 
 #: src/components/content/add/Subscribe.tsx
 msgid "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
@@ -996,9 +1071,18 @@ msgstr "URL канала, на который вы хотите подписат
 msgid "Theme"
 msgstr "Тема"
 
+#. placeholder {0}: feed.filterLegacy
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "This feed has a legacy filter that cannot be edited and is not applied. Please recreate the filter using the new expression editor. The legacy filter expression was: <0>{0}</0>"
+msgstr "Этот фид имеет устаревший фильтр, который нельзя редактировать и который не применяется. Пожалуйста, создайте фильтр заново, используя новый редактор выражений. Устаревшее выражение фильтра было: <0>{0}</0>"
+
 #: src/components/settings/ProfileSettings.tsx
-msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API. Use the form at the bottom of the page to generate a new API key"
+msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API and the Google Reader API. Use the form at the bottom of the page to generate a new API key"
-msgstr "Это ваш ключ API. Он может использоваться для некоторых операций API только для чтения и предоставляет доступ к API Fever. Чтобы сгенерировать новый ключ API, воспользуйтесь формой в нижней части страницы"
+msgstr "Это ваш ключ API. Он может использоваться для некоторых операций API только для чтения и предоставляет доступ к API Fever и API Google Reader. Используйте форму внизу страницы, чтобы сгенерировать новый ключ API"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "This setting can cause scrolling issues on some browsers (e.g. Safari)"
+msgstr "Этот параметр может вызвать проблемы с прокруткой в некоторых браузерах (например, Safari)"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Toggle read status of current entry"
@@ -1012,6 +1096,10 @@ msgstr "Переключить боковую панель"
 msgid "Toggle starred status of current entry"
 msgstr "Переключение статуса избранное для текущей записи"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Topic"
+msgstr "Тема"
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Try out CommaFeed with the demo account: demo/demo"
 msgstr "Попробуйте CommaFeed на демо аккаунте: demo/demo"
@@ -1024,29 +1112,31 @@ msgstr "Попробуйте демо-версию!"
 msgid "Unread"
 msgstr "Не прочитано"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Unstar"
 msgstr "Удалить из избранного"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "User key"
+msgstr "Ключ пользователя"
+
 #: src/components/settings/ProfileSettings.tsx
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: src/pages/auth/LoginPage.tsx
 #: src/pages/auth/LoginPage.tsx
 msgid "User Name or E-mail"
 msgstr "Имя пользователя или адрес электронной почты"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Violet"
-msgstr ""
+msgstr "Фиолетовый"
 
 #: src/components/Alert.tsx
 msgid "Warning"
@@ -1056,9 +1146,13 @@ msgstr "Предупреждение"
 msgid "Website"
 msgstr "Веб-сайт"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Welcome! This appears to be the first time you're running CommaFeed. Please create an administrator account to get started."
+msgstr "Добро пожаловать! Похоже, вы запускаете CommaFeed в первый раз. Пожалуйста, создайте учетную запись администратора, чтобы начать работу."
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Yellow"
-msgstr ""
+msgstr "Желтый"
 
 #: src/pages/app/FeedEntriesPage.tsx
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
@@ -1067,3 +1161,7 @@ msgstr "У вас еще нет подписок. Почему бы не поп
 #: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr "Ваши каналы были поставлены в очередь на обновление."
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Your password has been changed. You can now log in with your new password."
+msgstr "Ваш пароль был изменен. Теперь вы можете войти с новым паролем."

commafeed-client/src/locales/tr/messages.po

@@ -17,10 +17,6 @@ msgstr ""
 msgid "<0>CommaFeed is an open-source project. Sources are hosted on </0><1>GitHub</1>."
 msgstr "<0>CommaFeed açık kaynak kodlu bir proje. Kaynak kodları </0><1>GitHub</1>'da."
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "<0>Complete syntax is available </0><1>here</1><2>.</2>"
-msgstr "<0>Tüm sözdizimi </0><1>burada</1><2>.</2>"
-
 #: src/pages/auth/RegistrationPage.tsx
 msgid "<0>Have an account?</0><1>Log in!</1>"
 msgstr "<0>Hesabınız var mı?</0><1>Giriş yapın!</1>"
@@ -33,11 +29,15 @@ msgstr "<0>Merhaba,</0><1>Ben Belçika'dan Jérémie ve 10 yıldır boş zamanla
 msgid "<0>Need an account?</0><1>Sign up!</1>"
 msgstr "<0>Bir hesaba mı ihtiyacınız var?</0><1>Kaydolun!</1>"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "About"
 msgstr "Hakkında"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
+msgstr "Erişim jetonu"
+
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Actions"
 msgstr "Eylemler"
@@ -54,24 +54,27 @@ msgstr "Kategori ekle"
 msgid "Add user"
 msgstr "Kullanıcı ekle"
 
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/header/ProfileMenu.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Admin"
 msgstr "Yönetici"
 
-#: src/pages/app/FeedEntriesPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Admin user name"
-#: src/components/sidebar/Tree.tsx
+msgstr "Yönetici kullanıcı adı"
-#: src/components/header/Header.tsx
+
 #: src/components/content/add/CategorySelect.tsx
+#: src/components/header/Header.tsx
+#: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "All"
 msgstr "Tümü"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Always"
-msgstr ""
+msgstr "Her zaman"
 
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
@@ -93,6 +96,14 @@ msgstr "Duyuru"
 msgid "API key"
 msgstr "API anahtarı"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "API token"
+msgstr "API jetonu"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "App token"
+msgstr "Uygulama jetonu"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Are you sure you want to delete category <0>{categoryName}</0>?"
 msgstr "<0>{categoryName}</0> kategorisini silmek istediğinizden emin misiniz?"
@@ -122,54 +133,56 @@ msgid "Asc"
 msgstr "Artan"
 
 #: src/pages/app/FeedDetailsPage.tsx
-msgid "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+msgid "Auto-mark as read"
-msgstr "Mevcut değişkenler 'title', 'content', 'url' 'yazar' ve 'kategoriler'dir ve dize karşılaştırmasını kolaylaştırmak için içerikleri küçük harfe dönüştürülür."
+msgstr "Otomatik olarak okundu olarak işaretle"
 
 #: src/components/content/add/Subscribe.tsx
 msgid "Back"
 msgstr "Geri"
 
 #: src/pages/auth/PasswordRecoveryPage.tsx
+#: src/pages/auth/PasswordResetPage.tsx
 msgid "Back to log in"
 msgstr "Giriş yapmak için geri dön"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Blue"
-msgstr ""
+msgstr "Mavi"
+
+#: src/pages/app/AboutPage.tsx
+msgid "Browser extension"
+msgstr "Tarayıcı eklentisi"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Browser extension required for Chrome"
-msgstr ""
+msgstr "Chrome için tarayıcı eklentisi gereklidir"
-
-#: src/pages/app/AboutPage.tsx
-msgid "Browser extention"
-msgstr "Tarayıcı eklentisi"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Browser tab"
-msgstr ""
+msgstr "Tarayıcı sekmesi"
 
-#: src/pages/app/TagDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
+msgid "Build a filter expression to indicate what you want to read. Entries that don't match will be marked as read automatically."
-#: src/pages/app/CategoryDetailsPage.tsx
+msgstr "Ne okumak istediğinizi belirtmek için bir filtre ifadesi oluşturun. Eşleşmeyen girişler otomatik olarak okundu olarak işaretlenecektir."
-#: src/pages/app/CategoryDetailsPage.tsx
+
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
-#: src/components/content/add/ImportOpml.tsx
-#: src/components/content/add/AddCategory.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
+#: src/components/settings/CustomCodeSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/pages/app/FeedDetailsPage.tsx
+#: src/components/content/add/AddCategory.tsx
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/AboutPage.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Category"
 msgstr "Kategori"
 
@@ -183,11 +196,11 @@ msgstr "Feed'in çalışıp çalışmadığını kontrol edin"
 
 #: src/pages/app/Layout.tsx
 msgid "Close menu"
-msgstr ""
+msgstr "Menüyü kapat"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Cmd"
-msgstr ""
+msgstr "Cmd"
 
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
@@ -195,7 +208,11 @@ msgstr "CommaFeed tarayıcı eklentisi sürüm {browserExtensionVersion}."
 
 #: src/components/settings/ProfileSettings.tsx
 msgid "CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client. Login with your username and your <0>API key</0>."
-msgstr ""
+msgstr "CommaFeed, Fever API ile uyumludur. Fever uyumlu mobil istemcinizde aşağıdaki URL'yi kullanın. Kullanıcı adınız ve <0>API anahtarınız</0> ile giriş yapın."
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "CommaFeed is compatible with the Google Reader API. Use the following URL in your Google Reader-compatible mobile client. Login with your username and your <0>API key</0>."
+msgstr "CommaFeed, Google Reader API ile uyumludur. Google Reader uyumlu mobil istemcinizde aşağıdaki URL'yi kullanın. Kullanıcı adınız ve <0>API anahtarınız</0> ile giriş yapın."
 
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed next unread item"
@@ -209,11 +226,11 @@ msgstr "CommaFeed sürüm {version} ({revision})."
 msgid "Compact"
 msgstr "Kompakt"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Confirm"
 msgstr "Onayla"
 
@@ -221,10 +238,18 @@ msgstr "Onayla"
 msgid "Confirm password"
 msgstr "Şifreyi onayla"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Confirm Password"
+msgstr "Şifreyi Onayla"
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Cozy"
 msgstr "Rahat"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Create Admin Account"
+msgstr "Yönetici Hesabı Oluştur"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -247,22 +272,25 @@ msgstr "Sayfa yüklendiğinde çalıştırılacak özel JS kodu"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Cyan"
-msgstr ""
+msgstr "Macenta"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
 msgid "Dark"
-msgstr ""
+msgstr "Koyu"
 
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Date created"
 msgstr "Oluşturulma tarihi"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "days"
+msgstr "gün"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Delete"
 msgstr "Sil"
 
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 msgid "Delete account"
 msgstr "Hesabı sil"
@@ -281,18 +309,22 @@ msgstr "Açılış"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Detailed"
-msgstr ""
+msgstr "Detaylı"
 
-#: src/pages/app/SettingsPage.tsx
 #: src/components/settings/DisplaySettings.tsx
+msgid "Disable \"Pull to refresh\" browser behavior"
+msgstr "Tarayıcının \"Yenilemek için çek\" davranışını devre dışı bırak"
+
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
+#: src/pages/app/SettingsPage.tsx
 msgid "Display"
 msgstr "Ekran"
 
-#: src/pages/app/DonatePage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/DonatePage.tsx
 msgid "Donate"
-msgstr ""
+msgstr "Bağış Yap"
 
 #: src/components/settings/ProfileSettings.tsx
 msgid "Download"
@@ -302,15 +334,14 @@ msgstr "İndir"
 msgid "Drag link to bookmark bar"
 msgstr "Bağlantıyı yer işareti çubuğuna sürükleyin"
 
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "E-mail"
 msgstr "E-posta"
 
-#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/auth/RegistrationPage.tsx
 msgid "E-mail address"
 msgstr "E-posta adresi"
@@ -319,8 +350,8 @@ msgstr "E-posta adresi"
 msgid "Edit user"
 msgstr "Kullanıcıyı düzenle"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Enabled"
 msgstr "Etkin"
 
@@ -334,20 +365,16 @@ msgstr "Profil ayarlarını değiştirmek için mevcut şifrenizi girin"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entries to keep above the selected entry when scrolling"
-msgstr ""
+msgstr "Kaydırma sırasında seçilen girişin üzerinde tutulacak giriş sayısı"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entry headers"
-msgstr ""
+msgstr "Giriş başlıkları"
 
 #: src/components/Alert.tsx
 msgid "Error"
 msgstr "Hata"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Example: {example}."
-msgstr "Örnek: {örnek}."
-
 #: src/components/header/ProfileMenu.tsx
 msgid "Expanded"
 msgstr "Genişletilmiş"
@@ -356,8 +383,8 @@ msgstr "Genişletilmiş"
 msgid "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
 msgstr "Aboneliklerinizi ve kategorilerinizi diğer besleme okuma hizmetlerinde içe aktarılabilen bir OPML dosyası olarak dışa aktarın"
 
-#: src/pages/WelcomePage.tsx
 #: src/components/header/Header.tsx
+#: src/pages/WelcomePage.tsx
 msgid "Extension options"
 msgstr "Eklenti ayarları"
 
@@ -365,9 +392,8 @@ msgstr "Eklenti ayarları"
 msgid "Feed name"
 msgstr "Yayın adı"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Feed URL"
 msgstr "Feed URL'si"
 
@@ -377,11 +403,11 @@ msgstr "Tüm feed'lerimi şimdi çek"
 
 #: src/components/settings/ProfileSettings.tsx
 msgid "Fever API"
-msgstr ""
+msgstr "Fever API"
 
 #: src/components/settings/ProfileSettings.tsx
 msgid "Fever API URL"
-msgstr ""
+msgstr "Fever API URL'si"
 
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Filtering expression"
@@ -389,19 +415,19 @@ msgstr "Filtreleme ifadesi"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Font size"
-msgstr ""
+msgstr "Yazı boyutu"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Force fetching feeds is not yet available."
-msgstr ""
+msgstr "Beslemeleri zorla çekme özelliği henüz mevcut değil."
 
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
 msgstr "Parolanızı mı unuttunuz?"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generate an API key in your profile first."
 msgstr "Önce profilinizde bir API anahtarı oluşturun."
 
@@ -409,9 +435,9 @@ msgstr "Önce profilinizde bir API anahtarı oluşturun."
 msgid "Generate new API key"
 msgstr "Yeni API anahtarı oluştur"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generated feed url"
 msgstr "Oluşturulan besleme url'si"
 
@@ -432,29 +458,33 @@ msgstr "API belgelerine gidin."
 msgid "Goodies"
 msgstr "İyilikler"
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API"
+msgstr ""
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API URL"
+msgstr ""
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Grape"
-msgstr ""
+msgstr "Üzüm"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Gray"
-msgstr ""
+msgstr "Gri"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Green"
-msgstr ""
+msgstr "Yeşil"
 
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Id"
 msgstr "Kimlik"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
-msgstr "Boş değilse, 'doğru' veya 'yanlış' olarak değerlendirilen bir ifade. "
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "If the entry doesn't entirely fit on the screen"
-msgstr ""
+msgstr "Eğer giriş ekrana tamamen sığmıyorsa"
 
 #: src/pages/app/AboutPage.tsx
 msgid "If you encounter an issue, please report it on the issues page of the GitHub project."
@@ -470,15 +500,23 @@ msgstr "Genişletilmiş görünümde, girişler arasında gezinmek onları okund
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Indigo"
-msgstr ""
+msgstr "İndigo"
+
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Initial Setup"
+msgstr "Başlangıç Kurulumu"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Invalid password reset link. Please request a new one."
+msgstr "Geçersiz şifre sıfırlama bağlantısı. Lütfen yeni bir tane isteyin."
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Keep unread"
 msgstr "Okunmadan sakla"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/FeedEntries.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "Keyboard shortcuts"
 msgstr "Klavye kısayolları"
 
@@ -500,21 +538,21 @@ msgstr "Son yenileme mesajı"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Light"
-msgstr ""
+msgstr "Açık"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Lime"
-msgstr ""
+msgstr "Limon"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Link"
 msgstr "Bağlantı"
 
 #: src/components/settings/CustomCodeSettings.tsx
 msgid "Link to the documentation"
-msgstr ""
+msgstr "Belgelere bağlantı"
 
 #: src/hooks/useAppLoading.ts
 msgid "Loading profile..."
@@ -532,9 +570,8 @@ msgstr "Abonelikler yükleniyor..."
 msgid "Loading tags..."
 msgstr "Etiketler yükleniyor..."
 
+#: src/pages/auth/LoginPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 msgid "Log in"
 msgstr "Giriş"
 
@@ -546,8 +583,8 @@ msgstr "Çıkış"
 msgid "Long press"
 msgstr "Uzun bas"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Manage users"
 msgstr "Kullanıcıları yönet"
 
@@ -555,21 +592,25 @@ msgstr "Kullanıcıları yönet"
 msgid "Mark all as read"
 msgstr "Tümünü okundu olarak işaretle"
 
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
 msgid "Mark all entries as read"
 msgstr "Tüm girişleri okundu olarak işaretle"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read"
 msgstr "Okundu olarak işaretle"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read up to here"
 msgstr "Buraya kadar okundu olarak işaretle"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Mark entries in this feed as read after this number of days. Leave empty to disable."
+msgstr "Bu beslemedeki girişleri şu kadar gün sonra okundu olarak işaretle. Devre dışı bırakmak için boş bırakın."
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Metrics"
 msgstr "Metrikler"
@@ -586,15 +627,15 @@ msgstr "Sayfayı aşağı taşı"
 msgid "Move the page up"
 msgstr "Sayfayı yukarı taşı"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/components/RelativeDate.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "N/A"
 msgstr "Yok"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Name"
 msgstr "İsim"
 
@@ -604,23 +645,26 @@ msgstr "Adını girerek bir aboneliğe gidin"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Navigate to the next category/feed with unread entries when marking all entries as read"
-msgstr ""
+msgstr "Tüm girişleri okundu olarak işaretlerken okunmamış girişleri olan bir sonraki kategoriye/beslemeye git"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Never"
-msgstr ""
+msgstr "Asla"
 
 #: src/components/settings/ProfileSettings.tsx
 msgid "New password"
 msgstr "Yeni şifre"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "New Password"
+msgstr "Yeni Şifre"
+
 #: src/pages/app/AboutPage.tsx
 msgid "Newest first"
 msgstr "Önce en yenisi"
 
-#: src/components/header/Header.tsx
 #: src/components/content/add/Subscribe.tsx
+#: src/components/header/Header.tsx
 msgid "Next"
 msgstr "Sonraki"
 
@@ -638,7 +682,7 @@ msgstr "Başka giriş yok"
 
 #: src/components/content/ShareButtons.tsx
 msgid "No sharing options available."
-msgstr ""
+msgstr "Paylaşım seçeneği mevcut değil."
 
 #: src/components/sidebar/TreeSearch.tsx
 msgid "Nothing found"
@@ -650,19 +694,19 @@ msgstr "Önce en eski"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On desktop"
-msgstr ""
+msgstr "Masaüstünde"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On mobile"
-msgstr ""
+msgstr "Mobilde"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "On mobile, show action buttons at the bottom of the screen"
-msgstr ""
+msgstr "Mobilde, eylem düğmelerini ekranın altında göster"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Only applies to compact, cozy and detailed modes"
-msgstr ""
+msgstr "Yalnızca kompakt, rahat ve detaylı modlar için geçerlidir"
 
 #: src/pages/ErrorPage.tsx
 msgid "Oops!"
@@ -695,7 +739,7 @@ msgstr "Bağlantıyı yeni sekmede aç"
 
 #: src/pages/app/Layout.tsx
 msgid "Open menu"
-msgstr ""
+msgstr "Menüyü aç"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Open next entry"
@@ -717,18 +761,17 @@ msgstr "OPML"
 msgid "OPML export"
 msgstr "OPML dışa aktarma"
 
-#: src/components/content/add/ImportOpml.tsx
 #: src/components/content/add/ImportOpml.tsx
 msgid "OPML file"
 msgstr "OPML dosyası"
 
 #: src/components/content/add/ImportOpml.tsx
 msgid "OPML file is required"
-msgstr ""
+msgstr "OPML dosyası gereklidir"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Orange"
-msgstr ""
+msgstr "Turuncu"
 
 #: src/pages/app/AboutPage.tsx
 msgid "Order"
@@ -742,28 +785,31 @@ msgstr "Ebeveyn"
 msgid "Parent Category"
 msgstr "Üst Kategori"
 
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
 msgid "Password"
 msgstr "Şifre"
 
+#: src/hooks/useValidationRules.ts
+msgid "Password must be at least {minimumPasswordLength} characters"
+msgstr "Şifre en az {minimumPasswordLength} karakter olmalıdır"
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Password Recovery"
 msgstr "Parola Kurtarma"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
 msgid "Passwords do not match"
 msgstr "Parolalar eşleşmiyor"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Pink"
-msgstr ""
+msgstr "Pembe"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Position"
 msgstr "Konum"
 
@@ -773,22 +819,47 @@ msgstr "Önceki"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Primary color"
-msgstr ""
+msgstr "Birincil renk"
 
 #: src/pages/app/SettingsPage.tsx
 msgid "Profile"
 msgstr "Profil"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notification service"
+msgstr "Push bildirim servisi"
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Push notifications"
+msgstr "Push bildirimleri"
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Push notifications are not configured in your user settings."
+msgstr "Push bildirimleri kullanıcı ayarlarınızda yapılandırılmamış."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Push notifications are not enabled on this CommaFeed instance."
+msgstr "Bu CommaFeed örneğinde push bildirimleri etkin değil."
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
+msgstr "Push bildirimlerini al"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Receive push notifications when new feed entries are discovered. Enable \"Receive push notifications\" in the settings of each feed for which you want to receive notifications."
+msgstr "Yeni besleme girişleri keşfedildiğinde push bildirimleri alın. Bildirim almak istediğiniz her beslemenin ayarlarında \"Push bildirimlerini al\" seçeneğini etkinleştirin."
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Recover password"
 msgstr "Şifreyi kurtar"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Red"
-msgstr ""
+msgstr "Kırmızı"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/header/Header.tsx
+#: src/components/KeyboardShortcutsHelp.tsx
 msgid "Refresh"
 msgstr "Yenile"
 
@@ -796,26 +867,30 @@ msgstr "Yenile"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "Bu CommaFeed örneğinde kayıtlar kapalı"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Reset Password"
+msgstr "Şifreyi Sıfırla"
+
 #: src/pages/app/AboutPage.tsx
 msgid "REST API"
 msgstr "REST API"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr "Sağ tık"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
 #: 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"
 msgstr "Kaydet"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Scroll selected entry to the top of the page"
-msgstr ""
+msgstr "Seçilen girişi sayfanın üstüne kaydır"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Scroll smoothly when navigating between entries"
@@ -823,26 +898,24 @@ msgstr "Girişler arasında gezinirken sorunsuz ilerleyin"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Scrolling"
-msgstr ""
+msgstr "Kaydırma"
 
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/header/Header.tsx
 #: src/components/header/Header.tsx
+#: src/components/sidebar/TreeSearch.tsx
 msgid "Search"
 msgstr "Ara"
 
-#: src/components/header/Header.tsx
-msgid "Search requires at least 3 characters"
-msgstr "Arama için en az 3 karakter gerekiyor"
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select next unread feed/category"
-msgstr ""
+msgstr "Sonraki okunmamış beslemeyi/kategoriyi seç"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select previous unread feed/category"
-msgstr ""
+msgstr "Önceki okunmamış beslemeyi/kategoriyi seç"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Server URL"
+msgstr "Sunucu URL'si"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Set focus on next entry without opening it"
@@ -868,8 +941,6 @@ msgstr "Paylaş"
 msgid "Sharing sites"
 msgstr "Siteleri paylaşma"
 
-#: src/components/KeyboardShortcutsHelp.tsx
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Shift"
 msgstr "Vardiya"
@@ -892,7 +963,7 @@ msgstr "Giriş menüsünü göster (mobil)"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show external link icon"
-msgstr ""
+msgstr "Harici bağlantı simgesini göster"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show feeds and categories with no unread entries"
@@ -908,19 +979,18 @@ msgstr "Orijinal tarayıcı menüsünü göster (masaüstü)"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show star icon"
-msgstr ""
+msgstr "Yıldız simgesini göster"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show unread count in tab favicon"
-msgstr ""
+msgstr "Sekme simgesinde okunmamış sayısını göster"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show unread count in tab title"
-msgstr ""
+msgstr "Sekme başlığında okunmamış sayısını göster"
 
+#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
 msgid "Sign up"
 msgstr "Kaydolun"
 
@@ -928,26 +998,24 @@ msgstr "Kaydolun"
 msgid "Something bad just happened..."
 msgstr "Az önce kötü bir şey oldu..."
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Space"
 msgstr "Uzay"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Star"
 msgstr "Yıldız"
 
-#: src/pages/app/FeedEntriesPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
 #: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "Starred"
 msgstr "Yıldızlı"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/AddPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Subscribe"
 msgstr "Abone ol"
 
@@ -965,7 +1033,7 @@ msgstr "Başarı"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Swipe header to the left"
-msgstr ""
+msgstr "Başlığı sola kaydır"
 
 #: src/pages/WelcomePage.tsx
 msgid "Switch to dark theme"
@@ -977,16 +1045,23 @@ msgstr "Aydınlık temaya geç"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "System"
-msgstr ""
+msgstr "Sistem"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryFooter.tsx
 msgid "Tags"
 msgstr "Etiketler"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Teal"
-msgstr ""
+msgstr "Camgöbeği"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test"
+msgstr "Test"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test notification sent successfully."
+msgstr "Test bildirimi başarıyla gönderildi."
 
 #: src/components/content/add/Subscribe.tsx
 msgid "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
@@ -996,9 +1071,18 @@ msgstr "Abone olmak istediğiniz beslemenin URL'si. "
 msgid "Theme"
 msgstr "Tema"
 
+#. placeholder {0}: feed.filterLegacy
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "This feed has a legacy filter that cannot be edited and is not applied. Please recreate the filter using the new expression editor. The legacy filter expression was: <0>{0}</0>"
+msgstr "Bu beslemenin düzenlenemeyen ve uygulanmayan eski bir filtresi var. Lütfen yeni ifade düzenleyiciyi kullanarak filtreyi yeniden oluşturun. Eski filtre ifadesi şuydu: <0>{0}</0>"
+
 #: src/components/settings/ProfileSettings.tsx
-msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API. Use the form at the bottom of the page to generate a new API key"
+msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API and the Google Reader API. Use the form at the bottom of the page to generate a new API key"
-msgstr ""
+msgstr "Bu, API anahtarınızdır. Bazı salt okunur API işlemleri için kullanılabilir ve Fever API ile Google Reader API'ye erişim sağlar. Yeni bir API anahtarı oluşturmak için sayfanın altındaki formu kullanın"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "This setting can cause scrolling issues on some browsers (e.g. Safari)"
+msgstr "Bu ayar bazı tarayıcılarda (örneğin Safari) kaydırma sorunlarına neden olabilir"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Toggle read status of current entry"
@@ -1010,7 +1094,11 @@ msgstr "Kenar çubuğunu göster/gizle"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Toggle starred status of current entry"
-msgstr ""
+msgstr "Geçerli girişin yıldızlı durumunu değiştir"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Topic"
+msgstr "Konu"
 
 #: src/pages/auth/LoginPage.tsx
 msgid "Try out CommaFeed with the demo account: demo/demo"
@@ -1024,29 +1112,31 @@ msgstr "Demo'yu deneyin!"
 msgid "Unread"
 msgstr "Okunmamış"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Unstar"
 msgstr "Yıldızı kaldır"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Unsubscribe"
 msgstr "Aboneliği iptal et"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "User key"
+msgstr "Kullanıcı anahtarı"
+
 #: src/components/settings/ProfileSettings.tsx
 msgid "User name"
 msgstr "Kullanıcı adı"
 
-#: src/pages/auth/LoginPage.tsx
 #: src/pages/auth/LoginPage.tsx
 msgid "User Name or E-mail"
 msgstr "Kullanıcı Adı veya E-posta"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Violet"
-msgstr ""
+msgstr "Menekşe"
 
 #: src/components/Alert.tsx
 msgid "Warning"
@@ -1056,9 +1146,13 @@ msgstr "Uyarı"
 msgid "Website"
 msgstr "Web sitesi"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Welcome! This appears to be the first time you're running CommaFeed. Please create an administrator account to get started."
+msgstr "Hoş geldiniz! Görünüşe göre CommaFeed'i ilk kez çalıştırıyorsunuz. Başlamak için lütfen bir yönetici hesabı oluşturun."
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Yellow"
-msgstr ""
+msgstr "Sarı"
 
 #: src/pages/app/FeedEntriesPage.tsx
 msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
@@ -1067,3 +1161,7 @@ msgstr "Henüz aboneliğiniz yok. Sayfanın üstündeki + işaretiyle feed ekley
 #: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr "Feed'leriniz yenileme için sıraya alındı."
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Your password has been changed. You can now log in with your new password."
+msgstr "Şifreniz değiştirildi. Artık yeni şifrenizle giriş yapabilirsiniz."

commafeed-client/src/locales/zh/messages.po

@@ -17,10 +17,6 @@ msgstr ""
 msgid "<0>CommaFeed is an open-source project. Sources are hosted on </0><1>GitHub</1>."
 msgstr "<0>CommaFeed是一个开源项目，源码托管在 </0><1>GitHub</1>。"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "<0>Complete syntax is available </0><1>here</1><2>.</2>"
-msgstr "<0>可以使用完整的语法 </0><1>详情</1><2>.</2>"
-
 #: src/pages/auth/RegistrationPage.tsx
 msgid "<0>Have an account?</0><1>Log in!</1>"
 msgstr "<0>有帐号吗？</0><1>登录！</1>"
@@ -33,11 +29,15 @@ msgstr "<0>您好,</0><1>我是来自比利时的Jérémie，已经在业余时
 msgid "<0>Need an account?</0><1>Sign up!</1>"
 msgstr "<0>需要一个帐户？</0><1>注册！</1>"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "About"
 msgstr "关于"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Access token"
+msgstr "访问令牌"
+
 #: src/pages/admin/AdminUsersPage.tsx
 msgid "Actions"
 msgstr "操作"
@@ -54,21 +54,24 @@ msgstr "添加类别"
 msgid "Add user"
 msgstr "添加用户"
 
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/header/ProfileMenu.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Admin"
 msgstr "管理员"
 
-#: src/pages/app/FeedEntriesPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Admin user name"
-#: src/components/sidebar/Tree.tsx
+msgstr "管理员用户名"
-#: src/components/header/Header.tsx
+
 #: src/components/content/add/CategorySelect.tsx
+#: src/components/header/Header.tsx
+#: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "All"
 msgstr "全部"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Always"
 msgstr "总是"
@@ -93,6 +96,14 @@ msgstr "公告"
 msgid "API key"
 msgstr "API 密钥"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "API token"
+msgstr "API 令牌"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "App token"
+msgstr "应用令牌"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Are you sure you want to delete category <0>{categoryName}</0>?"
 msgstr "您确定要删除类别 <0>{categoryName}</0> 吗？"
@@ -122,14 +133,15 @@ msgid "Asc"
 msgstr "升序"
 
 #: src/pages/app/FeedDetailsPage.tsx
-msgid "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+msgid "Auto-mark as read"
-msgstr "可用变量为'title'、'content'、'url'、'author'和'categories'，它们的内容被转换为小写以方便字符串比较。"
+msgstr "自动标记为已读"
 
 #: src/components/content/add/Subscribe.tsx
 msgid "Back"
 msgstr "返回"
 
 #: src/pages/auth/PasswordRecoveryPage.tsx
+#: src/pages/auth/PasswordResetPage.tsx
 msgid "Back to log in"
 msgstr "返回登录"
 
@@ -137,39 +149,40 @@ msgstr "返回登录"
 msgid "Blue"
 msgstr "蓝"
 
-#: src/components/KeyboardShortcutsHelp.tsx
+#: src/pages/app/AboutPage.tsx
-msgid "Browser extension required for Chrome"
+msgid "Browser extension"
 msgstr "浏览器扩展"
 
-#: src/pages/app/AboutPage.tsx
+#: src/components/KeyboardShortcutsHelp.tsx
-msgid "Browser extention"
+msgid "Browser extension required for Chrome"
 msgstr "浏览器扩展"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Browser tab"
 msgstr "浏览器标签页"
 
-#: src/pages/app/TagDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
+msgid "Build a filter expression to indicate what you want to read. Entries that don't match will be marked as read automatically."
-#: src/pages/app/CategoryDetailsPage.tsx
+msgstr "构建过滤表达式以指示您想阅读的内容。不匹配的条目将被自动标记为已读。"
-#: src/pages/app/CategoryDetailsPage.tsx
+
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
-#: src/components/content/add/ImportOpml.tsx
-#: src/components/content/add/AddCategory.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
+#: src/components/settings/CustomCodeSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/PushNotificationSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Cancel"
 msgstr "取消"
 
-#: src/pages/app/FeedDetailsPage.tsx
+#: src/components/content/add/AddCategory.tsx
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/AboutPage.tsx
-#: src/components/content/add/AddCategory.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Category"
 msgstr "类别"
 
@@ -197,6 +210,10 @@ msgstr "CommaFeed的浏览器扩展版本：{browserExtensionVersion}。"
 msgid "CommaFeed is compatible with the Fever API. Use the following URL in your Fever-compatible mobile client. Login with your username and your <0>API key</0>."
 msgstr "CommaFeed 和 Fever API 兼容，可以在您Fever兼容的移动客户端中使用以下网址，通过用户名和<0>API密钥</0>登录。"
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "CommaFeed is compatible with the Google Reader API. Use the following URL in your Google Reader-compatible mobile client. Login with your username and your <0>API key</0>."
+msgstr "CommaFeed 和 Google Reader API 兼容，可以在您Google Reader兼容的移动客户端中使用以下网址，通过用户名和<0>API密钥</0>登录。"
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed next unread item"
 msgstr "CommaFeed 下一个未读项目"
@@ -209,11 +226,11 @@ msgstr "CommaFeed版本：{version} ({revision})"
 msgid "Compact"
 msgstr "紧凑"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Confirm"
 msgstr "确认"
 
@@ -221,10 +238,18 @@ msgstr "确认"
 msgid "Confirm password"
 msgstr "确认密码"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Confirm Password"
+msgstr "确认密码"
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Cozy"
 msgstr "宽松"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Create Admin Account"
+msgstr "创建管理员帐号"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -249,8 +274,8 @@ msgstr "将在页面加载时执行的自定义JS代码"
 msgid "Cyan"
 msgstr "青"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
 msgid "Dark"
 msgstr "暗黑"
 
@@ -258,11 +283,14 @@ msgstr "暗黑"
 msgid "Date created"
 msgstr "创建日期"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "days"
+msgstr "天"
+
 #: src/pages/app/CategoryDetailsPage.tsx
 msgid "Delete"
 msgstr "删除"
 
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/settings/ProfileSettings.tsx
 msgid "Delete account"
 msgstr "删除帐号"
@@ -283,14 +311,18 @@ msgstr "降序"
 msgid "Detailed"
 msgstr "详细"
 
-#: src/pages/app/SettingsPage.tsx
 #: src/components/settings/DisplaySettings.tsx
+msgid "Disable \"Pull to refresh\" browser behavior"
+msgstr "禁用浏览器的“下拉刷新”功能"
+
 #: src/components/header/ProfileMenu.tsx
+#: src/components/settings/DisplaySettings.tsx
+#: src/pages/app/SettingsPage.tsx
 msgid "Display"
 msgstr "显示"
 
-#: src/pages/app/DonatePage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/app/DonatePage.tsx
 msgid "Donate"
 msgstr "捐赠"
 
@@ -302,15 +334,14 @@ msgstr "下载"
 msgid "Drag link to bookmark bar"
 msgstr "拖动链接到书签栏"
 
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/auth/PasswordRecoveryPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
-#: src/components/settings/ProfileSettings.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/auth/RegistrationPage.tsx
 msgid "E-mail address"
 msgstr "电子邮件地址"
@@ -319,8 +350,8 @@ msgstr "电子邮件地址"
 msgid "Edit user"
 msgstr "编辑用户"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Enabled"
 msgstr "已启用"
 
@@ -344,10 +375,6 @@ msgstr "条目头部"
 msgid "Error"
 msgstr "错误"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "Example: {example}."
-msgstr "示例：{示例}。"
-
 #: src/components/header/ProfileMenu.tsx
 msgid "Expanded"
 msgstr "展开"
@@ -356,8 +383,8 @@ msgstr "展开"
 msgid "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
 msgstr "将您的订阅和类别导出为 OPML 文件，可以在其它信息流阅读服务中导入"
 
-#: src/pages/WelcomePage.tsx
 #: src/components/header/Header.tsx
+#: src/pages/WelcomePage.tsx
 msgid "Extension options"
 msgstr "扩展选项"
 
@@ -365,9 +392,8 @@ msgstr "扩展选项"
 msgid "Feed name"
 msgstr "信息流名称"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/FeedDetailsPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Feed URL"
 msgstr "信息流网址"
 
@@ -399,9 +425,9 @@ msgstr "强制获取订阅源功能不可用。"
 msgid "Forgot password?"
 msgstr "忘记密码？"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generate an API key in your profile first."
 msgstr "首先在您的配置文件中生成一个 API 密钥。"
 
@@ -409,9 +435,9 @@ msgstr "首先在您的配置文件中生成一个 API 密钥。"
 msgid "Generate new API key"
 msgstr "生成新的 API 密钥"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Generated feed url"
 msgstr "生成信息流网址"
 
@@ -432,6 +458,14 @@ msgstr "API 文档"
 msgid "Goodies"
 msgstr "好东西"
 
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API"
+msgstr ""
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Google Reader API URL"
+msgstr ""
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Grape"
 msgstr "深紫"
@@ -448,10 +482,6 @@ msgstr "绿"
 msgid "Id"
 msgstr "序号"
 
-#: src/pages/app/FeedDetailsPage.tsx
-msgid "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
-msgstr "如果不为空，则表达式的计算结果为“真”或“假”。如果为“假”，则此信息流的新条目将自动标记为已读。"
-
 #: src/components/settings/DisplaySettings.tsx
 msgid "If the entry doesn't entirely fit on the screen"
 msgstr "如果条目不能完全显示在屏幕上"
@@ -472,13 +502,21 @@ msgstr "在展开视图中，滚动条目将它们标记为已读"
 msgid "Indigo"
 msgstr "靛蓝"
 
-#: src/components/content/FeedEntryFooter.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Initial Setup"
+msgstr "初始化设置"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Invalid password reset link. Please request a new one."
+msgstr "密码重置链接无效，请重新申请。"
+
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Keep unread"
 msgstr "保持未读状态"
 
-#: src/pages/app/AboutPage.tsx
 #: src/components/content/FeedEntries.tsx
+#: src/pages/app/AboutPage.tsx
 msgid "Keyboard shortcuts"
 msgstr "键盘快捷键"
 
@@ -506,9 +544,9 @@ msgstr "浅色"
 msgid "Lime"
 msgstr "浅黄"
 
-#: src/pages/app/TagDetailsPage.tsx
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/TagDetailsPage.tsx
 msgid "Link"
 msgstr "链接"
 
@@ -532,9 +570,8 @@ msgstr "正在加载订阅..."
 msgid "Loading tags..."
 msgstr "正在加载标签..."
 
+#: src/pages/auth/LoginPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 msgid "Log in"
 msgstr "登录"
 
@@ -546,8 +583,8 @@ msgstr "注销"
 msgid "Long press"
 msgstr "长按"
 
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
 msgid "Manage users"
 msgstr "管理用户"
 
@@ -555,21 +592,25 @@ msgstr "管理用户"
 msgid "Mark all as read"
 msgstr "全部标记为已读"
 
-#: src/components/MarkAllAsReadConfirmationDialog.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
+#: src/components/MarkAllAsReadConfirmationDialog.tsx
 msgid "Mark all entries as read"
 msgstr "将所有条目标记为已读"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 msgid "Mark as read up to here"
 msgstr "标记为已读到这里"
 
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Mark entries in this feed as read after this number of days. Leave empty to disable."
+msgstr "在此天数后将此信息流中的条目标记为已读。留空以禁用。"
+
 #: src/components/header/ProfileMenu.tsx
 msgid "Metrics"
 msgstr "指标"
@@ -586,15 +627,15 @@ msgstr "下移页面"
 msgid "Move the page up"
 msgstr "上移页面"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/components/RelativeDate.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "N/A"
 msgstr "不适用"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/pages/admin/AdminUsersPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Name"
 msgstr "​​名称"
 
@@ -606,7 +647,6 @@ msgstr "通过输入订阅名称导航到订阅"
 msgid "Navigate to the next category/feed with unread entries when marking all entries as read"
 msgstr "将所有条目标记为已读时导航到下一个包含未读条目的类别/信息流"
 
-#: src/components/settings/DisplaySettings.tsx
 #: src/components/settings/DisplaySettings.tsx
 msgid "Never"
 msgstr "从不"
@@ -615,12 +655,16 @@ msgstr "从不"
 msgid "New password"
 msgstr "新密码"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "New Password"
+msgstr "新密码"
+
 #: src/pages/app/AboutPage.tsx
 msgid "Newest first"
 msgstr "最新的优先"
 
-#: src/components/header/Header.tsx
 #: src/components/content/add/Subscribe.tsx
+#: src/components/header/Header.tsx
 msgid "Next"
 msgstr "下一个"
 
@@ -717,7 +761,6 @@ msgstr "OPML"
 msgid "OPML export"
 msgstr "OPML 导出"
 
-#: src/components/content/add/ImportOpml.tsx
 #: src/components/content/add/ImportOpml.tsx
 msgid "OPML file"
 msgstr "OPML 文件"
@@ -742,19 +785,22 @@ msgstr "父类别"
 msgid "Parent Category"
 msgstr "父类别"
 
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/LoginPage.tsx
-#: src/pages/auth/LoginPage.tsx
 #: src/components/admin/UserEdit.tsx
+#: src/pages/auth/InitialSetupPage.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
 msgid "Password"
 msgstr "密码"
 
+#: src/hooks/useValidationRules.ts
+msgid "Password must be at least {minimumPasswordLength} characters"
+msgstr "密码最少需要 {minimumPasswordLength} 个字符"
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Password Recovery"
 msgstr "密码恢复"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
 msgid "Passwords do not match"
 msgstr "密码不匹配"
 
@@ -762,8 +808,8 @@ msgstr "密码不匹配"
 msgid "Pink"
 msgstr "粉红"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
 msgid "Position"
 msgstr "位置"
 
@@ -779,6 +825,31 @@ msgstr "主颜色"
 msgid "Profile"
 msgstr "配置文件"
 
+#: 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 "此 CommaFeed 实例未启用推送通知。"
+
+#: src/components/ReceivePushNotificationsChechbox.tsx
+msgid "Receive push notifications"
+msgstr "接收推送通知"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Receive push notifications when new feed entries are discovered. Enable \"Receive push notifications\" in the settings of each feed for which you want to receive notifications."
+msgstr "当发现新的信息流条目时接收推送通知。在您希望接收通知的每个信息流设置中启用“接收推送通知”。"
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "Recover password"
 msgstr "找回密码"
@@ -787,8 +858,8 @@ msgstr "找回密码"
 msgid "Red"
 msgstr "红"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/header/Header.tsx
+#: src/components/KeyboardShortcutsHelp.tsx
 msgid "Refresh"
 msgstr "刷新"
 
@@ -796,20 +867,24 @@ msgstr "刷新"
 msgid "Registrations are closed on this CommaFeed instance"
 msgstr "此 CommaFeed 实例上的注册已关闭"
 
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Reset Password"
+msgstr "重置密码"
+
 #: src/pages/app/AboutPage.tsx
 msgid "REST API"
 msgstr "REST API"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Right click"
 msgstr "右键单击"
 
-#: src/pages/app/FeedDetailsPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
-#: src/components/settings/ProfileSettings.tsx
-#: src/components/settings/CustomCodeSettings.tsx
 #: 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"
 msgstr "保存"
 
@@ -825,17 +900,11 @@ msgstr "在条目之间导航时平滑滚动"
 msgid "Scrolling"
 msgstr "滚动"
 
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/sidebar/TreeSearch.tsx
-#: src/components/header/Header.tsx
 #: src/components/header/Header.tsx
+#: src/components/sidebar/TreeSearch.tsx
 msgid "Search"
 msgstr "搜索"
 
-#: src/components/header/Header.tsx
-msgid "Search requires at least 3 characters"
-msgstr "搜索至少需要 3 个字符"
-
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Select next unread feed/category"
 msgstr "选择下一个未读信息流/类别"
@@ -844,6 +913,10 @@ msgstr "选择下一个未读信息流/类别"
 msgid "Select previous unread feed/category"
 msgstr "选择上一个未读信息流/类别"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Server URL"
+msgstr "服务器网址"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Set focus on next entry without opening it"
 msgstr "将焦点放在下一个条目而不打开它"
@@ -868,8 +941,6 @@ msgstr "分享"
 msgid "Sharing sites"
 msgstr "共享站点"
 
-#: src/components/KeyboardShortcutsHelp.tsx
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Shift"
 msgstr "Shift"
@@ -918,9 +989,8 @@ msgstr "在标签页图标上显示未读数量"
 msgid "Show unread count in tab title"
 msgstr "在标签页标题中显示未读数量"
 
+#: src/pages/auth/RegistrationPage.tsx
 #: src/pages/WelcomePage.tsx
-#: src/pages/auth/RegistrationPage.tsx
-#: src/pages/auth/RegistrationPage.tsx
 msgid "Sign up"
 msgstr "注册"
 
@@ -928,26 +998,24 @@ msgstr "注册"
 msgid "Something bad just happened..."
 msgstr "刚刚发生了不好的事情……"
 
-#: src/components/KeyboardShortcutsHelp.tsx
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Space"
 msgstr "空格"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Star"
 msgstr "星标"
 
-#: src/pages/app/FeedEntriesPage.tsx
-#: src/pages/app/CategoryDetailsPage.tsx
 #: src/components/sidebar/Tree.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedEntriesPage.tsx
 msgid "Starred"
 msgstr "已加星标"
 
+#: src/components/content/add/Subscribe.tsx
 #: src/pages/app/AddPage.tsx
-#: src/components/content/add/Subscribe.tsx
-#: src/components/content/add/Subscribe.tsx
 msgid "Subscribe"
 msgstr "订阅"
 
@@ -979,7 +1047,6 @@ msgstr "切换到浅色主题"
 msgid "System"
 msgstr "跟随系统"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryFooter.tsx
 msgid "Tags"
 msgstr "标签"
@@ -988,6 +1055,14 @@ msgstr "标签"
 msgid "Teal"
 msgstr "青绿"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test"
+msgstr "测试"
+
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Test notification sent successfully."
+msgstr "测试通知发送成功。"
+
 #: src/components/content/add/Subscribe.tsx
 msgid "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
 msgstr "您要订阅的信息流的网址。您也可以直接使用网站的网址，CommaFeed 会尝试在页面中找到信息流。"
@@ -996,9 +1071,18 @@ msgstr "您要订阅的信息流的网址。您也可以直接使用网站的网
 msgid "Theme"
 msgstr "主题"
 
+#. placeholder {0}: feed.filterLegacy
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "This feed has a legacy filter that cannot be edited and is not applied. Please recreate the filter using the new expression editor. The legacy filter expression was: <0>{0}</0>"
+msgstr "此信息流具有无法编辑且未应用的旧版过滤器。请使用新的表达式编辑器重新创建过滤器。旧版过滤器表达式为：<0>{0}</0>"
+
 #: src/components/settings/ProfileSettings.tsx
-msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API. Use the form at the bottom of the page to generate a new API key"
+msgid "This is your API key. It can be used for some read-only API operations and grants access to the Fever API and the Google Reader API. Use the form at the bottom of the page to generate a new API key"
-msgstr "这是您的API 密钥，它可以被用于Fever API的只读操作及访问授权。使用页面底部的表单生成一个新的API密钥。"
+msgstr "这是您的 API 密钥。它可用于某些只读 API 操作，并授予对 Fever API 和 Google Reader API 的访问权限。使用页面底部的表单生成新的 API 密钥"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "This setting can cause scrolling issues on some browsers (e.g. Safari)"
+msgstr "此设置在部分浏览器（例如 Safari）中可能导致滚动问题"
 
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Toggle read status of current entry"
@@ -1012,6 +1096,10 @@ msgstr "切换侧边栏"
 msgid "Toggle starred status of current entry"
 msgstr "切换当前条目的星标状态"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "Topic"
+msgstr "主题"
+
 #: src/pages/auth/LoginPage.tsx
 msgid "Try out CommaFeed with the demo account: demo/demo"
 msgstr "使用演示帐户试用 CommaFeed：demo/demo"
@@ -1024,22 +1112,24 @@ msgstr "尝试 demo！"
 msgid "Unread"
 msgstr "未读"
 
-#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/FeedEntryContextMenu.tsx
+#: src/components/content/FeedEntryFooter.tsx
 #: src/components/content/header/Star.tsx
 msgid "Unstar"
 msgstr "取消星标"
 
-#: src/pages/app/FeedDetailsPage.tsx
 #: src/pages/app/FeedDetailsPage.tsx
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
+#: src/components/settings/PushNotificationSettings.tsx
+msgid "User key"
+msgstr "用户密钥"
+
 #: src/components/settings/ProfileSettings.tsx
 msgid "User name"
 msgstr "用户名"
 
-#: src/pages/auth/LoginPage.tsx
 #: src/pages/auth/LoginPage.tsx
 msgid "User Name or E-mail"
 msgstr "用户名或电子邮件"
@@ -1056,6 +1146,10 @@ msgstr "警告"
 msgid "Website"
 msgstr "网站"
 
+#: src/pages/auth/InitialSetupPage.tsx
+msgid "Welcome! This appears to be the first time you're running CommaFeed. Please create an administrator account to get started."
+msgstr "欢迎！当前页仅当您第一次使用CommaFeed时出现，请创建一个管理员帐号以开始使用。"
+
 #: src/components/settings/DisplaySettings.tsx
 msgid "Yellow"
 msgstr "黄"
@@ -1067,3 +1161,7 @@ msgstr "您还没有任何订阅。"
 #: src/components/header/ProfileMenu.tsx
 msgid "Your feeds have been queued for refresh."
 msgstr "您的订阅已经进入刷新队列。"
+
+#: src/pages/auth/PasswordResetPage.tsx
+msgid "Your password has been changed. You can now log in with your new password."
+msgstr "您的密码已更改。您现在可以使用新密码登录。"

commafeed-client/src/main.tsx

@@ -15,9 +15,10 @@ dayjs.extend(relativeTime)
 dayjs.extend(duration)
 
 const root = document.getElementById("root")
-root &&
+if (!root) throw new Error("root element not found")
-    ReactDOM.createRoot(root).render(
+
-        <Provider store={store}>
+ReactDOM.createRoot(root).render(
-            <App />
+    <Provider store={store}>
-        </Provider>
+        <App />
-    )
+    </Provider>
+)

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.feed.FeedRefreshEngine.notifier.active": "Feed Refresh Engine active push notifications workers",
-    "com.commafeed.backend.HttpGetter.pool.size": "HttpGetter current pool size",
+    "com.commafeed.backend.feed.FeedRefreshEngine.notifier.queue": "Feed Refresh Engine queued push notifications workers",
-    "com.commafeed.backend.HttpGetter.pool.leased": "HttpGetter active connections",
-    "com.commafeed.backend.HttpGetter.pool.pending": "HttpGetter waiting for a connection",
     "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",
@@ -35,10 +33,11 @@ export function MetricsPage() {
         setLoading: state => ({ ...state, loading: true }),
     })
 
+    const { execute } = query
     useEffect(() => {
-        const interval = setInterval(() => query.execute(), 2000)
+        const interval = setInterval(() => execute(), 2000)
         return () => clearInterval(interval)
-    }, [query.execute])
+    }, [execute])
 
     if (!query.result) return <Loader />
     const { meters, gauges } = query.result.data

commafeed-client/src/pages/app/AboutPage.tsx

@@ -107,7 +107,7 @@ export function AboutPage() {
                     <List>
                         <List.Item>
                             <Anchor href={Constants.browserExtensionUrl} target="_blank" rel="noreferrer">
-                                <Trans>Browser extention</Trans>
+                                <Trans>Browser extension</Trans>
                             </Anchor>
                         </List.Item>
                         <List.Item>

commafeed-client/src/pages/app/FeedDetailsPage.tsx

@@ -1,10 +1,27 @@
+import { msg } from "@lingui/core/macro"
+import { useLingui } from "@lingui/react"
 import { Trans } from "@lingui/react/macro"
-import { Anchor, Box, Button, Code, Container, Divider, Group, Input, NumberInput, Stack, Text, TextInput, Title } from "@mantine/core"
+import {
+    Anchor,
+    Box,
+    Button,
+    Code,
+    Container,
+    Divider,
+    Group,
+    Input,
+    Alert as MantineAlert,
+    NumberInput,
+    Stack,
+    Text,
+    TextInput,
+    Title,
+} from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { openConfirmModal } from "@mantine/modals"
 import { useEffect } from "react"
 import { useAsync, useAsyncCallback } from "react-async-hook"
-import { TbDeviceFloppy, TbTrash } from "react-icons/tb"
+import { TbAlertTriangle, TbDeviceFloppy, TbTrash } from "react-icons/tb"
 import { useParams } from "react-router-dom"
 import { client, errorToStrings } from "@/app/client"
 import { redirectToRootCategory, redirectToSelectedSource } from "@/app/redirect/thunks"
@@ -13,46 +30,17 @@ import { reloadTree } from "@/app/tree/thunks"
 import type { FeedModificationRequest } from "@/app/types"
 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"
 
-function FilteringExpressionDescription() {
-    const example = <Code>url.contains('youtube') or (author eq 'athou' and title.contains('github'))</Code>
-    return (
-        <div>
-            <div>
-                <Trans>
-                    If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read
-                    automatically.
-                </Trans>
-            </div>
-            <div>
-                <Trans>
-                    Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case
-                    to ease string comparison.
-                </Trans>
-            </div>
-            <div>
-                <Trans>Example: {example}.</Trans>
-            </div>
-            <div>
-                <Trans>
-                    <span>Complete syntax is available </span>
-                    <a href="https://commons.apache.org/proper/commons-jexl/reference/syntax.html" target="_blank" rel="noreferrer">
-                        here
-                    </a>
-                    <span>.</span>
-                </Trans>
-            </div>
-        </div>
-    )
-}
-
 export function FeedDetailsPage() {
     const { id } = useParams()
-    if (!id) throw Error("id required")
+    if (!id) throw new Error("id required")
 
     const apiKey = useAppSelector(state => state.user.profile?.apiKey)
+    const { _ } = useLingui()
     const dispatch = useAppDispatch()
     const query = useAsync(async () => await client.feed.get(id), [id])
     const feed = query.result?.data
@@ -158,11 +146,36 @@ 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} />
-                    <TextInput
+                    <ReceivePushNotificationsChechbox {...form.getInputProps("pushNotificationsEnabled", { type: "checkbox" })} />
-                        label={<Trans>Filtering expression</Trans>}
+                    <NumberInput
-                        description={<FilteringExpressionDescription />}
+                        label={<Trans>Auto-mark as read</Trans>}
-                        {...form.getInputProps("filter")}
+                        description={<Trans>Mark entries in this feed as read after this number of days. Leave empty to disable.</Trans>}
+                        suffix={` ${_(msg`days`)}`}
+                        {...form.getInputProps("autoMarkAsReadAfterDays")}
+                        min={1}
+                        max={3650}
                     />
+                    <Input.Wrapper
+                        label={<Trans>Filtering expression</Trans>}
+                        description={
+                            <Trans>
+                                Build a filter expression to indicate what you want to read. Entries that don't match will be marked as read
+                                automatically.
+                            </Trans>
+                        }
+                    >
+                        {feed.filterLegacy && (
+                            <MantineAlert color="yellow" icon={<TbAlertTriangle />}>
+                                <Trans>
+                                    This feed has a legacy filter that cannot be edited and is not applied. Please recreate the filter using
+                                    the new expression editor. The legacy filter expression was: <Code>{feed.filterLegacy}</Code>
+                                </Trans>
+                            </MantineAlert>
+                        )}
+                        <Box mt="xs">
+                            <FilteringExpressionEditor initialValue={feed.filter} onChange={value => form.setFieldValue("filter", value)} />
+                        </Box>
+                    </Input.Wrapper>
 
                     <Group>
                         <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>

commafeed-client/src/pages/app/FeedEntriesPage.tsx

@@ -8,9 +8,11 @@ import { Constants } from "@/app/constants"
 import type { EntrySourceType } from "@/app/entries/slice"
 import { loadEntries } from "@/app/entries/thunks"
 import { redirectToCategoryDetails, redirectToFeedDetails, redirectToTagDetails } from "@/app/redirect/thunks"
-import { useAppDispatch, useAppSelector } from "@/app/store"
+import { useAppDispatch, useAppSelector, useShallowEqualAppSelector } from "@/app/store"
-import { flattenCategoryTree } from "@/app/utils"
+import { categoryHasNewEntries, categoryUnreadCount, flattenCategoryTree } from "@/app/utils"
 import { FeedEntries } from "@/components/content/FeedEntries"
+import { UnreadCount } from "@/components/sidebar/UnreadCount"
+import { useMobile } from "@/hooks/useMobile"
 import { tss } from "@/tss"
 
 function NoSubscriptionHelp() {
@@ -33,6 +35,12 @@ const useStyles = tss.create(() => ({
     sourceWebsiteLink: {
         color: "inherit",
         textDecoration: "none",
+        overflow: "hidden",
+    },
+    titleText: {
+        overflow: "hidden",
+        textOverflow: "ellipsis",
+        whiteSpace: "nowrap",
     },
 }))
 
@@ -48,6 +56,33 @@ export function FeedEntriesPage(props: Readonly<FeedEntriesPageProps>) {
     const sourceLabel = useAppSelector(state => state.entries.sourceLabel)
     const sourceWebsiteUrl = useAppSelector(state => state.entries.sourceWebsiteUrl)
     const hasMore = useAppSelector(state => state.entries.hasMore)
+    const mobile = useMobile()
+    const sidebarVisible = useAppSelector(state => state.tree.sidebarVisible)
+    const { unreadCount, hasNewEntries } = useShallowEqualAppSelector(state => {
+        const root = state.tree.rootCategory
+        if (!root) return { unreadCount: 0, hasNewEntries: false }
+
+        if (props.sourceType === "category") {
+            const category = id === Constants.categories.all.id ? root : flattenCategoryTree(root).find(c => c.id === id)
+            return {
+                unreadCount: categoryUnreadCount(category),
+                hasNewEntries: categoryHasNewEntries(category),
+            }
+        }
+
+        if (props.sourceType === "feed") {
+            const feed = flattenCategoryTree(root)
+                .flatMap(c => c.feeds)
+                .find(f => f.id === +id)
+            return {
+                unreadCount: feed?.unread ?? 0,
+                hasNewEntries: !!feed?.hasNewEntries,
+            }
+        }
+
+        return { unreadCount: 0, hasNewEntries: false }
+    })
+    const showUnreadCount = mobile || !sidebarVisible
     const dispatch = useAppDispatch()
 
     let title: React.ReactNode = sourceLabel
@@ -89,16 +124,23 @@ export function FeedEntriesPage(props: Readonly<FeedEntriesPageProps>) {
     return (
         // add some room at the bottom of the page in order to be able to scroll the current entry at the top of the page when expanding
         <Box mb={viewport.height * 0.7}>
-            <Group gap="xl" className="cf-entries-title">
+            <Group className="cf-entries-title" wrap="nowrap">
                 {sourceWebsiteUrl && (
                     <a href={sourceWebsiteUrl} target="_blank" rel="noreferrer" className={classes.sourceWebsiteLink}>
-                        <Title order={3}>{title}</Title>
+                        <Title order={3} className={classes.titleText}>
+                            {title}
+                        </Title>
                     </a>
                 )}
-                {!sourceWebsiteUrl && <Title order={3}>{title}</Title>}
+                {!sourceWebsiteUrl && (
+                    <Title order={3} className={classes.titleText}>
+                        {title}
+                    </Title>
+                )}
                 <ActionIcon onClick={titleClicked} variant="subtle" color={theme.primaryColor}>
                     <TbEdit size={18} />
                 </ActionIcon>
+                {showUnreadCount && <UnreadCount unreadCount={unreadCount} showIndicator={hasNewEntries} />}
             </Group>
 
             <FeedEntries />

commafeed-client/src/pages/app/Layout.tsx

@@ -1,10 +1,11 @@
 import { msg } from "@lingui/core/macro"
 import { ActionIcon, AppShell, Box, Center, Group, ScrollArea, Title, useMantineTheme } from "@mantine/core"
-import { type ReactNode, type RefObject, Suspense, useEffect, useRef } from "react"
+import { type ReactNode, type RefObject, Suspense, useEffect, useRef, useState } from "react"
 import Draggable from "react-draggable"
 import { TbMenu2, TbPlus, TbX } from "react-icons/tb"
 import { Outlet } from "react-router-dom"
 import { useSwipeable } from "react-swipeable"
+import Tinycon from "tinycon"
 import { Constants } from "@/app/constants"
 import { redirectToAdd, redirectToRootCategory } from "@/app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "@/app/store"
@@ -12,8 +13,10 @@ import { setMobileMenuOpen } from "@/app/tree/slice"
 import { reloadTree } from "@/app/tree/thunks"
 import { setSidebarWidth } from "@/app/user/slice"
 import { reloadProfile, reloadSettings, reloadTags } from "@/app/user/thunks"
+import { categoryUnreadCount } from "@/app/utils"
 import { ActionButton } from "@/components/ActionButton"
 import { AnnouncementDialog } from "@/components/AnnouncementDialog"
+import { DisablePullToRefresh } from "@/components/DisablePullToRefresh"
 import { Loader } from "@/components/Loader"
 import { Logo } from "@/components/Logo"
 import { MarkAllAsReadConfirmationDialog } from "@/components/MarkAllAsReadConfirmationDialog"
@@ -51,6 +54,78 @@ function LogoAndTitle() {
     )
 }
 
+function UnreadCountTitleHandler({
+    enabled,
+}: Readonly<{
+    enabled?: boolean
+}>) {
+    const root = useAppSelector(state => state.tree.rootCategory)
+    const unreadCount = categoryUnreadCount(root)
+    return <title>{enabled && unreadCount > 0 ? `(${unreadCount}) CommaFeed` : "CommaFeed"}</title>
+}
+
+function UnreadCountFaviconHandler({ enabled }: { enabled?: boolean }) {
+    const root = useAppSelector(state => state.tree.rootCategory)
+    const unreadCount = categoryUnreadCount(root)
+    useEffect(() => {
+        if (enabled && unreadCount > 0) {
+            Tinycon.setBubble(unreadCount)
+        } else {
+            Tinycon.reset()
+        }
+    }, [unreadCount, enabled])
+
+    return null
+}
+
+function BrowserExtensionBadgeUnreadCountHandler() {
+    const root = useAppSelector(state => state.tree.rootCategory)
+    const { setBadgeUnreadCount } = useBrowserExtension()
+    useEffect(() => {
+        if (!root) return
+        const unreadCount = categoryUnreadCount(root)
+        setBadgeUnreadCount(unreadCount)
+    }, [root, setBadgeUnreadCount])
+
+    return null
+}
+
+function CustomJsHandler() {
+    const [scriptLoaded, setScriptLoaded] = useState(false)
+    const { loading } = useAppLoading()
+
+    useEffect(() => {
+        if (scriptLoaded || loading) {
+            return
+        }
+
+        const script = document.createElement("script")
+        script.src = "custom_js.js"
+        script.async = true
+        document.body.appendChild(script)
+
+        setScriptLoaded(true)
+
+        return () => script.remove()
+    }, [scriptLoaded, loading])
+
+    return null
+}
+
+function CustomCssHandler() {
+    useEffect(() => {
+        const link = document.createElement("link")
+        link.rel = "stylesheet"
+        link.type = "text/css"
+        link.href = "custom_css.css"
+        document.head.appendChild(link)
+
+        return () => link.remove()
+    }, [])
+
+    return null
+}
+
 const useStyles = tss
     .withParams<{
         sidebarWidth: number
@@ -75,6 +150,9 @@ export default function Layout(props: Readonly<LayoutProps>) {
     const draggableSeparator = useRef<HTMLDivElement>(null)
 
     const { loading } = useAppLoading()
+    const unreadCountTitle = useAppSelector(state => state.user.settings?.unreadCountTitle)
+    const unreadCountFavicon = useAppSelector(state => state.user.settings?.unreadCountFavicon)
+    const disablePullToRefresh = useAppSelector(state => state.user.settings?.disablePullToRefresh)
     const mobileMenuOpen = useAppSelector(state => state.tree.mobileMenuOpen)
     const webSocketConnected = useAppSelector(state => state.server.webSocketConnected)
     const treeReloadInterval = useAppSelector(state => state.server.serverInfos?.treeReloadInterval)
@@ -173,61 +251,69 @@ export default function Layout(props: Readonly<LayoutProps>) {
 
     if (loading) return <LoadingPage />
     return (
-        <Box {...swipeHandlers}>
+        <>
-            <AppShell
+            <UnreadCountTitleHandler enabled={unreadCountTitle} />
-                header={{ height: Constants.layout.headerHeight, collapsed: headerInFooter }}
+            <UnreadCountFaviconHandler enabled={unreadCountFavicon} />
-                footer={{ height: Constants.layout.headerHeight, collapsed: !headerInFooter }}
+            <BrowserExtensionBadgeUnreadCountHandler />
-                navbar={{
+            <CustomJsHandler />
-                    width: sidebarWidth,
+            <CustomCssHandler />
-                    breakpoint: Constants.layout.mobileBreakpoint,
+            <DisablePullToRefresh enabled={disablePullToRefresh} />
-                    collapsed: { mobile: !mobileMenuOpen, desktop: !props.sidebarVisible },
+            <Box {...swipeHandlers}>
-                }}
+                <AppShell
-                padding={{ base: 6, [Constants.layout.mobileBreakpointName]: "md" }}
+                    header={{ height: Constants.layout.headerHeight, collapsed: headerInFooter }}
-            >
+                    footer={{ height: Constants.layout.headerHeight, collapsed: !headerInFooter }}
-                <AppShell.Header>{!headerInFooter && header}</AppShell.Header>
+                    navbar={{
-                <AppShell.Footer>{headerInFooter && header}</AppShell.Footer>
+                        width: sidebarWidth,
-                <AppShell.Navbar p={sidebarPadding}>
+                        breakpoint: Constants.layout.mobileBreakpoint,
-                    <AppShell.Section grow component={ScrollArea} mx="-sm" px="sm">
+                        collapsed: { mobile: !mobileMenuOpen, desktop: !props.sidebarVisible },
-                        <Box className={classes.sidebarContent}>{props.sidebar}</Box>
+                    }}
-                    </AppShell.Section>
+                    padding={{ base: 6, [Constants.layout.mobileBreakpointName]: "md" }}
-                </AppShell.Navbar>
+                >
-                <OnDesktop>
+                    <AppShell.Header>{!headerInFooter && header}</AppShell.Header>
-                    <Draggable
+                    <AppShell.Footer>{headerInFooter && header}</AppShell.Footer>
-                        nodeRef={draggableSeparator as RefObject<HTMLElement>}
+                    <AppShell.Navbar p={sidebarPadding}>
-                        axis="x"
+                        <AppShell.Section grow component={ScrollArea} mx="-sm" px="sm">
-                        defaultPosition={{
+                            <Box className={classes.sidebarContent}>{props.sidebar}</Box>
-                            x: sidebarWidth,
+                        </AppShell.Section>
-                            y: 0,
+                    </AppShell.Navbar>
-                        }}
+                    <OnDesktop>
-                        bounds={{
+                        <Draggable
-                            left: 120,
+                            nodeRef={draggableSeparator as RefObject<HTMLElement>}
-                            right: 1000,
+                            axis="x"
-                        }}
+                            defaultPosition={{
-                        grid={[30, 30]}
+                                x: sidebarWidth,
-                        onDrag={(_e, data) => {
+                                y: 0,
-                            dispatch(setSidebarWidth(data.x))
-                        }}
-                    >
-                        <Box
-                            ref={draggableSeparator}
-                            style={{
-                                position: "fixed",
-                                height: "100%",
-                                width: "10px",
-                                cursor: "ew-resize",
                             }}
-                        />
+                            bounds={{
-                    </Draggable>
+                                left: 120,
-                </OnDesktop>
+                                right: 1000,
+                            }}
+                            grid={[30, 30]}
+                            onDrag={(_e, data) => {
+                                dispatch(setSidebarWidth(data.x))
+                            }}
+                        >
+                            <Box
+                                ref={draggableSeparator}
+                                style={{
+                                    position: "fixed",
+                                    height: "100%",
+                                    width: "10px",
+                                    cursor: "ew-resize",
+                                }}
+                            />
+                        </Draggable>
+                    </OnDesktop>
 
-                <AppShell.Main>
+                    <AppShell.Main>
-                    <Suspense fallback={<Loader />}>
+                        <Suspense fallback={<Loader />}>
-                        <AnnouncementDialog />
+                            <AnnouncementDialog />
-                        <MarkAllAsReadConfirmationDialog />
+                            <MarkAllAsReadConfirmationDialog />
-                        <Outlet />
+                            <Outlet />
-                    </Suspense>
+                        </Suspense>
-                </AppShell.Main>
+                    </AppShell.Main>
-            </AppShell>
+                </AppShell>
-        </Box>
+            </Box>
+        </>
     )
 }

commafeed-client/src/pages/app/SettingsPage.tsx

@@ -1,9 +1,10 @@
 import { Trans } from "@lingui/react/macro"
 import { Container, Tabs } from "@mantine/core"
-import { TbCode, TbPhoto, TbUser } from "react-icons/tb"
+import { TbBell, TbCode, TbPhoto, TbUser } from "react-icons/tb"
 import { CustomCodeSettings } from "@/components/settings/CustomCodeSettings"
 import { DisplaySettings } from "@/components/settings/DisplaySettings"
 import { ProfileSettings } from "@/components/settings/ProfileSettings"
+import { PushNotificationSettings } from "@/components/settings/PushNotificationSettings"
 
 export function SettingsPage() {
     return (
@@ -13,6 +14,9 @@ export function SettingsPage() {
                     <Tabs.Tab value="display" leftSection={<TbPhoto size={16} />}>
                         <Trans>Display</Trans>
                     </Tabs.Tab>
+                    <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>
                     </Tabs.Tab>
@@ -25,6 +29,10 @@ export function SettingsPage() {
                     <DisplaySettings />
                 </Tabs.Panel>
 
+                <Tabs.Panel value="push-notifications" pt="xl">
+                    <PushNotificationSettings />
+                </Tabs.Panel>
+
                 <Tabs.Panel value="customCode" pt="xl">
                     <CustomCodeSettings />
                 </Tabs.Panel>

commafeed-client/src/pages/auth/InitialSetupPage.tsx

@@ -0,0 +1,95 @@
+import { msg } from "@lingui/core/macro"
+import { useLingui } from "@lingui/react"
+import { Trans } from "@lingui/react/macro"
+import { Box, Button, Container, Paper, PasswordInput, Stack, TextInput, Title } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { useAsyncCallback } from "react-async-hook"
+import { client, errorToStrings } from "@/app/client"
+import { redirectToRootCategory } from "@/app/redirect/thunks"
+import { useAppDispatch } from "@/app/store"
+import type { InitialSetupRequest } from "@/app/types"
+import { Alert } from "@/components/Alert"
+import { useValidationRules } from "@/hooks/useValidationRules"
+import { PageTitle } from "@/pages/PageTitle"
+
+export function InitialSetupPage() {
+    const dispatch = useAppDispatch()
+    const { _ } = useLingui()
+    const validationRules = useValidationRules()
+
+    const form = useForm<InitialSetupRequest>({
+        initialValues: {
+            name: "",
+            password: "",
+            email: "",
+        },
+        validate: {
+            password: validationRules.password,
+        },
+        validateInputOnChange: true,
+    })
+
+    const login = useAsyncCallback(client.user.login, {
+        onSuccess: () => {
+            dispatch(redirectToRootCategory())
+        },
+    })
+
+    const setup = useAsyncCallback(client.user.initialSetup, {
+        onSuccess: () => {
+            login.execute(form.values)
+        },
+    })
+
+    return (
+        <Container size="xs">
+            <PageTitle />
+            <Paper>
+                <Title order={2} mb="md">
+                    <Trans>Initial Setup</Trans>
+                </Title>
+                <Box mb="md">
+                    <Trans>
+                        Welcome! This appears to be the first time you're running CommaFeed. Please create an administrator account to get
+                        started.
+                    </Trans>
+                </Box>
+                {setup.error && (
+                    <Box mb="md">
+                        <Alert messages={errorToStrings(setup.error)} />
+                    </Box>
+                )}
+                <form onSubmit={form.onSubmit(setup.execute)}>
+                    <Stack>
+                        <TextInput
+                            label={<Trans>Admin user name</Trans>}
+                            placeholder={_(msg`Admin user name`)}
+                            {...form.getInputProps("name")}
+                            size="md"
+                            required
+                            autoCapitalize="off"
+                        />
+                        <PasswordInput
+                            label={<Trans>Password</Trans>}
+                            placeholder={_(msg`Password`)}
+                            {...form.getInputProps("password")}
+                            size="md"
+                            required
+                        />
+                        <TextInput
+                            type="email"
+                            label={<Trans>E-mail</Trans>}
+                            placeholder={_(msg`E-mail`)}
+                            {...form.getInputProps("email")}
+                            size="md"
+                        />
+
+                        <Button type="submit" loading={setup.loading}>
+                            <Trans>Create Admin Account</Trans>
+                        </Button>
+                    </Stack>
+                </form>
+            </Paper>
+        </Container>
+    )
+}

commafeed-client/src/pages/auth/PasswordResetPage.tsx

@@ -0,0 +1,119 @@
+import { msg } from "@lingui/core/macro"
+import { useLingui } from "@lingui/react"
+import { Trans } from "@lingui/react/macro"
+import { Anchor, Box, Button, Center, Container, Group, Paper, PasswordInput, Stack, Title } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { useState } from "react"
+import { useAsyncCallback } from "react-async-hook"
+import { Link, useSearchParams } from "react-router-dom"
+import { client, errorToStrings } from "@/app/client"
+import { Alert } from "@/components/Alert"
+import { useValidationRules } from "@/hooks/useValidationRules"
+import { PageTitle } from "@/pages/PageTitle"
+
+interface PasswordResetFormValues {
+    password: string
+    passwordConfirmation: string
+}
+
+export function PasswordResetPage() {
+    const [message, setMessage] = useState("")
+    const [searchParams] = useSearchParams()
+    const { _ } = useLingui()
+    const validationRules = useValidationRules()
+
+    const email = searchParams.get("email") ?? ""
+    const token = searchParams.get("token") ?? ""
+
+    const form = useForm<PasswordResetFormValues>({
+        initialValues: {
+            password: "",
+            passwordConfirmation: "",
+        },
+        validate: {
+            password: validationRules.password,
+            passwordConfirmation: (value, values) => validationRules.passwordConfirmation(value, values.password),
+        },
+        validateInputOnChange: true,
+    })
+
+    const resetPassword = useAsyncCallback(client.user.passwordResetCallback, {
+        onSuccess: () => {
+            setMessage(_(msg`Your password has been changed. You can now log in with your new password.`))
+            form.reset()
+        },
+    })
+
+    const isMissingParams = !email || !token
+
+    return (
+        <Container size="xs">
+            <PageTitle />
+            <Paper>
+                <Title order={2} mb="md">
+                    <Trans>Reset Password</Trans>
+                </Title>
+
+                {resetPassword.error && (
+                    <Box mb="md">
+                        <Alert messages={errorToStrings(resetPassword.error)} />
+                    </Box>
+                )}
+
+                {isMissingParams && (
+                    <Box mb="md">
+                        <Alert messages={[_(msg`Invalid password reset link. Please request a new one.`)]} />
+                    </Box>
+                )}
+
+                {message && (
+                    <Box mb="md">
+                        <Alert level="success" messages={[message]} />
+                    </Box>
+                )}
+
+                {!isMissingParams && !message && (
+                    <form
+                        onSubmit={form.onSubmit(values => {
+                            resetPassword.execute({
+                                email,
+                                token,
+                                password: values.password,
+                            })
+                        })}
+                    >
+                        <Stack>
+                            <PasswordInput
+                                label={<Trans>New Password</Trans>}
+                                placeholder={_(msg`New Password`)}
+                                {...form.getInputProps("password")}
+                                size="md"
+                                required
+                            />
+
+                            <PasswordInput
+                                label={<Trans>Confirm Password</Trans>}
+                                placeholder={_(msg`Confirm Password`)}
+                                {...form.getInputProps("passwordConfirmation")}
+                                size="md"
+                                required
+                            />
+
+                            <Button type="submit" loading={resetPassword.loading}>
+                                <Trans>Reset Password</Trans>
+                            </Button>
+                        </Stack>
+                    </form>
+                )}
+
+                <Center mt="md">
+                    <Group>
+                        <Anchor component={Link} to="/login">
+                            <Trans>Back to log in</Trans>
+                        </Anchor>
+                    </Group>
+                </Center>
+            </Paper>
+        </Container>
+    )
+}

commafeed-client/src/pages/auth/RegistrationPage.tsx

@@ -10,12 +10,14 @@ import { redirectToRootCategory } from "@/app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "@/app/store"
 import type { RegistrationRequest } from "@/app/types"
 import { Alert } from "@/components/Alert"
+import { useValidationRules } from "@/hooks/useValidationRules"
 import { PageTitle } from "@/pages/PageTitle"
 
 export function RegistrationPage() {
     const serverInfos = useAppSelector(state => state.server.serverInfos)
     const dispatch = useAppDispatch()
     const { _ } = useLingui()
+    const validationRules = useValidationRules()
 
     const form = useForm<RegistrationRequest>({
         initialValues: {
@@ -23,6 +25,10 @@ export function RegistrationPage() {
             password: "",
             email: "",
         },
+        validate: {
+            password: validationRules.password,
+        },
+        validateInputOnChange: true,
     })
 
     const login = useAsyncCallback(client.user.login, {
@@ -72,7 +78,7 @@ export function RegistrationPage() {
                                     placeholder={_(msg`E-mail address`)}
                                     {...form.getInputProps("email")}
                                     size="md"
-                                    required
+                                    required={serverInfos.emailAddressRequired}
                                 />
                                 <PasswordInput
                                     label={<Trans>Password</Trans>}

commafeed-client/tsconfig.json

@@ -8,12 +8,11 @@
         "lib": ["DOM", "DOM.Iterable", "ESNext"],
         "allowJs": false,
         "skipLibCheck": true,
-        "esModuleInterop": false,
         "allowSyntheticDefaultImports": true,
         "strict": true,
         "forceConsistentCasingInFileNames": true,
         "module": "ESNext",
-        "moduleResolution": "Node",
+        "moduleResolution": "bundler",
         "resolveJsonModule": true,
         "isolatedModules": true,
         "noEmit": true,

commafeed-client/vite.config.ts

@@ -1,29 +1,20 @@
 import { lingui } from "@lingui/vite-plugin"
-import react from "@vitejs/plugin-react"
+import babel from "@rolldown/plugin-babel"
-import { visualizer } from "rollup-plugin-visualizer"
+import react, { reactCompilerPreset } from "@vitejs/plugin-react"
 import { defineConfig } from "vite"
 import checker from "vite-plugin-checker"
-import tsconfigPaths from "vite-tsconfig-paths"
 
-// https://vitejs.dev/config/
 export default defineConfig(() => ({
     plugins: [
-        react({
+        react(),
-            babel: {
+        babel({
-                plugins: [
+            presets: [reactCompilerPreset()],
-                    // support for lingui macros
+            plugins: ["@lingui/babel-plugin-lingui-macro"],
-                    // needs to be before the react compiler plugin
-                    "@lingui/babel-plugin-lingui-macro",
-                    // react compiler
-                    ["babel-plugin-react-compiler", { target: "19" }],
-                ],
-            },
         }),
         lingui(),
-        tsconfigPaths(),
-        visualizer(),
         checker({
-            typescript: true,
+            // temporary disabled until TypeScript 7 exposes a stable api
+            // typescript: true,
             biome: {
                 command: "check",
                 flags: "--error-on-warnings",
@@ -45,22 +36,32 @@ export default defineConfig(() => ({
             "/logout": "http://localhost:8083",
         },
     },
-    build: {
+    resolve: {
-        chunkSizeWarningLimit: 3500,
+        tsconfigPaths: true,
-        rollupOptions: {
+    },
-            output: {
+    legacy: {
-                manualChunks: id => {
+        // required for websocket-heartbeat-js
-                    // output mantine as its own chunk because it is quite large
+        inconsistentCjsInterop: true,
-                    if (id.includes("@mantine")) {
-                        return "mantine"
-                    }
-                },
-            },
-        },
     },
     test: {
         environment: "jsdom",
         globals: true,
         setupFiles: "./src/setupTests.ts",
     },
+    build: {
+        chunkSizeWarningLimit: 4000,
+        rolldownOptions: {
+            output: {
+                codeSplitting: {
+                    groups: [
+                        // output mantine as its own chunk because it is quite large
+                        {
+                            name: "mantine",
+                            test: "@mantine",
+                        },
+                    ],
+                },
+            },
+        },
+    },
 }))

commafeed-server/dev/EclipseCodeFormatter.xml

@@ -1,401 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="23">
-    <profile kind="CodeFormatterProfile" name="CommaFeed" version="23">
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="48"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant" value="49"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="80"/>
-        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="48"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="49"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="48"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="140"/>
-        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="49"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="49"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="49"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="48"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="49"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="140"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-    </profile>
-</profiles>

commafeed-server/dev/checkstyle.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-          "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+		"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-          "https://checkstyle.org/dtds/configuration_1_3.dtd">
+		"https://checkstyle.org/dtds/configuration_1_3.dtd">
-          
+
 <module name="Checker">
 	<property name="charset" value="UTF-8" />
 	<property name="fileExtensions" value="java" />
@@ -40,11 +40,6 @@
 		<module name="AvoidStarImport" />
 		<module name="AvoidStaticImport" />
 		<module name="IllegalImport" />
-		<module name="ImportOrder">
-			<property name="groups" value="/^java\./,javax,jakarta,org,com" />
-			<property name="ordered" value="true" />
-			<property name="separated" value="true" />
-		</module>
 		<module name="RedundantImport" />
 		<module name="UnusedImports" />
 
@@ -60,7 +55,7 @@
 		<module name="EmptyCatchBlock">
 			<property name="exceptionVariableName" value="ignore|ignored" />
 			<message key="catch.block.empty"
-				value="Empty catch block. You can use the name 'ignore' or 'ignored' for the exception variable if you really want an empty catch block, but you should strongly consider at the very least logging something." />
+			         value="Empty catch block. You can use the name 'ignore' or 'ignored' for the exception variable if you really want an empty catch block, but you should strongly consider at the very least logging something." />
 		</module>
 		<module name="LeftCurly" />
 		<module name="NeedBraces" />
@@ -76,7 +71,7 @@
 		<module name="FallThrough" />
 		<module name="IllegalInstantiation">
 			<property name="classes"
-				value="java.lang.Boolean, java.lang.Byte, java.lang.Character, java.lang.Double, java.lang.Float, java.lang.Integer, java.lang.Long, java.lang.Short" />
+			          value="java.lang.Boolean, java.lang.Byte, java.lang.Character, java.lang.Double, java.lang.Float, java.lang.Integer, java.lang.Long, java.lang.Short" />
 		</module>
 		<module name="IllegalType" />
 		<module name="ModifiedControlVariable">
@@ -113,12 +108,6 @@
 		<module name="NoLineWrap" />
 		<module name="NoWhitespaceBefore" />
 		<module name="ParenPad" />
-		<module name="RegexpSinglelineJava">
-			<property name="format" value="^\t* +\t*\S" />
-			<property name="message" value="Line has leading space characters; indentation should be performed with tabs only." />
-			<property name="ignoreComments" value="true" />
-		</module>
-		<module name="WhitespaceAround" />
 
 	</module>
 </module>

commafeed-server/dev/eclipse.importorder

@@ -1,7 +0,0 @@
-#Organize Import Order
-#Wed Jan 29 15:15:04 CET 2025
-0=java
-1=javax
-2=jakarta
-3=org
-4=com

commafeed-server/src/main/docker/Dockerfile.jvm

@@ -1,4 +1,4 @@
-FROM ibm-semeru-runtimes:open-21.0.8_9-jre@sha256:551139c6639d176c9591c2e2eee16b0092b97a31761c8a9202cf9fffc844d845
+FROM ibm-semeru-runtimes:open-jdk-25.0.4.0-jre@sha256:02888a2306c2cb8af22a05b2c41be90fdc9df5f4611861ddf6ea90c874de65e6
 EXPOSE 8082
 
 RUN mkdir -p /commafeed/data

commafeed-server/src/main/docker/Dockerfile.native

@@ -1,4 +1,4 @@
-FROM debian:12.11@sha256:b6507e340c43553136f5078284c8c68d86ec8262b1724dde73c325e8d3dcdeba
+FROM debian:13.6@sha256:34cd9e9fd437c0a095ec39cb2e73422c9f30821b0d0848ed74fd0d43bae4d958
 ARG TARGETARCH
 
 EXPOSE 8082
@@ -6,7 +6,7 @@ EXPOSE 8082
 RUN mkdir -p /commafeed/data
 VOLUME /commafeed/data
 
-COPY artifacts/commafeed-*-${TARGETARCH}-runner /commafeed/application
+COPY artifacts/commafeed-*-${TARGETARCH}-runner /commafeed/commafeed
 WORKDIR /commafeed
 
-CMD ["./application"]
+CMD ["./commafeed"]

commafeed-server/src/main/docker/README.md

@@ -4,11 +4,11 @@ Official docker images for https://github.com/Athou/commafeed/
 
 ## Quickstart
 
-Start CommaFeed with a H2 embedded database. Then login as `admin/admin` on http://localhost:8082/
+Start CommaFeed with a H2 embedded database. The app will be accessible on http://localhost:8082/
 
 ### docker
 
-`docker run --name commafeed --detach --publish 8082:8082 --restart unless-stopped --volume /path/to/commafeed/db:/commafeed/data --memory 256M athou/commafeed:latest-h2`
+`docker run --name commafeed --detach --publish 8082:8082 --restart unless-stopped --volume /path/to/commafeed/data:/commafeed/data --memory 256M athou/commafeed:latest-h2`
 
 ### docker-compose
 
@@ -18,7 +18,7 @@ services:
     image: athou/commafeed:latest-h2
     restart: unless-stopped
     volumes:
-      - /path/to/commafeed/db:/commafeed/data
+      - ./data:/commafeed/data
     deploy:
       resources:
         limits:
@@ -56,7 +56,7 @@ services:
       POSTGRES_PASSWORD: commafeed
       POSTGRES_DB: commafeed
     volumes:
-      - /path/to/commafeed/db:/var/lib/postgresql/data
+      - ./data:/var/lib/postgresql
 ```
 
 CommaFeed also supports:
@@ -93,3 +93,12 @@ Tags are of the form `<version>-<database>[-jvm]` where:
     - `master` (always points to the latest git commit)
 - `<database>` is the database to use (`h2`, `postgresql`, `mysql` or `mariadb`)
 - `-jvm` is optional and indicates that CommaFeed is running on a JVM, and not compiled natively.
+
+## FAQ
+
+### Getting "Access to local address blocked" when adding a feed
+
+CommaFeed blocks access to local resources by default to prevent [SSRF](https://en.wikipedia.org/wiki/Server-side_request_forgery) attacks.
+If you want to subscribe to feeds that are only available on your local network, you can disable this security measure by setting the `COMMAFEED_HTTP_CLIENT_BLOCK_LOCAL_ADDRESSES` variable to `false`.
+Do this only if you trust all users of your CommaFeed instance not to access private resources.
+

commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java

@@ -1,38 +1,54 @@
 package com.commafeed;
 
-import jakarta.enterprise.event.Observes;
-import jakarta.inject.Singleton;
-
 import com.commafeed.backend.feed.FeedRefreshEngine;
-import com.commafeed.backend.service.db.DatabaseStartupService;
+import com.commafeed.backend.feed.ImageProxyUrl;
 import com.commafeed.backend.task.TaskScheduler;
 import com.commafeed.security.password.PasswordConstraintValidator;
 
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;
-import lombok.RequiredArgsConstructor;
 
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Singleton;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.SystemProperties;
+
+@Slf4j
 @Singleton
 @RequiredArgsConstructor
 public class CommaFeedApplication {
 
-	private final DatabaseStartupService databaseStartupService;
+    private final FeedRefreshEngine feedRefreshEngine;
-	private final FeedRefreshEngine feedRefreshEngine;
+    private final TaskScheduler taskScheduler;
-	private final TaskScheduler taskScheduler;
+    private final CommaFeedConfiguration config;
-	private final CommaFeedConfiguration config;
 
-	public void start(@Observes StartupEvent ev) {
+    public void start(@Observes StartupEvent ev) {
-		PasswordConstraintValidator.setStrict(config.users().strictPasswordPolicy());
+        log.info("starting up...");
 
-		databaseStartupService.populateInitialData();
+        // disable entity expansion limits added in JDK24+ (#1961)
+        // we already strip doctype declarations in XMLCleaner to prevent xxe attacks
+        // we also already limit the size of feeds we download in HttpGetter
+        System.setProperty(SystemProperties.JDK_XML_MAX_GENERAL_ENTITY_SIZE_LIMIT, "0");
+        System.setProperty(SystemProperties.JDK_XML_TOTAL_ENTITY_SIZE_LIMIT, "0");
 
-		feedRefreshEngine.start();
+        PasswordConstraintValidator.setMinimumPasswordLength(
-		taskScheduler.start();
+                config.users().minimumPasswordLength());
-	}
 
-	public void stop(@Observes ShutdownEvent ev) {
+        if (config.imageProxyEnabled()) {
-		feedRefreshEngine.stop();
+            ImageProxyUrl.generateKey();
-		taskScheduler.stop();
+        }
-	}
 
+        feedRefreshEngine.start();
+        taskScheduler.start();
+    }
+
+    public void stop(@Observes ShutdownEvent ev) {
+        log.info("shutting down...");
+
+        feedRefreshEngine.stop();
+        taskScheduler.stop();
+    }
 }

commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java

@@ -1,12 +1,5 @@
 package com.commafeed;
 
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Optional;
-
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.Positive;
-
 import com.commafeed.backend.feed.FeedRefreshIntervalCalculator;
 
 import io.quarkus.runtime.annotations.ConfigDocSection;
@@ -16,346 +9,355 @@ import io.quarkus.runtime.configuration.MemorySize;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefault;
 
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Positive;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Optional;
+
 /**
  * CommaFeed configuration
  *
- * Default values are for production, they can be overridden in application.properties for other profiles
+ * <p>Default values are for production, they can be overridden in application.properties for other
+ * profiles
  */
 @ConfigMapping(prefix = "commafeed")
 @ConfigRoot(phase = ConfigPhase.RUN_TIME)
 public interface CommaFeedConfiguration {
-	/**
+    /**
-	 * Whether to expose a robots.txt file that disallows web crawlers and search engine indexers.
+     * Whether to expose a robots.txt file that disallows web crawlers and search engine indexers.
-	 */
+     */
-	@WithDefault("true")
+    @WithDefault("true")
-	boolean hideFromWebCrawlers();
+    boolean hideFromWebCrawlers();
 
-	/**
+    /**
-	 * If enabled, images in feed entries will be proxied through the server instead of accessed directly by the browser.
+     * If enabled, images in feed entries will be proxied through the server instead of accessed
-	 * 
+     * directly by the browser.
-	 * This is useful if commafeed is accessed through a restricting proxy that blocks some feeds that are followed.
+     *
-	 */
+     * <p>This is useful if commafeed is accessed through a restricting proxy that blocks some feeds
-	@WithDefault("false")
+     * that are followed.
-	boolean imageProxyEnabled();
+     */
+    @WithDefault("false")
+    boolean imageProxyEnabled();
 
-	/**
+    /**
-	 * Enable password recovery via email.
+     * Enable password recovery via email.
-	 *
+     *
-	 * Quarkus mailer will need to be configured.
+     * <p>Quarkus mailer will need to be configured.
-	 */
+     */
-	@WithDefault("false")
+    @WithDefault("false")
-	boolean passwordRecoveryEnabled();
+    boolean passwordRecoveryEnabled();
 
-	/**
+    /** Message displayed in a notification at the bottom of the page. */
-	 * Message displayed in a notification at the bottom of the page.
+    Optional<String> announcement();
-	 */
-	Optional<String> announcement();
 
-	/**
+    /** Google Auth key for fetching Youtube channel favicons. */
-	 * Google Auth key for fetching Youtube channel favicons.
+    Optional<String> googleAuthKey();
-	 */
-	Optional<String> googleAuthKey();
 
-	/**
+    /** HTTP client configuration */
-	 * HTTP client configuration
+    @ConfigDocSection
-	 */
+    HttpClient httpClient();
-	@ConfigDocSection
-	HttpClient httpClient();
 
-	/**
+    /** Feed refresh engine settings. */
-	 * Feed refresh engine settings.
+    @ConfigDocSection
-	 */
+    FeedRefresh feedRefresh();
-	@ConfigDocSection
-	FeedRefresh feedRefresh();
 
-	/**
+    /** Push notification settings. */
-	 * Database settings.
+    @ConfigDocSection
-	 */
+    PushNotifications pushNotifications();
-	@ConfigDocSection
-	Database database();
 
-	/**
+    /** Database settings. */
-	 * Users settings.
+    @ConfigDocSection
-	 */
+    Database database();
-	@ConfigDocSection
-	Users users();
 
-	/**
+    /** Users settings. */
-	 * Websocket settings.
+    @ConfigDocSection
-	 */
+    Users users();
-	@ConfigDocSection
-	Websocket websocket();
 
-	interface HttpClient {
+    /** Websocket settings. */
-		/**
+    @ConfigDocSection
-		 * User-Agent string that will be used by the http client, leave empty for the default one.
+    Websocket websocket();
-		 */
-		Optional<String> userAgent();
 
-		/**
+    /**
-		 * Time to wait for a connection to be established.
+     * Duration to wait for the feed refresh engine and the task scheduler to stop when the
-		 */
+     * application is shutting down.
-		@WithDefault("5s")
+     */
-		Duration connectTimeout();
+    @WithDefault("2s")
+    Duration shutdownTimeout();
 
-		/**
+    interface HttpClient {
-		 * Time to wait for SSL handshake to complete.
+        /**
-		 */
+         * User-Agent string that will be used by the http client, leave empty for the default one.
-		@WithDefault("5s")
+         */
-		Duration sslHandshakeTimeout();
+        Optional<String> userAgent();
 
-		/**
+        /** Time to wait for a connection to be established. */
-		 * Time to wait between two packets before timeout.
+        @WithDefault("5s")
-		 */
+        Duration connectTimeout();
-		@WithDefault("10s")
-		Duration socketTimeout();
 
-		/**
+        /** Time to wait for SSL handshake to complete. */
-		 * Time to wait for the full response to be received.
+        @WithDefault("5s")
-		 */
+        Duration sslHandshakeTimeout();
-		@WithDefault("10s")
-		Duration responseTimeout();
 
-		/**
+        /** Time to wait between two packets before timeout. */
-		 * Time to live for a connection in the pool.
+        @WithDefault("10s")
-		 */
+        Duration socketTimeout();
-		@WithDefault("30s")
-		Duration connectionTimeToLive();
 
-		/**
+        /** Time to wait for the full response to be received. */
-		 * Time between eviction runs for idle connections.
+        @WithDefault("10s")
-		 */
+        Duration responseTimeout();
-		@WithDefault("1m")
-		Duration idleConnectionsEvictionInterval();
 
-		/**
+        /** Time to live for a connection in the pool. */
-		 * If a feed is larger than this, it will be discarded to prevent memory issues while parsing the feed.
+        @WithDefault("30s")
-		 */
+        Duration connectionTimeToLive();
-		@WithDefault("5M")
-		MemorySize maxResponseSize();
 
-		/**
+        /** Time between eviction runs for idle connections. */
-		 * Prevent access to local addresses to mitigate server-side request forgery (SSRF) attacks, which could potentially expose internal
+        @WithDefault("1m")
-		 * resources.
+        Duration idleConnectionsEvictionInterval();
-		 *
-		 * You may want to disable this if you subscribe to feeds that are only available on your local network and you trust all users of
-		 * your CommaFeed instance.
-		 */
-		@WithDefault("true")
-		boolean blockLocalAddresses();
 
-		/**
+        /**
-		 * HTTP client cache configuration
+         * If a feed is larger than this, it will be discarded to prevent memory issues while
-		 */
+         * parsing the feed.
-		@ConfigDocSection
+         */
-		HttpClientCache cache();
+        @WithDefault("5M")
-	}
+        MemorySize maxResponseSize();
 
-	interface HttpClientCache {
+        /**
-		/**
+         * Prevent access to local addresses to mitigate server-side request forgery (SSRF) attacks,
-		 * Whether to enable the cache. This cache is used to avoid spamming feeds in short bursts (e.g. when subscribing to a feed for the
+         * which could potentially expose internal resources.
-		 * first time or when clicking "fetch all my feeds now").
+         *
-		 */
+         * <p>You may want to enable this if you host a public instance of CommaFeed with
-		@WithDefault("true")
+         * registrations open.
-		boolean enabled();
+         */
+        @WithDefault("true")
+        boolean blockLocalAddresses();
 
-		/**
+        /** HTTP client cache configuration */
-		 * Maximum amount of memory the cache can use.
+        @ConfigDocSection
-		 */
+        HttpClientCache cache();
-		@WithDefault("10M")
+    }
-		MemorySize maximumMemorySize();
 
-		/**
+    interface HttpClientCache {
-		 * Duration after which an entry is removed from the cache.
+        /**
-		 */
+         * Whether to enable the cache. This cache is used to avoid spamming feeds in short bursts
-		@WithDefault("1m")
+         * (e.g. when subscribing to a feed for the first time or when clicking "fetch all my feeds
-		Duration expiration();
+         * now").
-	}
+         */
+        @WithDefault("true")
+        boolean enabled();
 
-	interface FeedRefresh {
+        /** Maximum amount of memory the cache can use. */
-		/**
+        @WithDefault("10M")
-		 * Default amount of time CommaFeed will wait before refreshing a feed.
+        MemorySize maximumMemorySize();
-		 */
-		@WithDefault("5m")
-		Duration interval();
 
-		/**
+        /** Duration after which an entry is removed from the cache. */
-		 * Maximum amount of time CommaFeed will wait before refreshing a feed. This is used as an upper bound when:
+        @WithDefault("1m")
-		 *
+        Duration expiration();
-		 * <ul>
+    }
-		 * <li>an error occurs while refreshing a feed and we're backing off exponentially</li>
-		 * <li>we receive a Cache-Control header from the feed</li>
-		 * <li>we receive a Retry-After header from the feed</li>
-		 * </ul>
-		 */
-		@WithDefault("4h")
-		Duration maxInterval();
 
-		/**
+    interface FeedRefresh {
-		 * If enabled, CommaFeed will calculate the next refresh time based on the feed's average time between entries and the time since
+        /** Default amount of time CommaFeed will wait before refreshing a feed. */
-		 * the last entry was published. The interval will be sometimes between the default refresh interval
+        @WithDefault("5m")
-		 * (`commafeed.feed-refresh.interval`) and the maximum refresh interval (`commafeed.feed-refresh.max-interval`).
+        Duration interval();
-		 * 
-		 * See {@link FeedRefreshIntervalCalculator} for details.
-		 */
-		@WithDefault("true")
-		boolean intervalEmpirical();
 
-		/**
+        /**
-		 * Feed refresh engine error handling settings.
+         * Maximum amount of time CommaFeed will wait before refreshing a feed. This is used as an
-		 */
+         * upper bound when:
-		@ConfigDocSection
+         *
-		FeedRefreshErrorHandling errors();
+         * <ul>
+         *   <li>an error occurs while refreshing a feed and we're backing off exponentially
+         *   <li>we receive a Cache-Control header from the feed
+         *   <li>we receive a Retry-After header from the feed
+         * </ul>
+         */
+        @WithDefault("4h")
+        Duration maxInterval();
 
-		/**
+        /**
-		 * Amount of http threads used to fetch feeds.
+         * If enabled, CommaFeed will calculate the next refresh time based on the feed's average
-		 */
+         * time between entries and the time since the last entry was published. The interval will
-		@Min(1)
+         * be sometimes between the default refresh interval (`commafeed.feed-refresh.interval`) and
-		@WithDefault("3")
+         * the maximum refresh interval (`commafeed.feed-refresh.max-interval`).
-		int httpThreads();
+         *
+         * <p>See {@link FeedRefreshIntervalCalculator} for details.
+         */
+        @WithDefault("true")
+        boolean intervalEmpirical();
 
-		/**
+        /** Feed refresh engine error handling settings. */
-		 * Amount of threads used to insert new entries in the database.
+        @ConfigDocSection
-		 */
+        FeedRefreshErrorHandling errors();
-		@Min(1)
-		@WithDefault("1")
-		int databaseThreads();
 
-		/**
+        /** Amount of http threads used to fetch feeds. */
-		 * Duration after which a user is considered inactive. Feeds for inactive users are not refreshed until they log in again.
+        @Min(1)
-		 *
+        @WithDefault("3")
-		 * 0 to disable.
+        int httpThreads();
-		 */
-		@WithDefault("0")
-		Duration userInactivityPeriod();
 
-		/**
+        /** Amount of threads used to insert new entries in the database. */
-		 * Duration after which the evaluation of a filtering expresion to mark an entry as read is considered to have timed out.
+        @Min(1)
-		 */
+        @WithDefault("1")
-		@WithDefault("500ms")
+        int databaseThreads();
-		Duration filteringExpressionEvaluationTimeout();
 
-		/**
+        /**
-		 * Duration after which the "Fetch all my feeds now" action is available again after use to avoid spamming feeds.
+         * Duration after which a user is considered inactive. Feeds for inactive users are not
-		 */
+         * refreshed until they log in again.
-		@WithDefault("0")
+         *
-		Duration forceRefreshCooldownDuration();
+         * <p>0 to disable.
-	}
+         */
+        @WithDefault("0")
+        Duration userInactivityPeriod();
 
-	interface FeedRefreshErrorHandling {
+        /**
-		/**
+         * Duration after which the evaluation of a filtering expresion to mark an entry as read is
-		 * Number of retries before backoff is applied.
+         * considered to have timed out.
-		 */
+         */
-		@Min(0)
+        @WithDefault("500ms")
-		@WithDefault("3")
+        Duration filteringExpressionEvaluationTimeout();
-		int retriesBeforeBackoff();
 
-		/**
+        /**
-		 * Duration to wait before retrying after an error. Will be multiplied by the number of errors since the last successful fetch.
+         * Duration after which the "Fetch all my feeds now" action is available again after use to
-		 */
+         * avoid spamming feeds.
-		@WithDefault("1h")
+         */
-		Duration backoffInterval();
+        @WithDefault("0")
-	}
+        Duration forceRefreshCooldownDuration();
+    }
 
-	interface Database {
+    interface PushNotifications {
-		/**
+        /** Whether to enable push notifications to notify users of new entries in their feeds. */
-		 * Timeout applied to all database queries.
+        @WithDefault("true")
-		 *
+        boolean enabled();
-		 * 0 to disable.
-		 */
-		@WithDefault("0")
-		Duration queryTimeout();
 
-		/**
+        /** Amount of threads used to send external notifications about new entries. */
-		 * Database cleanup settings.
+        @Min(1)
-		 */
+        @WithDefault("5")
-		@ConfigDocSection
+        int threads();
-		Cleanup cleanup();
 
-		interface Cleanup {
+        /**
-			/**
+         * Maximum amount of notifications that can be queued before new notifications are
-			 * Maximum age of feed entries in the database. Older entries will be deleted.
+         * discarded.
-			 *
+         */
-			 * 0 to disable.
+        @Min(1)
-			 */
+        @WithDefault("100")
-			@WithDefault("365d")
+        int queueCapacity();
-			Duration entriesMaxAge();
+    }
 
-			/**
+    interface FeedRefreshErrorHandling {
-			 * Maximum age of feed entry statuses (read/unread) in the database. Older statuses will be deleted.
+        /** Number of retries before backoff is applied. */
-			 *
+        @Min(0)
-			 * 0 to disable.
+        @WithDefault("3")
-			 */
+        int retriesBeforeBackoff();
-			@WithDefault("0")
-			Duration statusesMaxAge();
 
-			/**
+        /**
-			 * Maximum number of entries per feed to keep in the database.
+         * Duration to wait before retrying after an error. Will be multiplied by the number of
-			 *
+         * errors since the last successful fetch.
-			 * 0 to disable.
+         */
-			 */
+        @WithDefault("1h")
-			@WithDefault("500")
+        Duration backoffInterval();
-			int maxFeedCapacity();
+    }
 
-			/**
+    interface Database {
-			 * Limit the number of feeds a user can subscribe to.
+        /**
-			 *
+         * Timeout applied to all database queries.
-			 * 0 to disable.
+         *
-			 */
+         * <p>0 to disable.
-			@WithDefault("0")
+         */
-			int maxFeedsPerUser();
+        @WithDefault("0")
+        Duration queryTimeout();
 
-			/**
+        /** Database cleanup settings. */
-			 * Rows to delete per query while cleaning up old entries.
+        @ConfigDocSection
-			 */
+        Cleanup cleanup();
-			@Positive
-			@WithDefault("100")
-			int batchSize();
 
-			default Instant statusesInstantThreshold() {
+        interface Cleanup {
-				return statusesMaxAge().toMillis() > 0 ? Instant.now().minus(statusesMaxAge()) : null;
+            /**
-			}
+             * Maximum age of feed entries in the database. Older entries will be deleted.
-		}
+             *
-	}
+             * <p>0 to disable.
+             */
+            @WithDefault("365d")
+            Duration entriesMaxAge();
 
-	interface Users {
+            /**
-		/**
+             * Maximum age of feed entry statuses (read/unread) in the database. Older statuses will
-		 * Whether to let users create accounts for themselves.
+             * be deleted.
-		 */
+             *
-		@WithDefault("false")
+             * <p>0 to disable.
-		boolean allowRegistrations();
+             */
+            @WithDefault("0")
+            Duration statusesMaxAge();
 
-		/**
+            /**
-		 * Whether to enable strict password validation (1 uppercase char, 1 lowercase char, 1 digit, 1 special char).
+             * Maximum number of entries per feed to keep in the database.
-		 */
+             *
-		@WithDefault("true")
+             * <p>0 to disable.
-		boolean strictPasswordPolicy();
+             */
+            @WithDefault("500")
+            int maxFeedCapacity();
 
-		/**
+            /**
-		 * Whether to create a demo account the first time the app starts.
+             * Limit the number of feeds a user can subscribe to.
-		 */
+             *
-		@WithDefault("false")
+             * <p>0 to disable.
-		boolean createDemoAccount();
+             */
-	}
+            @WithDefault("0")
+            int maxFeedsPerUser();
 
-	interface Websocket {
+            /** Rows to delete per query while cleaning up old entries. */
-		/**
+            @Positive
-		 * Enable websocket connection so the server can notify web clients that there are new entries for feeds.
+            @WithDefault("100")
-		 */
+            int batchSize();
-		@WithDefault("true")
-		boolean enabled();
 
-		/**
+            /** Whether to keep starred entries when cleaning up old entries. */
-		 * Interval at which the client will send a ping message on the websocket to keep the connection alive.
+            @WithDefault("true")
-		 */
+            boolean keepStarredEntries();
-		@WithDefault("15m")
-		Duration pingInterval();
 
-		/**
+            default Instant statusesInstantThreshold() {
-		 * If the websocket connection is disabled or the connection is lost, the client will reload the feed tree at this interval.
+                return statusesMaxAge().toMillis() > 0
-		 */
+                        ? Instant.now().minus(statusesMaxAge())
-		@WithDefault("30s")
+                        : null;
-		Duration treeReloadInterval();
+            }
-	}
+        }
+    }
 
+    interface Users {
+        /** Whether to let users create accounts for themselves. */
+        @WithDefault("false")
+        boolean allowRegistrations();
+
+        /** Minimum password length for user accounts. */
+        @WithDefault("4")
+        int minimumPasswordLength();
+
+        /** Whether an email address is required when creating a user account. */
+        @WithDefault("false")
+        boolean emailAddressRequired();
+
+        /** Whether to create a demo account the first time the app starts. */
+        @WithDefault("false")
+        boolean createDemoAccount();
+    }
+
+    interface Websocket {
+        /**
+         * Enable websocket connection so the server can notify web clients that there are new
+         * entries for feeds.
+         */
+        @WithDefault("true")
+        boolean enabled();
+
+        /**
+         * Interval at which the client will send a ping message on the websocket to keep the
+         * connection alive.
+         */
+        @WithDefault("15m")
+        Duration pingInterval();
+
+        /**
+         * If the websocket connection is disabled or the connection is lost, the client will reload
+         * the feed tree at this interval.
+         */
+        @WithDefault("30s")
+        Duration treeReloadInterval();
+    }
 }

commafeed-server/src/main/java/com/commafeed/CommaFeedConstants.java

@@ -4,6 +4,5 @@ import lombok.experimental.UtilityClass;
 
 @UtilityClass
 public class CommaFeedConstants {
-	public static final String USERNAME_ADMIN = "admin";
+    public static final String USERNAME_DEMO = "demo";
-	public static final String USERNAME_DEMO = "demo";
 }

commafeed-server/src/main/java/com/commafeed/CommaFeedProducers.java

@@ -1,25 +1,24 @@
 package com.commafeed;
 
-import java.time.InstantSource;
+import com.codahale.metrics.MetricRegistry;
 
 import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
 
-import com.codahale.metrics.MetricRegistry;
+import java.time.InstantSource;
 
 @Singleton
 public class CommaFeedProducers {
 
-	@Produces
+    @Produces
-	@Singleton
+    @Singleton
-	public InstantSource instantSource() {
+    public InstantSource instantSource() {
-		return InstantSource.system();
+        return InstantSource.system();
-	}
+    }
-
-	@Produces
-	@Singleton
-	public MetricRegistry metricRegistry() {
-		return new MetricRegistry();
-	}
 
+    @Produces
+    @Singleton
+    public MetricRegistry metricRegistry() {
+        return new MetricRegistry();
+    }
 }

commafeed-server/src/main/java/com/commafeed/CommaFeedVersion.java

@@ -1,30 +1,29 @@
 package com.commafeed;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
 import jakarta.inject.Singleton;
 
 import lombok.Getter;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
 @Singleton
 @Getter
 public class CommaFeedVersion {
 
-	private final String version;
+    private final String version;
-	private final String gitCommit;
+    private final String gitCommit;
 
-	public CommaFeedVersion() throws IOException {
+    public CommaFeedVersion() throws IOException {
-		Properties properties = new Properties();
+        Properties properties = new Properties();
-		try (InputStream stream = getClass().getResourceAsStream("/git.properties")) {
+        try (InputStream stream = getClass().getResourceAsStream("/git.properties")) {
-			if (stream != null) {
+            if (stream != null) {
-				properties.load(stream);
+                properties.load(stream);
-			}
+            }
-		}
+        }
-
-		this.version = properties.getProperty("git.build.version", "unknown");
-		this.gitCommit = properties.getProperty("git.commit.id.abbrev", "unknown");
-	}
 
+        this.version = properties.getProperty("git.build.version", "unknown");
+        this.gitCommit = properties.getProperty("git.commit.id.abbrev", "unknown");
+    }
 }