docs(changelog): update release notes for v2.2.0

Why:
Passing an empty string as an endpoint to Client when instantiating a
new client might seem like something that should never happen but I
managed to trigger it while parsing some input files to register feeds
in bulk.

What:
In the execute() function, check early if the endpoint is "" and then
return immediately nil and a new error, named ErrEmptyEndpoint with a
descriptive string

.devcontainer/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   app:
-    image: mcr.microsoft.com/devcontainers/go
+    image: mcr.microsoft.com/devcontainers/go:1.22
     volumes:
       - ..:/workspace:cached
     command: sleep infinity
@@ -24,7 +24,7 @@ services:
     ports:
       - 5432:5432
   apprise:
-    image: caronc/apprise:latest
+    image: caronc/apprise:1.0
     restart: unless-stopped
     hostname: apprise
 volumes:

.github/ISSUE_TEMPLATE/improvement.md

@@ -1,10 +0,0 @@
----
-name: Improvement
-about: Do you have an idea to improve an existing feature?
-title: ''
-labels: improvements
-assignees: ''
-
----
-
-

.github/pull_request_template.md

@@ -1,4 +1,7 @@
 Do you follow the guidelines?
 
 - [ ] I have tested my changes
+- [ ] There is no breaking changes
+- [ ] I really tested my changes and there is no regression
+- [ ] Ideally, my commit messages follow the [Conventional Commits specification](https://www.conventionalcommits.org/)
 - [ ] I read this document: https://miniflux.app/faq.html#pull-request

.github/workflows/build_binaries.yml

@@ -12,13 +12,16 @@ jobs:
       - name: Set up Golang
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23.x"
+          check-latest: true
       - name: Checkout
         uses: actions/checkout@v4
       - name: Compile binaries
+        env:
+          CGO_ENABLED: 0
         run: make build
       - name: Upload binaries
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: binaries
           path: miniflux-*

.github/workflows/codeql-analysis.yml

@@ -29,11 +29,15 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    - uses: actions/setup-go@v5
+      with:
+        go-version: "1.23.x"
+
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/debian_packages.yml

@@ -1,6 +1,7 @@
 name: Debian Packages
 permissions: read-all
 on:
+  workflow_dispatch:
   push:
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
@@ -28,8 +29,34 @@ jobs:
       run: make debian-packages
     - name: List generated files
       run: ls -l *.deb
+  build-packages-manually:
+    if: github.event_name != 'pull_request' && github.event_name != 'push'
+    name: Build Packages Manually
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+          fetch-depth: 0
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      id: buildx
+      with:
+          install: true
+    - name: Available Docker Platforms
+      run: echo ${{ steps.buildx.outputs.platforms }}
+    - name: Build Debian Packages
+      run: make debian-packages
+    - name: Upload package
+      uses: actions/upload-artifact@v4
+      with:
+        name: packages
+        path: "*.deb"
+        if-no-files-found: error
+        retention-days: 3
   publish-packages:
-    if: ${{ ! github.event.pull_request }}
+    if: github.event_name == 'push'
     name: Publish Packages
     runs-on: ubuntu-latest
     steps:

.github/workflows/docker.yml

@@ -8,35 +8,8 @@ on:
   pull_request:
     branches: [ main ]
 jobs:
-  test-docker-images:
-    if: github.event.pull_request
-    name: Test Images
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Build Alpine image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./packaging/docker/alpine/Dockerfile
-          push: false
-          tags: ${{ github.repository_owner }}/miniflux:alpine-dev
-      - name: Test Alpine Docker image
-        run: docker run --rm ${{ github.repository_owner }}/miniflux:alpine-dev miniflux -i
-      - name: Build Distroless image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./packaging/docker/distroless/Dockerfile
-          push: false
-          tags: ${{ github.repository_owner }}/miniflux:distroless-dev
-      - name: Test Distroless Docker image
-        run: docker run --rm ${{ github.repository_owner }}/miniflux:distroless-dev miniflux -i
-
-  publish-docker-images:
-    if: ${{ ! github.event.pull_request }}
-    name: Publish Images
+  docker-images:
+    name: Docker Images
     permissions:
       packages: write
     runs-on: ubuntu-latest
@@ -46,33 +19,33 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Generate Alpine Docker tag
-        id: docker_alpine_tag
-        run: |
-          DOCKER_IMAGE=${{ github.repository_owner }}/miniflux
-          DOCKER_VERSION=dev
-          if [ "${{ github.event_name }}" = "schedule" ]; then
-          DOCKER_VERSION=nightly
-          TAGS="docker.io/${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION},quay.io/${DOCKER_IMAGE}:${DOCKER_VERSION}"
-          elif [[ $GITHUB_REF == refs/tags/* ]]; then
-          DOCKER_VERSION=${GITHUB_REF#refs/tags/}
-          TAGS="docker.io/${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION},quay.io/${DOCKER_IMAGE}:${DOCKER_VERSION},docker.io/${DOCKER_IMAGE}:latest,ghcr.io/${DOCKER_IMAGE}:latest,quay.io/${DOCKER_IMAGE}:latest"
-          fi
-          echo ::set-output name=tags::${TAGS}
+      - name: Generate Alpine Docker tags
+        id: docker_alpine_tags
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            docker.io/${{ github.repository_owner }}/miniflux
+            ghcr.io/${{ github.repository_owner }}/miniflux
+            quay.io/${{ github.repository_owner }}/miniflux
+          tags: |
+            type=ref,event=pr
+            type=schedule,pattern=nightly
+            type=semver,pattern={{raw}}
 
-      - name: Generate Distroless Docker tag
-        id: docker_distroless_tag
-        run: |
-          DOCKER_IMAGE=${{ github.repository_owner }}/miniflux
-          DOCKER_VERSION=dev-distroless
-          if [ "${{ github.event_name }}" = "schedule" ]; then
-          DOCKER_VERSION=nightly-distroless
-          TAGS="docker.io/${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION},quay.io/${DOCKER_IMAGE}:${DOCKER_VERSION}"
-          elif [[ $GITHUB_REF == refs/tags/* ]]; then
-          DOCKER_VERSION=${GITHUB_REF#refs/tags/}-distroless
-          TAGS="docker.io/${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION},quay.io/${DOCKER_IMAGE}:${DOCKER_VERSION},docker.io/${DOCKER_IMAGE}:latest-distroless,ghcr.io/${DOCKER_IMAGE}:latest-distroless,quay.io/${DOCKER_IMAGE}:latest-distroless"
-          fi
-          echo ::set-output name=tags::${TAGS}
+      - name: Generate Distroless Docker tags
+        id: docker_distroless_tags
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            docker.io/${{ github.repository_owner }}/miniflux
+            ghcr.io/${{ github.repository_owner }}/miniflux
+            quay.io/${{ github.repository_owner }}/miniflux
+          tags: |
+            type=ref,event=pr
+            type=schedule,pattern=nightly
+            type=semver,pattern={{raw}}
+          flavor: |
+            suffix=-distroless,onlatest=true
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -81,12 +54,14 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
+        if: ${{ github.event_name != 'pull_request' && vars.PUBLISH_DOCKER_IMAGES == 'true' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
+        if: ${{ github.event_name != 'pull_request' && vars.PUBLISH_DOCKER_IMAGES == 'true' }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -94,6 +69,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Quay Container Registry
+        if: ${{ github.event_name != 'pull_request' && vars.PUBLISH_DOCKER_IMAGES == 'true' }}
         uses: docker/login-action@v3
         with:
           registry: quay.io
@@ -101,19 +77,21 @@ jobs:
           password: ${{ secrets.QUAY_TOKEN }}
 
       - name: Build and Push Alpine images
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
+        if: ${{ vars.PUBLISH_DOCKER_IMAGES == 'true' }}
         with:
           context: .
           file: ./packaging/docker/alpine/Dockerfile
           platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
-          push: true
-          tags: ${{ steps.docker_alpine_tag.outputs.tags }}
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.docker_alpine_tags.outputs.tags }}
 
       - name: Build and Push Distroless images
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
+        if: ${{ vars.PUBLISH_DOCKER_IMAGES == 'true' }}
         with:
           context: .
           file: ./packaging/docker/distroless/Dockerfile
           platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.docker_distroless_tag.outputs.tags }}
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.docker_distroless_tags.outputs.tags }}

.github/workflows/linters.yml

@@ -13,20 +13,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Install jshint
+    - name: Install linters
       run: |
-        sudo npm install -g jshint@2.13.3
+        sudo npm install -g jshint@2.13.6 eslint@8.57.0
     - name: Run jshint
-      run: jshint ui/static/js/*.js
+      run: jshint internal/ui/static/js/*.js
+    - name: Run ESLint
+      run: eslint internal/ui/static/js/*.js
 
   golangci:
-    name: Golang Linter
+    name: Golang Linters
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
-      - uses: golangci/golangci-lint-action@v3
+          go-version: "1.23.x"
+      - run: "go vet ./..."
+      - uses: golangci/golangci-lint-action@v6
         with:
-          args: --timeout 10m --skip-dirs tests --disable errcheck --enable sqlclosecheck --enable misspell --enable gofmt --enable goimports --enable whitespace
+          args: --timeout 10m --skip-dirs tests --disable errcheck --enable sqlclosecheck --enable misspell --enable gofmt --enable goimports --enable whitespace --enable gocritic
+      - uses: dominikh/staticcheck-action@v1.3.1
+        with:
+          version: "2024.1.1"
+          install-go: false

.github/workflows/rpm_packages.yml

@@ -1,6 +1,7 @@
 name: RPM Packages
 permissions: read-all
 on:
+  workflow_dispatch:
   push:
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
@@ -19,8 +20,25 @@ jobs:
       run: make rpm
     - name: List generated files
       run: ls -l *.rpm
+  build-package-manually:
+    if: github.event_name != 'pull_request' && github.event_name != 'push'
+    name: Build Packages Manually
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+          fetch-depth: 0
+    - name: Build RPM Package
+      run: make rpm
+    - name: Upload package
+      uses: actions/upload-artifact@v4
+      with:
+        name: packages
+        path: "*.rpm"
+        if-no-files-found: error
+        retention-days: 3
   publish-package:
-    if: ${{ ! github.event.pull_request }}
+    if: github.event_name == 'push'
     name: Publish Packages
     runs-on: ubuntu-latest
     steps:

.github/workflows/tests.yml

@@ -15,7 +15,7 @@ jobs:
       max-parallel: 4
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        go-version: ["1.21"]
+        go-version: ["1.23.x"]
     steps:
     - name: Set up Go
       uses: actions/setup-go@v5
@@ -43,7 +43,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "1.21"
+        go-version: "1.23.x"
     - name: Checkout
       uses: actions/checkout@v4
     - name: Install Postgres client

.gitignore

@@ -1,6 +1,7 @@
-miniflux-*
+./*.sha256
 ./miniflux
-*.rpm
-*.deb
 .idea
-.vscode
+.vscode
+*.deb
+*.rpm
+miniflux-*

ChangeLog

@@ -1,3 +1,358 @@
+Version 2.2.0 (August 18, 2024)
+-------------------------------
+
+* refactor: simplify Youtube feeds discovery
+* fix(integration): define content encoding explicitly when sending article body to Readeck
+* fix(fever): correct sorting direction when using `max_id` argument
+* fix(client): Return `nil` and error if endpoint is an empty string
+* fix: video poster image URL is encoded twice when using `MEDIA_PROXY_MODE=all`
+* fix: use `BASE_URL` instead of `r.Host` to generate absolute media proxy URL
+* fix: panic during YouTube channel feed discovery
+* fix: honor `hide_globally` when creating a new feed through the api
+* fix: align pagination correctly on small screens with non-English text
+* fix: `store.GetEnclosure()` should return `nil` if no rows are returned
+* feat(locale): update Turkish translations
+* feat(locale): update French translations
+* feat(locale): update Chinese` translations
+* feat(integration): add ntfy integration
+* feat(api): add API routes `/v1/enclosures/{enclosureID}`
+* feat: validate `OAUTH2_PROVIDER` config option value
+* feat: remove YouTube video page subscription finder because `meta[itemprop="channelId"]` no longer exists
+* feat: remove well-known URL parameter trackers
+* feat: mark media as read when playback reaches 90%
+* feat: change log level to info when running migrations
+* feat: allow customizing the display name of the OpenID Connect provider
+* feat: add support for `base` HTML element when discovering feeds
+* feat: add support for `aside` HTML element in entry content
+* feat: Add option to disable local auth form
+* feat: add license info to Javascript files for LibreJS compatibility
+* feat: add `FETCH_BILIBILI_WATCH_TIME` config option
+* docs: update links to filtering rules
+* chore: avoid using legacy key/value format in Dockerfile
+* build(deps): bump `golang.org/x/oauth2` from `0.21.0` to `0.22.0`
+* build(deps): bump `golang.org/x/net` from `0.27.0` to `0.28.0`
+* build(deps): bump `golang.org/x/crypto` from `0.25.0` to `0.26.0`
+* build(deps): bump `github.com/tdewolff/minify/v2` from `2.20.36` to `2.20.37`
+* build(deps): bump `github.com/prometheus/client_golang`
+* build: update GitHub Actions to Go 1.23
+* build: publish OCI images only if `PUBLISH_DOCKER_IMAGES=true`
+* build: bump Alpine Linux build image to v3.20
+* build: add sha256 checksum file for published binaries
+
+Version 2.1.4 (July 9, 2024)
+----------------------------
+
+* test: add unit tests for `IsModified()` behaviour
+* refactor: improve YouTube page feed detection
+* fix(ui): settings form is not populated correctly after validation errors
+* fix(ui): playback speed indicator precision
+* fix(ui): playback speed indicator on shared entries
+* fix(integration): preserve existing Pinboard bookmarks
+* fix(googlereader): set `CrawlTimeMsec` to the correct precision
+* fix(build): failed to solve container image `arm64v8/golang:1.22-bookworm`
+* fix(build): add `distroless` suffix on `latest` tag in GitHub workflow
+* fix: use `ETag` as a stronger validator than `Last-Modified`
+* fix: update `theverge.com` rewrite rule to avoid duplicate image
+* fix: incorrect Go package comment `reader/readingtime`
+* fix: error out for improper rewrite regexp when processing feed entries
+* fix: ensures that session cookies are not expiring before the session is cleaned up from the database as per `CLEANUP_REMOVE_SESSIONS_DAYS`
+* fix: `<img>` aspect ratio with `height: auto`
+* feat(ui): add `viewport-fit=cover`
+* feat(sanitizer): add support for HTML hidden attribute
+* feat(locale): update French translations
+* feat(integration): add Raindrop integration
+* feat(integration): add feed name to Telegram message
+* feat(integration): add Betula integration
+* feat: use of insecure TLS ciphers when "Allow self-signed or invalid certificates" is enabled to workaround some broken websites
+* feat: discover feeds from a Youtube playlist pages
+* feat: add navigation to last/first page
+* feat: add global block and keep filters
+* feat: add description field to feed settings
+* feat: add `pitchfork.com` scraping rule
+* feat: add `FETCH_NEBULA_WATCH_TIME` config option
+* Bump `github.com/PuerkitoBio/goquery` from` 1.9.1` to` 1.9.2`
+* Bump `github.com/prometheus/client_golang` from `1.19.0` to `1.19.1`
+* build(deps): bump `library/alpine` in `/packaging/docker/alpine`
+* build(deps): bump `golangci/golangci-lint-action` from `4` to `6`
+* build(deps): bump `golang.org/x/term` from `0.19.0` to `0.22.0`
+* build(deps): bump `golang.org/x/oauth2` from `0.19.0` to `0.21.0`
+* build(deps): bump `golang.org/x/net` from `0.22.0` to `0.27.0`
+* build(deps): bump `golang.org/x/crypto` from `0.24.0` to `0.25.0`
+* build(deps): bump `github.com/yuin/goldmark` from `1.7.1` to `1.7.4`
+* build(deps): bump `github.com/tdewolff/minify/v2` from `2.20.20` to `2.20.36`
+* build(deps): bump `github.com/coreos/go-oidc/v3` from `3.10.0` to `3.11.0`
+* build(deps): bump `docker/build-push-action` from `5` to `6`
+
+Version 2.1.3 (April 27, 2024)
+------------------------------
+
+* `api`: `rand.Intn(math.MaxInt64)` causes tests to fail on 32-bit architectures (use `rand.Int()` instead)
+* `ci`: use `docker/metadata-action` instead of deprecated shell-scripts
+* `database`: remove `entries_feed_url_idx` index because entry URLs can exceeds btree index size limit
+* `finder`: find feeds from YouTube playlist
+* `http/response`: add brotli compression support
+* `integration/matrix`: fix function name in comment
+* `packaging`: specify container registry explicitly (e.g., Podman does not use `docker.io` by default)
+* `packaging`: use `make miniflux` instead of duplicating `go build` arguments (this leverages Go's PIE build mode)
+* `reader/fetcher`: add brotli content encoding support
+* `reader/processor`: minimize feed entries HTML content
+* `reader/rewrite`: add a rule for `oglaf.com`
+* `storage`: change `GetReadTime()` function to use `entries_feed_id_hash_key` index
+* `ui`: add seek and speed controls to media player
+* `ui`: add tag entries page
+* `ui`: fix JavaScript error when clicking on unread counter
+* `ui`: use `FORCE_REFRESH_INTERVAL` config for category refresh
+* Bump `github.com/tdewolff/minify/v2` from `2.20.19` to `2.20.20`
+* Bump `golang.org/x/net` from `0.22.0` to `0.24.0`
+* Bump `golang.org/x/term` from `0.18.0` to `0.19.0`
+* Bump `golang.org/x/oauth2` from `0.18.0` to `0.19.0`
+* Bump `github.com/yuin/goldmark` from `1.7.0` to `1.7.1`
+
+Version 2.1.2 (March 30, 2024)
+------------------------------
+
+* `api`: rewrite API integration tests without build tags
+* `ci`: add basic ESLinter checks
+* `ci`: enable go-critic linter and fix various issues detected
+* `ci`: fix JavaScript linter path in GitHub Actions
+* `cli`: avoid misleading error message when creating an admin user automatically
+* `config`: add `FILTER_ENTRY_MAX_AGE_DAYS` option
+* `config`: bump the number of simultaneous workers
+* `config`: rename `PROXY_*` options to `MEDIA_PROXY_*`
+* `config`: use `crypto.GenerateRandomBytes` instead of doing it by hand
+* `http/request`: refactor conditions to be more idiomatic
+* `http/response`: remove legacy `X-XSS-Protection` header
+* `integration/rssbrige`: fix rssbrige import
+* `integration/shaarli`: factorize the header+payload concatenation as data
+* `integration/shaarli`: no need to base64-encode then remove the padding when we can simply encode without padding
+* `integration/shaarli`: the JWT token was declared as using HS256 as algorithm, but was using HS512
+* `integration/webhook`: add category title to request body
+* `locale`: update Turkish translations
+* `man page`: sort config options in alphabetical order
+* `mediaproxy`: reduce the internal indentation of `ProxifiedUrl` by inverting some conditions
+* `mediaproxy`: simplify and refactor the package
+* `model`: replace` Optional{Int,Int64,Float64}` with a generic function `OptionalNumber()`
+* `model`: use struct embedding for `FeedCreationRequestFromSubscriptionDiscovery` to reduce code duplication
+* `reader/atom`: avoid debug message when the date is empty
+* `reader/atom`: change `if !a { a = } if !a {a = }` constructs into `if !a { a = ; if !a {a = }}` to reduce the number of comparisons and improve readability
+* `reader/atom`: Move the population of the feed's entries into a new function, to make BuildFeed easier to understand/separate concerns/implementation details
+* `reader/atom`: refactor Atom parser to use an adapter
+* `reader/atom`: use `sort+compact` instead of `compact+sort` to remove duplicates
+* `reader/atom`: when detecting the format, detect its version as well
+* `reader/encoding`: inline a one-liner function
+* `reader/handler`: fix force refresh feature
+* `reader/json`: refactor JSON Feed parser to use an adapter
+* `reader/media`: remove a superfluous error-check: `strconv.ParseInt` returns `0` when passed an empty string
+* `reader/media`: simplify switch-case by moving a common condition above it
+* `reader/processor`: compile block/keep regex only once per feed
+* `reader/rdf`: refactor RDF parser to use an adapter
+* `reader/rewrite`: inline some one-line functions
+* `reader/rewrite`: simplify `removeClickbait`
+* `reader/rewrite`: transform a free-standing function into a method
+* `reader/rewrite`: use a proper constant instead of a magic number in `applyFuncOnTextContent`
+* `reader/rss`: add support for `<media:category>` element
+* `reader/rss`: don't add empty tags to RSS items
+* `reader/rss`: refactor RSS parser to use a default namespace to avoid some limitations of the Go XML parser
+* `reader/rss`: refactor RSS Parser to use an adapter
+* `reader/rss`: remove some duplicated code in RSS parser
+* `reader`: ensure that enclosure URLs are always absolute
+* `reader`: move iTunes and GooglePlay XML definitions to their own packages
+* `reader`: parse podcast categories
+* `reader`: remove trailing space in `SiteURL` and `FeedURL`
+* `storage`: do not store empty tags
+* `storage`: simplify `removeDuplicates()` to use a `sort`+`compact` construct instead of doing it by hand with a hashmap
+* `storage`: Use plain strings concatenation instead of building an array and then joining it
+* `timezone`: make sure the tests pass when the timezone database is not installed on the host
+* `ui/css`: align `min-width` with the other `min-width` values
+* `ui/css`: fix regression: "Add to Home Screen" button is unreadable
+* `ui/js`: don't use lambdas to return a function, use directly the function instead
+* `ui/js`: enable trusted-types
+* `ui/js`: fix download button loading label
+* `ui/js`: fix JavaScript error on the login page when the user not authenticated
+* `ui/js`: inline one-line functions
+* `ui/js`: inline some `querySelectorAll` calls
+* `ui/js`: reduce the scope of some variables
+* `ui/js`: remove a hack for "Chrome 67 and earlier" since it was released in 2018
+* `ui/js`: replace `DomHelper.findParent` with `.closest`
+* `ui/js`: replace `let` with `const`
+* `ui/js`: simplify `DomHelper.getVisibleElements` by using a `filter` instead of a loop with an index
+* `ui/js`: use a `Set` instead of an array in a `KeyboardHandler`'s member
+* `ui/js`: use some ternaries where it makes sense
+* `ui/static`: make use of `HashFromBytes` everywhere
+* `ui/static`: set minifier ECMAScript version
+* `ui`: add keyboard shortcuts for scrolling to top/bottom of the item list
+* `ui`: add media player control playback speed
+* `ui`: remove unused variables and improve JSON decoding in `saveEnclosureProgression()`
+* `validator`: display an error message on edit feed page when the feed URL is not unique
+* Bump `github.com/coreos/go-oidc/v3` from `3.9.0` to `3.10.0`
+* Bump `github.com/go-webauthn/webauthn` from `0.10.1` to `0.10.2`
+* Bump `github.com/tdewolff/minify/v2` from `2.20.18` to `2.20.19`
+* Bump `google.golang.org/protobuf` from `1.32.0` to `1.33.0`
+
+Version 2.1.1 (March 10, 2024)
+-----------------------------
+
+* Move search form to a dedicated page
+* Add Readeck integration
+* Add feed option to disable HTTP/2 to avoid fingerprinting
+* Add `Enter` key as a hotkey to open selected item
+* Proxify `video` element `poster` attribute
+* Add a couple of new possible locations for feeds
+    * Hugo likes to generate `index.xml`
+    * `feed.atom` and `feed.rss` are used by enterprise-scale/old-school gigantic CMS
+* Fix categories import from Thunderbird's OPML
+* Fix logo misalignment when using languages that are more verbose than English
+* Google Reader: Do not return a 500 error when no items is returned
+* Handle RDF feeds with duplicated `<title>` elements
+* Sort integrations alphabetically
+* Add more URL validation in media proxy
+* Add unit test to ensure each translation has the correct number of plurals
+* Add missing plurals for some languages
+* Makefile: quiet `git describe` and `rev-parse` stderr: When building from a tarball instead of a cloned git repo, there would be two `fatal: not a git repository` errors emitted even though the build succeeds. This is because of how `VERSION` and `COMMIT` are set in the Makefile. This PR suppresses the stderr for these variable assignments.
+* Makefile: do not force `CGO_ENABLED=0` for `miniflux` target
+* Add GitHub Action pipeline to build packages on-demand
+* Remove Golint (deprecated), use `staticcheck` and `golangci-lint` instead
+* Build amd64/arm64 Debian packages with CGO disabled
+* Update `go.mod` and add `.exe` suffix to Windows binary
+* Add a couple of fuzzers
+* Fix CodeQL workflow
+* Code and performance improvements:
+    * Use an `io.ReadSeeker` instead of an `io.Reader` to parse feeds
+    * Speed up the sanitizer:
+        - Allow Youtube URLs to start with `www`
+        - Use `strings.Builder` instead of a `bytes.Buffer`
+        - Use a `strings.NewReader` instead of a `bytes.NewBufferString`
+        - Sprinkles a couple of `continue` to make the code-flow more obvious
+        - Inline calls to `inList`, and put their parameters in the right order
+        - Simplify `isPixelTracker`
+        - Simplify `isValidIframeSource`, by extracting the hostname and comparing it directly, instead of using the full url and checking if it starts with multiple variations of the same one (`//`, `http:`, `https://` multiplied by `/www.`)
+        - Add a benchmark
+        - Instead of having to allocate a ~100 keys map containing possibly dynamic values (at least to the go compiler), allocate it once in a global variable. This significantly speeds things up, by reducing the garbage
+        - Use constant time access for maps instead of iterating on them
+        - Build a ~large whitelist map inline instead of constructing it item by item (and remove a duplicate key/value pair)
+        - Use `slices` instead of hand-rolled loops
+    collector/allocator involvements.
+    * Reuse a `Reader` instead of copying to a buffer when parsing an Atom feed
+    * Preallocate memory when exporting to OPML: This should marginally increase performance when exporting a large amount of feeds to OPML
+    * Delay call of `view.New` after logging the user in: There is no need to do extra work like creating a session and its associated view until the user has been properly identified and as many possibly-failing sql request have been successfully run
+    * Use constant-time comparison for anti-csrf tokens: This is probably completely overkill, but since anti-csrf tokens are secrets, they should be compared against untrusted inputs in constant time
+    * Simplify and optimize `genericProxyRewriter`
+        - Reduce the amount of nested loops: it's preferable to search the whole page once and filter on it (even with filters that should always be false), than searching it again for every element we're looking for.
+        - Factorize the proxying conditions into a `shouldProxy` function to reduce the copy-pasta.
+    * Speed up `removeUnlikelyCandidates`: `.Not` returns a brand new `Selection`, copied element by element
+    * Improve `EstimateReadingTime`'s speed by a factor 7
+        - Refactorise the tests and add some
+        - Use 250 signs instead of the whole text
+        - Only check for Korean, Chinese and Japanese script
+        - Add a benchmark
+        - Use a more idiomatic control flow
+    * Don't compute reading-time when unused: If the user doesn't display reading times, there is no need to compute them. This should speed things up a bit, since `whatlanggo.Detect` is abysmally slow.
+    * Simplify `username` generation for the integration tests: No need to generate random numbers 10 times, generate a single big-enough one. A single int64 should be more than enough
+    * Add missing regex anchor detected by CodeQL
+    * Don't mix up slices capacity and length
+    * Use prepared statements for intervals, `ArchiveEntries` and `updateEnclosures`
+    * Use modern for-loops introduced with Go 1.22
+    * Remove a superfluous condition: No need to check if the length of `line` is positive since we're checking afterwards that it contains the `=` sign
+    * Close resources as soon as possible, instead of using `defer()` in a loop
+    * Remove superfluous escaping in a regex
+    * Use `strings.ReplaceAll` instead of `strings.Replace(…, -1)`
+    * Use `strings.EqualFold` instead of `strings.ToLower(…) ==`
+    * Use `.WriteString(` instead of `.Write([]byte(…`
+    * Use `%q` instead of `"%s"`
+    * Make `internal/worker/worker.go` read-only
+    * Use a switch-case construct in `internal/locale/plural.go` instead of an avalanche of `if`
+    * Template functions: simplify `formatFileSize` and `duration` implementation
+    * Inline some templating functions
+    * Make use of `printer.Print` when possible
+    * Add a `printer.Print` to `internal/locale/printer.go`: No need to use variadic functions with string format interpolation to generate static strings
+    * Minor code simplification in `internal/ui/view/view.go`: No need to create the map item by item when we can create it in one go
+    * Build the map inline in `CountAllFeeds()`: No need to build an empty map to then add more fields in it one by one
+    * Miscellaneous improvements to `internal/reader/subscription/finder.go`:
+        - Surface `localizedError` in `FindSubscriptionsFromWellKnownURLs` via `slog`
+        - Use an inline declaration for new subscriptions, like done elsewhere in the
+        file, if only for consistency's sake
+        - Preallocate the `subscriptions` slice when using an RSS-bridge,
+    * Use an update-where for `MarkCategoryAsRead` instead of a subquery
+    * Simplify `CleanOldUserSessions`' query: No need for a subquery, filtering on `created_at` directly is enough
+    * Simplify `cleanupEntries`' query
+        - `NOT (hash=ANY(%4))` can be expressed as `hash NOT IN $4`
+        - There is no need for a subquery operating on the same table, moving the conditions out is equivalent.
+    * Reformat `ArchiveEntries`'s query for consistency's sake and replace the `=ANY` with an `IN`
+    * Reformat the query in `GetEntryIDs` and `GetReadTime`'s query for consistency's sake
+    * Simplify `WeeklyFeedEntryCount`: No need for a `BETWEEN`: we want to filter on entries published in the last week, no need to express is as "entries published between now and last week", "entries published after last week" is enough
+    * Add some tests for `add_image_title`
+    * Remove `github.com/google/uuid` dependencies: Replace it with a hand-rolled implementation. Heck, an UUID isn't even a requirement according to Omnivore API docs
+    * Simplify `internal/reader/icon/finder.go`:
+        - Use a simple regex to parse data uri instead of a hand-rolled parser, and document what fields are considered mandatory.
+        - Use case-insensitive matching to find (fav)icons, instead of doing the same query twice with different letter cases
+        - Add `apple-touch-icon-precomposed.png` as a fallback `favicon`
+        - Reorder the queries to have `icon` first, since it seems to be the most popular one. It used to be last, meaning that pages had to be parsed completely 4 times, instead of one now.
+        - Minor factorisation in `findIconURLsFromHTMLDocument`
+    * Small refactoring of `internal/reader/date/parser.go`:
+        - Split dates formats into those that require local times and those who don't, so that there is no need to have a switch-case in the for loop with around 250 iterations at most.
+        - Be more strict when it comes to timezones, previously invalid ones like -13 were accepted. Also add a test for this.
+        - Bail out early if the date is an empty string.
+    * Make use of Go ≥ 1.21 slices package instead of hand-rolled loops
+    * Reorder the fields of the `Entry` struct to save some memory
+* Dependencies update:
+    * Bump `golang.org/x/oauth2` from `0.17.0` to `0.18.0`
+    * Bump `github.com/prometheus/client_golang` from `1.18.0` to `1.19.0`
+    * Bump `github.com/tdewolff/minify/v2` from `2.20.16` to `2.20.18`
+    * Bump `github.com/PuerkitoBio/goquery` from `1.8.1` to `1.9.1`
+    * Bump `golang.org/x/crypto` from `0.19.0` to `0.20.0`
+    * Bump `github.com/go-jose/go-jose/v3` from `3.0.1` to `3.0.3`
+
+Version 2.1.0 (February 17, 2024)
+---------------------------------
+
+* Add Linkwarden integration
+* Add LinkAce integration
+* Add `FORCE_REFRESH_INTERVAL` config option
+* Add `item-meta-info-reading-time` CSS class
+* Add `add_dynamic_iframe` rewrite function
+* Add attribute `data-original-mos` to `add_dynamic_image` rewrite candidates
+* Update entry processor to allow blocking/keeping entries by tags and/or authors
+* Change default `Accept` header when fetching feeds
+* Rewrite relative RSS Bridge URL to absolute URL
+* Use numeric user ID in Alpine and distroless container image (avoid `securityContext` error in Kubernetes)
+* Always try to use HTTP/2 when fetching feeds if available
+* Add `type` attribute in OPML export as per OPML 2.0 specs
+* Fix missing translation argument for the key `error.unable_to_parse_feed`
+* Fix Debian package builder when using Go 1.22 and `armhf` architecture
+* Fix typo in log message
+* Fix incorrect label shown when saving an article
+* Fix incorrect condition in refresh feeds cli
+* Fix incorrect label `for` attribute
+* Add missing label ID for custom CSS field
+* Accessibility improvements:
+    * Add workaround for macOS VoiceOver that didn't announce `details` and `summary` when expanded
+    * Add `alert` role to alert message element
+    * Add a `h2` heading to the article element so that the screen reader users can navigate the article through the heading level
+    * Add an `aria-label` attribute for the article element for screen readers
+    * Remove the icon image `alt` attribute in feeds list to prevent screen reader to announce it before entry title
+    * Add `sr-only` CSS class for screen reader users (provides more context)
+    * Differentiate between buttons and links
+    * Change links that could perform actions to buttons
+    * Improve translation of hidden Aria elements
+    * Remove the redundant article role
+    * Add a search landmark for the search form so that the screen reader users can navigate to it
+    * Add skip to content link
+    * Add `nav` landmark to page header links
+* Limit feed/category entry pagination to unread entries when coming from unread entry list
+* Update German translation
+* Update GitHub Actions to Go 1.22
+* Bump `golang.org/x/term` from `0.16.0` to `0.17.0`
+* Bump `github.com/google/uuid` from `1.5.0` to `1.6.0`
+* Bump `github.com/yuin/goldmark` from `1.6.0` to `1.7.0`
+* Bump `golang.org/x/oauth2` from `0.15.0` to `0.17.0`
+* Bump `github.com/tdewolff/minify/v2` from `2.20.10` to `2.20.12`
+* Bump `golang.org/x/term` from `0.15.0` to `0.16.0`
+* Bump `github.com/prometheus/client_golang` from `1.17.0` to `1.18.0`
+* Bump `github.com/tdewolff/minify/v2` from `2.20.9` to `2.20.16`
+* Bump `golang.org/x/crypto` from `0.16.0` to `0.19.0`
+* Bump `github.com/go-webauthn/webauthn` from `0.9.4` to` 0.10.1`
+* Bump `golang.org/x/net` from `0.20.0` to `0.21.0`
+
 Version 2.0.51 (December 13, 2023)
 ----------------------------------
 
@@ -158,7 +513,7 @@ Version 2.0.47 (August 20, 2023)
 * Add new API endpoint: `/entries/{entryID}/save`
 * Trigger Docker and packages workflows only for semantic tags
     * Go module versioning expect Git tags to start with the letter v.
-    * The goal is to keep the existing naming convention for generated artifacts and 
+    * The goal is to keep the existing naming convention for generated artifacts and
     have proper versioning for the Go module.
 * Bump `golang.org/x/*` dependencies
 * Bump `github.com/yuin/goldmark`

Makefile

@@ -1,17 +1,18 @@
-APP          := miniflux
-DOCKER_IMAGE := miniflux/miniflux
-VERSION      := $(shell git describe --tags --abbrev=0)
-COMMIT       := $(shell git rev-parse --short HEAD)
-BUILD_DATE   := `date +%FT%T%z`
-LD_FLAGS     := "-s -w -X 'miniflux.app/v2/internal/version.Version=$(VERSION)' -X 'miniflux.app/v2/internal/version.Commit=$(COMMIT)' -X 'miniflux.app/v2/internal/version.BuildDate=$(BUILD_DATE)'"
-PKG_LIST     := $(shell go list ./... | grep -v /vendor/)
-DB_URL       := postgres://postgres:postgres@localhost/miniflux_test?sslmode=disable
-DEB_IMG_ARCH := amd64
+APP             := miniflux
+DOCKER_IMAGE    := miniflux/miniflux
+VERSION         := $(shell git describe --tags --abbrev=0 2>/dev/null)
+COMMIT          := $(shell git rev-parse --short HEAD 2>/dev/null)
+BUILD_DATE      := `date +%FT%T%z`
+LD_FLAGS        := "-s -w -X 'miniflux.app/v2/internal/version.Version=$(VERSION)' -X 'miniflux.app/v2/internal/version.Commit=$(COMMIT)' -X 'miniflux.app/v2/internal/version.BuildDate=$(BUILD_DATE)'"
+PKG_LIST        := $(shell go list ./... | grep -v /vendor/)
+DB_URL          := postgres://postgres:postgres@localhost/miniflux_test?sslmode=disable
+DOCKER_PLATFORM := amd64
 
 export PGPASSWORD := postgres
 
 .PHONY: \
 	miniflux \
+	miniflux-no-pie \
 	linux-amd64 \
 	linux-arm64 \
 	linux-armv7 \
@@ -43,37 +44,50 @@ export PGPASSWORD := postgres
 	debian-packages
 
 miniflux:
-	@ CGO_ENABLED=0 go build -buildmode=pie -ldflags=$(LD_FLAGS) -o $(APP) main.go
+	@ go build -buildmode=pie -ldflags=$(LD_FLAGS) -o $(APP) main.go
+
+miniflux-no-pie:
+	@ go build -ldflags=$(LD_FLAGS) -o $(APP) main.go
 
 linux-amd64:
 	@ CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
 linux-arm64:
 	@ CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
 linux-armv7:
 	@ CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
 linux-armv6:
 	@ CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
 linux-armv5:
 	@ CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=5 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
 darwin-amd64:
 	@ GOOS=darwin GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
 darwin-arm64:
 	@ GOOS=darwin GOARCH=arm64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
 freebsd-amd64:
 	@ CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
 openbsd-amd64:
 	@ GOOS=openbsd GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ sha256sum $(APP)-$@ > $(APP)-$@.sha256
 
 windows-amd64:
-	@ GOOS=windows GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ GOOS=windows GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@.exe main.go
+	@ sha256sum $(APP)-$@.exe > $(APP)-$@.exe.sha256
 
 build: linux-amd64 linux-arm64 linux-armv7 linux-armv6 linux-armv5 darwin-amd64 darwin-arm64 freebsd-amd64 openbsd-amd64 windows-amd64
 
@@ -94,19 +108,21 @@ openbsd-x86:
 	@ GOOS=openbsd GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
 
 windows-x86:
-	@ GOOS=windows GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
+	@ GOOS=windows GOARCH=386 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@.exe main.go
 
 run:
-	@ LOG_DATE_TIME=1 DEBUG=1 RUN_MIGRATIONS=1 CREATE_ADMIN=1 ADMIN_USERNAME=admin ADMIN_PASSWORD=test123 go run main.go
+	@ LOG_DATE_TIME=1 LOG_LEVEL=debug RUN_MIGRATIONS=1 CREATE_ADMIN=1 ADMIN_USERNAME=admin ADMIN_PASSWORD=test123 go run main.go
 
 clean:
-	@ rm -f $(APP)-* $(APP) $(APP)*.rpm $(APP)*.deb
+	@ rm -f $(APP)-* $(APP) $(APP)*.rpm $(APP)*.deb $(APP)*.exe $(APP)*.sha256
 
 test:
 	go test -cover -race -count=1 ./...
 
 lint:
-	golint -set_exit_status ${PKG_LIST}
+	go vet ./...
+	staticcheck ./...
+	golangci-lint run --disable errcheck --enable sqlclosecheck --enable misspell --enable gofmt --enable goimports --enable whitespace
 
 integration-test:
 	psql -U postgres -c 'drop database if exists miniflux_test;'
@@ -120,9 +136,13 @@ integration-test:
 	RUN_MIGRATIONS=1 \
 	DEBUG=1 \
 	./miniflux-test >/tmp/miniflux.log 2>&1 & echo "$$!" > "/tmp/miniflux.pid"
-	
+
 	while ! nc -z localhost 8080; do sleep 1; done
-	go test -v -tags=integration -count=1 miniflux.app/v2/internal/tests
+
+	TEST_MINIFLUX_BASE_URL=http://127.0.0.1:8080 \
+	TEST_MINIFLUX_ADMIN_USERNAME=admin \
+	TEST_MINIFLUX_ADMIN_PASSWORD=test123 \
+	go test -v -count=1 ./internal/api
 
 clean-integration-test:
 	@ kill -9 `cat /tmp/miniflux.pid`
@@ -153,15 +173,15 @@ rpm: clean
 		rpmbuild -bb --define "_miniflux_version $(VERSION)" /root/rpmbuild/SPECS/miniflux.spec
 
 debian:
-	@ docker build --load \
-		--build-arg BASE_IMAGE_ARCH=$(DEB_IMG_ARCH) \
-		-t $(DEB_IMG_ARCH)/miniflux-deb-builder \
+	@ docker buildx build --load \
+		--platform linux/$(DOCKER_PLATFORM) \
+		-t miniflux-deb-builder \
 		-f packaging/debian/Dockerfile \
 		.
-	@ docker run --rm \
-		-v ${PWD}:/pkg $(DEB_IMG_ARCH)/miniflux-deb-builder
+	@ docker run --rm --platform linux/$(DOCKER_PLATFORM) \
+		-v ${PWD}:/pkg miniflux-deb-builder
 
 debian-packages: clean
-	$(MAKE) debian DEB_IMG_ARCH=amd64
-	$(MAKE) debian DEB_IMG_ARCH=arm64v8
-	$(MAKE) debian DEB_IMG_ARCH=arm32v7
+	$(MAKE) debian DOCKER_PLATFORM=amd64
+	$(MAKE) debian DOCKER_PLATFORM=arm64
+	$(MAKE) debian DOCKER_PLATFORM=arm/v7

client/client.go

@@ -18,16 +18,44 @@ type Client struct {
 }
 
 // New returns a new Miniflux client.
+// Deprecated: use NewClient instead.
 func New(endpoint string, credentials ...string) *Client {
-	// Web gives "API Endpoint = https://miniflux.app/v1/", it doesn't work (/v1/v1/me)
+	return NewClient(endpoint, credentials...)
+}
+
+// NewClient returns a new Miniflux client.
+func NewClient(endpoint string, credentials ...string) *Client {
+	// Trim trailing slashes and /v1 from the endpoint.
 	endpoint = strings.TrimSuffix(endpoint, "/")
 	endpoint = strings.TrimSuffix(endpoint, "/v1")
-	// trim to https://miniflux.app
-
-	if len(credentials) == 2 {
+	switch len(credentials) {
+	case 2:
 		return &Client{request: &request{endpoint: endpoint, username: credentials[0], password: credentials[1]}}
+	case 1:
+		return &Client{request: &request{endpoint: endpoint, apiKey: credentials[0]}}
+	default:
+		return &Client{request: &request{endpoint: endpoint}}
 	}
-	return &Client{request: &request{endpoint: endpoint, apiKey: credentials[0]}}
+}
+
+// Healthcheck checks if the application is up and running.
+func (c *Client) Healthcheck() error {
+	body, err := c.request.Get("/healthcheck")
+	if err != nil {
+		return fmt.Errorf("miniflux: unable to perform healthcheck: %w", err)
+	}
+	defer body.Close()
+
+	responseBodyContent, err := io.ReadAll(body)
+	if err != nil {
+		return fmt.Errorf("miniflux: unable to read healthcheck response: %w", err)
+	}
+
+	if string(responseBodyContent) != "OK" {
+		return fmt.Errorf("miniflux: invalid healthcheck response: %q", responseBodyContent)
+	}
+
+	return nil
 }
 
 // Version returns the version of the Miniflux instance.
@@ -528,6 +556,25 @@ func (c *Client) SaveEntry(entryID int64) error {
 	return err
 }
 
+// FetchEntryOriginalContent fetches the original content of an entry using the scraper.
+func (c *Client) FetchEntryOriginalContent(entryID int64) (string, error) {
+	body, err := c.request.Get(fmt.Sprintf("/v1/entries/%d/fetch-content", entryID))
+	if err != nil {
+		return "", err
+	}
+	defer body.Close()
+
+	var response struct {
+		Content string `json:"content"`
+	}
+
+	if err := json.NewDecoder(body).Decode(&response); err != nil {
+		return "", fmt.Errorf("miniflux: response error (%v)", err)
+	}
+
+	return response.Content, nil
+}
+
 // FetchCounters fetches feed counters.
 func (c *Client) FetchCounters() (*FeedCounters, error) {
 	body, err := c.request.Get("/v1/feeds/counters")
@@ -566,6 +613,28 @@ func (c *Client) Icon(iconID int64) (*FeedIcon, error) {
 	return feedIcon, nil
 }
 
+// Enclosure fetches a specific enclosure.
+func (c *Client) Enclosure(enclosureID int64) (*Enclosure, error) {
+	body, err := c.request.Get(fmt.Sprintf("/v1/enclosures/%d", enclosureID))
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	var enclosure *Enclosure
+	if err := json.NewDecoder(body).Decode(&enclosure); err != nil {
+		return nil, fmt.Errorf("miniflux: response error(%v)", err)
+	}
+
+	return enclosure, nil
+}
+
+// UpdateEnclosure updates an enclosure.
+func (c *Client) UpdateEnclosure(enclosureID int64, enclosureUpdate *EnclosureUpdateRequest) error {
+	_, err := c.request.Put(fmt.Sprintf("/v1/enclosures/%d", enclosureID), enclosureUpdate)
+	return err
+}
+
 func buildFilterQueryString(path string, filter *Filter) string {
 	if filter != nil {
 		values := url.Values{}
@@ -638,6 +707,10 @@ func buildFilterQueryString(path string, filter *Filter) string {
 			values.Set("feed_id", strconv.FormatInt(filter.FeedID, 10))
 		}
 
+		if filter.GloballyVisible {
+			values.Set("globally_visible", "true")
+		}
+
 		for _, status := range filter.Statuses {
 			values.Add("status", status)
 		}

client/doc.go

@@ -12,7 +12,7 @@ This code snippet fetch the list of users:
 		miniflux "miniflux.app/v2/client"
 	)
 
-	client := miniflux.New("https://api.example.org", "admin", "secret")
+	client := miniflux.NewClient("https://api.example.org", "admin", "secret")
 	users, err := client.Users()
 	if err != nil {
 		fmt.Println(err)

client/model.go

@@ -41,6 +41,9 @@ type User struct {
 	DefaultHomePage        string     `json:"default_home_page"`
 	CategoriesSortingOrder string     `json:"categories_sorting_order"`
 	MarkReadOnView         bool       `json:"mark_read_on_view"`
+	MediaPlaybackRate      float64    `json:"media_playback_rate"`
+	BlockFilterEntryRules  string     `json:"block_filter_entry_rules"`
+	KeepFilterEntryRules   string     `json:"keep_filter_entry_rules"`
 }
 
 func (u User) String() string {
@@ -58,28 +61,31 @@ type UserCreationRequest struct {
 
 // UserModificationRequest represents the request to update a user.
 type UserModificationRequest struct {
-	Username               *string `json:"username"`
-	Password               *string `json:"password"`
-	IsAdmin                *bool   `json:"is_admin"`
-	Theme                  *string `json:"theme"`
-	Language               *string `json:"language"`
-	Timezone               *string `json:"timezone"`
-	EntryDirection         *string `json:"entry_sorting_direction"`
-	EntryOrder             *string `json:"entry_sorting_order"`
-	Stylesheet             *string `json:"stylesheet"`
-	GoogleID               *string `json:"google_id"`
-	OpenIDConnectID        *string `json:"openid_connect_id"`
-	EntriesPerPage         *int    `json:"entries_per_page"`
-	KeyboardShortcuts      *bool   `json:"keyboard_shortcuts"`
-	ShowReadingTime        *bool   `json:"show_reading_time"`
-	EntrySwipe             *bool   `json:"entry_swipe"`
-	GestureNav             *string `json:"gesture_nav"`
-	DisplayMode            *string `json:"display_mode"`
-	DefaultReadingSpeed    *int    `json:"default_reading_speed"`
-	CJKReadingSpeed        *int    `json:"cjk_reading_speed"`
-	DefaultHomePage        *string `json:"default_home_page"`
-	CategoriesSortingOrder *string `json:"categories_sorting_order"`
-	MarkReadOnView         *bool   `json:"mark_read_on_view"`
+	Username               *string  `json:"username"`
+	Password               *string  `json:"password"`
+	IsAdmin                *bool    `json:"is_admin"`
+	Theme                  *string  `json:"theme"`
+	Language               *string  `json:"language"`
+	Timezone               *string  `json:"timezone"`
+	EntryDirection         *string  `json:"entry_sorting_direction"`
+	EntryOrder             *string  `json:"entry_sorting_order"`
+	Stylesheet             *string  `json:"stylesheet"`
+	GoogleID               *string  `json:"google_id"`
+	OpenIDConnectID        *string  `json:"openid_connect_id"`
+	EntriesPerPage         *int     `json:"entries_per_page"`
+	KeyboardShortcuts      *bool    `json:"keyboard_shortcuts"`
+	ShowReadingTime        *bool    `json:"show_reading_time"`
+	EntrySwipe             *bool    `json:"entry_swipe"`
+	GestureNav             *string  `json:"gesture_nav"`
+	DisplayMode            *string  `json:"display_mode"`
+	DefaultReadingSpeed    *int     `json:"default_reading_speed"`
+	CJKReadingSpeed        *int     `json:"cjk_reading_speed"`
+	DefaultHomePage        *string  `json:"default_home_page"`
+	CategoriesSortingOrder *string  `json:"categories_sorting_order"`
+	MarkReadOnView         *bool    `json:"mark_read_on_view"`
+	MediaPlaybackRate      *float64 `json:"media_playback_rate"`
+	BlockFilterEntryRules  *string  `json:"block_filter_entry_rules"`
+	KeepFilterEntryRules   *string  `json:"keep_filter_entry_rules"`
 }
 
 // Users represents a list of users.
@@ -107,7 +113,7 @@ type Subscription struct {
 }
 
 func (s Subscription) String() string {
-	return fmt.Sprintf(`Title="%s", URL="%s", Type="%s"`, s.Title, s.URL, s.Type)
+	return fmt.Sprintf(`Title=%q, URL=%q, Type=%q`, s.Title, s.URL, s.Type)
 }
 
 // Subscriptions represents a list of subscriptions.
@@ -140,6 +146,7 @@ type Feed struct {
 	Password                    string    `json:"password"`
 	Category                    *Category `json:"category,omitempty"`
 	HideGlobally                bool      `json:"hide_globally"`
+	DisableHTTP2                bool      `json:"disable_http2"`
 }
 
 // FeedCreationRequest represents the request to create a feed.
@@ -160,6 +167,7 @@ type FeedCreationRequest struct {
 	BlocklistRules              string `json:"blocklist_rules"`
 	KeeplistRules               string `json:"keeplist_rules"`
 	HideGlobally                bool   `json:"hide_globally"`
+	DisableHTTP2                bool   `json:"disable_http2"`
 }
 
 // FeedModificationRequest represents the request to update a feed.
@@ -182,6 +190,7 @@ type FeedModificationRequest struct {
 	AllowSelfSignedCertificates *bool   `json:"allow_self_signed_certificates"`
 	FetchViaProxy               *bool   `json:"fetch_via_proxy"`
 	HideGlobally                *bool   `json:"hide_globally"`
+	DisableHTTP2                *bool   `json:"disable_http2"`
 }
 
 // FeedIcon represents the feed icon.
@@ -202,24 +211,24 @@ type Feeds []*Feed
 // Entry represents a subscription item in the system.
 type Entry struct {
 	ID          int64      `json:"id"`
-	UserID      int64      `json:"user_id"`
-	FeedID      int64      `json:"feed_id"`
-	Status      string     `json:"status"`
+	Date        time.Time  `json:"published_at"`
+	ChangedAt   time.Time  `json:"changed_at"`
+	CreatedAt   time.Time  `json:"created_at"`
+	Feed        *Feed      `json:"feed,omitempty"`
 	Hash        string     `json:"hash"`
-	Title       string     `json:"title"`
 	URL         string     `json:"url"`
 	CommentsURL string     `json:"comments_url"`
-	Date        time.Time  `json:"published_at"`
-	CreatedAt   time.Time  `json:"created_at"`
-	ChangedAt   time.Time  `json:"changed_at"`
+	Title       string     `json:"title"`
+	Status      string     `json:"status"`
 	Content     string     `json:"content"`
 	Author      string     `json:"author"`
 	ShareCode   string     `json:"share_code"`
-	Starred     bool       `json:"starred"`
-	ReadingTime int        `json:"reading_time"`
 	Enclosures  Enclosures `json:"enclosures,omitempty"`
-	Feed        *Feed      `json:"feed,omitempty"`
 	Tags        []string   `json:"tags"`
+	ReadingTime int        `json:"reading_time"`
+	UserID      int64      `json:"user_id"`
+	FeedID      int64      `json:"feed_id"`
+	Starred     bool       `json:"starred"`
 }
 
 // EntryModificationRequest represents a request to modify an entry.
@@ -233,12 +242,17 @@ type Entries []*Entry
 
 // Enclosure represents an attachment.
 type Enclosure struct {
-	ID       int64  `json:"id"`
-	UserID   int64  `json:"user_id"`
-	EntryID  int64  `json:"entry_id"`
-	URL      string `json:"url"`
-	MimeType string `json:"mime_type"`
-	Size     int    `json:"size"`
+	ID               int64  `json:"id"`
+	UserID           int64  `json:"user_id"`
+	EntryID          int64  `json:"entry_id"`
+	URL              string `json:"url"`
+	MimeType         string `json:"mime_type"`
+	Size             int    `json:"size"`
+	MediaProgression int64  `json:"media_progression"`
+}
+
+type EnclosureUpdateRequest struct {
+	MediaProgression int64 `json:"media_progression"`
 }
 
 // Enclosures represents a list of attachments.
@@ -269,6 +283,7 @@ type Filter struct {
 	CategoryID      int64
 	FeedID          int64
 	Statuses        []string
+	GloballyVisible bool
 }
 
 // EntryResultSet represents the response when fetching entries.
@@ -287,3 +302,7 @@ type VersionResponse struct {
 	Arch      string `json:"arch"`
 	OS        string `json:"os"`
 }
+
+func SetOptionalField[T any](value T) *T {
+	return &value
+}

client/request.go

@@ -26,6 +26,8 @@ var (
 	ErrForbidden     = errors.New("miniflux: access forbidden")
 	ErrServerError   = errors.New("miniflux: internal server error")
 	ErrNotFound      = errors.New("miniflux: resource not found")
+	ErrBadRequest    = errors.New("miniflux: bad request")
+	ErrEmptyEndpoint = errors.New("miniflux: empty endpoint provided")
 )
 
 type errorResponse struct {
@@ -61,6 +63,9 @@ func (r *request) Delete(path string) error {
 }
 
 func (r *request) execute(method, path string, data interface{}) (io.ReadCloser, error) {
+	if r.endpoint == "" {
+		return nil, ErrEmptyEndpoint
+	}
 	if r.endpoint[len(r.endpoint)-1:] == "/" {
 		r.endpoint = r.endpoint[:len(r.endpoint)-1]
 	}
@@ -124,10 +129,10 @@ func (r *request) execute(method, path string, data interface{}) (io.ReadCloser,
 		var resp errorResponse
 		decoder := json.NewDecoder(response.Body)
 		if err := decoder.Decode(&resp); err != nil {
-			return nil, fmt.Errorf("miniflux: bad request error (%v)", err)
+			return nil, fmt.Errorf("%w (%v)", ErrBadRequest, err)
 		}
 
-		return nil, fmt.Errorf("miniflux: bad request (%s)", resp.ErrorMessage)
+		return nil, fmt.Errorf("%w (%s)", ErrBadRequest, resp.ErrorMessage)
 	}
 
 	if response.StatusCode > 400 {

contrib/docker-compose/basic.yml

@@ -24,6 +24,7 @@ services:
     environment:
       - POSTGRES_USER=miniflux
       - POSTGRES_PASSWORD=secret
+      - POSTGRES_DB=miniflux
     volumes:
       - miniflux-db:/var/lib/postgresql/data
     healthcheck:

go.mod

@@ -1,49 +1,49 @@
 module miniflux.app/v2
 
-// +heroku goVersion go1.21
+// +heroku goVersion go1.22
 
 require (
-	github.com/PuerkitoBio/goquery v1.8.1
+	github.com/PuerkitoBio/goquery v1.9.2
 	github.com/abadojack/whatlanggo v1.0.1
-	github.com/coreos/go-oidc/v3 v3.9.0
-	github.com/go-webauthn/webauthn v0.9.4
-	github.com/google/uuid v1.5.0
+	github.com/andybalholm/brotli v1.1.0
+	github.com/coreos/go-oidc/v3 v3.11.0
+	github.com/go-webauthn/webauthn v0.10.2
 	github.com/gorilla/mux v1.8.1
 	github.com/lib/pq v1.10.9
-	github.com/prometheus/client_golang v1.17.0
-	github.com/tdewolff/minify/v2 v2.20.9
-	github.com/yuin/goldmark v1.6.0
-	golang.org/x/crypto v0.16.0
-	golang.org/x/net v0.19.0
-	golang.org/x/oauth2 v0.15.0
-	golang.org/x/term v0.15.0
+	github.com/prometheus/client_golang v1.20.0
+	github.com/tdewolff/minify/v2 v2.20.37
+	github.com/yuin/goldmark v1.7.4
+	golang.org/x/crypto v0.26.0
+	golang.org/x/net v0.28.0
+	golang.org/x/oauth2 v0.22.0
+	golang.org/x/term v0.23.0
+	golang.org/x/text v0.17.0
 	mvdan.cc/xurls/v2 v2.5.0
 )
 
 require (
-	github.com/go-webauthn/x v0.1.5 // indirect
-	github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
+	github.com/go-webauthn/x v0.1.9 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/google/go-tpm v0.9.0 // indirect
 )
 
 require (
 	github.com/andybalholm/cascadia v1.3.2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.5.0 // indirect
-	github.com/go-jose/go-jose/v3 v3.0.1 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.6.0 // indirect
+	github.com/go-jose/go-jose/v4 v4.0.2 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.11.1 // indirect
-	github.com/tdewolff/parse/v2 v2.7.6 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/tdewolff/parse/v2 v2.7.15 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	golang.org/x/sys v0.23.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 )
 
-go 1.21
+go 1.22

go.sum

@@ -1,138 +1,118 @@
-github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM=
-github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ=
+github.com/PuerkitoBio/goquery v1.9.2 h1:4/wZksC3KgkQw7SQgkKotmKljk0M6V8TUvA8Wb4yPeE=
+github.com/PuerkitoBio/goquery v1.9.2/go.mod h1:GHPCaP0ODyyxqcNoFGYlAprUFH81NuRPd0GX3Zu2Mvk=
 github.com/abadojack/whatlanggo v1.0.1 h1:19N6YogDnf71CTHm3Mp2qhYfkRdyvbgwWdd2EPxJRG4=
 github.com/abadojack/whatlanggo v1.0.1/go.mod h1:66WiQbSbJBIlOZMsvbKe5m6pzQovxCH9B/K8tQB2uoc=
-github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
+github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
+github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
 github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/coreos/go-oidc/v3 v3.9.0 h1:0J/ogVOd4y8P0f0xUh8l9t07xRP/d8tccvjHl2dcsSo=
-github.com/coreos/go-oidc/v3 v3.9.0/go.mod h1:rTKz2PYwftcrtoCzV5g5kvfJoWcm0Mk8AF8y1iAQro4=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/coreos/go-oidc/v3 v3.11.0 h1:Ia3MxdwpSw702YW0xgfmP1GVCMA9aEFWu12XUZ3/OtI=
+github.com/coreos/go-oidc/v3 v3.11.0/go.mod h1:gE3LgjOgFoHi9a4ce4/tJczr0Ai2/BoDhf0r5lltWI0=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fxamacker/cbor/v2 v2.5.0 h1:oHsG0V/Q6E/wqTS2O1Cozzsy69nqCiguo5Q1a1ADivE=
-github.com/fxamacker/cbor/v2 v2.5.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
-github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA=
-github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
-github.com/go-webauthn/webauthn v0.9.4 h1:YxvHSqgUyc5AK2pZbqkWWR55qKeDPhP8zLDr6lpIc2g=
-github.com/go-webauthn/webauthn v0.9.4/go.mod h1:LqupCtzSef38FcxzaklmOn7AykGKhAhr9xlRbdbgnTw=
-github.com/go-webauthn/x v0.1.5 h1:V2TCzDU2TGLd0kSZOXdrqDVV5JB9ILnKxA9S53CSBw0=
-github.com/go-webauthn/x v0.1.5/go.mod h1:qbzWwcFcv4rTwtCLOZd+icnr6B7oSsAGZJqlt8cukqY=
-github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
-github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/fxamacker/cbor/v2 v2.6.0 h1:sU6J2usfADwWlYDAFhZBQ6TnLFBHxgesMrQfQgk1tWA=
+github.com/fxamacker/cbor/v2 v2.6.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
+github.com/go-jose/go-jose/v4 v4.0.2 h1:R3l3kkBds16bO7ZFAEEcofK0MkrAJt3jlJznWZG0nvk=
+github.com/go-jose/go-jose/v4 v4.0.2/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY=
+github.com/go-webauthn/webauthn v0.10.2 h1:OG7B+DyuTytrEPFmTX503K77fqs3HDK/0Iv+z8UYbq4=
+github.com/go-webauthn/webauthn v0.10.2/go.mod h1:Gd1IDsGAybuvK1NkwUTLbGmeksxuRJjVN2PE/xsPxHs=
+github.com/go-webauthn/x v0.1.9 h1:v1oeLmoaa+gPOaZqUdDentu6Rl7HkSSsmOT6gxEQHhE=
+github.com/go-webauthn/x v0.1.9/go.mod h1:pJNMlIMP1SU7cN8HNlKJpLEnFHCygLCvaLZ8a1xeoQA=
+github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
+github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-tpm v0.9.0 h1:sQF6YqWMi+SCXpsmS3fd21oPy/vSddwZry4JnmltHVk=
 github.com/google/go-tpm v0.9.0/go.mod h1:FkNVkc6C+IsvDI9Jw1OveJmxGZUUaKxtrpOS47QWKfU=
-github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
-github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
-github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
-github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM=
-github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
-github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
-github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
-github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI=
-github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tdewolff/minify/v2 v2.20.9 h1:0RGsL+jBpm77obkuNCjNZ2eiN81CZzTnjeVmTqxCmYk=
-github.com/tdewolff/minify/v2 v2.20.9/go.mod h1:hZnNtFqXVQ5QIAR05tdgvS7h6E80jyRwHSGVmM4jbzQ=
-github.com/tdewolff/parse/v2 v2.7.6 h1:PGZH2b/itDSye9RatReRn4GBhsT+KFEMtAMjHRuY1h8=
-github.com/tdewolff/parse/v2 v2.7.6/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA=
-github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA=
+github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI=
+github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
+github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tdewolff/minify/v2 v2.20.37 h1:Q97cx4STXCh1dlWDlNHZniE8BJ2EBL0+2b0n92BJQhw=
+github.com/tdewolff/minify/v2 v2.20.37/go.mod h1:L1VYef/jwKw6Wwyk5A+T0mBjjn3mMPgmjjA688RNsxU=
+github.com/tdewolff/parse/v2 v2.7.15 h1:hysDXtdGZIRF5UZXwpfn3ZWRbm+ru4l53/ajBRGpCTw=
+github.com/tdewolff/parse/v2 v2.7.15/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA=
 github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
+github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo=
+github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yuin/goldmark v1.6.0 h1:boZcn2GTjpsynOsC0iJHnBWa4Bi0qzfJjthwauItG68=
-github.com/yuin/goldmark v1.6.0/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/goldmark v1.7.4 h1:BDXOHExt+A7gwPCJgPIIq7ENvceR7we7rOS9TNoLZeg=
+github.com/yuin/goldmark v1.7.4/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
-golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
+golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
-golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
-golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
-golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
-golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
+golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
+golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
+golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
-golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
-golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
+golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
+golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
+golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
-google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 mvdan.cc/xurls/v2 v2.5.0 h1:lyBNOm8Wo71UknhUs4QTFUNNMyxy2JEIaKKo0RWOh+8=

internal/api/api.go

@@ -72,6 +72,8 @@ func Serve(router *mux.Router, store *storage.Storage, pool *worker.Pool) {
 	sr.HandleFunc("/entries/{entryID}/fetch-content", handler.fetchContent).Methods(http.MethodGet)
 	sr.HandleFunc("/flush-history", handler.flushHistory).Methods(http.MethodPut, http.MethodDelete)
 	sr.HandleFunc("/icons/{iconID}", handler.getIconByIconID).Methods(http.MethodGet)
+	sr.HandleFunc("/enclosures/{enclosureID}", handler.getEnclosureByID).Methods(http.MethodGet)
+	sr.HandleFunc("/enclosures/{enclosureID}", handler.updateEnclosureByID).Methods(http.MethodPut)
 	sr.HandleFunc("/version", handler.versionHandler).Methods(http.MethodGet)
 }
 

internal/api/enclosure.go

@@ -0,0 +1,79 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package api // import "miniflux.app/v2/internal/api"
+
+import (
+	json_parser "encoding/json"
+	"net/http"
+
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/http/response/json"
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/validator"
+)
+
+func (h *handler) getEnclosureByID(w http.ResponseWriter, r *http.Request) {
+	enclosureID := request.RouteInt64Param(r, "enclosureID")
+
+	enclosure, err := h.store.GetEnclosure(enclosureID)
+	if err != nil {
+		json.ServerError(w, r, err)
+		return
+	}
+
+	if enclosure == nil {
+		json.NotFound(w, r)
+		return
+	}
+
+	userID := request.UserID(r)
+	if enclosure.UserID != userID {
+		json.NotFound(w, r)
+		return
+	}
+
+	enclosure.ProxifyEnclosureURL(h.router)
+
+	json.OK(w, r, enclosure)
+}
+
+func (h *handler) updateEnclosureByID(w http.ResponseWriter, r *http.Request) {
+	enclosureID := request.RouteInt64Param(r, "enclosureID")
+
+	var enclosureUpdateRequest model.EnclosureUpdateRequest
+	if err := json_parser.NewDecoder(r.Body).Decode(&enclosureUpdateRequest); err != nil {
+		json.BadRequest(w, r, err)
+		return
+	}
+
+	if err := validator.ValidateEnclosureUpdateRequest(&enclosureUpdateRequest); err != nil {
+		json.BadRequest(w, r, err)
+		return
+	}
+
+	enclosure, err := h.store.GetEnclosure(enclosureID)
+	if err != nil {
+		json.ServerError(w, r, err)
+		return
+	}
+
+	if enclosure == nil {
+		json.NotFound(w, r)
+		return
+	}
+
+	userID := request.UserID(r)
+	if enclosure.UserID != userID {
+		json.NotFound(w, r)
+		return
+	}
+
+	enclosure.MediaProgression = enclosureUpdateRequest.MediaProgression
+	if err := h.store.UpdateEnclosure(enclosure); err != nil {
+		json.ServerError(w, r, err)
+		return
+	}
+
+	json.NoContent(w, r)
+}

internal/api/entry.go

@@ -8,19 +8,16 @@ import (
 	"errors"
 	"net/http"
 	"strconv"
-	"strings"
 	"time"
 
-	"miniflux.app/v2/internal/config"
 	"miniflux.app/v2/internal/http/request"
 	"miniflux.app/v2/internal/http/response/json"
 	"miniflux.app/v2/internal/integration"
+	"miniflux.app/v2/internal/mediaproxy"
 	"miniflux.app/v2/internal/model"
-	"miniflux.app/v2/internal/proxy"
 	"miniflux.app/v2/internal/reader/processor"
 	"miniflux.app/v2/internal/reader/readingtime"
 	"miniflux.app/v2/internal/storage"
-	"miniflux.app/v2/internal/urllib"
 	"miniflux.app/v2/internal/validator"
 )
 
@@ -36,19 +33,9 @@ func (h *handler) getEntryFromBuilder(w http.ResponseWriter, r *http.Request, b
 		return
 	}
 
-	entry.Content = proxy.AbsoluteProxyRewriter(h.router, r.Host, entry.Content)
-	proxyOption := config.Opts.ProxyOption()
+	entry.Content = mediaproxy.RewriteDocumentWithAbsoluteProxyURL(h.router, entry.Content)
 
-	for i := range entry.Enclosures {
-		if proxyOption == "all" || proxyOption != "none" && !urllib.IsHTTPS(entry.Enclosures[i].URL) {
-			for _, mediaType := range config.Opts.ProxyMediaTypes() {
-				if strings.HasPrefix(entry.Enclosures[i].MimeType, mediaType+"/") {
-					entry.Enclosures[i].URL = proxy.AbsoluteProxifyURL(h.router, r.Host, entry.Enclosures[i].URL)
-					break
-				}
-			}
-		}
-	}
+	entry.Enclosures.ProxifyEnclosureURL(h.router)
 
 	json.OK(w, r, entry)
 }
@@ -149,6 +136,15 @@ func (h *handler) findEntries(w http.ResponseWriter, r *http.Request, feedID int
 	builder.WithLimit(limit)
 	builder.WithTags(tags)
 	builder.WithEnclosures()
+
+	if request.HasQueryParam(r, "globally_visible") {
+		globallyVisible := request.QueryBoolParam(r, "globally_visible", true)
+
+		if globallyVisible {
+			builder.WithGloballyVisible()
+		}
+	}
+
 	configureFilters(builder, r)
 
 	entries, err := builder.GetEntries()
@@ -164,7 +160,7 @@ func (h *handler) findEntries(w http.ResponseWriter, r *http.Request, feedID int
 	}
 
 	for i := range entries {
-		entries[i].Content = proxy.AbsoluteProxyRewriter(h.router, r.Host, entries[i].Content)
+		entries[i].Content = mediaproxy.RewriteDocumentWithAbsoluteProxyURL(h.router, entries[i].Content)
 	}
 
 	json.OK(w, r, &entriesResponse{Total: count, Entries: entries})
@@ -275,7 +271,9 @@ func (h *handler) updateEntry(w http.ResponseWriter, r *http.Request) {
 	}
 
 	entryUpdateRequest.Patch(entry)
-	entry.ReadingTime = readingtime.EstimateReadingTime(entry.Content, user.DefaultReadingSpeed, user.CJKReadingSpeed)
+	if user.ShowReadingTime {
+		entry.ReadingTime = readingtime.EstimateReadingTime(entry.Content, user.DefaultReadingSpeed, user.CJKReadingSpeed)
+	}
 
 	if err := h.store.UpdateEntryTitleAndContent(entry); err != nil {
 		json.ServerError(w, r, err)

internal/api/feed.go

@@ -115,7 +115,7 @@ func (h *handler) updateFeed(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if validationErr := validator.ValidateFeedModification(h.store, userID, &feedModificationRequest); validationErr != nil {
+	if validationErr := validator.ValidateFeedModification(h.store, userID, originalFeed.ID, &feedModificationRequest); validationErr != nil {
 		json.BadRequest(w, r, validationErr.Error())
 		return
 	}

internal/api/subscription.go

@@ -42,6 +42,7 @@ func (h *handler) discoverSubscriptions(w http.ResponseWriter, r *http.Request)
 	requestBuilder.WithUsernameAndPassword(subscriptionDiscoveryRequest.Username, subscriptionDiscoveryRequest.Password)
 	requestBuilder.UseProxy(subscriptionDiscoveryRequest.FetchViaProxy)
 	requestBuilder.IgnoreTLSErrors(subscriptionDiscoveryRequest.AllowSelfSignedCertificates)
+	requestBuilder.DisableHTTP2(subscriptionDiscoveryRequest.DisableHTTP2)
 
 	subscriptions, localizedError := subscription.NewSubscriptionFinder(requestBuilder).FindSubscriptions(
 		subscriptionDiscoveryRequest.URL,

internal/api/user.go

@@ -7,6 +7,8 @@ import (
 	json_parser "encoding/json"
 	"errors"
 	"net/http"
+	"regexp"
+	"strings"
 
 	"miniflux.app/v2/internal/http/request"
 	"miniflux.app/v2/internal/http/response/json"
@@ -77,11 +79,23 @@ func (h *handler) updateUser(w http.ResponseWriter, r *http.Request) {
 		}
 
 		if userModificationRequest.IsAdmin != nil && *userModificationRequest.IsAdmin {
-			json.BadRequest(w, r, errors.New("Only administrators can change permissions of standard users"))
+			json.BadRequest(w, r, errors.New("only administrators can change permissions of standard users"))
 			return
 		}
 	}
 
+	cleanEnd := regexp.MustCompile(`(?m)\r\n\s*$`)
+	if userModificationRequest.BlockFilterEntryRules != nil {
+		*userModificationRequest.BlockFilterEntryRules = cleanEnd.ReplaceAllLiteralString(*userModificationRequest.BlockFilterEntryRules, "")
+		// Clean carriage returns for Windows environments
+		*userModificationRequest.BlockFilterEntryRules = strings.ReplaceAll(*userModificationRequest.BlockFilterEntryRules, "\r\n", "\n")
+	}
+	if userModificationRequest.KeepFilterEntryRules != nil {
+		*userModificationRequest.KeepFilterEntryRules = cleanEnd.ReplaceAllLiteralString(*userModificationRequest.KeepFilterEntryRules, "")
+		// Clean carriage returns for Windows environments
+		*userModificationRequest.KeepFilterEntryRules = strings.ReplaceAll(*userModificationRequest.KeepFilterEntryRules, "\r\n", "\n")
+	}
+
 	if validationErr := validator.ValidateUserModification(h.store, originalUser.ID, &userModificationRequest); validationErr != nil {
 		json.BadRequest(w, r, validationErr.Error())
 		return
@@ -141,7 +155,7 @@ func (h *handler) userByID(w http.ResponseWriter, r *http.Request) {
 	userID := request.RouteInt64Param(r, "userID")
 	user, err := h.store.UserByID(userID)
 	if err != nil {
-		json.BadRequest(w, r, errors.New("Unable to fetch this user from the database"))
+		json.BadRequest(w, r, errors.New("unable to fetch this user from the database"))
 		return
 	}
 
@@ -163,7 +177,7 @@ func (h *handler) userByUsername(w http.ResponseWriter, r *http.Request) {
 	username := request.RouteStringParam(r, "username")
 	user, err := h.store.UserByUsername(username)
 	if err != nil {
-		json.BadRequest(w, r, errors.New("Unable to fetch this user from the database"))
+		json.BadRequest(w, r, errors.New("unable to fetch this user from the database"))
 		return
 	}
 
@@ -194,7 +208,7 @@ func (h *handler) removeUser(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if user.ID == request.UserID(r) {
-		json.BadRequest(w, r, errors.New("You cannot remove yourself"))
+		json.BadRequest(w, r, errors.New("you cannot remove yourself"))
 		return
 	}
 

internal/cli/ask_credentials.go

@@ -16,7 +16,7 @@ func askCredentials() (string, string) {
 	fd := int(os.Stdin.Fd())
 
 	if !term.IsTerminal(fd) {
-		printErrorAndExit(fmt.Errorf("this is not a terminal, exiting"))
+		printErrorAndExit(fmt.Errorf("this is not an interactive terminal, exiting"))
 	}
 
 	fmt.Print("Enter Username: ")

internal/cli/cli.go

@@ -4,6 +4,7 @@
 package cli // import "miniflux.app/v2/internal/cli"
 
 import (
+	"errors"
 	"flag"
 	"fmt"
 	"io"
@@ -23,7 +24,7 @@ const (
 	flagVersionHelp         = "Show application version"
 	flagMigrateHelp         = "Run SQL migrations"
 	flagFlushSessionsHelp   = "Flush all sessions (disconnect users)"
-	flagCreateAdminHelp     = "Create admin user"
+	flagCreateAdminHelp     = "Create an admin user from an interactive terminal"
 	flagResetPasswordHelp   = "Reset user password"
 	flagResetFeedErrorsHelp = "Clear all feed errors for all users"
 	flagDebugModeHelp       = "Show debug logs"
@@ -88,6 +89,23 @@ func Parse() {
 		printErrorAndExit(err)
 	}
 
+	if oauth2Provider := config.Opts.OAuth2Provider(); oauth2Provider != "" {
+		if oauth2Provider != "oidc" && oauth2Provider != "google" {
+			printErrorAndExit(fmt.Errorf(`unsupported OAuth2 provider: %q (Possible values are "google" or "oidc")`, oauth2Provider))
+		}
+	}
+
+	if config.Opts.DisableLocalAuth() {
+		switch {
+		case config.Opts.OAuth2Provider() == "" && config.Opts.AuthProxyHeader() == "":
+			printErrorAndExit(errors.New("DISABLE_LOCAL_AUTH is enabled but neither OAUTH2_PROVIDER nor AUTH_PROXY_HEADER is not set. Please enable at least one authentication source"))
+		case config.Opts.OAuth2Provider() != "" && !config.Opts.IsOAuth2UserCreationAllowed():
+			printErrorAndExit(errors.New("DISABLE_LOCAL_AUTH is enabled and an OAUTH2_PROVIDER is configured, but OAUTH2_USER_CREATION is not enabled"))
+		case config.Opts.AuthProxyHeader() != "" && !config.Opts.IsAuthProxyUserCreationAllowed():
+			printErrorAndExit(errors.New("DISABLE_LOCAL_AUTH is enabled and an AUTH_PROXY_HEADER is configured, but AUTH_PROXY_USER_CREATION is not enabled"))
+		}
+	}
+
 	if flagConfigDump {
 		fmt.Print(config.Opts)
 		return
@@ -191,7 +209,7 @@ func Parse() {
 	}
 
 	if flagCreateAdmin {
-		createAdmin(store)
+		createAdminUserFromInteractiveTerminal(store)
 		return
 	}
 
@@ -211,9 +229,8 @@ func Parse() {
 		printErrorAndExit(err)
 	}
 
-	// Create admin user and start the daemon.
 	if config.Opts.CreateAdmin() {
-		createAdmin(store)
+		createAdminUserFromEnvironmentVariables(store)
 	}
 
 	if flagRefreshFeeds {

internal/cli/create_admin.go

@@ -12,15 +12,20 @@ import (
 	"miniflux.app/v2/internal/validator"
 )
 
-func createAdmin(store *storage.Storage) {
-	userCreationRequest := &model.UserCreationRequest{
-		Username: config.Opts.AdminUsername(),
-		Password: config.Opts.AdminPassword(),
-		IsAdmin:  true,
-	}
+func createAdminUserFromEnvironmentVariables(store *storage.Storage) {
+	createAdminUser(store, config.Opts.AdminUsername(), config.Opts.AdminPassword())
+}
 
-	if userCreationRequest.Username == "" || userCreationRequest.Password == "" {
-		userCreationRequest.Username, userCreationRequest.Password = askCredentials()
+func createAdminUserFromInteractiveTerminal(store *storage.Storage) {
+	username, password := askCredentials()
+	createAdminUser(store, username, password)
+}
+
+func createAdminUser(store *storage.Storage, username, password string) {
+	userCreationRequest := &model.UserCreationRequest{
+		Username: username,
+		Password: password,
+		IsAdmin:  true,
 	}
 
 	if store.UserExists(userCreationRequest.Username) {
@@ -34,7 +39,12 @@ func createAdmin(store *storage.Storage) {
 		printErrorAndExit(validationErr.Error())
 	}
 
-	if _, err := store.CreateUser(userCreationRequest); err != nil {
+	if user, err := store.CreateUser(userCreationRequest); err != nil {
 		printErrorAndExit(err)
+	} else {
+		slog.Info("Created new admin user",
+			slog.String("username", user.Username),
+			slog.Int64("user_id", user.ID),
+		)
 	}
 }

internal/cli/refresh_feeds.go

@@ -45,7 +45,7 @@ func refreshFeeds(store *storage.Storage) {
 		slog.Int("nb_workers", config.Opts.WorkerPoolSize()),
 	)
 
-	for i := 0; i < config.Opts.WorkerPoolSize(); i++ {
+	for i := range config.Opts.WorkerPoolSize() {
 		wg.Add(1)
 		go func(workerID int) {
 			defer wg.Done()
@@ -56,7 +56,7 @@ func refreshFeeds(store *storage.Storage) {
 					slog.Int("worker_id", workerID),
 				)
 
-				if localizedError := feedHandler.RefreshFeed(store, job.UserID, job.FeedID, false); err != nil {
+				if localizedError := feedHandler.RefreshFeed(store, job.UserID, job.FeedID, false); localizedError != nil {
 					slog.Warn("Unable to refresh feed",
 						slog.Int64("feed_id", job.FeedID),
 						slog.Int64("user_id", job.UserID),

internal/config/config_test.go

@@ -4,6 +4,7 @@
 package config // import "miniflux.app/v2/internal/config"
 
 import (
+	"bytes"
 	"os"
 	"testing"
 )
@@ -258,6 +259,29 @@ func TestCustomBaseURLWithTrailingSlash(t *testing.T) {
 	}
 }
 
+func TestCustomBaseURLWithCustomPort(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("BASE_URL", "http://example.org:88/folder/")
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	if opts.BaseURL() != "http://example.org:88/folder" {
+		t.Fatalf(`Unexpected base URL, got "%s"`, opts.BaseURL())
+	}
+
+	if opts.RootURL() != "http://example.org:88" {
+		t.Fatalf(`Unexpected root URL, got "%s"`, opts.RootURL())
+	}
+
+	if opts.BasePath() != "/folder" {
+		t.Fatalf(`Unexpected base path, got "%s"`, opts.BasePath())
+	}
+}
+
 func TestBaseURLWithoutScheme(t *testing.T) {
 	os.Clearenv()
 	os.Setenv("BASE_URL", "example.org/folder/")
@@ -759,6 +783,41 @@ func TestPollingFrequency(t *testing.T) {
 	}
 }
 
+func TestDefautForceRefreshInterval(t *testing.T) {
+	os.Clearenv()
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := defaultForceRefreshInterval
+	result := opts.ForceRefreshInterval()
+
+	if result != expected {
+		t.Fatalf(`Unexpected FORCE_REFRESH_INTERVAL value, got %v instead of %v`, result, expected)
+	}
+}
+
+func TestForceRefreshInterval(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("FORCE_REFRESH_INTERVAL", "42")
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := 42
+	result := opts.ForceRefreshInterval()
+
+	if result != expected {
+		t.Fatalf(`Unexpected FORCE_REFRESH_INTERVAL value, got %v instead of %v`, result, expected)
+	}
+}
+
 func TestDefaultBatchSizeValue(t *testing.T) {
 	os.Clearenv()
 
@@ -1407,9 +1466,9 @@ func TestPocketConsumerKeyFromUserPrefs(t *testing.T) {
 	}
 }
 
-func TestProxyOption(t *testing.T) {
+func TestMediaProxyMode(t *testing.T) {
 	os.Clearenv()
-	os.Setenv("PROXY_OPTION", "all")
+	os.Setenv("MEDIA_PROXY_MODE", "all")
 
 	parser := NewParser()
 	opts, err := parser.ParseEnvironmentVariables()
@@ -1418,14 +1477,14 @@ func TestProxyOption(t *testing.T) {
 	}
 
 	expected := "all"
-	result := opts.ProxyOption()
+	result := opts.MediaProxyMode()
 
 	if result != expected {
-		t.Fatalf(`Unexpected PROXY_OPTION value, got %q instead of %q`, result, expected)
+		t.Fatalf(`Unexpected MEDIA_PROXY_MODE value, got %q instead of %q`, result, expected)
 	}
 }
 
-func TestDefaultProxyOptionValue(t *testing.T) {
+func TestDefaultMediaProxyModeValue(t *testing.T) {
 	os.Clearenv()
 
 	parser := NewParser()
@@ -1434,17 +1493,17 @@ func TestDefaultProxyOptionValue(t *testing.T) {
 		t.Fatalf(`Parsing failure: %v`, err)
 	}
 
-	expected := defaultProxyOption
-	result := opts.ProxyOption()
+	expected := defaultMediaProxyMode
+	result := opts.MediaProxyMode()
 
 	if result != expected {
-		t.Fatalf(`Unexpected PROXY_OPTION value, got %q instead of %q`, result, expected)
+		t.Fatalf(`Unexpected MEDIA_PROXY_MODE value, got %q instead of %q`, result, expected)
 	}
 }
 
-func TestProxyMediaTypes(t *testing.T) {
+func TestMediaProxyResourceTypes(t *testing.T) {
 	os.Clearenv()
-	os.Setenv("PROXY_MEDIA_TYPES", "image,audio")
+	os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image,audio")
 
 	parser := NewParser()
 	opts, err := parser.ParseEnvironmentVariables()
@@ -1454,25 +1513,25 @@ func TestProxyMediaTypes(t *testing.T) {
 
 	expected := []string{"audio", "image"}
 
-	if len(expected) != len(opts.ProxyMediaTypes()) {
-		t.Fatalf(`Unexpected PROXY_MEDIA_TYPES value, got %v instead of %v`, opts.ProxyMediaTypes(), expected)
+	if len(expected) != len(opts.MediaProxyResourceTypes()) {
+		t.Fatalf(`Unexpected MEDIA_PROXY_RESOURCE_TYPES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
 	}
 
 	resultMap := make(map[string]bool)
-	for _, mediaType := range opts.ProxyMediaTypes() {
+	for _, mediaType := range opts.MediaProxyResourceTypes() {
 		resultMap[mediaType] = true
 	}
 
 	for _, mediaType := range expected {
 		if !resultMap[mediaType] {
-			t.Fatalf(`Unexpected PROXY_MEDIA_TYPES value, got %v instead of %v`, opts.ProxyMediaTypes(), expected)
+			t.Fatalf(`Unexpected MEDIA_PROXY_RESOURCE_TYPES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
 		}
 	}
 }
 
-func TestProxyMediaTypesWithDuplicatedValues(t *testing.T) {
+func TestMediaProxyResourceTypesWithDuplicatedValues(t *testing.T) {
 	os.Clearenv()
-	os.Setenv("PROXY_MEDIA_TYPES", "image,audio, image")
+	os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image,audio, image")
 
 	parser := NewParser()
 	opts, err := parser.ParseEnvironmentVariables()
@@ -1481,23 +1540,119 @@ func TestProxyMediaTypesWithDuplicatedValues(t *testing.T) {
 	}
 
 	expected := []string{"audio", "image"}
-	if len(expected) != len(opts.ProxyMediaTypes()) {
-		t.Fatalf(`Unexpected PROXY_MEDIA_TYPES value, got %v instead of %v`, opts.ProxyMediaTypes(), expected)
+	if len(expected) != len(opts.MediaProxyResourceTypes()) {
+		t.Fatalf(`Unexpected MEDIA_PROXY_RESOURCE_TYPES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
 	}
 
 	resultMap := make(map[string]bool)
-	for _, mediaType := range opts.ProxyMediaTypes() {
+	for _, mediaType := range opts.MediaProxyResourceTypes() {
 		resultMap[mediaType] = true
 	}
 
 	for _, mediaType := range expected {
 		if !resultMap[mediaType] {
-			t.Fatalf(`Unexpected PROXY_MEDIA_TYPES value, got %v instead of %v`, opts.ProxyMediaTypes(), expected)
+			t.Fatalf(`Unexpected MEDIA_PROXY_RESOURCE_TYPES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
 		}
 	}
 }
 
-func TestProxyImagesOptionBackwardCompatibility(t *testing.T) {
+func TestDefaultMediaProxyResourceTypes(t *testing.T) {
+	os.Clearenv()
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := []string{"image"}
+
+	if len(expected) != len(opts.MediaProxyResourceTypes()) {
+		t.Fatalf(`Unexpected MEDIA_PROXY_RESOURCE_TYPES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
+	}
+
+	resultMap := make(map[string]bool)
+	for _, mediaType := range opts.MediaProxyResourceTypes() {
+		resultMap[mediaType] = true
+	}
+
+	for _, mediaType := range expected {
+		if !resultMap[mediaType] {
+			t.Fatalf(`Unexpected MEDIA_PROXY_RESOURCE_TYPES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
+		}
+	}
+}
+
+func TestMediaProxyHTTPClientTimeout(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("MEDIA_PROXY_HTTP_CLIENT_TIMEOUT", "24")
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := 24
+	result := opts.MediaProxyHTTPClientTimeout()
+
+	if result != expected {
+		t.Fatalf(`Unexpected MEDIA_PROXY_HTTP_CLIENT_TIMEOUT value, got %d instead of %d`, result, expected)
+	}
+}
+
+func TestDefaultMediaProxyHTTPClientTimeoutValue(t *testing.T) {
+	os.Clearenv()
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := defaultMediaProxyHTTPClientTimeout
+	result := opts.MediaProxyHTTPClientTimeout()
+
+	if result != expected {
+		t.Fatalf(`Unexpected MEDIA_PROXY_HTTP_CLIENT_TIMEOUT value, got %d instead of %d`, result, expected)
+	}
+}
+
+func TestMediaProxyCustomURL(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("MEDIA_PROXY_CUSTOM_URL", "http://example.org/proxy")
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+	expected := "http://example.org/proxy"
+	result := opts.MediaCustomProxyURL()
+	if result != expected {
+		t.Fatalf(`Unexpected MEDIA_PROXY_CUSTOM_URL value, got %q instead of %q`, result, expected)
+	}
+}
+
+func TestMediaProxyPrivateKey(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "foobar")
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := []byte("foobar")
+	result := opts.MediaProxyPrivateKey()
+
+	if !bytes.Equal(result, expected) {
+		t.Fatalf(`Unexpected MEDIA_PROXY_PRIVATE_KEY value, got %q instead of %q`, result, expected)
+	}
+}
+
+func TestProxyImagesOptionForBackwardCompatibility(t *testing.T) {
 	os.Clearenv()
 	os.Setenv("PROXY_IMAGES", "all")
 
@@ -1508,30 +1663,31 @@ func TestProxyImagesOptionBackwardCompatibility(t *testing.T) {
 	}
 
 	expected := []string{"image"}
-	if len(expected) != len(opts.ProxyMediaTypes()) {
-		t.Fatalf(`Unexpected PROXY_MEDIA_TYPES value, got %v instead of %v`, opts.ProxyMediaTypes(), expected)
+	if len(expected) != len(opts.MediaProxyResourceTypes()) {
+		t.Fatalf(`Unexpected PROXY_IMAGES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
 	}
 
 	resultMap := make(map[string]bool)
-	for _, mediaType := range opts.ProxyMediaTypes() {
+	for _, mediaType := range opts.MediaProxyResourceTypes() {
 		resultMap[mediaType] = true
 	}
 
 	for _, mediaType := range expected {
 		if !resultMap[mediaType] {
-			t.Fatalf(`Unexpected PROXY_MEDIA_TYPES value, got %v instead of %v`, opts.ProxyMediaTypes(), expected)
+			t.Fatalf(`Unexpected PROXY_IMAGES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
 		}
 	}
 
 	expectedProxyOption := "all"
-	result := opts.ProxyOption()
+	result := opts.MediaProxyMode()
 	if result != expectedProxyOption {
 		t.Fatalf(`Unexpected PROXY_OPTION value, got %q instead of %q`, result, expectedProxyOption)
 	}
 }
 
-func TestDefaultProxyMediaTypes(t *testing.T) {
+func TestProxyImageURLForBackwardCompatibility(t *testing.T) {
 	os.Clearenv()
+	os.Setenv("PROXY_IMAGE_URL", "http://example.org/proxy")
 
 	parser := NewParser()
 	opts, err := parser.ParseEnvironmentVariables()
@@ -1539,25 +1695,73 @@ func TestDefaultProxyMediaTypes(t *testing.T) {
 		t.Fatalf(`Parsing failure: %v`, err)
 	}
 
-	expected := []string{"image"}
+	expected := "http://example.org/proxy"
+	result := opts.MediaCustomProxyURL()
+	if result != expected {
+		t.Fatalf(`Unexpected PROXY_IMAGE_URL value, got %q instead of %q`, result, expected)
+	}
+}
 
-	if len(expected) != len(opts.ProxyMediaTypes()) {
-		t.Fatalf(`Unexpected PROXY_MEDIA_TYPES value, got %v instead of %v`, opts.ProxyMediaTypes(), expected)
+func TestProxyURLOptionForBackwardCompatibility(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("PROXY_URL", "http://example.org/proxy")
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := "http://example.org/proxy"
+	result := opts.MediaCustomProxyURL()
+	if result != expected {
+		t.Fatalf(`Unexpected PROXY_URL value, got %q instead of %q`, result, expected)
+	}
+}
+
+func TestProxyMediaTypesOptionForBackwardCompatibility(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("PROXY_MEDIA_TYPES", "image,audio")
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+	expected := []string{"audio", "image"}
+	if len(expected) != len(opts.MediaProxyResourceTypes()) {
+		t.Fatalf(`Unexpected PROXY_MEDIA_TYPES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
 	}
 
 	resultMap := make(map[string]bool)
-	for _, mediaType := range opts.ProxyMediaTypes() {
+	for _, mediaType := range opts.MediaProxyResourceTypes() {
 		resultMap[mediaType] = true
 	}
 
 	for _, mediaType := range expected {
 		if !resultMap[mediaType] {
-			t.Fatalf(`Unexpected PROXY_MEDIA_TYPES value, got %v instead of %v`, opts.ProxyMediaTypes(), expected)
+			t.Fatalf(`Unexpected PROXY_MEDIA_TYPES value, got %v instead of %v`, opts.MediaProxyResourceTypes(), expected)
 		}
 	}
 }
 
-func TestProxyHTTPClientTimeout(t *testing.T) {
+func TestProxyOptionForBackwardCompatibility(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("PROXY_OPTION", "all")
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+	expected := "all"
+	result := opts.MediaProxyMode()
+	if result != expected {
+		t.Fatalf(`Unexpected PROXY_OPTION value, got %q instead of %q`, result, expected)
+	}
+}
+
+func TestProxyHTTPClientTimeoutOptionForBackwardCompatibility(t *testing.T) {
 	os.Clearenv()
 	os.Setenv("PROXY_HTTP_CLIENT_TIMEOUT", "24")
 
@@ -1566,29 +1770,26 @@ func TestProxyHTTPClientTimeout(t *testing.T) {
 	if err != nil {
 		t.Fatalf(`Parsing failure: %v`, err)
 	}
-
 	expected := 24
-	result := opts.ProxyHTTPClientTimeout()
-
+	result := opts.MediaProxyHTTPClientTimeout()
 	if result != expected {
 		t.Fatalf(`Unexpected PROXY_HTTP_CLIENT_TIMEOUT value, got %d instead of %d`, result, expected)
 	}
 }
 
-func TestDefaultProxyHTTPClientTimeoutValue(t *testing.T) {
+func TestProxyPrivateKeyOptionForBackwardCompatibility(t *testing.T) {
 	os.Clearenv()
+	os.Setenv("PROXY_PRIVATE_KEY", "foobar")
 
 	parser := NewParser()
 	opts, err := parser.ParseEnvironmentVariables()
 	if err != nil {
 		t.Fatalf(`Parsing failure: %v`, err)
 	}
-
-	expected := defaultProxyHTTPClientTimeout
-	result := opts.ProxyHTTPClientTimeout()
-
-	if result != expected {
-		t.Fatalf(`Unexpected PROXY_HTTP_CLIENT_TIMEOUT value, got %d instead of %d`, result, expected)
+	expected := []byte("foobar")
+	result := opts.MediaProxyPrivateKey()
+	if !bytes.Equal(result, expected) {
+		t.Fatalf(`Unexpected PROXY_PRIVATE_KEY value, got %q instead of %q`, result, expected)
 	}
 }
 
@@ -1843,6 +2044,42 @@ func TestAuthProxyUserCreationAdmin(t *testing.T) {
 	}
 }
 
+func TestFetchBilibiliWatchTime(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("FETCH_BILIBILI_WATCH_TIME", "1")
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := true
+	result := opts.FetchBilibiliWatchTime()
+
+	if result != expected {
+		t.Fatalf(`Unexpected FETCH_BILIBILI_WATCH_TIME value, got %v instead of %v`, result, expected)
+	}
+}
+
+func TestFetchNebulaWatchTime(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("FETCH_NEBULA_WATCH_TIME", "1")
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := true
+	result := opts.FetchNebulaWatchTime()
+
+	if result != expected {
+		t.Fatalf(`Unexpected FETCH_NEBULA_WATCH_TIME value, got %v instead of %v`, result, expected)
+	}
+}
+
 func TestFetchOdyseeWatchTime(t *testing.T) {
 	os.Clearenv()
 	os.Setenv("FETCH_ODYSEE_WATCH_TIME", "1")
@@ -1909,7 +2146,7 @@ func TestParseConfigDumpOutput(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if _, err := tmpfile.Write([]byte(serialized)); err != nil {
+	if _, err := tmpfile.WriteString(serialized); err != nil {
 		t.Fatal(err)
 	}
 

internal/config/options.go

@@ -4,12 +4,12 @@
 package config // import "miniflux.app/v2/internal/config"
 
 import (
-	"crypto/rand"
 	"fmt"
 	"sort"
 	"strings"
 	"time"
 
+	"miniflux.app/v2/internal/crypto"
 	"miniflux.app/v2/internal/version"
 )
 
@@ -27,8 +27,9 @@ const (
 	defaultBaseURL                            = "http://localhost"
 	defaultRootURL                            = "http://localhost"
 	defaultBasePath                           = ""
-	defaultWorkerPoolSize                     = 5
+	defaultWorkerPoolSize                     = 16
 	defaultPollingFrequency                   = 60
+	defaultForceRefreshInterval               = 30
 	defaultBatchSize                          = 100
 	defaultPollingScheduler                   = "round_robin"
 	defaultSchedulerEntryFrequencyMinInterval = 5
@@ -50,10 +51,13 @@ const (
 	defaultCleanupArchiveUnreadDays           = 180
 	defaultCleanupArchiveBatchSize            = 10000
 	defaultCleanupRemoveSessionsDays          = 30
-	defaultProxyHTTPClientTimeout             = 120
-	defaultProxyOption                        = "http-only"
-	defaultProxyMediaTypes                    = "image"
-	defaultProxyUrl                           = ""
+	defaultMediaProxyHTTPClientTimeout        = 120
+	defaultMediaProxyMode                     = "http-only"
+	defaultMediaResourceTypes                 = "image"
+	defaultMediaProxyURL                      = ""
+	defaultFilterEntryMaxAgeDays              = 0
+	defaultFetchBilibiliWatchTime             = false
+	defaultFetchNebulaWatchTime               = false
 	defaultFetchOdyseeWatchTime               = false
 	defaultFetchYouTubeWatchTime              = false
 	defaultYouTubeEmbedUrlOverride            = "https://www.youtube-nocookie.com/embed/"
@@ -65,7 +69,9 @@ const (
 	defaultOAuth2ClientSecret                 = ""
 	defaultOAuth2RedirectURL                  = ""
 	defaultOAuth2OidcDiscoveryEndpoint        = ""
+	defaultOauth2OidcProviderName             = "OpenID Connect"
 	defaultOAuth2Provider                     = ""
+	defaultDisableLocalAuth                   = false
 	defaultPocketConsumerKey                  = ""
 	defaultHTTPClientTimeout                  = 20
 	defaultHTTPClientMaxBodySize              = 15
@@ -122,6 +128,7 @@ type Options struct {
 	cleanupArchiveBatchSize            int
 	cleanupRemoveSessionsDays          int
 	pollingFrequency                   int
+	forceRefreshInterval               int
 	batchSize                          int
 	pollingScheduler                   string
 	schedulerEntryFrequencyMinInterval int
@@ -133,19 +140,24 @@ type Options struct {
 	createAdmin                        bool
 	adminUsername                      string
 	adminPassword                      string
-	proxyHTTPClientTimeout             int
-	proxyOption                        string
-	proxyMediaTypes                    []string
-	proxyUrl                           string
+	mediaProxyHTTPClientTimeout        int
+	mediaProxyMode                     string
+	mediaProxyResourceTypes            []string
+	mediaProxyCustomURL                string
+	fetchBilibiliWatchTime             bool
+	fetchNebulaWatchTime               bool
 	fetchOdyseeWatchTime               bool
 	fetchYouTubeWatchTime              bool
+	filterEntryMaxAgeDays              int
 	youTubeEmbedUrlOverride            string
 	oauth2UserCreationAllowed          bool
 	oauth2ClientID                     string
 	oauth2ClientSecret                 string
 	oauth2RedirectURL                  string
 	oidcDiscoveryEndpoint              string
+	oidcProviderName                   string
 	oauth2Provider                     string
+	disableLocalAuth                   bool
 	pocketConsumerKey                  string
 	httpClientTimeout                  int
 	httpClientMaxBodySize              int64
@@ -163,15 +175,12 @@ type Options struct {
 	metricsPassword                    string
 	watchdog                           bool
 	invidiousInstance                  string
-	proxyPrivateKey                    []byte
+	mediaProxyPrivateKey               []byte
 	webAuthn                           bool
 }
 
 // NewOptions returns Options with default values.
 func NewOptions() *Options {
-	randomKey := make([]byte, 16)
-	rand.Read(randomKey)
-
 	return &Options{
 		HTTPS:                              defaultHTTPS,
 		logFile:                            defaultLogFile,
@@ -200,6 +209,7 @@ func NewOptions() *Options {
 		cleanupArchiveBatchSize:            defaultCleanupArchiveBatchSize,
 		cleanupRemoveSessionsDays:          defaultCleanupRemoveSessionsDays,
 		pollingFrequency:                   defaultPollingFrequency,
+		forceRefreshInterval:               defaultForceRefreshInterval,
 		batchSize:                          defaultBatchSize,
 		pollingScheduler:                   defaultPollingScheduler,
 		schedulerEntryFrequencyMinInterval: defaultSchedulerEntryFrequencyMinInterval,
@@ -209,10 +219,13 @@ func NewOptions() *Options {
 		pollingParsingErrorLimit:           defaultPollingParsingErrorLimit,
 		workerPoolSize:                     defaultWorkerPoolSize,
 		createAdmin:                        defaultCreateAdmin,
-		proxyHTTPClientTimeout:             defaultProxyHTTPClientTimeout,
-		proxyOption:                        defaultProxyOption,
-		proxyMediaTypes:                    []string{defaultProxyMediaTypes},
-		proxyUrl:                           defaultProxyUrl,
+		mediaProxyHTTPClientTimeout:        defaultMediaProxyHTTPClientTimeout,
+		mediaProxyMode:                     defaultMediaProxyMode,
+		mediaProxyResourceTypes:            []string{defaultMediaResourceTypes},
+		mediaProxyCustomURL:                defaultMediaProxyURL,
+		filterEntryMaxAgeDays:              defaultFilterEntryMaxAgeDays,
+		fetchBilibiliWatchTime:             defaultFetchBilibiliWatchTime,
+		fetchNebulaWatchTime:               defaultFetchNebulaWatchTime,
 		fetchOdyseeWatchTime:               defaultFetchOdyseeWatchTime,
 		fetchYouTubeWatchTime:              defaultFetchYouTubeWatchTime,
 		youTubeEmbedUrlOverride:            defaultYouTubeEmbedUrlOverride,
@@ -221,7 +234,9 @@ func NewOptions() *Options {
 		oauth2ClientSecret:                 defaultOAuth2ClientSecret,
 		oauth2RedirectURL:                  defaultOAuth2RedirectURL,
 		oidcDiscoveryEndpoint:              defaultOAuth2OidcDiscoveryEndpoint,
+		oidcProviderName:                   defaultOauth2OidcProviderName,
 		oauth2Provider:                     defaultOAuth2Provider,
+		disableLocalAuth:                   defaultDisableLocalAuth,
 		pocketConsumerKey:                  defaultPocketConsumerKey,
 		httpClientTimeout:                  defaultHTTPClientTimeout,
 		httpClientMaxBodySize:              defaultHTTPClientMaxBodySize * 1024 * 1024,
@@ -239,7 +254,7 @@ func NewOptions() *Options {
 		metricsPassword:                    defaultMetricsPassword,
 		watchdog:                           defaultWatchdog,
 		invidiousInstance:                  defaultInvidiousInstance,
-		proxyPrivateKey:                    randomKey,
+		mediaProxyPrivateKey:               crypto.GenerateRandomBytes(16),
 		webAuthn:                           defaultWebAuthn,
 	}
 }
@@ -378,6 +393,11 @@ func (o *Options) PollingFrequency() int {
 	return o.pollingFrequency
 }
 
+// ForceRefreshInterval returns the force refresh interval
+func (o *Options) ForceRefreshInterval() int {
+	return o.forceRefreshInterval
+}
+
 // BatchSize returns the number of feeds to send for background processing.
 func (o *Options) BatchSize() int {
 	return o.batchSize
@@ -437,11 +457,21 @@ func (o *Options) OIDCDiscoveryEndpoint() string {
 	return o.oidcDiscoveryEndpoint
 }
 
+// OIDCProviderName returns the OAuth2 OIDC provider's display name
+func (o *Options) OIDCProviderName() string {
+	return o.oidcProviderName
+}
+
 // OAuth2Provider returns the name of the OAuth2 provider configured.
 func (o *Options) OAuth2Provider() string {
 	return o.oauth2Provider
 }
 
+// DisableLocalAUth returns true if the local user database should not be used to authenticate users
+func (o *Options) DisableLocalAuth() bool {
+	return o.disableLocalAuth
+}
+
 // HasHSTS returns true if HTTP Strict Transport Security is enabled.
 func (o *Options) HasHSTS() bool {
 	return o.hsts
@@ -478,30 +508,47 @@ func (o *Options) YouTubeEmbedUrlOverride() string {
 	return o.youTubeEmbedUrlOverride
 }
 
+// FetchNebulaWatchTime returns true if the Nebula video duration
+// should be fetched and used as a reading time.
+func (o *Options) FetchNebulaWatchTime() bool {
+	return o.fetchNebulaWatchTime
+}
+
 // FetchOdyseeWatchTime returns true if the Odysee video duration
 // should be fetched and used as a reading time.
 func (o *Options) FetchOdyseeWatchTime() bool {
 	return o.fetchOdyseeWatchTime
 }
 
-// ProxyOption returns "none" to never proxy, "http-only" to proxy non-HTTPS, "all" to always proxy.
-func (o *Options) ProxyOption() string {
-	return o.proxyOption
+// FetchBilibiliWatchTime returns true if the Bilibili video duration
+// should be fetched and used as a reading time.
+func (o *Options) FetchBilibiliWatchTime() bool {
+	return o.fetchBilibiliWatchTime
 }
 
-// ProxyMediaTypes returns a slice of media types to proxy.
-func (o *Options) ProxyMediaTypes() []string {
-	return o.proxyMediaTypes
+// MediaProxyMode returns "none" to never proxy, "http-only" to proxy non-HTTPS, "all" to always proxy.
+func (o *Options) MediaProxyMode() string {
+	return o.mediaProxyMode
 }
 
-// ProxyUrl returns a string of a URL to use to proxy image requests
-func (o *Options) ProxyUrl() string {
-	return o.proxyUrl
+// MediaProxyResourceTypes returns a slice of resource types to proxy.
+func (o *Options) MediaProxyResourceTypes() []string {
+	return o.mediaProxyResourceTypes
 }
 
-// ProxyHTTPClientTimeout returns the time limit in seconds before the proxy HTTP client cancel the request.
-func (o *Options) ProxyHTTPClientTimeout() int {
-	return o.proxyHTTPClientTimeout
+// MediaCustomProxyURL returns the custom proxy URL for medias.
+func (o *Options) MediaCustomProxyURL() string {
+	return o.mediaProxyCustomURL
+}
+
+// MediaProxyHTTPClientTimeout returns the time limit in seconds before the proxy HTTP client cancel the request.
+func (o *Options) MediaProxyHTTPClientTimeout() int {
+	return o.mediaProxyHTTPClientTimeout
+}
+
+// MediaProxyPrivateKey returns the private key used by the media proxy.
+func (o *Options) MediaProxyPrivateKey() []byte {
+	return o.mediaProxyPrivateKey
 }
 
 // HasHTTPService returns true if the HTTP service is enabled.
@@ -597,16 +644,16 @@ func (o *Options) InvidiousInstance() string {
 	return o.invidiousInstance
 }
 
-// ProxyPrivateKey returns the private key used by the media proxy
-func (o *Options) ProxyPrivateKey() []byte {
-	return o.proxyPrivateKey
-}
-
 // WebAuthn returns true if WebAuthn logins are supported
 func (o *Options) WebAuthn() bool {
 	return o.webAuthn
 }
 
+// FilterEntryMaxAgeDays returns the number of days after which entries should be retained.
+func (o *Options) FilterEntryMaxAgeDays() int {
+	return o.filterEntryMaxAgeDays
+}
+
 // SortedOptions returns options as a list of key value pairs, sorted by keys.
 func (o *Options) SortedOptions(redactSecret bool) []*Option {
 	var keyValues = map[string]interface{}{
@@ -632,8 +679,11 @@ func (o *Options) SortedOptions(redactSecret bool) []*Option {
 		"DISABLE_HSTS":                           !o.hsts,
 		"DISABLE_HTTP_SERVICE":                   !o.httpService,
 		"DISABLE_SCHEDULER_SERVICE":              !o.schedulerService,
+		"FILTER_ENTRY_MAX_AGE_DAYS":              o.filterEntryMaxAgeDays,
 		"FETCH_YOUTUBE_WATCH_TIME":               o.fetchYouTubeWatchTime,
+		"FETCH_NEBULA_WATCH_TIME":                o.fetchNebulaWatchTime,
 		"FETCH_ODYSEE_WATCH_TIME":                o.fetchOdyseeWatchTime,
+		"FETCH_BILIBILI_WATCH_TIME":              o.fetchBilibiliWatchTime,
 		"HTTPS":                                  o.HTTPS,
 		"HTTP_CLIENT_MAX_BODY_SIZE":              o.httpClientMaxBodySize,
 		"HTTP_CLIENT_PROXY":                      o.httpClientProxy,
@@ -658,18 +708,21 @@ func (o *Options) SortedOptions(redactSecret bool) []*Option {
 		"OAUTH2_CLIENT_ID":                       o.oauth2ClientID,
 		"OAUTH2_CLIENT_SECRET":                   redactSecretValue(o.oauth2ClientSecret, redactSecret),
 		"OAUTH2_OIDC_DISCOVERY_ENDPOINT":         o.oidcDiscoveryEndpoint,
+		"OAUTH2_OIDC_PROVIDER_NAME":              o.oidcProviderName,
 		"OAUTH2_PROVIDER":                        o.oauth2Provider,
 		"OAUTH2_REDIRECT_URL":                    o.oauth2RedirectURL,
 		"OAUTH2_USER_CREATION":                   o.oauth2UserCreationAllowed,
+		"DISABLE_LOCAL_AUTH":                     o.disableLocalAuth,
 		"POCKET_CONSUMER_KEY":                    redactSecretValue(o.pocketConsumerKey, redactSecret),
 		"POLLING_FREQUENCY":                      o.pollingFrequency,
+		"FORCE_REFRESH_INTERVAL":                 o.forceRefreshInterval,
 		"POLLING_PARSING_ERROR_LIMIT":            o.pollingParsingErrorLimit,
 		"POLLING_SCHEDULER":                      o.pollingScheduler,
-		"PROXY_HTTP_CLIENT_TIMEOUT":              o.proxyHTTPClientTimeout,
-		"PROXY_MEDIA_TYPES":                      o.proxyMediaTypes,
-		"PROXY_OPTION":                           o.proxyOption,
-		"PROXY_PRIVATE_KEY":                      redactSecretValue(string(o.proxyPrivateKey), redactSecret),
-		"PROXY_URL":                              o.proxyUrl,
+		"MEDIA_PROXY_HTTP_CLIENT_TIMEOUT":        o.mediaProxyHTTPClientTimeout,
+		"MEDIA_PROXY_RESOURCE_TYPES":             o.mediaProxyResourceTypes,
+		"MEDIA_PROXY_MODE":                       o.mediaProxyMode,
+		"MEDIA_PROXY_PRIVATE_KEY":                redactSecretValue(string(o.mediaProxyPrivateKey), redactSecret),
+		"MEDIA_PROXY_CUSTOM_URL":                 o.mediaProxyCustomURL,
 		"ROOT_URL":                               o.rootURL,
 		"RUN_MIGRATIONS":                         o.runMigrations,
 		"SCHEDULER_ENTRY_FREQUENCY_MAX_INTERVAL": o.schedulerEntryFrequencyMaxInterval,

internal/config/parser.go

@@ -10,6 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log/slog"
 	"net/url"
 	"os"
 	"strconv"
@@ -56,7 +57,7 @@ func (p *Parser) parseFileContent(r io.Reader) (lines []string) {
 	scanner := bufio.NewScanner(r)
 	for scanner.Scan() {
 		line := strings.TrimSpace(scanner.Text())
-		if len(line) > 0 && !strings.HasPrefix(line, "#") && strings.Index(line, "=") > 0 {
+		if !strings.HasPrefix(line, "#") && strings.Index(line, "=") > 0 {
 			lines = append(lines, line)
 		}
 	}
@@ -87,6 +88,7 @@ func (p *Parser) parseLines(lines []string) (err error) {
 				p.opts.logFormat = parsedValue
 			}
 		case "DEBUG":
+			slog.Warn("The DEBUG environment variable is deprecated, use LOG_LEVEL instead")
 			parsedValue := parseBool(value, defaultDebug)
 			if parsedValue {
 				p.opts.logLevel = "debug"
@@ -112,6 +114,8 @@ func (p *Parser) parseLines(lines []string) (err error) {
 			p.opts.databaseMinConns = parseInt(value, defaultDatabaseMinConns)
 		case "DATABASE_CONNECTION_LIFETIME":
 			p.opts.databaseConnectionLifetime = parseInt(value, defaultDatabaseConnectionLifetime)
+		case "FILTER_ENTRY_MAX_AGE_DAYS":
+			p.opts.filterEntryMaxAgeDays = parseInt(value, defaultFilterEntryMaxAgeDays)
 		case "RUN_MIGRATIONS":
 			p.opts.runMigrations = parseBool(value, defaultRunMigrations)
 		case "DISABLE_HSTS":
@@ -142,6 +146,8 @@ func (p *Parser) parseLines(lines []string) (err error) {
 			p.opts.workerPoolSize = parseInt(value, defaultWorkerPoolSize)
 		case "POLLING_FREQUENCY":
 			p.opts.pollingFrequency = parseInt(value, defaultPollingFrequency)
+		case "FORCE_REFRESH_INTERVAL":
+			p.opts.forceRefreshInterval = parseInt(value, defaultForceRefreshInterval)
 		case "BATCH_SIZE":
 			p.opts.batchSize = parseInt(value, defaultBatchSize)
 		case "POLLING_SCHEDULER":
@@ -156,20 +162,41 @@ func (p *Parser) parseLines(lines []string) (err error) {
 			p.opts.schedulerRoundRobinMinInterval = parseInt(value, defaultSchedulerRoundRobinMinInterval)
 		case "POLLING_PARSING_ERROR_LIMIT":
 			p.opts.pollingParsingErrorLimit = parseInt(value, defaultPollingParsingErrorLimit)
-		// kept for compatibility purpose
 		case "PROXY_IMAGES":
-			p.opts.proxyOption = parseString(value, defaultProxyOption)
+			slog.Warn("The PROXY_IMAGES environment variable is deprecated, use MEDIA_PROXY_MODE instead")
+			p.opts.mediaProxyMode = parseString(value, defaultMediaProxyMode)
 		case "PROXY_HTTP_CLIENT_TIMEOUT":
-			p.opts.proxyHTTPClientTimeout = parseInt(value, defaultProxyHTTPClientTimeout)
+			slog.Warn("The PROXY_HTTP_CLIENT_TIMEOUT environment variable is deprecated, use MEDIA_PROXY_HTTP_CLIENT_TIMEOUT instead")
+			p.opts.mediaProxyHTTPClientTimeout = parseInt(value, defaultMediaProxyHTTPClientTimeout)
+		case "MEDIA_PROXY_HTTP_CLIENT_TIMEOUT":
+			p.opts.mediaProxyHTTPClientTimeout = parseInt(value, defaultMediaProxyHTTPClientTimeout)
 		case "PROXY_OPTION":
-			p.opts.proxyOption = parseString(value, defaultProxyOption)
+			slog.Warn("The PROXY_OPTION environment variable is deprecated, use MEDIA_PROXY_MODE instead")
+			p.opts.mediaProxyMode = parseString(value, defaultMediaProxyMode)
+		case "MEDIA_PROXY_MODE":
+			p.opts.mediaProxyMode = parseString(value, defaultMediaProxyMode)
 		case "PROXY_MEDIA_TYPES":
-			p.opts.proxyMediaTypes = parseStringList(value, []string{defaultProxyMediaTypes})
-		// kept for compatibility purpose
+			slog.Warn("The PROXY_MEDIA_TYPES environment variable is deprecated, use MEDIA_PROXY_RESOURCE_TYPES instead")
+			p.opts.mediaProxyResourceTypes = parseStringList(value, []string{defaultMediaResourceTypes})
+		case "MEDIA_PROXY_RESOURCE_TYPES":
+			p.opts.mediaProxyResourceTypes = parseStringList(value, []string{defaultMediaResourceTypes})
 		case "PROXY_IMAGE_URL":
-			p.opts.proxyUrl = parseString(value, defaultProxyUrl)
+			slog.Warn("The PROXY_IMAGE_URL environment variable is deprecated, use MEDIA_PROXY_CUSTOM_URL instead")
+			p.opts.mediaProxyCustomURL = parseString(value, defaultMediaProxyURL)
 		case "PROXY_URL":
-			p.opts.proxyUrl = parseString(value, defaultProxyUrl)
+			slog.Warn("The PROXY_URL environment variable is deprecated, use MEDIA_PROXY_CUSTOM_URL instead")
+			p.opts.mediaProxyCustomURL = parseString(value, defaultMediaProxyURL)
+		case "PROXY_PRIVATE_KEY":
+			slog.Warn("The PROXY_PRIVATE_KEY environment variable is deprecated, use MEDIA_PROXY_PRIVATE_KEY instead")
+			randomKey := make([]byte, 16)
+			rand.Read(randomKey)
+			p.opts.mediaProxyPrivateKey = parseBytes(value, randomKey)
+		case "MEDIA_PROXY_PRIVATE_KEY":
+			randomKey := make([]byte, 16)
+			rand.Read(randomKey)
+			p.opts.mediaProxyPrivateKey = parseBytes(value, randomKey)
+		case "MEDIA_PROXY_CUSTOM_URL":
+			p.opts.mediaProxyCustomURL = parseString(value, defaultMediaProxyURL)
 		case "CREATE_ADMIN":
 			p.opts.createAdmin = parseBool(value, defaultCreateAdmin)
 		case "ADMIN_USERNAME":
@@ -198,8 +225,12 @@ func (p *Parser) parseLines(lines []string) (err error) {
 			p.opts.oauth2RedirectURL = parseString(value, defaultOAuth2RedirectURL)
 		case "OAUTH2_OIDC_DISCOVERY_ENDPOINT":
 			p.opts.oidcDiscoveryEndpoint = parseString(value, defaultOAuth2OidcDiscoveryEndpoint)
+		case "OAUTH2_OIDC_PROVIDER_NAME":
+			p.opts.oidcProviderName = parseString(value, defaultOauth2OidcProviderName)
 		case "OAUTH2_PROVIDER":
 			p.opts.oauth2Provider = parseString(value, defaultOAuth2Provider)
+		case "DISABLE_LOCAL_AUTH":
+			p.opts.disableLocalAuth = parseBool(value, defaultDisableLocalAuth)
 		case "HTTP_CLIENT_TIMEOUT":
 			p.opts.httpClientTimeout = parseInt(value, defaultHTTPClientTimeout)
 		case "HTTP_CLIENT_MAX_BODY_SIZE":
@@ -232,6 +263,10 @@ func (p *Parser) parseLines(lines []string) (err error) {
 			p.opts.metricsPassword = parseString(value, defaultMetricsPassword)
 		case "METRICS_PASSWORD_FILE":
 			p.opts.metricsPassword = readSecretFile(value, defaultMetricsPassword)
+		case "FETCH_BILIBILI_WATCH_TIME":
+			p.opts.fetchBilibiliWatchTime = parseBool(value, defaultFetchBilibiliWatchTime)
+		case "FETCH_NEBULA_WATCH_TIME":
+			p.opts.fetchNebulaWatchTime = parseBool(value, defaultFetchNebulaWatchTime)
 		case "FETCH_ODYSEE_WATCH_TIME":
 			p.opts.fetchOdyseeWatchTime = parseBool(value, defaultFetchOdyseeWatchTime)
 		case "FETCH_YOUTUBE_WATCH_TIME":
@@ -242,10 +277,6 @@ func (p *Parser) parseLines(lines []string) (err error) {
 			p.opts.watchdog = parseBool(value, defaultWatchdog)
 		case "INVIDIOUS_INSTANCE":
 			p.opts.invidiousInstance = parseString(value, defaultInvidiousInstance)
-		case "PROXY_PRIVATE_KEY":
-			randomKey := make([]byte, 16)
-			rand.Read(randomKey)
-			p.opts.proxyPrivateKey = parseBytes(value, randomKey)
 		case "WEBAUTHN":
 			p.opts.webAuthn = parseBool(value, defaultWebAuthn)
 		}

internal/crypto/crypto.go

@@ -7,6 +7,7 @@ import (
 	"crypto/hmac"
 	"crypto/rand"
 	"crypto/sha256"
+	"crypto/subtle"
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
@@ -16,8 +17,7 @@ import (
 
 // HashFromBytes returns a SHA-256 checksum of the input.
 func HashFromBytes(value []byte) string {
-	sum := sha256.Sum256(value)
-	return fmt.Sprintf("%x", sum)
+	return fmt.Sprintf("%x", sha256.Sum256(value))
 }
 
 // Hash returns a SHA-256 checksum of a string.
@@ -55,3 +55,12 @@ func GenerateSHA256Hmac(secret string, data []byte) string {
 	h.Write(data)
 	return hex.EncodeToString(h.Sum(nil))
 }
+
+func GenerateUUID() string {
+	b := GenerateRandomBytes(16)
+	return fmt.Sprintf("%X-%X-%X-%X-%X", b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
+}
+
+func ConstantTimeCmp(a, b string) bool {
+	return subtle.ConstantTimeCompare([]byte(a), []byte(b)) == 1
+}

internal/database/database.go

@@ -32,7 +32,7 @@ func Migrate(db *sql.DB) error {
 	var currentVersion int
 	db.QueryRow(`SELECT version FROM schema_version`).Scan(&currentVersion)
 
-	slog.Debug("Running database migrations",
+	slog.Info("Running database migrations",
 		slog.Int("current_version", currentVersion),
 		slog.Int("latest_version", schemaVersion),
 	)

internal/database/migrations.go

@@ -834,4 +834,112 @@ var migrations = []func(tx *sql.Tx) error{
 		_, err = tx.Exec(sql)
 		return
 	},
+	func(tx *sql.Tx) (err error) {
+		sql := `
+			ALTER TABLE integrations ADD COLUMN linkace_enabled bool default 'f';
+			ALTER TABLE integrations ADD COLUMN linkace_url text default '';
+			ALTER TABLE integrations ADD COLUMN linkace_api_key text default '';
+			ALTER TABLE integrations ADD COLUMN linkace_tags text default '';
+			ALTER TABLE integrations ADD COLUMN linkace_is_private bool default 't';
+			ALTER TABLE integrations ADD COLUMN linkace_check_disabled bool default 't';
+		`
+		_, err = tx.Exec(sql)
+		return err
+	},
+	func(tx *sql.Tx) (err error) {
+		sql := `
+			ALTER TABLE integrations ADD COLUMN linkwarden_enabled bool default 'f';
+			ALTER TABLE integrations ADD COLUMN linkwarden_url text default '';
+			ALTER TABLE integrations ADD COLUMN linkwarden_api_key text default '';
+		`
+		_, err = tx.Exec(sql)
+		return err
+	},
+	func(tx *sql.Tx) (err error) {
+		sql := `
+			ALTER TABLE integrations ADD COLUMN readeck_enabled bool default 'f';
+			ALTER TABLE integrations ADD COLUMN readeck_only_url bool default 'f';
+			ALTER TABLE integrations ADD COLUMN readeck_url text default '';
+			ALTER TABLE integrations ADD COLUMN readeck_api_key text default '';
+			ALTER TABLE integrations ADD COLUMN readeck_labels text default '';
+		`
+		_, err = tx.Exec(sql)
+		return err
+	},
+	func(tx *sql.Tx) (err error) {
+		sql := `ALTER TABLE feeds ADD COLUMN disable_http2 bool default 'f'`
+		_, err = tx.Exec(sql)
+		return err
+	},
+	func(tx *sql.Tx) (err error) {
+		sql := `ALTER TABLE users ADD COLUMN media_playback_rate numeric default 1;`
+		_, err = tx.Exec(sql)
+		return err
+	},
+	func(tx *sql.Tx) (err error) {
+		// the WHERE part speed-up the request a lot
+		sql := `UPDATE entries SET tags = array_remove(tags, '') WHERE '' = ANY(tags);`
+		_, err = tx.Exec(sql)
+		return err
+	},
+	func(tx *sql.Tx) (err error) {
+		// Entry URLs can exceeds btree maximum size
+		// Checking entry existence is now using entries_feed_id_status_hash_idx index
+		_, err = tx.Exec(`DROP INDEX entries_feed_url_idx`)
+		return err
+	},
+	func(tx *sql.Tx) (err error) {
+		sql := `
+			ALTER TABLE integrations ADD COLUMN raindrop_enabled bool default 'f';
+			ALTER TABLE integrations ADD COLUMN raindrop_token text default '';
+			ALTER TABLE integrations ADD COLUMN raindrop_collection_id text default '';
+			ALTER TABLE integrations ADD COLUMN raindrop_tags text default '';
+		`
+		_, err = tx.Exec(sql)
+		return err
+	},
+	func(tx *sql.Tx) (err error) {
+		sql := `ALTER TABLE feeds ADD COLUMN description text default ''`
+		_, err = tx.Exec(sql)
+		return err
+	},
+	func(tx *sql.Tx) (err error) {
+		sql := `
+			ALTER TABLE users
+				ADD COLUMN block_filter_entry_rules text not null default '',
+				ADD COLUMN keep_filter_entry_rules text not null default ''
+		`
+		_, err = tx.Exec(sql)
+		return err
+	},
+	func(tx *sql.Tx) (err error) {
+		sql := `
+			ALTER TABLE integrations ADD COLUMN betula_url text default '';
+			ALTER TABLE integrations ADD COLUMN betula_token text default '';
+			ALTER TABLE integrations ADD COLUMN betula_enabled bool default 'f';
+		`
+		_, err = tx.Exec(sql)
+		return err
+	},
+	func(tx *sql.Tx) (err error) {
+		sql := `
+			ALTER TABLE integrations ADD COLUMN ntfy_enabled bool default 'f';
+			ALTER TABLE integrations ADD COLUMN ntfy_url text default '';
+			ALTER TABLE integrations ADD COLUMN ntfy_topic text default '';
+			ALTER TABLE integrations ADD COLUMN ntfy_api_token text default '';
+			ALTER TABLE integrations ADD COLUMN ntfy_username text default '';
+			ALTER TABLE integrations ADD COLUMN ntfy_password text default '';
+			ALTER TABLE integrations ADD COLUMN ntfy_icon_url text default '';
+
+			ALTER TABLE feeds ADD COLUMN ntfy_enabled bool default 'f';
+			ALTER TABLE feeds ADD COLUMN ntfy_priority int default '3';
+		`
+		_, err = tx.Exec(sql)
+		return err
+	},
+	func(tx *sql.Tx) (err error) {
+		sql := `ALTER TABLE users ADD COLUMN mark_read_on_media_player_completion bool default 'f';`
+		_, err = tx.Exec(sql)
+		return err
+	},
 }

internal/fever/handler.go

@@ -13,8 +13,8 @@ import (
 	"miniflux.app/v2/internal/http/request"
 	"miniflux.app/v2/internal/http/response/json"
 	"miniflux.app/v2/internal/integration"
+	"miniflux.app/v2/internal/mediaproxy"
 	"miniflux.app/v2/internal/model"
-	"miniflux.app/v2/internal/proxy"
 	"miniflux.app/v2/internal/storage"
 
 	"github.com/gorilla/mux"
@@ -247,7 +247,6 @@ func (h *handler) handleItems(w http.ResponseWriter, r *http.Request) {
 	builder := h.store.NewEntryQueryBuilder(userID)
 	builder.WithoutStatus(model.EntryStatusRemoved)
 	builder.WithLimit(50)
-	builder.WithSorting("id", model.DefaultSortingDirection)
 
 	switch {
 	case request.HasQueryParam(r, "since_id"):
@@ -258,6 +257,7 @@ func (h *handler) handleItems(w http.ResponseWriter, r *http.Request) {
 				slog.Int64("since_id", sinceID),
 			)
 			builder.AfterEntryID(sinceID)
+			builder.WithSorting("id", "ASC")
 		}
 	case request.HasQueryParam(r, "max_id"):
 		maxID := request.QueryInt64Param(r, "max_id", 0)
@@ -324,7 +324,7 @@ func (h *handler) handleItems(w http.ResponseWriter, r *http.Request) {
 			FeedID:    entry.FeedID,
 			Title:     entry.Title,
 			Author:    entry.Author,
-			HTML:      proxy.AbsoluteProxyRewriter(h.router, r.Host, entry.Content),
+			HTML:      mediaproxy.RewriteDocumentWithAbsoluteProxyURL(h.router, entry.Content),
 			URL:       entry.URL,
 			IsSaved:   isSaved,
 			IsRead:    isRead,

internal/googlereader/handler.go

@@ -18,13 +18,12 @@ import (
 	"miniflux.app/v2/internal/http/response/json"
 	"miniflux.app/v2/internal/http/route"
 	"miniflux.app/v2/internal/integration"
+	"miniflux.app/v2/internal/mediaproxy"
 	"miniflux.app/v2/internal/model"
-	"miniflux.app/v2/internal/proxy"
 	"miniflux.app/v2/internal/reader/fetcher"
 	mff "miniflux.app/v2/internal/reader/handler"
 	mfs "miniflux.app/v2/internal/reader/subscription"
 	"miniflux.app/v2/internal/storage"
-	"miniflux.app/v2/internal/urllib"
 	"miniflux.app/v2/internal/validator"
 
 	"github.com/gorilla/mux"
@@ -265,9 +264,10 @@ func getStreamFilterModifiers(r *http.Request) (RequestModifiers, error) {
 }
 
 func getStream(streamID string, userID int64) (Stream, error) {
-	if strings.HasPrefix(streamID, FeedPrefix) {
+	switch {
+	case strings.HasPrefix(streamID, FeedPrefix):
 		return Stream{Type: FeedStream, ID: strings.TrimPrefix(streamID, FeedPrefix)}, nil
-	} else if strings.HasPrefix(streamID, fmt.Sprintf(UserStreamPrefix, userID)) || strings.HasPrefix(streamID, StreamPrefix) {
+	case strings.HasPrefix(streamID, fmt.Sprintf(UserStreamPrefix, userID)) || strings.HasPrefix(streamID, StreamPrefix):
 		id := strings.TrimPrefix(streamID, fmt.Sprintf(UserStreamPrefix, userID))
 		id = strings.TrimPrefix(id, StreamPrefix)
 		switch id {
@@ -288,15 +288,15 @@ func getStream(streamID string, userID int64) (Stream, error) {
 		default:
 			return Stream{NoStream, ""}, fmt.Errorf("googlereader: unknown stream with id: %s", id)
 		}
-	} else if strings.HasPrefix(streamID, fmt.Sprintf(UserLabelPrefix, userID)) || strings.HasPrefix(streamID, LabelPrefix) {
+	case strings.HasPrefix(streamID, fmt.Sprintf(UserLabelPrefix, userID)) || strings.HasPrefix(streamID, LabelPrefix):
 		id := strings.TrimPrefix(streamID, fmt.Sprintf(UserLabelPrefix, userID))
 		id = strings.TrimPrefix(id, LabelPrefix)
 		return Stream{LabelStream, id}, nil
-	} else if streamID == "" {
+	case streamID == "":
 		return Stream{NoStream, ""}, nil
+	default:
+		return Stream{NoStream, ""}, fmt.Errorf("googlereader: unknown stream type: %s", streamID)
 	}
-
-	return Stream{NoStream, ""}, fmt.Errorf("googlereader: unknown stream type: %s", streamID)
 }
 
 func getStreams(streamIDs []string, userID int64) ([]Stream, error) {
@@ -382,7 +382,7 @@ func getItemIDs(r *http.Request) ([]int64, error) {
 	return itemIDs, nil
 }
 
-func checkOutputFormat(w http.ResponseWriter, r *http.Request) error {
+func checkOutputFormat(r *http.Request) error {
 	var output string
 	if r.Method == http.MethodPost {
 		err := r.ParseForm()
@@ -736,11 +736,12 @@ func getFeed(stream Stream, store *storage.Storage, userID int64) (*model.Feed,
 }
 
 func getOrCreateCategory(category Stream, store *storage.Storage, userID int64) (*model.Category, error) {
-	if category.ID == "" {
+	switch {
+	case category.ID == "":
 		return store.FirstCategory(userID)
-	} else if store.CategoryTitleExists(userID, category.ID) {
+	case store.CategoryTitleExists(userID, category.ID):
 		return store.CategoryByTitle(userID, category.ID)
-	} else {
+	default:
 		catRequest := model.CategoryRequest{
 			Title: category.ID,
 		}
@@ -764,7 +765,7 @@ func subscribe(newFeed Stream, category Stream, title string, store *storage.Sto
 	}
 
 	created, localizedError := mff.CreateFeed(store, userID, &feedRequest)
-	if err != nil {
+	if localizedError != nil {
 		return nil, localizedError.Error()
 	}
 
@@ -908,8 +909,8 @@ func (h *handler) streamItemContentsHandler(w http.ResponseWriter, r *http.Reque
 		slog.Int64("user_id", userID),
 	)
 
-	if err := checkOutputFormat(w, r); err != nil {
-		json.ServerError(w, r, err)
+	if err := checkOutputFormat(r); err != nil {
+		json.BadRequest(w, r, err)
 		return
 	}
 
@@ -960,7 +961,7 @@ func (h *handler) streamItemContentsHandler(w http.ResponseWriter, r *http.Reque
 	}
 
 	if len(entries) == 0 {
-		json.ServerError(w, r, fmt.Errorf("googlereader: no items returned from the database"))
+		json.BadRequest(w, r, fmt.Errorf("googlereader: no items returned from the database for item IDs: %v", itemIDs))
 		return
 	}
 
@@ -984,7 +985,7 @@ func (h *handler) streamItemContentsHandler(w http.ResponseWriter, r *http.Reque
 	}
 	contentItems := make([]contentItem, len(entries))
 	for i, entry := range entries {
-		enclosures := make([]contentItemEnclosure, len(entry.Enclosures))
+		enclosures := make([]contentItemEnclosure, 0, len(entry.Enclosures))
 		for _, enclosure := range entry.Enclosures {
 			enclosures = append(enclosures, contentItemEnclosure{URL: enclosure.URL, Type: enclosure.MimeType})
 		}
@@ -1001,28 +1002,18 @@ func (h *handler) streamItemContentsHandler(w http.ResponseWriter, r *http.Reque
 			categories = append(categories, userStarred)
 		}
 
-		entry.Content = proxy.AbsoluteProxyRewriter(h.router, r.Host, entry.Content)
-		proxyOption := config.Opts.ProxyOption()
+		entry.Content = mediaproxy.RewriteDocumentWithAbsoluteProxyURL(h.router, entry.Content)
 
-		for i := range entry.Enclosures {
-			if proxyOption == "all" || proxyOption != "none" && !urllib.IsHTTPS(entry.Enclosures[i].URL) {
-				for _, mediaType := range config.Opts.ProxyMediaTypes() {
-					if strings.HasPrefix(entry.Enclosures[i].MimeType, mediaType+"/") {
-						entry.Enclosures[i].URL = proxy.AbsoluteProxifyURL(h.router, r.Host, entry.Enclosures[i].URL)
-						break
-					}
-				}
-			}
-		}
+		entry.Enclosures.ProxifyEnclosureURL(h.router)
 
 		contentItems[i] = contentItem{
 			ID:            fmt.Sprintf(EntryIDLong, entry.ID),
 			Title:         entry.Title,
 			Author:        entry.Author,
-			TimestampUsec: fmt.Sprintf("%d", entry.Date.UnixNano()/(int64(time.Microsecond)/int64(time.Nanosecond))),
-			CrawlTimeMsec: fmt.Sprintf("%d", entry.Date.UnixNano()/(int64(time.Microsecond)/int64(time.Nanosecond))),
+			TimestampUsec: fmt.Sprintf("%d", entry.Date.UnixMicro()),
+			CrawlTimeMsec: fmt.Sprintf("%d", entry.CreatedAt.UnixMilli()),
 			Published:     entry.Date.Unix(),
-			Updated:       entry.Date.Unix(),
+			Updated:       entry.ChangedAt.Unix(),
 			Categories:    categories,
 			Canonical: []contentHREF{
 				{
@@ -1170,7 +1161,7 @@ func (h *handler) tagListHandler(w http.ResponseWriter, r *http.Request) {
 		slog.String("user_agent", r.UserAgent()),
 	)
 
-	if err := checkOutputFormat(w, r); err != nil {
+	if err := checkOutputFormat(r); err != nil {
 		json.BadRequest(w, r, err)
 		return
 	}
@@ -1205,8 +1196,8 @@ func (h *handler) subscriptionListHandler(w http.ResponseWriter, r *http.Request
 		slog.String("user_agent", r.UserAgent()),
 	)
 
-	if err := checkOutputFormat(w, r); err != nil {
-		json.ServerError(w, r, err)
+	if err := checkOutputFormat(r); err != nil {
+		json.BadRequest(w, r, err)
 		return
 	}
 
@@ -1224,7 +1215,7 @@ func (h *handler) subscriptionListHandler(w http.ResponseWriter, r *http.Request
 			URL:        feed.FeedURL,
 			Categories: []subscriptionCategory{{fmt.Sprintf(UserLabelPrefix, userID) + feed.Category.Title, feed.Category.Title, "folder"}},
 			HTMLURL:    feed.SiteURL,
-			IconURL:    "", //TODO Icons are only base64 encode in DB yet
+			IconURL:    "", // TODO: Icons are base64 encoded in the DB.
 		})
 	}
 	json.OK(w, r, result)
@@ -1251,8 +1242,8 @@ func (h *handler) userInfoHandler(w http.ResponseWriter, r *http.Request) {
 		slog.String("user_agent", r.UserAgent()),
 	)
 
-	if err := checkOutputFormat(w, r); err != nil {
-		json.ServerError(w, r, err)
+	if err := checkOutputFormat(r); err != nil {
+		json.BadRequest(w, r, err)
 		return
 	}
 
@@ -1276,8 +1267,8 @@ func (h *handler) streamItemIDsHandler(w http.ResponseWriter, r *http.Request) {
 		slog.Int64("user_id", userID),
 	)
 
-	if err := checkOutputFormat(w, r); err != nil {
-		json.ServerError(w, r, fmt.Errorf("googlereader: output only as json supported"))
+	if err := checkOutputFormat(r); err != nil {
+		json.BadRequest(w, r, err)
 		return
 	}
 
@@ -1477,8 +1468,7 @@ func (h *handler) handleFeedStreamHandler(w http.ResponseWriter, r *http.Request
 
 	if len(rm.ExcludeTargets) > 0 {
 		for _, s := range rm.ExcludeTargets {
-			switch s.Type {
-			case ReadStream:
+			if s.Type == ReadStream {
 				builder.WithoutStatus(model.EntryStatusRead)
 			}
 		}

internal/http/cookie/cookie.go

@@ -6,15 +6,14 @@ package cookie // import "miniflux.app/v2/internal/http/cookie"
 import (
 	"net/http"
 	"time"
+
+	"miniflux.app/v2/internal/config"
 )
 
 // Cookie names.
 const (
 	CookieAppSessionID  = "MinifluxAppSessionID"
 	CookieUserSessionID = "MinifluxUserSessionID"
-
-	// Cookie duration in days.
-	cookieDuration = 30
 )
 
 // New creates a new cookie.
@@ -25,7 +24,7 @@ func New(name, value string, isHTTPS bool, path string) *http.Cookie {
 		Path:     basePath(path),
 		Secure:   isHTTPS,
 		HttpOnly: true,
-		Expires:  time.Now().Add(cookieDuration * 24 * time.Hour),
+		Expires:  time.Now().Add(time.Duration(config.Opts.CleanupRemoveSessionsDays()) * 24 * time.Hour),
 		SameSite: http.SameSiteLaxMode,
 	}
 }

internal/http/request/context.go

@@ -37,14 +37,10 @@ const (
 
 func WebAuthnSessionData(r *http.Request) *model.WebAuthnSession {
 	if v := r.Context().Value(WebAuthnDataContextKey); v != nil {
-		value, valid := v.(model.WebAuthnSession)
-		if !valid {
-			return nil
+		if value, valid := v.(model.WebAuthnSession); valid {
+			return &value
 		}
-
-		return &value
 	}
-
 	return nil
 }
 
@@ -151,39 +147,27 @@ func ClientIP(r *http.Request) string {
 
 func getContextStringValue(r *http.Request, key ContextKey) string {
 	if v := r.Context().Value(key); v != nil {
-		value, valid := v.(string)
-		if !valid {
-			return ""
+		if value, valid := v.(string); valid {
+			return value
 		}
-
-		return value
 	}
-
 	return ""
 }
 
 func getContextBoolValue(r *http.Request, key ContextKey) bool {
 	if v := r.Context().Value(key); v != nil {
-		value, valid := v.(bool)
-		if !valid {
-			return false
+		if value, valid := v.(bool); valid {
+			return value
 		}
-
-		return value
 	}
-
 	return false
 }
 
 func getContextInt64Value(r *http.Request, key ContextKey) int64 {
 	if v := r.Context().Value(key); v != nil {
-		value, valid := v.(int64)
-		if !valid {
-			return 0
+		if value, valid := v.(int64); valid {
+			return value
 		}
-
-		return value
 	}
-
 	return 0
 }

internal/http/response/builder.go

@@ -12,6 +12,8 @@ import (
 	"net/http"
 	"strings"
 	"time"
+
+	"github.com/andybalholm/brotli"
 )
 
 const compressionThreshold = 1024
@@ -96,7 +98,6 @@ func (b *Builder) Write() {
 }
 
 func (b *Builder) writeHeaders() {
-	b.headers["X-XSS-Protection"] = "1; mode=block"
 	b.headers["X-Content-Type-Options"] = "nosniff"
 	b.headers["X-Frame-Options"] = "DENY"
 	b.headers["Referrer-Policy"] = "no-referrer"
@@ -111,8 +112,15 @@ func (b *Builder) writeHeaders() {
 func (b *Builder) compress(data []byte) {
 	if b.enableCompression && len(data) > compressionThreshold {
 		acceptEncoding := b.r.Header.Get("Accept-Encoding")
-
 		switch {
+		case strings.Contains(acceptEncoding, "br"):
+			b.headers["Content-Encoding"] = "br"
+			b.writeHeaders()
+
+			brotliWriter := brotli.NewWriterV2(b.w, brotli.DefaultCompression)
+			defer brotliWriter.Close()
+			brotliWriter.Write(data)
+			return
 		case strings.Contains(acceptEncoding, "gzip"):
 			b.headers["Content-Encoding"] = "gzip"
 			b.writeHeaders()

internal/http/response/builder_test.go

@@ -28,7 +28,6 @@ func TestResponseHasCommonHeaders(t *testing.T) {
 	resp := w.Result()
 
 	headers := map[string]string{
-		"X-XSS-Protection":       "1; mode=block",
 		"X-Content-Type-Options": "nosniff",
 		"X-Frame-Options":        "DENY",
 	}
@@ -229,7 +228,7 @@ func TestBuildResponseWithCachingAndEtag(t *testing.T) {
 	}
 }
 
-func TestBuildResponseWithGzipCompression(t *testing.T) {
+func TestBuildResponseWithBrotliCompression(t *testing.T) {
 	body := strings.Repeat("a", compressionThreshold+1)
 	r, err := http.NewRequest("GET", "/", nil)
 	r.Header.Set("Accept-Encoding", "gzip, deflate, br")
@@ -246,6 +245,30 @@ func TestBuildResponseWithGzipCompression(t *testing.T) {
 	handler.ServeHTTP(w, r)
 	resp := w.Result()
 
+	expected := "br"
+	actual := resp.Header.Get("Content-Encoding")
+	if actual != expected {
+		t.Fatalf(`Unexpected header value, got %q instead of %q`, actual, expected)
+	}
+}
+
+func TestBuildResponseWithGzipCompression(t *testing.T) {
+	body := strings.Repeat("a", compressionThreshold+1)
+	r, err := http.NewRequest("GET", "/", nil)
+	r.Header.Set("Accept-Encoding", "gzip, deflate")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	w := httptest.NewRecorder()
+
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		New(w, r).WithBody(body).Write()
+	})
+
+	handler.ServeHTTP(w, r)
+	resp := w.Result()
+
 	expected := "gzip"
 	actual := resp.Header.Get("Content-Encoding")
 	if actual != expected {

internal/integration/betula/betula.go

@@ -0,0 +1,57 @@
+package betula
+
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+	"strings"
+	"time"
+
+	"miniflux.app/v2/internal/urllib"
+	"miniflux.app/v2/internal/version"
+)
+
+const defaultClientTimeout = 10 * time.Second
+
+type Client struct {
+	url   string
+	token string
+}
+
+func NewClient(url, token string) *Client {
+	return &Client{url: url, token: token}
+}
+
+func (c *Client) CreateBookmark(entryURL, entryTitle string, tags []string) error {
+	apiEndpoint, err := urllib.JoinBaseURLAndPath(c.url, "/save-link")
+	if err != nil {
+		return fmt.Errorf("betula: unable to generate save-link endpoint: %v", err)
+	}
+
+	values := url.Values{}
+	values.Add("url", entryURL)
+	values.Add("title", entryTitle)
+	values.Add("tags", strings.Join(tags, ","))
+
+	request, err := http.NewRequest(http.MethodPost, apiEndpoint+"?"+values.Encode(), nil)
+	if err != nil {
+		return fmt.Errorf("betula: unable to create request: %v", err)
+	}
+
+	request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	request.Header.Set("User-Agent", "Miniflux/"+version.Version)
+	request.AddCookie(&http.Cookie{Name: "betula-token", Value: c.token})
+
+	httpClient := &http.Client{Timeout: defaultClientTimeout}
+	response, err := httpClient.Do(request)
+	if err != nil {
+		return fmt.Errorf("betula: unable to send request: %v", err)
+	}
+	defer response.Body.Close()
+
+	if response.StatusCode >= 400 {
+		return fmt.Errorf("betula: unable to create bookmark: url=%s status=%d", apiEndpoint, response.StatusCode)
+	}
+
+	return nil
+}

internal/integration/integration.go

@@ -8,15 +8,21 @@ import (
 
 	"miniflux.app/v2/internal/config"
 	"miniflux.app/v2/internal/integration/apprise"
+	"miniflux.app/v2/internal/integration/betula"
 	"miniflux.app/v2/internal/integration/espial"
 	"miniflux.app/v2/internal/integration/instapaper"
+	"miniflux.app/v2/internal/integration/linkace"
 	"miniflux.app/v2/internal/integration/linkding"
+	"miniflux.app/v2/internal/integration/linkwarden"
 	"miniflux.app/v2/internal/integration/matrixbot"
 	"miniflux.app/v2/internal/integration/notion"
+	"miniflux.app/v2/internal/integration/ntfy"
 	"miniflux.app/v2/internal/integration/nunuxkeeper"
 	"miniflux.app/v2/internal/integration/omnivore"
 	"miniflux.app/v2/internal/integration/pinboard"
 	"miniflux.app/v2/internal/integration/pocket"
+	"miniflux.app/v2/internal/integration/raindrop"
+	"miniflux.app/v2/internal/integration/readeck"
 	"miniflux.app/v2/internal/integration/readwise"
 	"miniflux.app/v2/internal/integration/shaarli"
 	"miniflux.app/v2/internal/integration/shiori"
@@ -28,6 +34,30 @@ import (
 
 // SendEntry sends the entry to third-party providers when the user click on "Save".
 func SendEntry(entry *model.Entry, userIntegrations *model.Integration) {
+	if userIntegrations.BetulaEnabled {
+		slog.Debug("Sending entry to Betula",
+			slog.Int64("user_id", userIntegrations.UserID),
+			slog.Int64("entry_id", entry.ID),
+			slog.String("entry_url", entry.URL),
+		)
+
+		client := betula.NewClient(userIntegrations.BetulaURL, userIntegrations.BetulaToken)
+		err := client.CreateBookmark(
+			entry.URL,
+			entry.Title,
+			entry.Tags,
+		)
+
+		if err != nil {
+			slog.Error("Unable to send entry to Betula",
+				slog.Int64("user_id", userIntegrations.UserID),
+				slog.Int64("entry_id", entry.ID),
+				slog.String("entry_url", entry.URL),
+				slog.Any("error", err),
+			)
+		}
+	}
+
 	if userIntegrations.PinboardEnabled {
 		slog.Debug("Sending entry to Pinboard",
 			slog.Int64("user_id", userIntegrations.UserID),
@@ -180,6 +210,30 @@ func SendEntry(entry *model.Entry, userIntegrations *model.Integration) {
 		}
 	}
 
+	if userIntegrations.LinkAceEnabled {
+		slog.Debug("Sending entry to LinkAce",
+			slog.Int64("user_id", userIntegrations.UserID),
+			slog.Int64("entry_id", entry.ID),
+			slog.String("entry_url", entry.URL),
+		)
+
+		client := linkace.NewClient(
+			userIntegrations.LinkAceURL,
+			userIntegrations.LinkAceAPIKey,
+			userIntegrations.LinkAceTags,
+			userIntegrations.LinkAcePrivate,
+			userIntegrations.LinkAceCheckDisabled,
+		)
+		if err := client.AddURL(entry.URL, entry.Title); err != nil {
+			slog.Error("Unable to send entry to LinkAce",
+				slog.Int64("user_id", userIntegrations.UserID),
+				slog.Int64("entry_id", entry.ID),
+				slog.String("entry_url", entry.URL),
+				slog.Any("error", err),
+			)
+		}
+	}
+
 	if userIntegrations.LinkdingEnabled {
 		slog.Debug("Sending entry to Linkding",
 			slog.Int64("user_id", userIntegrations.UserID),
@@ -203,6 +257,50 @@ func SendEntry(entry *model.Entry, userIntegrations *model.Integration) {
 		}
 	}
 
+	if userIntegrations.LinkwardenEnabled {
+		slog.Debug("Sending entry to linkwarden",
+			slog.Int64("user_id", userIntegrations.UserID),
+			slog.Int64("entry_id", entry.ID),
+			slog.String("entry_url", entry.URL),
+		)
+
+		client := linkwarden.NewClient(
+			userIntegrations.LinkwardenURL,
+			userIntegrations.LinkwardenAPIKey,
+		)
+		if err := client.CreateBookmark(entry.URL, entry.Title); err != nil {
+			slog.Error("Unable to send entry to Linkwarden",
+				slog.Int64("user_id", userIntegrations.UserID),
+				slog.Int64("entry_id", entry.ID),
+				slog.String("entry_url", entry.URL),
+				slog.Any("error", err),
+			)
+		}
+	}
+
+	if userIntegrations.ReadeckEnabled {
+		slog.Debug("Sending entry to Readeck",
+			slog.Int64("user_id", userIntegrations.UserID),
+			slog.Int64("entry_id", entry.ID),
+			slog.String("entry_url", entry.URL),
+		)
+
+		client := readeck.NewClient(
+			userIntegrations.ReadeckURL,
+			userIntegrations.ReadeckAPIKey,
+			userIntegrations.ReadeckLabels,
+			userIntegrations.ReadeckOnlyURL,
+		)
+		if err := client.CreateBookmark(entry.URL, entry.Title, entry.Content); err != nil {
+			slog.Error("Unable to send entry to Readeck",
+				slog.Int64("user_id", userIntegrations.UserID),
+				slog.Int64("entry_id", entry.ID),
+				slog.String("entry_url", entry.URL),
+				slog.Any("error", err),
+			)
+		}
+	}
+
 	if userIntegrations.ReadwiseEnabled {
 		slog.Debug("Sending entry to Readwise",
 			slog.Int64("user_id", userIntegrations.UserID),
@@ -288,6 +386,7 @@ func SendEntry(entry *model.Entry, userIntegrations *model.Integration) {
 			)
 		}
 	}
+
 	if userIntegrations.OmnivoreEnabled {
 		slog.Debug("Sending entry to Omnivore",
 			slog.Int64("user_id", userIntegrations.UserID),
@@ -305,6 +404,24 @@ func SendEntry(entry *model.Entry, userIntegrations *model.Integration) {
 			)
 		}
 	}
+
+	if userIntegrations.RaindropEnabled {
+		slog.Debug("Sending entry to Raindrop",
+			slog.Int64("user_id", userIntegrations.UserID),
+			slog.Int64("entry_id", entry.ID),
+			slog.String("entry_url", entry.URL),
+		)
+
+		client := raindrop.NewClient(userIntegrations.RaindropToken, userIntegrations.RaindropCollectionID, userIntegrations.RaindropTags)
+		if err := client.CreateRaindrop(entry.URL, entry.Title); err != nil {
+			slog.Error("Unable to send entry to Raindrop",
+				slog.Int64("user_id", userIntegrations.UserID),
+				slog.Int64("entry_id", entry.ID),
+				slog.String("entry_url", entry.URL),
+				slog.Any("error", err),
+			)
+		}
+	}
 }
 
 // PushEntries pushes a list of entries to activated third-party providers during feed refreshes.
@@ -354,6 +471,28 @@ func PushEntries(feed *model.Feed, entries model.Entries, userIntegrations *mode
 		}
 	}
 
+	if userIntegrations.NtfyEnabled && feed.NtfyEnabled {
+		slog.Debug("Sending new entries to Ntfy",
+			slog.Int64("user_id", userIntegrations.UserID),
+			slog.Int("nb_entries", len(entries)),
+			slog.Int64("feed_id", feed.ID),
+		)
+
+		client := ntfy.NewClient(
+			userIntegrations.NtfyURL,
+			userIntegrations.NtfyTopic,
+			userIntegrations.NtfyAPIToken,
+			userIntegrations.NtfyUsername,
+			userIntegrations.NtfyPassword,
+			userIntegrations.NtfyIconURL,
+			feed.NtfyPriority,
+		)
+
+		if err := client.SendMessages(feed, entries); err != nil {
+			slog.Warn("Unable to send new entries to Ntfy", slog.Any("error", err))
+		}
+	}
+
 	// Integrations that only support sending individual entries
 	if userIntegrations.TelegramBotEnabled || userIntegrations.AppriseEnabled {
 		for _, entry := range entries {

internal/integration/linkace/linkace.go

@@ -0,0 +1,83 @@
+package linkace
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+	"time"
+
+	"miniflux.app/v2/internal/urllib"
+	"miniflux.app/v2/internal/version"
+)
+
+const defaultClientTimeout = 10 * time.Second
+
+type Client struct {
+	baseURL       string
+	apiKey        string
+	tags          string
+	private       bool
+	checkDisabled bool
+}
+
+func NewClient(baseURL, apiKey, tags string, private bool, checkDisabled bool) *Client {
+	return &Client{baseURL: baseURL, apiKey: apiKey, tags: tags, private: private, checkDisabled: checkDisabled}
+}
+
+func (c *Client) AddURL(entryURL, entryTitle string) error {
+	if c.baseURL == "" || c.apiKey == "" {
+		return fmt.Errorf("linkace: missing base URL or API key")
+	}
+
+	tagsSplitFn := func(c rune) bool {
+		return c == ',' || c == ' '
+	}
+
+	apiEndpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/api/v1/links")
+	if err != nil {
+		return fmt.Errorf("linkace: invalid API endpoint: %v", err)
+	}
+	requestBody, err := json.Marshal(&createItemRequest{
+		Url:           entryURL,
+		Title:         entryTitle,
+		Tags:          strings.FieldsFunc(c.tags, tagsSplitFn),
+		Private:       c.private,
+		CheckDisabled: c.checkDisabled,
+	})
+	if err != nil {
+		return fmt.Errorf("linkace: unable to encode request body: %v", err)
+	}
+
+	request, err := http.NewRequest(http.MethodPost, apiEndpoint, bytes.NewReader(requestBody))
+	if err != nil {
+		return fmt.Errorf("linkace: unable to create request: %v", err)
+	}
+
+	request.Header.Set("Content-Type", "application/json")
+	request.Header.Set("Accept", "application/json")
+	request.Header.Set("User-Agent", "Miniflux/"+version.Version)
+	request.Header.Set("Authorization", "Bearer "+c.apiKey)
+
+	httpClient := &http.Client{Timeout: defaultClientTimeout}
+	response, err := httpClient.Do(request)
+	if err != nil {
+		return fmt.Errorf("linkace: unable to send request: %v", err)
+	}
+	defer response.Body.Close()
+
+	if response.StatusCode >= 400 {
+		return fmt.Errorf("linkace: unable to create item: url=%s status=%d", apiEndpoint, response.StatusCode)
+	}
+
+	return nil
+}
+
+type createItemRequest struct {
+	Title         string   `json:"title,omitempty"`
+	Url           string   `json:"url"`
+	Tags          []string `json:"tags,omitempty"`
+	Private       bool     `json:"is_private,omitempty"`
+	CheckDisabled bool     `json:"check_disabled,omitempty"`
+}

internal/integration/linkwarden/linkwarden.go

@@ -0,0 +1,80 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package linkwarden // import "miniflux.app/v2/internal/integration/linkwarden"
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"time"
+
+	"miniflux.app/v2/internal/urllib"
+	"miniflux.app/v2/internal/version"
+)
+
+const defaultClientTimeout = 10 * time.Second
+
+type Client struct {
+	baseURL string
+	apiKey  string
+}
+
+func NewClient(baseURL, apiKey string) *Client {
+	return &Client{baseURL: baseURL, apiKey: apiKey}
+}
+
+func (c *Client) CreateBookmark(entryURL, entryTitle string) error {
+	if c.baseURL == "" || c.apiKey == "" {
+		return fmt.Errorf("linkwarden: missing base URL or API key")
+	}
+
+	apiEndpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/api/v1/links")
+	if err != nil {
+		return fmt.Errorf(`linkwarden: invalid API endpoint: %v`, err)
+	}
+
+	requestBody, err := json.Marshal(&linkwardenBookmark{
+		Url:         entryURL,
+		Name:        "",
+		Description: "",
+		Tags:        []string{},
+		Collection:  map[string]interface{}{},
+	})
+
+	if err != nil {
+		return fmt.Errorf("linkwarden: unable to encode request body: %v", err)
+	}
+
+	request, err := http.NewRequest(http.MethodPost, apiEndpoint, bytes.NewReader(requestBody))
+	if err != nil {
+		return fmt.Errorf("linkwarden: unable to create request: %v", err)
+	}
+
+	request.Header.Set("Content-Type", "application/json")
+	request.Header.Set("User-Agent", "Miniflux/"+version.Version)
+	request.AddCookie(&http.Cookie{Name: "__Secure-next-auth.session-token", Value: c.apiKey})
+	request.AddCookie(&http.Cookie{Name: "next-auth.session-token", Value: c.apiKey})
+
+	httpClient := &http.Client{Timeout: defaultClientTimeout}
+	response, err := httpClient.Do(request)
+	if err != nil {
+		return fmt.Errorf("linkwarden: unable to send request: %v", err)
+	}
+	defer response.Body.Close()
+
+	if response.StatusCode >= 400 {
+		return fmt.Errorf("linkwarden: unable to create link: url=%s status=%d", apiEndpoint, response.StatusCode)
+	}
+
+	return nil
+}
+
+type linkwardenBookmark struct {
+	Url         string                 `json:"url"`
+	Name        string                 `json:"name"`
+	Description string                 `json:"description"`
+	Tags        []string               `json:"tags"`
+	Collection  map[string]interface{} `json:"collection"`
+}

internal/integration/matrixbot/matrixbot.go

@@ -10,7 +10,7 @@ import (
 	"miniflux.app/v2/internal/model"
 )
 
-// PushEntry pushes entries to matrix chat using integration settings provided
+// PushEntries pushes entries to matrix chat using integration settings provided
 func PushEntries(feed *model.Feed, entries model.Entries, matrixBaseURL, matrixUsername, matrixPassword, matrixRoomID string) error {
 	client := NewClient(matrixBaseURL)
 	discovery, err := client.DiscoverEndpoints()
@@ -28,7 +28,7 @@ func PushEntries(feed *model.Feed, entries model.Entries, matrixBaseURL, matrixU
 
 	for _, entry := range entries {
 		textMessages = append(textMessages, fmt.Sprintf(`[%s] %s - %s`, feed.Title, entry.Title, entry.URL))
-		formattedTextMessages = append(formattedTextMessages, fmt.Sprintf(`<li><strong>%s</strong>: <a href="%s">%s</a></li>`, feed.Title, entry.URL, entry.Title))
+		formattedTextMessages = append(formattedTextMessages, fmt.Sprintf(`<li><strong>%s</strong>: <a href=%q>%s</a></li>`, feed.Title, entry.URL, entry.Title))
 	}
 
 	_, err = client.SendFormattedTextMessage(

internal/integration/ntfy/ntfy.go

@@ -0,0 +1,120 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package ntfy // import "miniflux.app/v2/internal/integration/ntfy"
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"log/slog"
+	"net/http"
+	"time"
+
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/version"
+)
+
+const (
+	defaultClientTimeout = 10 * time.Second
+	defaultNtfyURL       = "https://ntfy.sh"
+)
+
+type Client struct {
+	ntfyURL, ntfyTopic, ntfyApiToken, ntfyUsername, ntfyPassword, ntfyIconURL string
+	ntfyPriority                                                              int
+}
+
+func NewClient(ntfyURL, ntfyTopic, ntfyApiToken, ntfyUsername, ntfyPassword, ntfyIconURL string, ntfyPriority int) *Client {
+	if ntfyURL == "" {
+		ntfyURL = defaultNtfyURL
+	}
+	return &Client{ntfyURL, ntfyTopic, ntfyApiToken, ntfyUsername, ntfyPassword, ntfyIconURL, ntfyPriority}
+}
+
+func (c *Client) SendMessages(feed *model.Feed, entries model.Entries) error {
+	for _, entry := range entries {
+		ntfyMessage := &ntfyMessage{
+			Topic:    c.ntfyTopic,
+			Message:  entry.Title,
+			Title:    feed.Title,
+			Priority: c.ntfyPriority,
+			Click:    entry.URL,
+		}
+
+		if c.ntfyIconURL != "" {
+			ntfyMessage.Icon = c.ntfyIconURL
+		}
+
+		slog.Debug("Sending Ntfy message",
+			slog.String("url", c.ntfyURL),
+			slog.String("topic", c.ntfyTopic),
+			slog.Int("priority", ntfyMessage.Priority),
+			slog.String("message", ntfyMessage.Message),
+			slog.String("entry_url", entry.URL),
+		)
+
+		if err := c.makeRequest(ntfyMessage); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (c *Client) makeRequest(payload any) error {
+	requestBody, err := json.Marshal(payload)
+	if err != nil {
+		return fmt.Errorf("ntfy: unable to encode request body: %v", err)
+	}
+
+	request, err := http.NewRequest(http.MethodPost, c.ntfyURL, bytes.NewReader(requestBody))
+	if err != nil {
+		return fmt.Errorf("ntfy: unable to create request: %v", err)
+	}
+
+	request.Header.Set("Content-Type", "application/json")
+	request.Header.Set("User-Agent", "Miniflux/"+version.Version)
+
+	// See https://docs.ntfy.sh/publish/#access-tokens
+	if c.ntfyApiToken != "" {
+		request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", c.ntfyApiToken))
+	}
+
+	// See https://docs.ntfy.sh/publish/#username-password
+	if c.ntfyUsername != "" && c.ntfyPassword != "" {
+		request.SetBasicAuth(c.ntfyUsername, c.ntfyPassword)
+	}
+
+	httpClient := &http.Client{Timeout: defaultClientTimeout}
+	response, err := httpClient.Do(request)
+	if err != nil {
+		return fmt.Errorf("ntfy: unable to send request: %v", err)
+	}
+	defer response.Body.Close()
+
+	if response.StatusCode >= 400 {
+		return fmt.Errorf("ntfy: incorrect response status code %d for url %s", response.StatusCode, c.ntfyURL)
+	}
+
+	return nil
+}
+
+// See https://docs.ntfy.sh/publish/#publish-as-json
+type ntfyMessage struct {
+	Topic    string       `json:"topic"`
+	Message  string       `json:"message"`
+	Title    string       `json:"title"`
+	Tags     []string     `json:"tags,omitempty"`
+	Priority int          `json:"priority,omitempty"`
+	Icon     string       `json:"icon,omitempty"` // https://docs.ntfy.sh/publish/#icons
+	Click    string       `json:"click,omitempty"`
+	Actions  []ntfyAction `json:"actions,omitempty"`
+}
+
+// See https://docs.ntfy.sh/publish/#action-buttons
+type ntfyAction struct {
+	Action string `json:"action"`
+	Label  string `json:"label"`
+	URL    string `json:"url"`
+}

internal/integration/omnivore/omnivore.go

@@ -11,8 +11,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/google/uuid"
-
+	"miniflux.app/v2/internal/crypto"
 	"miniflux.app/v2/internal/version"
 )
 
@@ -79,7 +78,7 @@ func (c *client) SaveUrl(url string) error {
 		"query": mutation,
 		"variables": map[string]interface{}{
 			"input": map[string]interface{}{
-				"clientRequestId": uuid.New().String(),
+				"clientRequestId": crypto.GenerateUUID(),
 				"source":          "api",
 				"url":             url,
 			},

internal/integration/pinboard/pinboard.go

@@ -4,6 +4,8 @@
 package pinboard // import "miniflux.app/v2/internal/integration/pinboard"
 
 import (
+	"encoding/xml"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -12,6 +14,9 @@ import (
 	"miniflux.app/v2/internal/version"
 )
 
+var errPostNotFound = fmt.Errorf("pinboard: post not found")
+var errMissingCredentials = fmt.Errorf("pinboard: missing auth token")
+
 const defaultClientTimeout = 10 * time.Second
 
 type Client struct {
@@ -24,20 +29,27 @@ func NewClient(authToken string) *Client {
 
 func (c *Client) CreateBookmark(entryURL, entryTitle, pinboardTags string, markAsUnread bool) error {
 	if c.authToken == "" {
-		return fmt.Errorf("pinboard: missing auth token")
+		return errMissingCredentials
 	}
 
-	toRead := "no"
+	// We check if the url is already bookmarked to avoid overriding existing data.
+	post, err := c.getBookmark(entryURL)
+
+	if err != nil && errors.Is(err, errPostNotFound) {
+		post = NewPost(entryURL, entryTitle)
+	} else if err != nil {
+		// In case of any other error, we return immediately to avoid overriding existing data.
+		return err
+	}
+
+	post.addTag(pinboardTags)
 	if markAsUnread {
-		toRead = "yes"
+		post.SetToread()
 	}
 
 	values := url.Values{}
 	values.Add("auth_token", c.authToken)
-	values.Add("url", entryURL)
-	values.Add("description", entryTitle)
-	values.Add("tags", pinboardTags)
-	values.Add("toread", toRead)
+	post.AddValues(values)
 
 	apiEndpoint := "https://api.pinboard.in/v1/posts/add?" + values.Encode()
 	request, err := http.NewRequest(http.MethodGet, apiEndpoint, nil)
@@ -61,3 +73,46 @@ func (c *Client) CreateBookmark(entryURL, entryTitle, pinboardTags string, markA
 
 	return nil
 }
+
+// getBookmark fetches a bookmark from Pinboard. https://www.pinboard.in/api/#posts_get
+func (c *Client) getBookmark(entryURL string) (*Post, error) {
+	if c.authToken == "" {
+		return nil, errMissingCredentials
+	}
+
+	values := url.Values{}
+	values.Add("auth_token", c.authToken)
+	values.Add("url", entryURL)
+
+	apiEndpoint := "https://api.pinboard.in/v1/posts/get?" + values.Encode()
+	request, err := http.NewRequest(http.MethodGet, apiEndpoint, nil)
+	if err != nil {
+		return nil, fmt.Errorf("pinboard: unable to create request: %v", err)
+	}
+
+	request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	request.Header.Set("User-Agent", "Miniflux/"+version.Version)
+
+	httpClient := &http.Client{Timeout: defaultClientTimeout}
+	response, err := httpClient.Do(request)
+	if err != nil {
+		return nil, fmt.Errorf("pinboard: unable fetch bookmark: %v", err)
+	}
+	defer response.Body.Close()
+
+	if response.StatusCode >= 400 {
+		return nil, fmt.Errorf("pinboard: unable to fetch bookmark, status=%d", response.StatusCode)
+	}
+
+	var results posts
+	err = xml.NewDecoder(response.Body).Decode(&results)
+	if err != nil {
+		return nil, fmt.Errorf("pinboard: unable to decode XML: %v", err)
+	}
+
+	if len(results.Posts) == 0 {
+		return nil, errPostNotFound
+	}
+
+	return &results.Posts[0], nil
+}

internal/integration/pinboard/post.go

@@ -0,0 +1,62 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package pinboard // import "miniflux.app/v2/internal/integration/pinboard"
+
+import (
+	"encoding/xml"
+	"net/url"
+	"strings"
+	"time"
+)
+
+// Post a Pinboard bookmark.  "inspiration" from https://github.com/drags/pinboard/blob/master/posts.go#L32-L42
+type Post struct {
+	XMLName     xml.Name  `xml:"post"`
+	Url         string    `xml:"href,attr"`
+	Description string    `xml:"description,attr"`
+	Tags        string    `xml:"tag,attr"`
+	Extended    string    `xml:"extended,attr"`
+	Date        time.Time `xml:"time,attr"`
+	Shared      string    `xml:"shared,attr"`
+	Toread      string    `xml:"toread,attr"`
+}
+
+// Posts A result of a Pinboard API call
+type posts struct {
+	XMLName xml.Name `xml:"posts"`
+	Posts   []Post   `xml:"post"`
+}
+
+func NewPost(url string, description string) *Post {
+	return &Post{
+		Url:         url,
+		Description: description,
+		Date:        time.Now(),
+		Toread:      "no",
+	}
+}
+
+func (p *Post) addTag(tag string) {
+	if !strings.Contains(p.Tags, tag) {
+		p.Tags += " " + tag
+	}
+}
+
+func (p *Post) SetToread() {
+	p.Toread = "yes"
+}
+
+func (p *Post) AddValues(values url.Values) {
+	values.Add("url", p.Url)
+	values.Add("description", p.Description)
+	values.Add("tags", p.Tags)
+	if p.Toread != "" {
+		values.Add("toread", p.Toread)
+	}
+	if p.Shared != "" {
+		values.Add("shared", p.Shared)
+	}
+	values.Add("dt", p.Date.Format(time.RFC3339))
+	values.Add("extended", p.Extended)
+}

internal/integration/raindrop/raindrop.go

@@ -0,0 +1,78 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package raindrop // import "miniflux.app/v2/internal/integration/raindrop"
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+	"time"
+
+	"miniflux.app/v2/internal/version"
+)
+
+const defaultClientTimeout = 10 * time.Second
+
+type Client struct {
+	token        string
+	collectionID string
+	tags         []string
+}
+
+func NewClient(token, collectionID, tags string) *Client {
+	return &Client{token: token, collectionID: collectionID, tags: strings.Split(tags, ",")}
+}
+
+// https://developer.raindrop.io/v1/raindrops/single#create-raindrop
+func (c *Client) CreateRaindrop(entryURL, entryTitle string) error {
+	if c.token == "" {
+		return fmt.Errorf("raindrop: missing token")
+	}
+
+	var request *http.Request
+	requestBodyJson, err := json.Marshal(&raindrop{
+		Link:       entryURL,
+		Title:      entryTitle,
+		Collection: collection{Id: c.collectionID},
+		Tags:       c.tags,
+	})
+	if err != nil {
+		return fmt.Errorf("raindrop: unable to encode request body: %v", err)
+	}
+
+	request, err = http.NewRequest(http.MethodPost, "https://api.raindrop.io/rest/v1/raindrop", bytes.NewReader(requestBodyJson))
+	if err != nil {
+		return fmt.Errorf("raindrop: unable to create request: %v", err)
+	}
+	request.Header.Set("Content-Type", "application/json")
+
+	request.Header.Set("User-Agent", "Miniflux/"+version.Version)
+	request.Header.Set("Authorization", "Bearer "+c.token)
+
+	httpClient := &http.Client{Timeout: defaultClientTimeout}
+	response, err := httpClient.Do(request)
+	if err != nil {
+		return fmt.Errorf("raindrop: unable to send request: %v", err)
+	}
+	defer response.Body.Close()
+
+	if response.StatusCode >= 400 {
+		return fmt.Errorf("raindrop: unable to create bookmark: status=%d", response.StatusCode)
+	}
+
+	return nil
+}
+
+type raindrop struct {
+	Link       string     `json:"link"`
+	Title      string     `json:"title"`
+	Collection collection `json:"collection,omitempty"`
+	Tags       []string   `json:"tags"`
+}
+
+type collection struct {
+	Id string `json:"$id"`
+}

internal/integration/readeck/readeck.go

@@ -0,0 +1,149 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package readeck // import "miniflux.app/v2/internal/integration/readeck"
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"mime/multipart"
+	"net/http"
+	"strings"
+	"time"
+
+	"miniflux.app/v2/internal/urllib"
+	"miniflux.app/v2/internal/version"
+)
+
+const defaultClientTimeout = 10 * time.Second
+
+type Client struct {
+	baseURL string
+	apiKey  string
+	labels  string
+	onlyURL bool
+}
+
+func NewClient(baseURL, apiKey, labels string, onlyURL bool) *Client {
+	return &Client{baseURL: baseURL, apiKey: apiKey, labels: labels, onlyURL: onlyURL}
+}
+
+func (c *Client) CreateBookmark(entryURL, entryTitle string, entryContent string) error {
+	if c.baseURL == "" || c.apiKey == "" {
+		return fmt.Errorf("readeck: missing base URL or API key")
+	}
+
+	apiEndpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/api/bookmarks/")
+	if err != nil {
+		return fmt.Errorf(`readeck: invalid API endpoint: %v`, err)
+	}
+
+	labelsSplitFn := func(c rune) bool {
+		return c == ',' || c == ' '
+	}
+	labelsSplit := strings.FieldsFunc(c.labels, labelsSplitFn)
+
+	var request *http.Request
+	if c.onlyURL {
+		requestBodyJson, err := json.Marshal(&readeckBookmark{
+			Url:    entryURL,
+			Title:  entryTitle,
+			Labels: labelsSplit,
+		})
+		if err != nil {
+			return fmt.Errorf("readeck: unable to encode request body: %v", err)
+		}
+		request, err = http.NewRequest(http.MethodPost, apiEndpoint, bytes.NewReader(requestBodyJson))
+		if err != nil {
+			return fmt.Errorf("readeck: unable to create request: %v", err)
+		}
+		request.Header.Set("Content-Type", "application/json")
+	} else {
+		requestBody := new(bytes.Buffer)
+		multipartWriter := multipart.NewWriter(requestBody)
+
+		urlPart, err := multipartWriter.CreateFormField("url")
+		if err != nil {
+			return fmt.Errorf("readeck: unable to encode request body (entry url): %v", err)
+		}
+		urlPart.Write([]byte(entryURL))
+
+		titlePart, err := multipartWriter.CreateFormField("title")
+		if err != nil {
+			return fmt.Errorf("readeck: unable to encode request body (entry title): %v", err)
+		}
+		titlePart.Write([]byte(entryTitle))
+
+		featurePart, err := multipartWriter.CreateFormField("feature_find_main")
+		if err != nil {
+			return fmt.Errorf("readeck: unable to encode request body (feature_find_main flag): %v", err)
+		}
+		featurePart.Write([]byte("false")) // false to disable readability
+
+		for _, label := range labelsSplit {
+			labelPart, err := multipartWriter.CreateFormField("labels")
+			if err != nil {
+				return fmt.Errorf("readeck: unable to encode request body (entry labels): %v", err)
+			}
+			labelPart.Write([]byte(label))
+		}
+
+		contentBodyHeader, err := json.Marshal(&partContentHeader{
+			Url:           entryURL,
+			ContentHeader: contentHeader{ContentType: "text/html; charset=utf-8"},
+		})
+		if err != nil {
+			return fmt.Errorf("readeck: unable to encode request body (entry content header): %v", err)
+		}
+
+		contentPart, err := multipartWriter.CreateFormFile("resource", "blob")
+		if err != nil {
+			return fmt.Errorf("readeck: unable to encode request body (entry content): %v", err)
+		}
+		contentPart.Write(contentBodyHeader)
+		contentPart.Write([]byte("\n"))
+		contentPart.Write([]byte(entryContent))
+
+		err = multipartWriter.Close()
+		if err != nil {
+			return fmt.Errorf("readeck: unable to encode request body: %v", err)
+		}
+		request, err = http.NewRequest(http.MethodPost, apiEndpoint, requestBody)
+		if err != nil {
+			return fmt.Errorf("readeck: unable to create request: %v", err)
+		}
+		request.Header.Set("Content-Type", multipartWriter.FormDataContentType())
+	}
+
+	request.Header.Set("User-Agent", "Miniflux/"+version.Version)
+	request.Header.Set("Authorization", "Bearer "+c.apiKey)
+
+	httpClient := &http.Client{Timeout: defaultClientTimeout}
+	response, err := httpClient.Do(request)
+	if err != nil {
+		return fmt.Errorf("readeck: unable to send request: %v", err)
+	}
+	defer response.Body.Close()
+
+	if response.StatusCode >= 400 {
+		return fmt.Errorf("readeck: unable to create bookmark: url=%s status=%d", apiEndpoint, response.StatusCode)
+	}
+
+	return nil
+}
+
+type readeckBookmark struct {
+	Url    string   `json:"url"`
+	Title  string   `json:"title"`
+	Labels []string `json:"labels,omitempty"`
+}
+
+type contentHeader struct {
+	ContentType string `json:"content-type"`
+}
+
+type partContentHeader struct {
+	Url           string        `json:"url"`
+	ContentHeader contentHeader `json:"headers"`
+}

internal/integration/rssbridge/rssbridge.go

@@ -1,15 +1,20 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package rssbridge // import "miniflux.app/integration/rssbridge"
+package rssbridge // import "miniflux.app/v2/internal/integration/rssbridge"
 
 import (
 	"encoding/json"
 	"fmt"
+	"log/slog"
 	"net/http"
 	"net/url"
+	"strings"
+	"time"
 )
 
+const defaultClientTimeout = 30 * time.Second
+
 type Bridge struct {
 	URL        string     `json:"url"`
 	BridgeMeta BridgeMeta `json:"bridgeMeta"`
@@ -19,30 +24,61 @@ type BridgeMeta struct {
 	Name string `json:"name"`
 }
 
-func DetectBridges(rssbridgeURL, websiteURL string) (bridgeResponse []Bridge, err error) {
-	u, err := url.Parse(rssbridgeURL)
+func DetectBridges(rssBridgeURL, websiteURL string) ([]*Bridge, error) {
+	endpointURL, err := url.Parse(rssBridgeURL)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("RSS-Bridge: unable to parse bridge URL: %w", err)
 	}
-	values := u.Query()
+
+	values := endpointURL.Query()
 	values.Add("action", "findfeed")
 	values.Add("format", "atom")
 	values.Add("url", websiteURL)
-	u.RawQuery = values.Encode()
+	endpointURL.RawQuery = values.Encode()
 
-	response, err := http.Get(u.String())
+	slog.Debug("Detecting RSS bridges", slog.String("url", endpointURL.String()))
+
+	request, err := http.NewRequest(http.MethodGet, endpointURL.String(), nil)
 	if err != nil {
-		return nil, fmt.Errorf("RSS-Bridge: unable to excute request: %w", err)
+		return nil, fmt.Errorf("RSS-Bridge: unable to create request: %w", err)
+	}
+
+	httpClient := &http.Client{Timeout: defaultClientTimeout}
+
+	response, err := httpClient.Do(request)
+	if err != nil {
+		return nil, fmt.Errorf("RSS-Bridge: unable to execute request: %w", err)
 	}
 	defer response.Body.Close()
+
 	if response.StatusCode == http.StatusNotFound {
-		return
+		return nil, nil
 	}
+
 	if response.StatusCode > 400 {
 		return nil, fmt.Errorf("RSS-Bridge: unexpected status code %d", response.StatusCode)
 	}
+
+	var bridgeResponse []*Bridge
 	if err := json.NewDecoder(response.Body).Decode(&bridgeResponse); err != nil {
 		return nil, fmt.Errorf("RSS-Bridge: unable to decode bridge response: %w", err)
 	}
-	return
+
+	for _, bridge := range bridgeResponse {
+		slog.Debug("Found RSS bridge",
+			slog.String("name", bridge.BridgeMeta.Name),
+			slog.String("url", bridge.URL),
+		)
+
+		if strings.HasPrefix(bridge.URL, "./") {
+			bridge.URL = rssBridgeURL + bridge.URL[2:]
+
+			slog.Debug("Rewrited relative RSS bridge URL",
+				slog.String("name", bridge.BridgeMeta.Name),
+				slog.String("url", bridge.URL),
+			)
+		}
+	}
+
+	return bridgeResponse, nil
 }

internal/integration/shaarli/shaarli.go

@@ -11,7 +11,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"strings"
 	"time"
 
 	"miniflux.app/v2/internal/urllib"
@@ -74,14 +73,15 @@ func (c *Client) CreateLink(entryURL, entryTitle string) error {
 }
 
 func (c *Client) generateBearerToken() string {
-	header := strings.TrimRight(base64.URLEncoding.EncodeToString([]byte(`{"typ":"JWT", "alg":"HS256"}`)), "=")
-	payload := strings.TrimRight(base64.URLEncoding.EncodeToString([]byte(fmt.Sprintf(`{"iat": %d}`, time.Now().Unix()))), "=")
+	header := base64.RawURLEncoding.EncodeToString([]byte(`{"typ":"JWT","alg":"HS512"}`))
+	payload := base64.RawURLEncoding.EncodeToString([]byte(fmt.Sprintf(`{"iat":%d}`, time.Now().Unix())))
+	data := header + "." + payload
 
 	mac := hmac.New(sha512.New, []byte(c.apiSecret))
-	mac.Write([]byte(header + "." + payload))
-	signature := strings.TrimRight(base64.URLEncoding.EncodeToString(mac.Sum(nil)), "=")
+	mac.Write([]byte(data))
+	signature := base64.RawURLEncoding.EncodeToString(mac.Sum(nil))
 
-	return header + "." + payload + "." + signature
+	return data + "." + signature
 }
 
 type addLinkRequest struct {

internal/integration/telegrambot/telegrambot.go

@@ -11,7 +11,8 @@ import (
 
 func PushEntry(feed *model.Feed, entry *model.Entry, botToken, chatID string, topicID *int64, disableWebPagePreview, disableNotification bool, disableButtons bool) error {
 	formattedText := fmt.Sprintf(
-		`<a href=%q>%s</a>`,
+		`<b>%s</b> - <a href=%q>%s</a>`,
+		feed.Title,
 		entry.URL,
 		entry.Title,
 	)

internal/integration/webhook/webhook.go

@@ -57,6 +57,7 @@ func (c *Client) SendSaveEntryWebhookEvent(entry *model.Entry) error {
 				ID:         entry.Feed.ID,
 				UserID:     entry.Feed.UserID,
 				CategoryID: entry.Feed.Category.ID,
+				Category:   &WebhookCategory{ID: entry.Feed.Category.ID, Title: entry.Feed.Category.Title},
 				FeedURL:    entry.Feed.FeedURL,
 				SiteURL:    entry.Feed.SiteURL,
 				Title:      entry.Feed.Title,
@@ -94,13 +95,13 @@ func (c *Client) SendNewEntriesWebhookEvent(feed *model.Feed, entries model.Entr
 			Tags:        entry.Tags,
 		})
 	}
-
 	return c.makeRequest(NewEntriesEventType, &WebhookNewEntriesEvent{
 		EventType: NewEntriesEventType,
 		Feed: &WebhookFeed{
 			ID:         feed.ID,
 			UserID:     feed.UserID,
 			CategoryID: feed.Category.ID,
+			Category:   &WebhookCategory{ID: feed.Category.ID, Title: feed.Category.Title},
 			FeedURL:    feed.FeedURL,
 			SiteURL:    feed.SiteURL,
 			Title:      feed.Title,
@@ -145,13 +146,19 @@ func (c *Client) makeRequest(eventType string, payload any) error {
 }
 
 type WebhookFeed struct {
-	ID         int64     `json:"id"`
-	UserID     int64     `json:"user_id"`
-	CategoryID int64     `json:"category_id"`
-	FeedURL    string    `json:"feed_url"`
-	SiteURL    string    `json:"site_url"`
-	Title      string    `json:"title"`
-	CheckedAt  time.Time `json:"checked_at"`
+	ID         int64            `json:"id"`
+	UserID     int64            `json:"user_id"`
+	CategoryID int64            `json:"category_id"`
+	Category   *WebhookCategory `json:"category,omitempty"`
+	FeedURL    string           `json:"feed_url"`
+	SiteURL    string           `json:"site_url"`
+	Title      string           `json:"title"`
+	CheckedAt  time.Time        `json:"checked_at"`
+}
+
+type WebhookCategory struct {
+	ID    int64  `json:"id"`
+	Title string `json:"title"`
 }
 
 type WebhookEntry struct {

internal/locale/catalog.go

@@ -20,7 +20,7 @@ var translationFiles embed.FS
 // LoadCatalogMessages loads and parses all translations encoded in JSON.
 func LoadCatalogMessages() error {
 	var err error
-	defaultCatalog = make(catalog)
+	defaultCatalog = make(catalog, len(AvailableLanguages()))
 
 	for language := range AvailableLanguages() {
 		defaultCatalog[language], err = loadTranslationFile(language)

internal/locale/catalog_test.go

@@ -53,11 +53,11 @@ func TestAllKeysHaveValue(t *testing.T) {
 			switch value := v.(type) {
 			case string:
 				if value == "" {
-					t.Errorf(`The key %q for the language %q have an empty string as value`, k, language)
+					t.Errorf(`The key %q for the language %q has an empty string as value`, k, language)
 				}
-			case []string:
+			case []any:
 				if len(value) == 0 {
-					t.Errorf(`The key %q for the language %q have an empty list as value`, k, language)
+					t.Errorf(`The key %q for the language %q has an empty list as value`, k, language)
 				}
 			}
 		}
@@ -88,3 +88,20 @@ func TestMissingTranslations(t *testing.T) {
 		}
 	}
 }
+
+func TestTranslationFilePluralForms(t *testing.T) {
+	for language := range AvailableLanguages() {
+		messages, err := loadTranslationFile(language)
+		if err != nil {
+			t.Fatalf(`Unable to load translation messages for language %q`, language)
+		}
+
+		for k, v := range messages {
+			if value, ok := v.([]any); ok {
+				if len(value) != numberOfPluralFormsPerLanguage[language] {
+					t.Errorf(`The key %q for the language %q does not have the expected number of plurals, got %d instead of %d`, k, language, len(value), numberOfPluralFormsPerLanguage[language])
+				}
+			}
+		}
+	}
+}

internal/locale/locale.go

@@ -3,6 +3,27 @@
 
 package locale // import "miniflux.app/v2/internal/locale"
 
+var numberOfPluralFormsPerLanguage = map[string]int{
+	"en_US": 2,
+	"es_ES": 2,
+	"fr_FR": 2,
+	"de_DE": 2,
+	"pl_PL": 3,
+	"pt_BR": 2,
+	"zh_CN": 1,
+	"zh_TW": 1,
+	"nl_NL": 2,
+	"ru_RU": 3,
+	"it_IT": 2,
+	"ja_JP": 1,
+	"tr_TR": 2,
+	"el_EL": 2,
+	"fi_FI": 2,
+	"hi_IN": 2,
+	"uk_UA": 3,
+	"id_ID": 1,
+}
+
 // AvailableLanguages returns the list of available languages.
 func AvailableLanguages() map[string]string {
 	return map[string]string{

internal/locale/plural.go

@@ -3,69 +3,65 @@
 
 package locale // import "miniflux.app/v2/internal/locale"
 
-type pluralFormFunc func(n int) int
-
 // See https://localization-guide.readthedocs.io/en/latest/l10n/pluralforms.html
 // And http://www.unicode.org/cldr/charts/29/supplemental/language_plural_rules.html
-var pluralForms = map[string]pluralFormFunc{
+var pluralForms = map[string](func(n int) int){
 	// nplurals=2; plural=(n != 1);
 	"default": func(n int) int {
 		if n != 1 {
 			return 1
 		}
-
 		return 0
 	},
 	// nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5);
 	"ar_AR": func(n int) int {
-		if n == 0 {
+		switch {
+		case n == 0:
 			return 0
-		}
-
-		if n == 1 {
+		case n == 1:
 			return 1
-		}
-
-		if n == 2 {
+		case n == 2:
 			return 2
-		}
-
-		if n%100 >= 3 && n%100 <= 10 {
+		case n%100 >= 3 && n%100 <= 10:
 			return 3
-		}
-
-		if n%100 >= 11 {
+		case n%100 >= 11:
 			return 4
 		}
-
 		return 5
 	},
 	// nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;
 	"cs_CZ": func(n int) int {
-		if n == 1 {
+		switch {
+		case n == 1:
 			return 0
-		}
-
-		if n >= 2 && n <= 4 {
+		case n >= 2 && n <= 4:
 			return 1
 		}
-
 		return 2
 	},
+	// nplurals=2; plural=(n > 1);
+	"fr_FR": func(n int) int {
+		if n > 1 {
+			return 1
+		}
+		return 0
+	},
 	// nplurals=1; plural=0;
 	"id_ID": func(n int) int {
 		return 0
 	},
+	// nplurals=1; plural=0;
+	"ja_JP": func(n int) int {
+		return 0
+	},
 	// nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);
 	"pl_PL": func(n int) int {
-		if n == 1 {
+		switch {
+		case n == 1:
 			return 0
-		}
-
-		if n%10 >= 2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20) {
+		case n%10 >= 2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20):
 			return 1
 		}
-
 		return 2
 	},
 	// nplurals=2; plural=(n > 1);
@@ -76,23 +72,31 @@ var pluralForms = map[string]pluralFormFunc{
 		return 0
 	},
 	"ru_RU": pluralFormRuSrUa,
+	// nplurals=2; plural=(n > 1);
+	"tr_TR": func(n int) int {
+		if n > 1 {
+			return 1
+		}
+		return 0
+	},
 	"uk_UA": pluralFormRuSrUa,
 	"sr_RS": pluralFormRuSrUa,
 	// nplurals=1; plural=0;
 	"zh_CN": func(n int) int {
 		return 0
 	},
+	"zh_TW": func(n int) int {
+		return 0
+	},
 }
 
 // nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);
 func pluralFormRuSrUa(n int) int {
-	if n%10 == 1 && n%100 != 11 {
+	switch {
+	case n%10 == 1 && n%100 != 11:
 		return 0
-	}
-
-	if n%10 >= 2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20) {
+	case n%10 >= 2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20):
 		return 1
 	}
-
 	return 2
 }

internal/locale/plural_test.go

@@ -25,6 +25,20 @@ func TestPluralRules(t *testing.T) {
 			2: 1,
 			5: 2,
 		},
+		"fr_FR": {
+			1: 0,
+			2: 1,
+			5: 1,
+		},
+		"id_ID": {
+			1: 0,
+			5: 0,
+		},
+		"ja_JP": {
+			1: 0,
+			2: 0,
+			5: 0,
+		},
 		"pl_PL": {
 			1: 0,
 			2: 1,
@@ -45,10 +59,24 @@ func TestPluralRules(t *testing.T) {
 			2: 1,
 			5: 2,
 		},
+		"tr_TR": {
+			1: 0,
+			2: 1,
+			5: 1,
+		},
+		"uk_UA": {
+			1: 0,
+			2: 1,
+			5: 2,
+		},
 		"zh_CN": {
 			1: 0,
 			5: 0,
 		},
+		"zh_TW": {
+			1: 0,
+			5: 0,
+		},
 	}
 
 	for rule, values := range scenarios {

internal/locale/printer.go

@@ -10,6 +10,15 @@ type Printer struct {
 	language string
 }
 
+func (p *Printer) Print(key string) string {
+	if str, ok := defaultCatalog[p.language][key]; ok {
+		if translation, ok := str.(string); ok {
+			return translation
+		}
+	}
+	return key
+}
+
 // Printf is like fmt.Printf, but using language-specific formatting.
 func (p *Printer) Printf(key string, args ...interface{}) string {
 	var translation string

internal/locale/translations/de_DE.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "Sind Sie sicher?",
     "confirm.question.refresh": "Möchten Sie eine erzwungene Aktualisierung durchführen?",
     "confirm.yes": "ja",
@@ -18,6 +19,8 @@
     "action.home_screen": "Zum Startbildschirm hinzufügen",
     "tooltip.keyboard_shortcuts": "Tastenkürzel: %s",
     "tooltip.logged_user": "Angemeldet als %s",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "Ungelesen",
     "menu.starred": "Lesezeichen",
     "menu.history": "Verlauf",
@@ -32,6 +35,7 @@
     "menu.about": "Über",
     "menu.export": "Exportieren",
     "menu.import": "Importieren",
+    "menu.search": "Suche",
     "menu.create_category": "Kategorie anlegen",
     "menu.mark_page_as_read": "Diese Seite als gelesen markieren",
     "menu.mark_all_as_read": "Alle als gelesen markieren",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "Geteilte Artikel",
     "search.label": "Suche",
     "search.placeholder": "Suche...",
+    "search.submit": "Search",
+    "pagination.last": "Last",
     "pagination.next": "Nächste",
+    "pagination.first": "First",
     "pagination.previous": "Vorherige",
     "entry.status.unread": "Ungelesen",
     "entry.status.read": "Gelesen",
@@ -81,11 +88,27 @@
     "entry.estimated_reading_time": [
         "%d Minute zu lesen",
         "%d Minuten zu lesen"
-    ],    
+    ],
     "entry.tags.label": "Stichworte:",
     "page.shared_entries.title": "Geteilte Artikel",
+    "page.shared_entries_count": [
+        "%d shared entry",
+        "%d shared entries"
+    ],
     "page.unread.title": "Ungelesen",
+    "page.unread_entry_count": [
+        "%d unread entry",
+        "%d unread entries"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total",
+        "%d entries in total"
+    ],
     "page.starred.title": "Lesezeichen",
+    "page.starred_entry_count": [
+        "%d starred entry",
+        "%d starred entries"
+    ],
     "page.categories.title": "Kategorien",
     "page.categories.no_feed": "Kein Abonnement.",
     "page.categories.entries": "Artikel",
@@ -94,21 +117,28 @@
         "Es gibt %d Abonnement.",
         "Es gibt %d Abonnements."
     ],
-    "page.categories.unread_counter": "Anzahl der ungelesenen Artikel",
+    "page.categories_count": [
+        "%d category",
+        "%d categories"
+    ],
     "page.new_category.title": "Neue Kategorie",
     "page.new_user.title": "Neuer Benutzer",
     "page.edit_category.title": "Kategorie bearbeiten: %s",
     "page.edit_user.title": "Benutzer bearbeiten: %s",
     "page.feeds.title": "Abonnements",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "Letzte Aktualisierung:",
-    "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "Anzahl der ungelesenen Artikel",
+    "page.feeds.next_check": "Nächste Aktualisierung:",
     "page.feeds.read_counter": "Anzahl der gelesenen Artikel",
     "page.feeds.error_count": [
         "%d Fehler",
         "%d Fehler"
     ],
     "page.history.title": "Verlauf",
+    "page.read_entry_count": [
+        "%d read entry",
+        "%d read entries"
+    ],
     "page.import.title": "Importieren",
     "page.search.title": "Suchergebnisse",
     "page.about.title": "Über",
@@ -118,12 +148,12 @@
     "page.about.author": "Autor:",
     "page.about.license": "Lizenz:",
     "page.about.global_config_options": "Globale Konfigurationsoptionen",
-    "page.about.postgres_version": "Postgres Version:",
-    "page.about.go_version": "Go Version:",
+    "page.about.postgres_version": "Postgres-Version:",
+    "page.about.go_version": "Go-Version:",
     "page.add_feed.title": "Neues Abonnement",
     "page.add_feed.no_category": "Es ist keine Kategorie vorhanden. Wenigstens eine Kategorie muss angelegt sein.",
     "page.add_feed.label.url": "URL",
-    "page.add_feed.submit": "Abonnement suchen",
+    "page.add_feed.submit": "Abonnement finden",
     "page.add_feed.legend.advanced_options": "Erweiterte Optionen",
     "page.add_feed.choose_feed": "Abonnement auswählen",
     "page.edit_feed.title": "Abonnement bearbeiten: %s",
@@ -132,7 +162,7 @@
     "page.edit_feed.etag_header": "ETag-Kopfzeile:",
     "page.edit_feed.no_header": "Nicht verfügbar",
     "page.edit_feed.last_parsing_error": "Letzter Analysefehler",
-    "page.entry.attachments": "Anlagen",
+    "page.entry.attachments": "Anhänge",
     "page.keyboard_shortcuts.title": "Tastenkürzel",
     "page.keyboard_shortcuts.subtitle.sections": "Navigation zwischen den Menüpunkten",
     "page.keyboard_shortcuts.subtitle.items": "Navigation zwischen den Artikeln",
@@ -150,6 +180,8 @@
     "page.keyboard_shortcuts.go_to_feed": "Zum Abonnement gehen",
     "page.keyboard_shortcuts.go_to_previous_page": "Zur vorherigen Seite gehen",
     "page.keyboard_shortcuts.go_to_next_page": "Zur nächsten Seite gehen",
+    "page.keyboard_shortcuts.go_to_bottom_item": "Gehen Sie zum untersten Element",
+    "page.keyboard_shortcuts.go_to_top_item": "Zum obersten Artikel gehen",
     "page.keyboard_shortcuts.open_item": "Gewählten Artikel öffnen",
     "page.keyboard_shortcuts.open_original": "Original-Artikel öffnen",
     "page.keyboard_shortcuts.open_original_same_window": "Öffne den Original-Link in der aktuellen Registerkarte",
@@ -162,10 +194,10 @@
     "page.keyboard_shortcuts.download_content": "Vollständigen Inhalt herunterladen",
     "page.keyboard_shortcuts.toggle_bookmark_status": "Lesezeichen hinzufügen/entfernen",
     "page.keyboard_shortcuts.save_article": "Artikel speichern",
-    "page.keyboard_shortcuts.scroll_item_to_top": "Artikel nach oben blättern",
+    "page.keyboard_shortcuts.scroll_item_to_top": "Artikel an den Anfang blättern",
     "page.keyboard_shortcuts.remove_feed": "Dieses Abonnement entfernen",
     "page.keyboard_shortcuts.go_to_search": "Fokus auf das Suchformular setzen",
-    "page.keyboard_shortcuts.toggle_entry_attachments": "Artikel Anhänge öffnen/schließen",
+    "page.keyboard_shortcuts.toggle_entry_attachments": "Artikelanhänge öffnen/schließen",
     "page.keyboard_shortcuts.close_modal": "Liste der Tastenkürzel schließen",
     "page.users.title": "Benutzer",
     "page.users.username": "Benutzername",
@@ -176,15 +208,15 @@
     "page.users.last_login": "Letzte Anmeldung",
     "page.users.is_admin": "Administrator",
     "page.settings.title": "Einstellungen",
-    "page.settings.link_google_account": "Google Konto verknüpfen",
-    "page.settings.unlink_google_account": "Google Konto Verknüpfung entfernen",
-    "page.settings.link_oidc_account": "OpenID Connect Konto verknüpfen",
-    "page.settings.unlink_oidc_account": "OpenID Connect Konto Verknüpfung entfernen",
+    "page.settings.link_google_account": "Google-Konto verknüpfen",
+    "page.settings.unlink_google_account": "Verknüpfung mit Google-Konto entfernen",
+    "page.settings.link_oidc_account": "%s-Konto verknüpfen",
+    "page.settings.unlink_oidc_account": "Verknüpfung mit %s-Konto entfernen",
     "page.settings.webauthn.passkeys": "Passkeys",
-    "page.settings.webauthn.actions": "Actions",
-    "page.settings.webauthn.passkey_name": "Passkey Name",
-    "page.settings.webauthn.added_on": "Added On",
-    "page.settings.webauthn.last_seen_on": "Last Used",
+    "page.settings.webauthn.actions": "Aktionen",
+    "page.settings.webauthn.passkey_name": "Name des Passkeys",
+    "page.settings.webauthn.added_on": "Hinzugefügt am",
+    "page.settings.webauthn.last_seen_on": "Zuletzt genutzt",
     "page.settings.webauthn.register": "Hauptschlüssel registrieren",
     "page.settings.webauthn.register.error": "Hauptschlüssel kann nicht registriert werden",
     "page.settings.webauthn.delete": [
@@ -193,22 +225,22 @@
     ],
     "page.login.title": "Anmeldung",
     "page.login.google_signin": "Anmeldung mit Google",
-    "page.login.oidc_signin": "Anmeldung mit OpenID Connect",
-    "page.login.webauthn_login": "Melden Sie sich mit dem Hauptschlüssel an",
+    "page.login.oidc_signin": "Anmeldung mit %s",
+    "page.login.webauthn_login": "Melden Sie sich mit dem Passkey an",
     "page.login.webauthn_login.error": "Anmeldung mit Passkey nicht möglich",
     "page.integrations.title": "Dienste",
-    "page.integration.miniflux_api": "Miniflux API",
-    "page.integration.miniflux_api_endpoint": "API Endpunkt",
+    "page.integration.miniflux_api": "Miniflux-API",
+    "page.integration.miniflux_api_endpoint": "API-Endpunkt",
     "page.integration.miniflux_api_username": "Benutzername",
     "page.integration.miniflux_api_password": "Passwort",
-    "page.integration.miniflux_api_password_value": "Ihr Konto Passwort",
+    "page.integration.miniflux_api_password_value": "Ihr Konto-Passwort",
     "page.integration.bookmarklet": "Bookmarklet",
     "page.integration.bookmarklet.name": "Mit Miniflux abonnieren",
     "page.integration.bookmarklet.instructions": "Ziehen Sie diesen Link in Ihre Lesezeichen.",
     "page.integration.bookmarklet.help": "Dieser spezielle Link ermöglicht es, eine Webseite direkt über ein Lesezeichen im Browser zu abonnieren.",
     "page.sessions.title": "Sitzungen",
     "page.sessions.table.date": "Datum",
-    "page.sessions.table.ip": "IP Addresse",
+    "page.sessions.table.ip": "IP-Addresse",
     "page.sessions.table.user_agent": "Benutzeragent",
     "page.sessions.table.actions": "Aktionen",
     "page.sessions.table.current_session": "Aktuelle Sitzung",
@@ -223,11 +255,12 @@
     "page.offline.title": "Offline-Modus",
     "page.offline.message": "Du bist offline",
     "page.offline.refresh_page": "Versuchen Sie, die Seite zu aktualisieren",
-    "page.webauthn_rename.title": "Rename Passkey",
+    "page.webauthn_rename.title": "Passkey umbenennen",
     "alert.no_shared_entry": "Es existieren derzeit keine geteilten Artikel.",
     "alert.no_bookmark": "Es existiert derzeit kein Lesezeichen.",
     "alert.no_category": "Es ist keine Kategorie vorhanden.",
     "alert.no_category_entry": "Es befindet sich kein Artikel in dieser Kategorie.",
+    "alert.no_tag_entry": "Es gibt keine Artikel, die diesem Tag entsprechen.",
     "alert.no_feed_entry": "Es existiert kein Artikel für dieses Abonnement.",
     "alert.no_feed": "Es sind keine Abonnements vorhanden.",
     "alert.no_feed_in_category": "Für diese Kategorie gibt es kein Abonnement.",
@@ -254,6 +287,13 @@
     "error.unable_to_update_user": "Dieser Benutzer konnte nicht aktualisiert werden.",
     "error.unable_to_update_feed": "Dieses Abonnement konnte nicht aktualisiert werden.",
     "error.subscription_not_found": "Es wurden keine Abonnements gefunden.",
+    "error.invalid_theme": "Ungültiges Thema.",
+    "error.invalid_language": "Ungültige Sprache.",
+    "error.invalid_timezone": "Ungültige Zeitzone.",
+    "error.invalid_entry_direction": "Ungültige Sortierreihenfolge.",
+    "error.invalid_display_mode": "Progressive Web App (PWA) Anzeigemodus",
+    "error.invalid_gesture_nav": "Ungültige Gestennavigation.",
+    "error.invalid_default_home_page": "Ungültige Standard-Startseite!",
     "error.empty_file": "Diese Datei ist leer.",
     "error.bad_credentials": "Benutzername oder Passwort ungültig.",
     "error.fields_mandatory": "Alle Felder sind obligatorisch.",
@@ -262,6 +302,14 @@
     "error.password_min_length": "Wenigstens 6 Zeichen müssen genutzt werden.",
     "error.settings_mandatory_fields": "Die Felder für Benutzername, Thema, Sprache und Zeitzone sind obligatorisch.",
     "error.settings_reading_speed_is_positive": "Die Lesegeschwindigkeiten müssen positive ganze Zahlen sein.",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "Die Anzahl der Einträge pro Seite ist ungültig.",
     "error.feed_mandatory_fields": "Die URL und die Kategorie sind obligatorisch.",
     "error.feed_already_exists": "Dieser Feed existiert bereits.",
@@ -276,79 +324,88 @@
     "error.user_mandatory_fields": "Der Benutzername ist obligatorisch.",
     "error.api_key_already_exists": "Dieser API-Schlüssel ist bereits vorhanden.",
     "error.unable_to_create_api_key": "Dieser API-Schlüssel kann nicht erstellt werden.",
-    "error.invalid_theme": "Ungültiges Thema.",
-    "error.invalid_language": "Ungültige Sprache.",
-    "error.invalid_timezone": "Ungültige Zeitzone.",
-    "error.invalid_entry_direction": "Ungültige Sortierreihenfolge.",
-    "error.invalid_display_mode": "Progressive Web App (PWA) Anzeigemodus",
-    "error.invalid_gesture_nav": "Ungültige Gestennavigation.",
-    "error.invalid_default_home_page": "Ungültige Standard-Startseite!",
     "form.feed.label.title": "Titel",
-    "form.feed.label.site_url": "Webseite-URL",
-    "form.feed.label.feed_url": "Abonnement-URL",
+    "form.feed.label.site_url": "URL der Webseite",
+    "form.feed.label.feed_url": "URL des Abonnements",
+    "form.feed.label.description": "Beschreibung",
     "form.feed.label.category": "Kategorie",
-    "form.feed.label.crawler": "Inhalt herunterladen",
+    "form.feed.label.crawler": "Originalinhalt herunterladen",
     "form.feed.label.feed_username": "Benutzername des Abonnements",
     "form.feed.label.feed_password": "Passwort des Abonnements",
     "form.feed.label.user_agent": "Standardbenutzeragenten überschreiben",
     "form.feed.label.cookie": "Cookies setzen",
     "form.feed.label.scraper_rules": "Extraktionsregeln",
     "form.feed.label.rewrite_rules": "Umschreiberegeln",
+    "form.feed.label.apprise_service_urls": "Kommaseparierte Liste der Apprise Service-URLs",
     "form.feed.label.blocklist_rules": "Blockierregeln",
     "form.feed.label.keeplist_rules": "Erlaubnisregeln",
     "form.feed.label.urlrewrite_rules": "Umschreibregeln für URL",
-    "form.feed.label.apprise_service_urls": "Kommaseparierte Liste der Apprise service URLs",
-    "form.feed.label.ignore_http_cache": "Ignoriere HTTP-cache",
+    "form.feed.label.ignore_http_cache": "Ignoriere HTTP-Cache",
     "form.feed.label.allow_self_signed_certificates": "Erlaube selbstsignierte oder ungültige Zertifikate",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "Über Proxy abrufen",
     "form.feed.label.disabled": "Dieses Abonnement nicht aktualisieren",
-    "form.feed.label.no_media_player": "No media player (audio/video)",
+    "form.feed.label.no_media_player": "Kein Media-Player (Audio/Video)",
     "form.feed.label.hide_globally": "Einträge in der globalen Ungelesen-Liste ausblenden",
-    "form.feed.fieldset.general": "General",
-    "form.feed.fieldset.rules": "Rules",
-    "form.feed.fieldset.network_settings": "Network Settings",
-    "form.feed.fieldset.integration": "Third-Party Services",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
+    "form.feed.fieldset.general": "Allgemein",
+    "form.feed.fieldset.rules": "Regeln",
+    "form.feed.fieldset.network_settings": "Netzwerkeinstellungen",
+    "form.feed.fieldset.integration": "Drittanbieter-Dienste",
     "form.category.label.title": "Titel",
     "form.category.hide_globally": "Einträge in der globalen Ungelesen-Liste ausblenden",
     "form.user.label.username": "Benutzername",
     "form.user.label.password": "Passwort",
-    "form.user.label.confirmation": "Passwort Bestätigung",
+    "form.user.label.confirmation": "Passwortbestätigung",
     "form.user.label.admin": "Administrator",
     "form.prefs.label.language": "Sprache",
     "form.prefs.label.timezone": "Zeitzone",
     "form.prefs.label.theme": "Thema",
-    "form.prefs.label.entry_sorting": "Sortierung der Artikel",
+    "form.prefs.label.entry_sorting": "Sortierung der Einträge",
     "form.prefs.label.entries_per_page": "Einträge pro Seite",
     "form.prefs.label.default_reading_speed": "Lesegeschwindigkeit für andere Sprachen (Wörter pro Minute)",
     "form.prefs.label.cjk_reading_speed": "Lesegeschwindigkeit für Chinesisch, Koreanisch und Japanisch (Zeichen pro Minute)",
-    "form.prefs.label.display_mode": "Anzeigemodus der Web-App (muss neu installiert werden)",
-    "form.prefs.select.older_first": "Älteste Artikel zuerst",
-    "form.prefs.select.recent_first": "Neueste Artikel zuerst",
+    "form.prefs.label.display_mode": "Anzeigemodus der progressiven Web-Anwendung (PWA)",
+    "form.prefs.select.older_first": "Ältere Einträge zuerst",
+    "form.prefs.select.recent_first": "Neue Einträge zuerst",
     "form.prefs.select.fullscreen": "Vollbildschirm",
     "form.prefs.select.standalone": "Eigenständige",
     "form.prefs.select.minimal_ui": "Minimal",
     "form.prefs.select.browser": "Browser",
-    "form.prefs.select.publish_time": "Eintrag veröffentlichte Zeit",
-    "form.prefs.select.created_time": "Eintrag erstellt Zeit",
+    "form.prefs.select.publish_time": "Artikel veröffentlichte am",
+    "form.prefs.select.created_time": "Artikel erstellt am",
     "form.prefs.select.alphabetical": "Alphabetisch",
-    "form.prefs.select.unread_count": "Ungelesen zählen",
-    "form.prefs.select.none": "Keiner",
+    "form.prefs.select.unread_count": "Ungelesen",
+    "form.prefs.select.none": "Keine",
     "form.prefs.select.tap": "Doppeltippen",
     "form.prefs.select.swipe": "Wischen",
     "form.prefs.label.keyboard_shortcuts": "Tastaturkürzel aktivieren",
-    "form.prefs.label.entry_swipe": "Aktivieren Sie das Streichen von Einträgen auf Touchscreens",
+    "form.prefs.label.entry_swipe": "Aktivieren Sie das Wischen von Einträgen auf Touchscreens",
     "form.prefs.label.gesture_nav": "Geste zum Navigieren zwischen Einträgen",
     "form.prefs.label.show_reading_time": "Geschätzte Lesezeit für Artikel anzeigen",
     "form.prefs.label.custom_css": "Benutzerdefiniertes CSS",
-    "form.prefs.label.entry_order": "Eintrag Sortierspalte",
-    "form.prefs.label.default_home_page": "Standard Startseite",
-    "form.prefs.label.categories_sorting_order": "Kategorien sortieren",
+    "form.prefs.label.entry_order": "Artikel-Sortierspalte",
+    "form.prefs.label.default_home_page": "Standard-Startseite",
+    "form.prefs.label.categories_sorting_order": "Kategorie-Sortierung",
     "form.prefs.label.mark_read_on_view": "Einträge automatisch als gelesen markieren, wenn sie angezeigt werden",
-    "form.prefs.fieldset.application_settings": "Application Settings",
-    "form.prefs.fieldset.authentication_settings": "Authentication Settings",
-    "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
+    "form.prefs.fieldset.application_settings": "Anwendungseinstellungen",
+    "form.prefs.fieldset.authentication_settings": "Authentifizierungseinstellungen",
+    "form.prefs.fieldset.reader_settings": "Reader-Einstellungen",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "OPML Datei",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "Fever API aktivieren",
     "form.integration.fever_username": "Fever Benutzername",
     "form.integration.fever_password": "Fever Passwort",
@@ -356,73 +413,98 @@
     "form.integration.googlereader_activate": "Google Reader API aktivieren",
     "form.integration.googlereader_username": "Google Reader Benutzername",
     "form.integration.googlereader_password": "Google Reader Passwort",
-    "form.integration.googlereader_endpoint": "Google Reader API Endpunkt:",
-    "form.integration.pinboard_activate": "Artikel in Pinboard speichern",
-    "form.integration.pinboard_token": "Pinboard API Token",
+    "form.integration.googlereader_endpoint": "Google Reader API-Endpunkt:",
+    "form.integration.pinboard_activate": "Einträge in Pinboard speichern",
+    "form.integration.pinboard_token": "Pinboard API-Token",
     "form.integration.pinboard_tags": "Pinboard Tags",
     "form.integration.pinboard_bookmark": "Lesezeichen als ungelesen markieren",
-    "form.integration.instapaper_activate": "Artikel in Instapaper speichern",
+    "form.integration.instapaper_activate": "Einträge in Instapaper speichern",
     "form.integration.instapaper_username": "Instapaper Benutzername",
     "form.integration.instapaper_password": "Instapaper Passwort",
-    "form.integration.pocket_activate": "Artikel in Pocket speichern",
-    "form.integration.pocket_consumer_key": "Pocket Consumer Key",
-    "form.integration.pocket_access_token": "Pocket Access Token",
+    "form.integration.pocket_activate": "Einträge in Pocket speichern",
+    "form.integration.pocket_consumer_key": "Pocket Verbraucher-Schlüssel",
+    "form.integration.pocket_access_token": "Pocket Zugangs-Token",
     "form.integration.pocket_connect_link": "Verbinden Sie Ihr Pocket Konto",
-    "form.integration.wallabag_activate": "Artikel in Wallabag speichern",
+    "form.integration.wallabag_activate": "Einträge in Wallabag speichern",
     "form.integration.wallabag_only_url": "Nur URL senden (anstelle des vollständigen Inhalts)",
     "form.integration.wallabag_endpoint": "Wallabag URL",
     "form.integration.wallabag_client_id": "Wallabag Client-ID",
-    "form.integration.wallabag_client_secret": "Wallabag Client-Secret",
+    "form.integration.wallabag_client_secret": "Wallabag Client-Geheimnis",
     "form.integration.wallabag_username": "Wallabag Benutzername",
     "form.integration.wallabag_password": "Wallabag Passwort",
-    "form.integration.notion_activate": "Save entries to Notion",
+    "form.integration.notion_activate": "Einträge in Notion speichern",
     "form.integration.notion_page_id": "Notion Page ID",
-    "form.integration.notion_token": "Notion Secret Token",
+    "form.integration.notion_token": "Notion Geheimnis-Token",
     "form.integration.apprise_activate": "Push entries to Apprise",
     "form.integration.apprise_url": "Apprise API URL",
-    "form.integration.apprise_services_url": "Kommaseparierte Liste der Apprise service URLs",
+    "form.integration.apprise_services_url": "Kommaseparierte Liste von Apprise service URLs",
     "form.integration.nunux_keeper_activate": "Artikel in Nunux Keeper speichern",
     "form.integration.nunux_keeper_endpoint": "Nunux Keeper API-Endpunkt",
     "form.integration.nunux_keeper_api_key": "Nunux Keeper API-Schlüssel",
-    "form.integration.omnivore_activate": "Artikel in Omnivore speichern",
+    "form.integration.omnivore_activate": "Einträge in Omnivore speichern",
     "form.integration.omnivore_url": "Omnivore API-Endpunkt",
     "form.integration.omnivore_api_key": "Omnivore API-Schlüssel",
-    "form.integration.espial_activate": "Artikel in Espial speichern",
+    "form.integration.espial_activate": "Einträge in Espial",
     "form.integration.espial_endpoint": "Espial API-Endpunkt",
     "form.integration.espial_api_key": "Espial API-Schlüssel",
-    "form.integration.espial_tags": "Espial tags",
-    "form.integration.readwise_activate": "Save entries to Readwise Reader",
-    "form.integration.readwise_api_key": "Readwise Reader Access Token",
-    "form.integration.readwise_api_key_link": "Get your Readwise Access Token",
-    "form.integration.telegram_bot_activate": "Pushen Sie neue Artikel in den Telegram-Chat",
-    "form.integration.telegram_bot_token": "Bot token",
-    "form.integration.telegram_chat_id": "Chat ID",
-    "form.integration.telegram_topic_id": "Topic ID",
-    "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
-    "form.integration.telegram_bot_disable_notification": "Disable notification",
-    "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.espial_tags": "Espial Tags",
+    "form.integration.readwise_activate": "Einträge in Readwise Reader speichern",
+    "form.integration.readwise_api_key": "Readwise Reader Zugangs-Token",
+    "form.integration.readwise_api_key_link": "Erhalten Sie Ihren Readwise Zugangs-Token",
+    "form.integration.telegram_bot_activate": "Schicken Sie neue Artikel in den Telegram-Chat",
+    "form.integration.telegram_bot_token": "Bot-Token",
+    "form.integration.telegram_chat_id": "Chat-ID",
+    "form.integration.telegram_topic_id": "Thema-ID",
+    "form.integration.telegram_bot_disable_web_page_preview": "Webseiten-Vorschau deaktivieren",
+    "form.integration.telegram_bot_disable_notification": "Benachrichtigungen deaktivieren",
+    "form.integration.telegram_bot_disable_buttons": "Schaltfächen deaktivieren",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "Artikel in Linkding speichern",
     "form.integration.linkding_endpoint": "Linkding API-Endpunkt",
     "form.integration.linkding_api_key": "Linkding API-Schlüssel",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "Lesezeichen als ungelesen markieren",
-    "form.integration.matrix_bot_activate": "Neue Artikel in die Matrix übertragen",
+    "form.integration.linkwarden_activate": "Artikel in Linkwarden speichern",
+    "form.integration.linkwarden_endpoint": "Linkwarden API-Endpunkt",
+    "form.integration.linkwarden_api_key": "Linkwarden API-Schlüssel",
+    "form.integration.matrix_bot_activate": "Neue Artikel in Matrix übertragen",
     "form.integration.matrix_bot_user": "Benutzername für Matrix",
     "form.integration.matrix_bot_password": "Passwort für Matrix-Benutzer",
     "form.integration.matrix_bot_url": "URL des Matrix-Servers",
     "form.integration.matrix_bot_chat_id": "ID des Matrix-Raums",
-    "form.integration.shiori_activate": "Artikel in Shiori",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Artikel in Readeck speichern",
+    "form.integration.readeck_endpoint": "Readeck API-Endpunkt",
+    "form.integration.readeck_api_key": "Readeck API-Schlüssel",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "Nur URL senden (anstelle des vollständigen Inhalts)",
+    "form.integration.shiori_activate": "Artikel in Shiori speichern",
     "form.integration.shiori_endpoint": "Shiori API-Endpunkt",
     "form.integration.shiori_username": "Shiori Benutzername",
     "form.integration.shiori_password": "Shiori Passwort",
-    "form.integration.shaarli_activate": "Save articles to Shaarli",
+    "form.integration.shaarli_activate": "Artikel in Shaarli speichern",
     "form.integration.shaarli_endpoint": "Shaarli URL",
-    "form.integration.shaarli_api_secret": "Shaarli API Secret",
-    "form.integration.webhook_activate": "Enable Webhook",
+    "form.integration.shaarli_api_secret": "Shaarli API Geheimnis",
+    "form.integration.webhook_activate": "Webhook aktivieren",
     "form.integration.webhook_url": "Webhook URL",
-    "form.integration.webhook_secret": "Webhook Secret",
-    "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
+    "form.integration.webhook_secret": "Webhook Geheimnis",
+    "form.integration.rssbridge_activate": "Beim Hinzufügen von Abonnements RSS-Bridge prüfen.",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "API-Schlüsselbezeichnung",
     "form.submit.loading": "Lade...",
     "form.submit.saving": "Speichern...",
@@ -453,30 +535,44 @@
         "vor %d Jahr",
         "vor %d Jahren"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
-    "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
-    "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
-    "error.http_body_read": "Unable to read the HTTP body: %v.",
-    "error.http_empty_response_body": "The HTTP response body is empty.",
-    "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
-    "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
-    "error.network_timeout": "This website is too slow and the request timed out: %v",
-    "error.http_client_error": "HTTP client error: %v.",
-    "error.http_not_authorized": "Access to this website is not authorized. It could be a bad username or password.",
-    "error.http_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
-    "error.http_forbidden": "Access to this website is forbidden. Perhaps, this website has a bot protection mechanism?",
-    "error.http_resource_not_found": "The requested resource is not found. Please, verify the URL.",
-    "error.http_internal_server_error": "The website is not available at the moment due to a server error. The problem is not on Miniflux side. Please, try again later.",
-    "error.http_bad_gateway": "The website is not available at the moment due to a bad gateway error. The problem is not on Miniflux side. Please, try again later.",
-    "error.http_service_unavailable": "The website is not available at the moment due to an internal server error. The problem is not on Miniflux side. Please, try again later.",
-    "error.http_gateway_timeout": "The website is not available at the moment due to a gateway timeout error. The problem is not on Miniflux side. Please, try again later.",
-    "error.http_unexpected_status_code": "The website is not available at the moment due to an unexpected HTTP status code: %d. The problem is not on Miniflux side. Please, try again later.",
-    "error.database_error": "Database error: %v.",
-    "error.category_not_found": "This category does not exist or does not belong to this user.",
-    "error.duplicated_feed": "This feed already exists.",
-    "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
-    "error.feed_not_found": "This feed does not exist or does not belong to this user.",
-    "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "alert.too_many_feeds_refresh": [
+        "Sie haben zu viele Aktualisierungen ausgelöst. Bitte warten Sie %d Minute, bevor Sie es erneut versuchen.",
+        "Sie haben zu viele Aktualisierungen ausgelöst. Bitte warten Sie %d Minuten, bevor Sie es erneut versuchen."
+    ],
+    "alert.background_feed_refresh": "Alle Abonnements werden derzeit im Hintergrund aktualisiert. Sie können Miniflux weiterhin benutzen, während dieser Prozess ausgeführt wird.",
+    "error.http_response_too_large": "Die HTTP-Antwort ist zu groß. Sie könnten die Grenze für die Größe der HTTP-Antwort in den globalen Einstellungen erhöhen (benötigt einen Neustart des Servers)",
+    "error.http_body_read": "Der HTTP-Inhalt kann nicht gelesen werden: %v",
+    "error.http_empty_response_body": "Der Inhalt der HTTP-Antwort ist leer.",
+    "error.http_empty_response": "Die HTTP-Antwort ist leer. Vielleicht versucht die Webseite, sich vor Bots zu schützen?",
+    "error.tls_error": "TLS-Fehler: %q. Wenn Sie mögen, können Sie versuchen die TLS-Verifizierung in den Einstellungen des Abonnements zu deaktivieren.",
+    "error.network_operation": "Miniflux kann die Webseite aufgrund eines Netzwerk-Fehlers nicht erreichen: %v",
+    "error.network_timeout": "Die Webseite ist zu langsam und die Anfrage ist abgelaufen: %v.",
+    "error.http_client_error": "HTTP-Client-Fehler: %v.",
+    "error.http_not_authorized": "Der Zugriff auf diese Website ist nicht erlaubt. Möglicherweise sind der Benutzername oder das Passwort falsch.",
+    "error.http_too_many_requests": "Miniflux hat zu viele Anfragen an diese Webseite gestellt. Bitte versuchen Sie es später erneut oder ändern Sie die Konfiguration der Anwendung.",
+    "error.http_forbidden": "Der Zugriff auf diese Webseite ist verboten. Vielleicht versucht die Webseite, sich vor Bots zu schützen?",
+    "error.http_resource_not_found": "Die gewünschte Quelle wurde nicht gefunden. Bitte stellen Sie sicher, dass die URL korrekt ist.",
+    "error.http_internal_server_error": "Die Webseite steht durch einen Server-Fehler derzeit nicht zur Verfügung. Versuchen Sie es bitte später erneut.",
+    "error.http_bad_gateway": "Die Webseite ist aufgrund eines Bad-Gateway-Fehlers derzeit nicht verfügbar. Das Problem liegt nicht bei Miniflux. Bitte versuchen Sie es später erneut.",
+    "error.http_service_unavailable": "Die Webseite ist aufgrund eines Internal-Server-Fehlers derzeit nicht verfügbar. Das Problem liegt nicht bei Miniflux. Bitte versuchen Sie es später erneut.",
+    "error.http_gateway_timeout": "Die Webseite ist aufgrund eines Gateway-Timeout-Fehlers derzeit nicht verfügbar. Das Problem liegt nicht bei Miniflux. Bitte versuchen Sie es später erneut.",
+    "error.http_unexpected_status_code": "Die Webseite ist aufgrund eines eines unerwarteten HTTP-Fehlers derzeit nicht verfügbar: %d. Das Problem liegt nicht bei Miniflux. Bitte versuchen Sie es später erneut.",
+    "error.database_error": "Datenbank-Fehler: %v.",
+    "error.category_not_found": "Diese Kategorie existiert nicht oder gehört nicht zu diesem Benutzer.",
+    "error.duplicated_feed": "Dieses Abonnement existiert bereits.",
+    "error.unable_to_parse_feed": "Dieses Abonnement kann nicht gelesen werden: %v.",
+    "error.feed_not_found": "Dieses Abonnement existiert nicht oder gehört nicht zu diesem Benutzer.",
+    "error.unable_to_detect_rssbridge": "Abonnement kann nicht durch RSS-Bridge erkannt werden: %v.",
+    "error.feed_format_not_detected": "Das Format des Abonnements kann nicht erkannt werden: %v.",
+    "form.prefs.label.media_playback_rate": "Wiedergabegeschwindigkeit von Audio/Video",
+    "error.settings_media_playback_rate_range": "Die Wiedergabegeschwindigkeit liegt außerhalb des Bereichs",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/el_EL.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "Είστε σίγουροι;",
     "confirm.question.refresh": "Θέλετε να επιτελέσετε μια υποχρεωτική ανανέωση;",
     "confirm.yes": "ναι",
@@ -18,6 +19,8 @@
     "action.home_screen": "Προσθήκη στην αρχική οθόνη",
     "tooltip.keyboard_shortcuts": "Συντόμευση πληκτρολογίου: % s",
     "tooltip.logged_user": "Συνδεδεμένος/η ως %s",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "Μη αναγνωσμένα",
     "menu.starred": "Αγαπημένα",
     "menu.history": "Ιστορικό",
@@ -32,6 +35,7 @@
     "menu.about": "Περί",
     "menu.export": "Εξαγωγή",
     "menu.import": "Εισαγωγή",
+    "menu.search": "Αναζήτηση",
     "menu.create_category": "Δημιουργήστε μια κατηγορία",
     "menu.mark_page_as_read": "Σημείωση αυτής της σελίδας ως αναγνωσμένη",
     "menu.mark_all_as_read": "Σημείωση όλων ως αναγνωσμένα",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "Κοινόχρηστες καταχωρήσεις",
     "search.label": "Αναζήτηση",
     "search.placeholder": "Αναζήτηση...",
+    "search.submit": "Search",
+    "pagination.last": "Last",
     "pagination.next": "Επόμενη",
+    "pagination.first": "First",
     "pagination.previous": "Προηγούμενη",
     "entry.status.unread": "Μη αναγνωσμένο",
     "entry.status.read": "Αναγνωσμένο",
@@ -84,8 +91,24 @@
     ],
     "entry.tags.label": "Ετικέτες:",
     "page.shared_entries.title": "Κοινόχρηστες Καταχωρήσεις",
+    "page.shared_entries_count": [
+        "%d shared entry",
+        "%d shared entries"
+    ],
     "page.unread.title": "Μη αναγνωσμένα",
+    "page.unread_entry_count": [
+        "%d unread entry",
+        "%d unread entries"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total",
+        "%d entries in total"
+    ],
     "page.starred.title": "Αγαπημένo",
+    "page.starred_entry_count": [
+        "%d starred entry",
+        "%d starred entries"
+    ],
     "page.categories.title": "Κατηγορίες",
     "page.categories.no_feed": "Καμία ροή.",
     "page.categories.entries": "Άρθρα",
@@ -94,21 +117,28 @@
         "Υπάρχει μία %d ροή.",
         "Υπάρχουν %d ροές."
     ],
-    "page.categories.unread_counter": "Αριθμός μη αναγνωσμένων καταχωρήσεων",
     "page.new_category.title": "Νέα Κατηγορία",
     "page.new_user.title": "Νέος Χρήστης",
     "page.edit_category.title": "Επεξεργασία κατηγορίας: % s",
     "page.edit_user.title": "Επεξεργασία χρήστη: % s",
     "page.feeds.title": "Ροές",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "Τελευταίος έλεγχος:",
     "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "Αριθμός μη αναγνωσμένων καταχωρήσεων",
     "page.feeds.read_counter": "Αριθμός αναγνωσμένων καταχωρήσεων",
     "page.feeds.error_count": [
         "%d σφάλμα",
         "%d σφάλματα"
     ],
     "page.history.title": "Ιστορικό",
+    "page.read_entry_count": [
+        "%d read entry",
+        "%d read entries"
+    ],
+    "page.categories_count": [
+        "%d category",
+        "%d categories"
+    ],
     "page.import.title": "Εισαγωγή",
     "page.search.title": "Αποτελέσματα Αναζήτησης",
     "page.about.title": "Περί",
@@ -150,6 +180,8 @@
     "page.keyboard_shortcuts.go_to_feed": "Πηγαίνετε στη ροή",
     "page.keyboard_shortcuts.go_to_previous_page": "Μετάβαση στην προηγούμενη σελίδα",
     "page.keyboard_shortcuts.go_to_next_page": "Μετάβαση στην επόμενη σελίδα",
+    "page.keyboard_shortcuts.go_to_bottom_item": "Μετάβαση στο κάτω στοιχείο",
+    "page.keyboard_shortcuts.go_to_top_item": "Μετάβαση στο επάνω στοιχείο",
     "page.keyboard_shortcuts.open_item": "Άνοιγμα επιλεγμένου στοιχείου",
     "page.keyboard_shortcuts.open_original": "Άνοιγμα αρχικού συνδέσμου",
     "page.keyboard_shortcuts.open_original_same_window": "Άνοιγμα αρχικού συνδέσμου στην τρέχουσα καρτέλα",
@@ -178,8 +210,8 @@
     "page.settings.title": "Ρυθμίσεις",
     "page.settings.link_google_account": "Σύνδεση του λογαριασμό μου Google",
     "page.settings.unlink_google_account": "Αποσύνδεση του λογαριασμού μου Google",
-    "page.settings.link_oidc_account": "Σύνδεση του λογαριασμού μου OpenID Connect",
-    "page.settings.unlink_oidc_account": "Αποσύνδεση του λογαριασμού μου OpenID Connect",
+    "page.settings.link_oidc_account": "Σύνδεση του λογαριασμού μου %s",
+    "page.settings.unlink_oidc_account": "Αποσύνδεση του λογαριασμού μου %s",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Passkey Name",
@@ -193,7 +225,7 @@
     ],
     "page.login.title": "Είσοδος",
     "page.login.google_signin": "Συνδεθείτε με τo Google",
-    "page.login.oidc_signin": "Συνδεθείτε με το OpenID Connect",
+    "page.login.oidc_signin": "Συνδεθείτε με το %s",
     "page.login.webauthn_login": "Είσοδος με κωδικό πρόσβασης",
     "page.login.webauthn_login.error": "Δεν είναι δυνατή η σύνδεση με κωδικό πρόσβασης",
     "page.integrations.title": "Ενσωμάτωση",
@@ -228,6 +260,7 @@
     "alert.no_bookmark": "Δεν υπάρχει σελιδοδείκτης αυτή τη στιγμή.",
     "alert.no_category": "Δεν υπάρχει κατηγορία.",
     "alert.no_category_entry": "Δεν υπάρχουν άρθρα σε αυτήν την κατηγορία.",
+    "alert.no_tag_entry": "Δεν υπάρχουν αντικείμενα που να ταιριάζουν με αυτή την ετικέτα.",
     "alert.no_feed_entry": "Δεν υπάρχουν άρθρα για αυτήν τη ροή.",
     "alert.no_feed": "Δεν έχετε συνδρομές.",
     "alert.no_feed_in_category": "Δεν υπάρχει συνδρομή για αυτήν την κατηγορία.",
@@ -269,6 +302,14 @@
     "error.password_min_length": "Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον 6 χαρακτήρες.",
     "error.settings_mandatory_fields": "Τα πεδία όνομα χρήστη, θέμα, Γλώσσα και ζώνη ώρας είναι υποχρεωτικά.",
     "error.settings_reading_speed_is_positive": "Οι ταχύτητες ανάγνωσης πρέπει να είναι θετικοί ακέραιοι αριθμοί.",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "Ο αριθμός των καταχωρήσεων ανά σελίδα δεν είναι έγκυρος.",
     "error.feed_mandatory_fields": "Η διεύθυνση URL και η κατηγορία είναι υποχρεωτικά.",
     "error.feed_already_exists": "Αυτή η ροή υπάρχει ήδη.",
@@ -288,6 +329,7 @@
     "form.feed.label.title": "Τίτλος",
     "form.feed.label.site_url": "Διεύθυνση URL ιστότοπου",
     "form.feed.label.feed_url": "Διεύθυνση URL ροής",
+    "form.feed.label.description": "Περιγραφή",
     "form.feed.label.category": "Κατηγορία",
     "form.feed.label.crawler": "Λήψη αρχικού περιεχομένου",
     "form.feed.label.feed_username": "Όνομα Χρήστη ροής",
@@ -300,6 +342,7 @@
     "form.feed.label.keeplist_rules": "Κρατήστε Κανόνες",
     "form.feed.label.ignore_http_cache": "Αγνοήστε την προσωρινή μνήμη HTTP",
     "form.feed.label.allow_self_signed_certificates": "Να επιτρέπονται αυτο-υπογεγραμμένα ή μη έγκυρα πιστοποιητικά",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "Λήψη μέσω διακομιστή μεσολάβησης",
     "form.feed.label.disabled": "Μη ανανέωση αυτής της ροής",
     "form.feed.label.no_media_player": "No media player (audio/video)",
@@ -308,6 +351,13 @@
     "form.feed.fieldset.rules": "Rules",
     "form.feed.fieldset.network_settings": "Network Settings",
     "form.feed.fieldset.integration": "Third-Party Services",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.category.label.title": "Τίτλος",
     "form.category.hide_globally": "Απόκρυψη καταχωρήσεων σε γενική λίστα μη αναγνωσμένων",
     "form.user.label.username": "Χρήστης",
@@ -344,11 +394,18 @@
     "form.prefs.label.default_home_page": "Προεπιλεγμένη αρχική σελίδα",
     "form.prefs.label.categories_sorting_order": "Ταξινόμηση κατηγοριών",
     "form.prefs.label.mark_read_on_view": "Αυτόματη επισήμανση καταχωρήσεων ως αναγνωσμένων κατά την προβολή",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "Application Settings",
     "form.prefs.fieldset.authentication_settings": "Authentication Settings",
     "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "Αρχείο OPML",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "Ενεργοποιήστε το Fever API",
     "form.integration.fever_username": "Όνομα Χρήστη Fever",
     "form.integration.fever_password": "Κωδικός Πρόσβασης Fever",
@@ -401,16 +458,34 @@
     "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
     "form.integration.telegram_bot_disable_notification": "Disable notification",
     "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "Αποθήκευση άρθρων στο Linkding",
     "form.integration.linkding_endpoint": "Τελικό σημείο Linkding API",
     "form.integration.linkding_api_key": "Κλειδί API Linkding",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "Σημείωση του σελιδοδείκτη ως μη αναγνωσμένου",
+    "form.integration.linkwarden_activate": "Αποθήκευση άρθρων στο Linkwarden",
+    "form.integration.linkwarden_endpoint": "Τελικό σημείο Linkwarden API",
+    "form.integration.linkwarden_api_key": "Κλειδί API Linkwarden",
     "form.integration.matrix_bot_activate": "Μεταφορά νέων άρθρων στο Matrix",
     "form.integration.matrix_bot_user": "Όνομα χρήστη για το Matrix",
     "form.integration.matrix_bot_password": "Κωδικός πρόσβασης για τον χρήστη Matrix",
     "form.integration.matrix_bot_url": "URL διακομιστή Matrix",
     "form.integration.matrix_bot_chat_id": "Αναγνωριστικό της αίθουσας Matrix",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Αποθήκευση άρθρων στο Readeck",
+    "form.integration.readeck_endpoint": "Τελικό σημείο Readeck API",
+    "form.integration.readeck_api_key": "Κλειδί API Readeck",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "Αποστολή μόνο URL (αντί για πλήρες περιεχόμενο)",
     "form.integration.shiori_activate": "Αποθήκευση άρθρων στο Shiori",
     "form.integration.shiori_endpoint": "Τελικό σημείο Shiori",
     "form.integration.shiori_username": "Όνομα Χρήστη Shiori",
@@ -423,6 +498,13 @@
     "form.integration.webhook_secret": "Webhook Secret",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "Ετικέτα κλειδιού API",
     "form.submit.loading": "Φόρτωση...",
     "form.submit.saving": "Αποθήκευση...",
@@ -453,13 +535,16 @@
         "πριν %d έτος",
         "πριν %d έτη"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again."
+    ],
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -478,5 +563,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "Ταχύτητα αναπαραγωγής του ήχου/βίντεο",
+    "error.settings_media_playback_rate_range": "Η ταχύτητα αναπαραγωγής είναι εκτός εύρους",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/en_US.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "Are you sure?",
     "confirm.question.refresh": "Are you sure you want to force refresh?",
     "confirm.yes": "yes",
@@ -18,6 +19,8 @@
     "action.home_screen": "Add to home screen",
     "tooltip.keyboard_shortcuts": "Keyboard Shortcut: %s",
     "tooltip.logged_user": "Logged in as %s",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "Unread",
     "menu.starred": "Starred",
     "menu.history": "History",
@@ -32,6 +35,7 @@
     "menu.about": "About",
     "menu.export": "Export",
     "menu.import": "Import",
+    "menu.search": "Search",
     "menu.create_category": "Create a category",
     "menu.mark_page_as_read": "Mark this page as read",
     "menu.mark_all_as_read": "Mark all as read",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "Shared entries",
     "search.label": "Search",
     "search.placeholder": "Search…",
+    "search.submit": "Search",
+    "pagination.last": "Last",
     "pagination.next": "Next",
+    "pagination.first": "First",
     "pagination.previous": "Previous",
     "entry.status.unread": "Unread",
     "entry.status.read": "Read",
@@ -84,8 +91,24 @@
     ],
     "entry.tags.label": "Tags:",
     "page.shared_entries.title": "Shared entries",
+    "page.shared_entries_count": [
+        "%d shared entry",
+        "%d shared entries"
+    ],
     "page.unread.title": "Unread",
+    "page.unread_entry_count": [
+        "%d unread entry",
+        "%d unread entries"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total",
+        "%d entries in total"
+    ],
     "page.starred.title": "Starred",
+    "page.starred_entry_count": [
+        "%d starred entry",
+        "%d starred entries"
+    ],
     "page.categories.title": "Categories",
     "page.categories.no_feed": "No feed.",
     "page.categories.entries": "Entries",
@@ -94,21 +117,28 @@
         "There is %d feed.",
         "There are %d feeds."
     ],
-    "page.categories.unread_counter": "Number of unread entries",
+    "page.categories_count": [
+        "%d category",
+        "%d categories"
+    ],
     "page.new_category.title": "New Category",
     "page.new_user.title": "New User",
     "page.edit_category.title": "Edit Category: %s",
     "page.edit_user.title": "Edit User: %s",
     "page.feeds.title": "Feeds",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "Last check:",
     "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "Number of unread entries",
     "page.feeds.read_counter": "Number of read entries",
     "page.feeds.error_count": [
         "%d error",
         "%d errors"
     ],
     "page.history.title": "History",
+    "page.read_entry_count": [
+        "%d read entry",
+        "%d read entries"
+    ],
     "page.import.title": "Import",
     "page.search.title": "Search Results",
     "page.about.title": "About",
@@ -148,6 +178,8 @@
     "page.keyboard_shortcuts.go_to_previous_item": "Go to previous item",
     "page.keyboard_shortcuts.go_to_next_item": "Go to next item",
     "page.keyboard_shortcuts.go_to_feed": "Go to feed",
+    "page.keyboard_shortcuts.go_to_top_item": "Go to top item",
+    "page.keyboard_shortcuts.go_to_bottom_item": "Go to bottom item",
     "page.keyboard_shortcuts.go_to_previous_page": "Go to previous page",
     "page.keyboard_shortcuts.go_to_next_page": "Go to next page",
     "page.keyboard_shortcuts.open_item": "Open selected item",
@@ -178,8 +210,8 @@
     "page.settings.title": "Settings",
     "page.settings.link_google_account": "Link my Google account",
     "page.settings.unlink_google_account": "Unlink my Google account",
-    "page.settings.link_oidc_account": "Link my OpenID Connect account",
-    "page.settings.unlink_oidc_account": "Unlink my OpenID Connect account",
+    "page.settings.link_oidc_account": "Link my %s account",
+    "page.settings.unlink_oidc_account": "Unlink my %s account",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Passkey Name",
@@ -187,13 +219,13 @@
     "page.settings.webauthn.last_seen_on": "Last Used",
     "page.settings.webauthn.register": "Register passkey",
     "page.settings.webauthn.register.error": "Unable to register passkey",
-    "page.settings.webauthn.delete" : [
+    "page.settings.webauthn.delete": [
         "Remove %d passkey",
         "Remove %d passkeys"
     ],
     "page.login.title": "Sign In",
     "page.login.google_signin": "Sign in with Google",
-    "page.login.oidc_signin": "Sign in with OpenID Connect",
+    "page.login.oidc_signin": "Sign in with %s",
     "page.login.webauthn_login": "Login with passkey",
     "page.login.webauthn_login.error": "Unable to login with passkey",
     "page.integrations.title": "Integrations",
@@ -228,6 +260,7 @@
     "alert.no_bookmark": "There are no starred entries.",
     "alert.no_category": "There is no category.",
     "alert.no_category_entry": "There are no entries in this category.",
+    "alert.no_tag_entry": "There are no entries matching this tag.",
     "alert.no_feed_entry": "There are no entries for this feed.",
     "alert.no_feed": "You don’t have any feeds.",
     "alert.no_feed_in_category": "There is no feed for this category.",
@@ -269,6 +302,14 @@
     "error.password_min_length": "The password must have at least 6 characters.",
     "error.settings_mandatory_fields": "The username, theme, language and timezone fields are mandatory.",
     "error.settings_reading_speed_is_positive": "The reading speeds must be positive integers.",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "The number of entries per page is not valid.",
     "error.feed_mandatory_fields": "The URL and the category are mandatory.",
     "error.feed_already_exists": "This feed already exists.",
@@ -286,6 +327,7 @@
     "form.feed.label.title": "Title",
     "form.feed.label.site_url": "Site URL",
     "form.feed.label.feed_url": "Feed URL",
+    "form.feed.label.description": "Description",
     "form.feed.label.category": "Category",
     "form.feed.label.crawler": "Fetch original content",
     "form.feed.label.feed_username": "Feed Username",
@@ -300,10 +342,18 @@
     "form.feed.label.urlrewrite_rules": "URL Rewrite Rules",
     "form.feed.label.ignore_http_cache": "Ignore HTTP cache",
     "form.feed.label.allow_self_signed_certificates": "Allow self-signed or invalid certificates",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "Fetch via proxy",
     "form.feed.label.disabled": "Do not refresh this feed",
     "form.feed.label.no_media_player": "No media player (audio/video)",
     "form.feed.label.hide_globally": "Hide entries in global unread list",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.fieldset.general": "General",
     "form.feed.fieldset.rules": "Rules",
     "form.feed.fieldset.network_settings": "Network Settings",
@@ -344,11 +394,18 @@
     "form.prefs.label.default_home_page": "Default home page",
     "form.prefs.label.categories_sorting_order": "Categories sorting",
     "form.prefs.label.mark_read_on_view": "Automatically mark entries as read when viewed",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "Application Settings",
     "form.prefs.fieldset.authentication_settings": "Authentication Settings",
     "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "OPML file",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "Activate Fever API",
     "form.integration.fever_username": "Fever Username",
     "form.integration.fever_password": "Fever Password",
@@ -401,16 +458,34 @@
     "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
     "form.integration.telegram_bot_disable_notification": "Disable notification",
     "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "Save entries to Linkding",
     "form.integration.linkding_endpoint": "Linkding API Endpoint",
     "form.integration.linkding_api_key": "Linkding API key",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "Mark bookmark as unread",
+    "form.integration.linkwarden_activate": "Save entries to Linkwarden",
+    "form.integration.linkwarden_endpoint": "Linkwarden API Endpoint",
+    "form.integration.linkwarden_api_key": "Linkwarden API key",
     "form.integration.matrix_bot_activate": "Push new entries to Matrix",
     "form.integration.matrix_bot_user": "Username for Matrix",
     "form.integration.matrix_bot_password": "Password for Matrix user",
     "form.integration.matrix_bot_url": "Matrix server URL",
     "form.integration.matrix_bot_chat_id": "ID of Matrix Room",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Save entries to readeck",
+    "form.integration.readeck_endpoint": "Readeck API Endpoint",
+    "form.integration.readeck_api_key": "Readeck API key",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "Send only URL (instead of full content)",
     "form.integration.shiori_activate": "Save articles to Shiori",
     "form.integration.shiori_endpoint": "Shiori API Endpoint",
     "form.integration.shiori_username": "Shiori Username",
@@ -423,6 +498,13 @@
     "form.integration.webhook_secret": "Webhook Secret",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "API Key Label",
     "form.submit.loading": "Loading…",
     "form.submit.saving": "Saving…",
@@ -453,13 +535,16 @@
         "%d year ago",
         "%d years ago"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again."
+    ],
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -478,5 +563,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "Playback speed of the audio/video",
+    "error.settings_media_playback_rate_range": "Playback speed is out of range",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/es_ES.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "¿Estás seguro?",
     "confirm.question.refresh": "¿Quieres forzar la actualización?",
     "confirm.yes": "sí",
@@ -18,6 +19,8 @@
     "action.home_screen": "Añadir a la pantalla principal",
     "tooltip.keyboard_shortcuts": "Atajo de teclado: %s",
     "tooltip.logged_user": "Registrado como %s",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "No leídos",
     "menu.starred": "Marcadores",
     "menu.history": "Historial",
@@ -32,6 +35,7 @@
     "menu.about": "Acerca de",
     "menu.export": "Exportar",
     "menu.import": "Importar",
+    "menu.search": "Buscar",
     "menu.create_category": "Crear una categoría",
     "menu.mark_page_as_read": "Marcar esta página como leída",
     "menu.mark_all_as_read": "Marcar todos como leídos",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "Artículos compartidos",
     "search.label": "Buscar",
     "search.placeholder": "Búsqueda...",
+    "search.submit": "Search",
+    "pagination.last": "Ultimo",
     "pagination.next": "Siguiente",
+    "pagination.first": "Primero",
     "pagination.previous": "Anterior",
     "entry.status.unread": "No leído",
     "entry.status.read": "Leído",
@@ -81,11 +88,27 @@
     "entry.estimated_reading_time": [
         "%d minuto de lectura",
         "%d minutos de lectura"
-    ],    
+    ],
     "entry.tags.label": "Etiquetas:",
     "page.shared_entries.title": "Artículos compartidos",
+    "page.shared_entries_count": [
+        "%d shared entry",
+        "%d shared entries"
+    ],
     "page.unread.title": "No leídos",
+    "page.unread_entry_count": [
+        "%d unread entry",
+        "%d unread entries"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total",
+        "%d entries in total"
+    ],
     "page.starred.title": "Marcadores",
+    "page.starred_entry_count": [
+        "%d starred entry",
+        "%d starred entries"
+    ],
     "page.categories.title": "Categorías",
     "page.categories.no_feed": "Sin fuente.",
     "page.categories.entries": "Artículos",
@@ -94,21 +117,28 @@
         "Hay %d fuente.",
         "Hay %d fuentes."
     ],
-    "page.categories.unread_counter": "Número de artículos no leídos",
+    "page.categories_count": [
+        "%d category",
+        "%d categories"
+    ],
     "page.new_category.title": "Nueva categoría",
     "page.new_user.title": "Nuevo usuario",
     "page.edit_category.title": "Editar categoría: %s",
     "page.edit_user.title": "Editar usuario: %s",
     "page.feeds.title": "Fuentes",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "Última verificación:",
     "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "Número de artículos no leídos",
     "page.feeds.read_counter": "Número de artículos leídos",
     "page.feeds.error_count": [
         "%d error",
         "%d errores"
     ],
     "page.history.title": "Historial",
+    "page.read_entry_count": [
+        "%d read entry",
+        "%d read entries"
+    ],
     "page.import.title": "Importar",
     "page.search.title": "Resultados de la búsqueda",
     "page.about.title": "Acerca de",
@@ -150,6 +180,8 @@
     "page.keyboard_shortcuts.go_to_feed": "Ir a la fuente",
     "page.keyboard_shortcuts.go_to_previous_page": "Ir al página anterior",
     "page.keyboard_shortcuts.go_to_next_page": "Ir al página siguiente",
+    "page.keyboard_shortcuts.go_to_bottom_item": "Ir al elemento inferior",
+    "page.keyboard_shortcuts.go_to_top_item": "Ir al elemento superior",
     "page.keyboard_shortcuts.open_item": "Abrir el elemento seleccionado",
     "page.keyboard_shortcuts.open_original": "Abrir el enlace original",
     "page.keyboard_shortcuts.open_original_same_window": "Abrir enlace original en la pestaña actual",
@@ -178,8 +210,8 @@
     "page.settings.title": "Ajustes",
     "page.settings.link_google_account": "Vincular mi cuenta de Google",
     "page.settings.unlink_google_account": "Desvincular mi cuenta de Google",
-    "page.settings.link_oidc_account": "Vincular mi cuenta de OpenID Connect",
-    "page.settings.unlink_oidc_account": "Desvincular mi cuenta de OpenID Connect",
+    "page.settings.link_oidc_account": "Vincular mi cuenta de %s",
+    "page.settings.unlink_oidc_account": "Desvincular mi cuenta de %s",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Passkey Name",
@@ -193,7 +225,7 @@
     ],
     "page.login.title": "Iniciar sesión",
     "page.login.google_signin": "Iniciar sesión con tu cuenta de Google",
-    "page.login.oidc_signin": "Iniciar sesión con tu cuenta de OpenID Connect",
+    "page.login.oidc_signin": "Iniciar sesión con tu cuenta de %s",
     "page.login.webauthn_login": "Iniciar sesión con clave de acceso",
     "page.login.webauthn_login.error": "No se puede iniciar sesión con la clave de paso",
     "page.integrations.title": "Integraciones",
@@ -228,6 +260,7 @@
     "alert.no_bookmark": "No hay marcador en este momento.",
     "alert.no_category": "No hay categoría.",
     "alert.no_category_entry": "No hay artículos en esta categoría.",
+    "alert.no_tag_entry": "No hay artículos con esta etiqueta.",
     "alert.no_feed_entry": "No hay artículos para esta fuente.",
     "alert.no_feed": "No tienes fuentes.",
     "alert.no_feed_in_category": "No hay fuentes para esta categoría.",
@@ -262,6 +295,14 @@
     "error.password_min_length": "La contraseña debería tener al menos 6 caracteres.",
     "error.settings_mandatory_fields": "Los campos de nombre de usuario, tema, idioma y zona horaria son obligatorios.",
     "error.settings_reading_speed_is_positive": "Las velocidades de lectura deben ser números enteros positivos.",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "El número de artículos por página no es válido.",
     "error.feed_mandatory_fields": "Los campos de URL y categoría son obligatorios.",
     "error.feed_already_exists": "Este feed ya existe.",
@@ -286,6 +327,7 @@
     "form.feed.label.title": "Título",
     "form.feed.label.site_url": "URL del sitio",
     "form.feed.label.feed_url": "URL de la fuente",
+    "form.feed.label.description": "Descripción",
     "form.feed.label.category": "Categoría",
     "form.feed.label.crawler": "Obtener rastreador original",
     "form.feed.label.feed_username": "Nombre de usuario de la fuente",
@@ -300,10 +342,18 @@
     "form.feed.label.urlrewrite_rules": "Reglas de Filtrado (Reescritura)",
     "form.feed.label.ignore_http_cache": "Ignorar caché HTTP",
     "form.feed.label.allow_self_signed_certificates": "Permitir certificados autofirmados o no válidos",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "Buscar a través de proxy",
     "form.feed.label.disabled": "No actualice este feed",
     "form.feed.label.no_media_player": "No media player (audio/video)",
     "form.feed.label.hide_globally": "Ocultar artículos en la lista global de no leídos",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.fieldset.general": "General",
     "form.feed.fieldset.rules": "Rules",
     "form.feed.fieldset.network_settings": "Network Settings",
@@ -344,11 +394,18 @@
     "form.prefs.label.default_home_page": "Página de inicio por defecto",
     "form.prefs.label.categories_sorting_order": "Clasificación por categorías",
     "form.prefs.label.mark_read_on_view": "Marcar automáticamente las entradas como leídas cuando se vean",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "Application Settings",
     "form.prefs.fieldset.authentication_settings": "Authentication Settings",
     "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "Archivo OPML",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "Activar API de Fever",
     "form.integration.fever_username": "Nombre de usuario de Fever",
     "form.integration.fever_password": "Contraseña de Fever",
@@ -401,16 +458,34 @@
     "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
     "form.integration.telegram_bot_disable_notification": "Disable notification",
     "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "Enviar artículos a Linkding",
     "form.integration.linkding_endpoint": "Acceso API de Linkding",
     "form.integration.linkding_api_key": "Clave de API de Linkding",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "Marcar marcador como no leído",
+    "form.integration.linkwarden_activate": "Enviar artículos a Linkwarden",
+    "form.integration.linkwarden_endpoint": "Acceso API de Linkwarden",
+    "form.integration.linkwarden_api_key": "Clave de API de Linkwarden",
     "form.integration.matrix_bot_activate": "Transferir nuevos artículos a Matrix",
     "form.integration.matrix_bot_user": "Nombre de usuario para Matrix",
     "form.integration.matrix_bot_password": "Contraseña para el usuario de Matrix",
     "form.integration.matrix_bot_url": "URL del servidor de Matrix",
     "form.integration.matrix_bot_chat_id": "ID de la sala de Matrix",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Enviar artículos a Readeck",
+    "form.integration.readeck_endpoint": "Acceso API de Readeck",
+    "form.integration.readeck_api_key": "Clave de API de Readeck",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "Enviar solo URL (en lugar de contenido completo)",
     "form.integration.shiori_activate": "Guardar artículos a Shiori",
     "form.integration.shiori_endpoint": "Extremo de API de Shiori",
     "form.integration.shiori_username": "Nombre de usuario de Shiori",
@@ -423,6 +498,13 @@
     "form.integration.webhook_secret": "Webhook Secret",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "Etiqueta de clave API",
     "form.submit.loading": "Cargando...",
     "form.submit.saving": "Guardando...",
@@ -453,13 +535,16 @@
         "hace %d año",
         "hace %d años"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again."
+    ],
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -478,5 +563,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "Velocidad de reproducción del audio/vídeo",
+    "error.settings_media_playback_rate_range": "La velocidad de reproducción está fuera de rango",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/fi_FI.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "Oletko varma?",
     "confirm.question.refresh": "Haluatko pakottaa päivityksen?",
     "confirm.yes": "kyllä",
@@ -18,6 +19,8 @@
     "action.home_screen": "Lisää aloitusnäytölle",
     "tooltip.keyboard_shortcuts": "Pikanäppäin: %s",
     "tooltip.logged_user": "Kirjautunut %s-käyttäjänä",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "Lukemattomat",
     "menu.starred": "Suosikit",
     "menu.history": "Historia",
@@ -32,6 +35,7 @@
     "menu.about": "Tietoja",
     "menu.export": "Vie",
     "menu.import": "Tuo",
+    "menu.search": "Haku",
     "menu.create_category": "Luo kategoria",
     "menu.mark_page_as_read": "Merkitse tämä sivu luetuksi",
     "menu.mark_all_as_read": "Merkitse kaikki luetuksi",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "Jaetut artikkelit",
     "search.label": "Haku",
     "search.placeholder": "Hae...",
+    "search.submit": "Search",
+    "pagination.last": "Last",
     "pagination.next": "Seuraava",
+    "pagination.first": "First",
     "pagination.previous": "Edellinen",
     "entry.status.unread": "Lukematon",
     "entry.status.read": "Luettu",
@@ -84,8 +91,24 @@
     ],
     "entry.tags.label": "Tags:",
     "page.shared_entries.title": "Jaetut artikkelit",
+    "page.shared_entries_count": [
+        "%d shared entry",
+        "%d shared entries"
+    ],
     "page.unread.title": "Lukemattomat",
+    "page.unread_entry_count": [
+        "%d unread entry",
+        "%d unread entries"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total",
+        "%d entries in total"
+    ],
     "page.starred.title": "Suosikit",
+    "page.starred_entry_count": [
+        "%d starred entry",
+        "%d starred entries"
+    ],
     "page.categories.title": "Kategoriat",
     "page.categories.no_feed": "Ei syötettä.",
     "page.categories.entries": "Artikkelit",
@@ -94,21 +117,28 @@
         "On %d syöte.",
         "On %d syötettä."
     ],
-    "page.categories.unread_counter": "Lukemattomien artikkeleiden määrä",
+    "page.categories_count": [
+        "%d category",
+        "%d categories"
+    ],
     "page.new_category.title": "Uusi kategoria",
     "page.new_user.title": "Uusi käyttäjä",
     "page.edit_category.title": "Muokkaa kategoria: %s",
     "page.edit_user.title": "Muokkaa käyttäjä: %s",
     "page.feeds.title": "Syötteet",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "Viimeisin tarkistus:",
     "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "Lukemattomien artikkeleiden määrä",
     "page.feeds.read_counter": "Luettujen artikkeleiden määrä",
     "page.feeds.error_count": [
         "%d virhe",
         "%d virhettä"
     ],
     "page.history.title": "Historia",
+    "page.read_entry_count": [
+        "%d read entry",
+        "%d read entries"
+    ],
     "page.import.title": "Tuo",
     "page.search.title": "Hakutulokset",
     "page.about.title": "Tietoja",
@@ -150,6 +180,8 @@
     "page.keyboard_shortcuts.go_to_feed": "Siirry syötteeseen",
     "page.keyboard_shortcuts.go_to_previous_page": "Siirry edelliselle sivulle",
     "page.keyboard_shortcuts.go_to_next_page": "Siirry seuraavalle sivulle",
+    "page.keyboard_shortcuts.go_to_bottom_item": "Siirry alimpaan kohtaan",
+    "page.keyboard_shortcuts.go_to_top_item": "Siirry alkuun",
     "page.keyboard_shortcuts.open_item": "Avaa valittu kohde",
     "page.keyboard_shortcuts.open_original": "Avaa alkuperäinen linkki",
     "page.keyboard_shortcuts.open_original_same_window": "Avaa alkuperäinen linkki nykyisessä välilehdessä",
@@ -178,8 +210,8 @@
     "page.settings.title": "Asetukset",
     "page.settings.link_google_account": "Linkitä Google-tilini",
     "page.settings.unlink_google_account": "Poista Google-tilini linkitys",
-    "page.settings.link_oidc_account": "Linkitä OpenID Connect -tilini",
-    "page.settings.unlink_oidc_account": "Poista OpenID Connect -tilini linkitys",
+    "page.settings.link_oidc_account": "Linkitä %s -tilini",
+    "page.settings.unlink_oidc_account": "Poista %s -tilini linkitys",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Passkey Name",
@@ -193,7 +225,7 @@
     ],
     "page.login.title": "Kirjaudu sisään",
     "page.login.google_signin": "Kirjaudu sisään Googlella",
-    "page.login.oidc_signin": "Kirjaudu sisään OpenID Connectilla",
+    "page.login.oidc_signin": "Kirjaudu sisään %silla",
     "page.login.webauthn_login": "Kirjaudu sisään salasanalla",
     "page.login.webauthn_login.error": "Ei voida kirjautua sisään salasanalla",
     "page.integrations.title": "Integraatiot",
@@ -228,6 +260,7 @@
     "alert.no_bookmark": "Tällä hetkellä ei ole kirjanmerkkiä.",
     "alert.no_category": "Ei ole kategoriaa.",
     "alert.no_category_entry": "Tässä kategoriassa ei ole artikkeleita.",
+    "alert.no_tag_entry": "Tätä tunnistetta vastaavia merkintöjä ei ole.",
     "alert.no_feed_entry": "Tässä syötteessä ei ole artikkeleita.",
     "alert.no_feed": "Sinulla ei ole tilauksia.",
     "alert.no_feed_in_category": "Tälle kategorialle ei ole tilausta.",
@@ -269,6 +302,14 @@
     "error.password_min_length": "Salasanassa on oltava vähintään 6 merkkiä.",
     "error.settings_mandatory_fields": "Käyttäjätunnus, teema, kieli ja aikavyöhyke ovat pakollisia.",
     "error.settings_reading_speed_is_positive": "Lukunopeuksien on oltava positiivisia kokonaislukuja.",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "Artikkelien määrä sivulla ei kelpaa.",
     "error.feed_mandatory_fields": "URL-osoite ja kategoria ovat pakollisia.",
     "error.feed_already_exists": "Tämä syöte on jo olemassa.",
@@ -288,6 +329,7 @@
     "form.feed.label.title": "Otsikko",
     "form.feed.label.site_url": "Sivuston URL-osoite",
     "form.feed.label.feed_url": "Syötteen URL-osoite",
+    "form.feed.label.description": "Kuvaus",
     "form.feed.label.category": "Kategoria",
     "form.feed.label.crawler": "Nouda alkuperäinen sisältö",
     "form.feed.label.feed_username": "Syötteen käyttäjätunnus",
@@ -300,10 +342,18 @@
     "form.feed.label.keeplist_rules": "Keep-säännöt",
     "form.feed.label.ignore_http_cache": "Ohita HTTP-välimuisti",
     "form.feed.label.allow_self_signed_certificates": "Salli itseallekirjoitetut tai virheelliset varmenteet",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "Nouda välityspalvelimen kautta",
     "form.feed.label.disabled": "Älä päivitä tätä syötettä",
     "form.feed.label.no_media_player": "No media player (audio/video)",
     "form.feed.label.hide_globally": "Piilota artikkelit lukemattomien listassa",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.fieldset.general": "General",
     "form.feed.fieldset.rules": "Rules",
     "form.feed.fieldset.network_settings": "Network Settings",
@@ -344,11 +394,18 @@
     "form.prefs.label.default_home_page": "Oletusarvoinen etusivu",
     "form.prefs.label.categories_sorting_order": "Kategorioiden lajittelu",
     "form.prefs.label.mark_read_on_view": "Merkitse kohdat automaattisesti luetuiksi, kun niitä tarkastellaan",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "Application Settings",
     "form.prefs.fieldset.authentication_settings": "Authentication Settings",
     "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "OPML-tiedosto",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "Ota Fever API käyttöön",
     "form.integration.fever_username": "Fever-käyttäjätunnus",
     "form.integration.fever_password": "Fever-salasana",
@@ -401,16 +458,34 @@
     "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
     "form.integration.telegram_bot_disable_notification": "Disable notification",
     "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "Tallenna artikkelit Linkkiin",
     "form.integration.linkding_endpoint": "Linkding API-päätepiste",
     "form.integration.linkding_api_key": "Linkding API-avain",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "Merkitse kirjanmerkki lukemattomaksi",
+    "form.integration.linkwarden_activate": "Tallenna artikkelit Linkkiin",
+    "form.integration.linkwarden_endpoint": "Linkwarden API-päätepiste",
+    "form.integration.linkwarden_api_key": "Linkwarden API-avain",
     "form.integration.matrix_bot_activate": "Siirrä uudet artikkelit Matrixiin",
     "form.integration.matrix_bot_user": "Matrixin käyttäjätunnus",
     "form.integration.matrix_bot_password": "Matrix-käyttäjän salasana",
     "form.integration.matrix_bot_url": "Matrix-palvelimen URL-osoite",
     "form.integration.matrix_bot_chat_id": "Matrix-huoneen tunnus",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Tallenna artikkelit Readeckiin",
+    "form.integration.readeck_endpoint": "Readeck API-päätepiste",
+    "form.integration.readeck_api_key": "Readeck API-avain",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "Lähetä vain URL-osoite (koko sisällön sijaan)",
     "form.integration.shiori_activate": "Save articles to Shiori",
     "form.integration.shiori_endpoint": "Shiori API Endpoint",
     "form.integration.shiori_username": "Shiori Username",
@@ -423,6 +498,13 @@
     "form.integration.webhook_secret": "Webhook Secret",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "API Key Label",
     "form.submit.loading": "Ladataan...",
     "form.submit.saving": "Tallennetaan...",
@@ -453,13 +535,16 @@
         "%d vuosi sitten",
         "%d vuotta sitten"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again."
+    ],
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -478,5 +563,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "Äänen/videon toistonopeus",
+    "error.settings_media_playback_rate_range": "Toistonopeus on alueen ulkopuolella",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/fr_FR.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Aller au contenu",
     "confirm.question": "Êtes-vous sûr ?",
     "confirm.question.refresh": "Voulez-vous forcer le rafraîchissement ?",
     "confirm.yes": "oui",
@@ -18,6 +19,8 @@
     "action.home_screen": "Ajouter à l'écran d'accueil",
     "tooltip.keyboard_shortcuts": "Raccourci clavier : %s",
     "tooltip.logged_user": "Connecté en tant que %s",
+    "menu.title": "Menu",
+    "menu.home_page": "Page d'accueil",
     "menu.unread": "Non lus",
     "menu.starred": "Favoris",
     "menu.history": "Historique",
@@ -32,6 +35,7 @@
     "menu.about": "À propos",
     "menu.export": "Export",
     "menu.import": "Import",
+    "menu.search": "Recherche",
     "menu.create_category": "Créer une catégorie",
     "menu.mark_page_as_read": "Marquer cette page comme lu",
     "menu.mark_all_as_read": "Tout marquer comme lu",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "Articles partagés",
     "search.label": "Recherche",
     "search.placeholder": "Recherche...",
+    "search.submit": "Rechercher",
+    "pagination.last": "Dernière page",
     "pagination.next": "Suivant",
+    "pagination.first": "Première page",
     "pagination.previous": "Précédent",
     "entry.status.unread": "Non lu",
     "entry.status.read": "Lu",
@@ -81,11 +88,27 @@
     "entry.estimated_reading_time": [
         "%d minute de lecture",
         "%d minutes de lecture"
-    ],    
+    ],
     "entry.tags.label": "Libellés :",
     "page.shared_entries.title": "Articles partagés",
+    "page.shared_entries_count": [
+        "%d article partagé",
+        "%d articles partagés"
+    ],
     "page.unread.title": "Non lus",
+    "page.unread_entry_count": [
+        "%d article non lu",
+        "%d articles non lus"
+    ],
+    "page.total_entry_count": [
+        "%d article au total",
+        "%d articles au total"
+    ],
     "page.starred.title": "Favoris",
+    "page.starred_entry_count": [
+        "%d favori",
+        "%d favoris"
+    ],
     "page.categories.title": "Catégories",
     "page.categories.no_feed": "Aucun abonnement.",
     "page.categories.entries": "Articles",
@@ -94,21 +117,28 @@
         "Il y a %d abonnement.",
         "Il y a %d abonnements."
     ],
-    "page.categories.unread_counter": "Nombre d'entrées non lues",
+    "page.categories_count": [
+        "%d catégorie",
+        "%d catégories"
+    ],
     "page.new_category.title": "Nouvelle catégorie",
     "page.new_user.title": "Nouvel Utilisateur",
     "page.edit_category.title": "Modification de la catégorie : %s",
     "page.edit_user.title": "Modification de l'utilisateur : %s",
     "page.feeds.title": "Abonnements",
+    "page.category_label": "Catégorie : %s",
     "page.feeds.last_check": "Dernière vérification :",
     "page.feeds.next_check": "Prochaine vérification :",
-    "page.feeds.unread_counter": "Nombre d'entrées non lues",
     "page.feeds.read_counter": "Nombre d'entrées lues",
     "page.feeds.error_count": [
         "%d erreur",
         "%d erreurs"
     ],
     "page.history.title": "Historique",
+    "page.read_entry_count": [
+        "%d read entry",
+        "%d read entries"
+    ],
     "page.import.title": "Importation",
     "page.search.title": "Résultats de la recherche",
     "page.about.title": "À propos",
@@ -150,6 +180,8 @@
     "page.keyboard_shortcuts.go_to_feed": "Voir abonnement",
     "page.keyboard_shortcuts.go_to_previous_page": "Page précédente",
     "page.keyboard_shortcuts.go_to_next_page": "Page suivante",
+    "page.keyboard_shortcuts.go_to_bottom_item": "Aller à l'élément du bas",
+    "page.keyboard_shortcuts.go_to_top_item": "Aller à l'élément supérieur",
     "page.keyboard_shortcuts.open_item": "Ouvrir élément sélectionné",
     "page.keyboard_shortcuts.open_original": "Ouvrir le lien original",
     "page.keyboard_shortcuts.open_original_same_window": "Ouvrir le lien original dans l'onglet en cours",
@@ -178,8 +210,8 @@
     "page.settings.title": "Réglages",
     "page.settings.link_google_account": "Associer mon compte Google",
     "page.settings.unlink_google_account": "Dissocier mon compte Google",
-    "page.settings.link_oidc_account": "Associer mon compte OpenID Connect",
-    "page.settings.unlink_oidc_account": "Dissocier mon compte OpenID Connect",
+    "page.settings.link_oidc_account": "Associer mon compte %s",
+    "page.settings.unlink_oidc_account": "Dissocier mon compte %s",
     "page.settings.webauthn.passkeys": "Clés d’accès",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Nom de la clé d’accès",
@@ -187,13 +219,13 @@
     "page.settings.webauthn.last_seen_on": "Dernière utilisation",
     "page.settings.webauthn.register": "Enregister une nouvelle clé d’accès",
     "page.settings.webauthn.register.error": "Impossible d'enregistrer la clé d’accès",
-    "page.settings.webauthn.delete" : [
+    "page.settings.webauthn.delete": [
         "Supprimer %d clé d’accès",
         "Supprimer %d clés d’accès"
     ],
     "page.login.title": "Connexion",
     "page.login.google_signin": "Se connecter avec Google",
-    "page.login.oidc_signin": "Se connecter avec OpenID Connect",
+    "page.login.oidc_signin": "Se connecter avec %s",
     "page.login.webauthn_login": "Se connecter avec une clé d’accès",
     "page.login.webauthn_login.error": "Impossible de se connecter avec la clé d’accès",
     "page.integrations.title": "Intégrations",
@@ -228,6 +260,7 @@
     "alert.no_bookmark": "Il n'y a aucun favoris pour le moment.",
     "alert.no_category": "Il n'y a aucune catégorie.",
     "alert.no_category_entry": "Il n'y a aucun article dans cette catégorie.",
+    "alert.no_tag_entry": "Il n'y a aucun article correspondant à ce tag.",
     "alert.no_feed_entry": "Il n'y a aucun article pour cet abonnement.",
     "alert.no_feed": "Vous n'avez aucun abonnement.",
     "alert.no_feed_in_category": "Il n'y a pas d'abonnement pour cette catégorie.",
@@ -262,6 +295,14 @@
     "error.password_min_length": "Vous devez utiliser au moins 6 caractères pour le mot de passe.",
     "error.settings_mandatory_fields": "Le nom d'utilisateur, le thème, la langue et le fuseau horaire sont obligatoire.",
     "error.settings_reading_speed_is_positive": "Les vitesses de lecture doivent être des entiers positifs.",
+    "error.settings_block_rule_fieldname_invalid": "Règle de blocage invalide : la règle n°%d ne contient pas un nom de champ valide (Options : %s)",
+    "error.settings_block_rule_separator_required": "Règle de blocage invalide : le motif de la règle n°%d doit être séparé par un '='",
+    "error.settings_block_rule_regex_required": "Règle de blocage invalide : le motif de la règle n°%d n'est pas fourni",
+    "error.settings_block_rule_invalid_regex": "Règle de blocage invalide : le motif de la règle n°%d n'est pas une expression régulière valide",
+    "error.settings_keep_rule_fieldname_invalid": "Règle de conservation invalide : la règle n°%d ne contient pas un nom de champ valide (Options : %s)",
+    "error.settings_keep_rule_separator_required": "Règle de conservation invalide : le motif de la règle n°%d doit être séparé par un '='",
+    "error.settings_keep_rule_regex_required": "Règle de conservation invalide : le motif de la règle n°%d n'est pas fourni",
+    "error.settings_keep_rule_invalid_regex": "Règle de conservation invalide : le motif de la règle n°%d n'est pas une expression régulière valide",
     "error.entries_per_page_invalid": "Le nombre d'entrées par page n'est pas valide.",
     "error.feed_mandatory_fields": "L'URL et la catégorie sont obligatoire.",
     "error.feed_already_exists": "Ce flux existe déjà.",
@@ -286,6 +327,7 @@
     "form.feed.label.title": "Titre",
     "form.feed.label.site_url": "URL du site web",
     "form.feed.label.feed_url": "URL du flux",
+    "form.feed.label.description": "Description",
     "form.feed.label.category": "Catégorie",
     "form.feed.label.crawler": "Récupérer le contenu original",
     "form.feed.label.feed_username": "Nom d'utilisateur du flux",
@@ -300,10 +342,18 @@
     "form.feed.label.urlrewrite_rules": "Règles de réécriture d'URL",
     "form.feed.label.ignore_http_cache": "Ignorer le cache HTTP",
     "form.feed.label.allow_self_signed_certificates": "Autoriser les certificats auto-signés ou non valides",
+    "form.feed.label.disable_http2": "Désactiver HTTP/2",
     "form.feed.label.fetch_via_proxy": "Récupérer via proxy",
     "form.feed.label.disabled": "Ne pas actualiser ce flux",
     "form.feed.label.no_media_player": "Pas de lecteur multimedia (audio/vidéo)",
     "form.feed.label.hide_globally": "Masquer les entrées dans la liste globale non lue",
+    "form.feed.label.ntfy_activate": "Activer les notifications",
+    "form.feed.label.ntfy_priority": "Priorité de notification",
+    "form.feed.label.ntfy_max_priority": "Priorité maximale de notification",
+    "form.feed.label.ntfy_high_priority": "Priorité élevée de notification",
+    "form.feed.label.ntfy_default_priority": "Priorité par défaut de notification",
+    "form.feed.label.ntfy_low_priority": "Priorité basse de notification",
+    "form.feed.label.ntfy_min_priority": "Priorité minimale de notification",
     "form.feed.fieldset.general": "Général",
     "form.feed.fieldset.rules": "Règles",
     "form.feed.fieldset.network_settings": "Paramètres réseau",
@@ -344,11 +394,18 @@
     "form.prefs.label.default_home_page": "Page d'accueil par défaut",
     "form.prefs.label.categories_sorting_order": "Colonne de tri des catégories",
     "form.prefs.label.mark_read_on_view": "Marquer automatiquement les entrées comme lues lorsqu'elles sont consultées",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Marquer automatiquement les entrées comme lues lorsqu'elles sont consultées. Pour l'audio/vidéo, marquer comme lues après 90%%",
+    "form.prefs.label.mark_read_on_media_completion": "Marqué  les entrées comme lues uniquement après 90%%  de lecture de l'audio/vidéo",
+    "form.prefs.label.mark_read_manually": "Marqué les entrées comme lues manuellement",
     "form.prefs.fieldset.application_settings": "Paramètres de l'application",
     "form.prefs.fieldset.authentication_settings": "Paramètres d'authentification",
     "form.prefs.fieldset.reader_settings": "Paramètres du lecteur",
+    "form.prefs.fieldset.global_feed_settings": "Paramètres globaux des abonnements",
     "form.import.label.file": "Fichier OPML",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "Sauvegarder les entrées vers Betula",
+    "form.integration.betula_url": "URL du serveur Betula",
+    "form.integration.betula_token": "Jeton de sécurité de l'API de Betula",
     "form.integration.fever_activate": "Activer l'API de Fever",
     "form.integration.fever_username": "Nom d'utilisateur pour l'API de Fever",
     "form.integration.fever_password": "Mot de passe pour l'API de Fever",
@@ -391,7 +448,7 @@
     "form.integration.espial_endpoint": "URL de l'API de Espial",
     "form.integration.espial_api_key": "Clé d'API de Espial",
     "form.integration.espial_tags": "Libellés de Espial",
-    "form.integration.readwise_activate": "Enregistrer les entrées dans Readwise Reader",
+    "form.integration.readwise_activate": "Enregistrer les entrées vers Readwise Reader",
     "form.integration.readwise_api_key": "Jeton d'accès au lecteur Readwise",
     "form.integration.readwise_api_key_link": "Obtenez votre jeton d'accès Readwise",
     "form.integration.telegram_bot_activate": "Envoyer les nouveaux articles vers Telegram",
@@ -400,17 +457,35 @@
     "form.integration.telegram_topic_id": "Identifiant du sujet (Topic ID)",
     "form.integration.telegram_bot_disable_web_page_preview": "Désactiver l'aperçu de la page Web",
     "form.integration.telegram_bot_disable_notification": "Désactiver les notifications",
-    "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.telegram_bot_disable_buttons": "Désactiver les boutons",
+    "form.integration.linkace_activate": "Enregistrer les entrées vers LinkAce",
+    "form.integration.linkace_endpoint": "Point de terminaison de l'API LinkAce",
+    "form.integration.linkace_api_key": "Clé d'API LinkAce",
+    "form.integration.linkace_tags": "Étiquettes LinkAce",
+    "form.integration.linkace_is_private": "Marquer le lien comme privé",
+    "form.integration.linkace_check_disabled": "Désactiver la vérification des liens",
     "form.integration.linkding_activate": "Sauvegarder les articles vers Linkding",
     "form.integration.linkding_endpoint": "URL de l'API de Linkding",
     "form.integration.linkding_api_key": "Clé d'API de Linkding",
-    "form.integration.linkding_tags": "Linkding Tags",
+    "form.integration.linkding_tags": "Libellés",
     "form.integration.linkding_bookmark": "Marquer le lien comme non lu",
+    "form.integration.linkwarden_activate": "Sauvegarder les articles vers Linkwarden",
+    "form.integration.linkwarden_endpoint": "URL de l'API de Linkwarden",
+    "form.integration.linkwarden_api_key": "Clé d'API de Linkwarden",
     "form.integration.matrix_bot_activate": "Envoyer les nouveaux articles vers Matrix",
     "form.integration.matrix_bot_user": "Nom de l'utilisateur Matrix",
     "form.integration.matrix_bot_password": "Mot de passe de l'utilisateur Matrix",
     "form.integration.matrix_bot_url": "URL du serveur Matrix",
     "form.integration.matrix_bot_chat_id": "Identifiant de la salle Matrix",
+    "form.integration.raindrop_activate": "Enregistrer les entrées vers Raindrop",
+    "form.integration.raindrop_token": "Jeton d'accès de Raindrop",
+    "form.integration.raindrop_collection_id": "Identifiant de la collection",
+    "form.integration.raindrop_tags": "Libellés (séparées par des virgules)",
+    "form.integration.readeck_activate": "Sauvegarder les articles vers Readeck",
+    "form.integration.readeck_endpoint": "URL de l'API de Readeck",
+    "form.integration.readeck_api_key": "Clé d'API de Readeck",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "Envoyer uniquement l'URL (au lieu du contenu complet)",
     "form.integration.shiori_activate": "Sauvegarder les articles vers Shiori",
     "form.integration.shiori_endpoint": "URL de l'API de Shiori",
     "form.integration.shiori_username": "Nom d'utilisateur de Shiori",
@@ -423,6 +498,13 @@
     "form.integration.webhook_secret": "Secret du webhook",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Envoyer les entrées vers ntfy",
+    "form.integration.ntfy_topic": "Sujet Ntfy",
+    "form.integration.ntfy_url": "URL de Ntfy (optionnel, ntfy.sh par défaut)",
+    "form.integration.ntfy_api_token": "Jeton d'API Ntfy (optionnel)",
+    "form.integration.ntfy_username": "Nom d'utilisateur Ntfy (optionnel)",
+    "form.integration.ntfy_password": "Mot de passe Ntfy (facultatif)",
+    "form.integration.ntfy_icon_url": "URL de l'icône Ntfy (facultatif)",
     "form.api_key.label.description": "Libellé de la clé d'API",
     "form.submit.loading": "Chargement...",
     "form.submit.saving": "Sauvegarde en cours...",
@@ -453,13 +535,16 @@
         "il y a %d an",
         "il y a %d ans"
     ],
-    "alert.too_many_feeds_refresh": "Vous avez déclenché trop d'actualisations de flux. Veuillez attendre 30 minutes avant de réessayer.",
+    "alert.too_many_feeds_refresh": [
+        "Vous avez déclenché trop d'actualisations de flux. Veuillez attendre %d minute avant de réessayer.",
+        "Vous avez déclenché trop d'actualisations de flux. Veuillez attendre %d minutes avant de réessayer."
+    ],
     "alert.background_feed_refresh": "Les abonnements sont en cours d'actualisation en arrière-plan. Vous pouvez continuer à naviguer dans l'application.",
     "error.http_response_too_large": "La réponse HTTP est trop volumineuse. Vous pouvez augmenter la limite de taille de réponse HTTP dans les paramètres de l'application (redémarrage de l'application nécessaire).",
     "error.http_body_read": "Impossible de lire le corps de la réponse HTTP : %v.",
     "error.http_empty_response_body": "Le corps de la réponse HTTP est vide.",
     "error.http_empty_response": "La réponse HTTP est vide. Peut-être que ce site web bloque Miniflux avec une protection anti-bot ?",
-    "error.tls_error": "Erreur TLS : %v. Vous pouvez désactiver la vérification TLS dans les paramètres de l'abonnement.",
+    "error.tls_error": "Erreur TLS : %q. Vous pouvez désactiver la vérification TLS dans les paramètres de l'abonnement.",
     "error.network_operation": "Miniflux n'est pas en mesure de se connecter à ce site web à cause d'un problème réseau : %v.",
     "error.network_timeout": "Ce site web est trop lent à répondre : %v.",
     "error.http_client_error": "Erreur du client HTTP : %v.",
@@ -478,5 +563,16 @@
     "error.unable_to_parse_feed": "Impossible d'analyser ce flux : %v.",
     "error.feed_not_found": "Impossible de trouver ce flux.",
     "error.unable_to_detect_rssbridge": "Impossible de détecter un flux RSS en utilisant RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Impossible de détecter le format du flux : %v."
+    "error.feed_format_not_detected": "Impossible de détecter le format du flux : %v.",
+    "form.prefs.label.media_playback_rate": "Vitesse de lecture de l'audio/vidéo",
+    "error.settings_media_playback_rate_range": "La vitesse de lecture est hors limites",
+    "enclosure_media_controls.seek" : "Avancer/Reculer :",
+    "enclosure_media_controls.seek.title" : "Avancer/Reculer de %s seconds",
+    "enclosure_media_controls.speed" : "Vitesse :",
+    "enclosure_media_controls.speed.faster" : "Accélérer",
+    "enclosure_media_controls.speed.faster.title" : "Accélérer de %sx",
+    "enclosure_media_controls.speed.slower" : "Ralentir",
+    "enclosure_media_controls.speed.slower.title" : "Ralentir de %sx",
+    "enclosure_media_controls.speed.reset" : "Réinitialiser",
+    "enclosure_media_controls.speed.reset.title" : "Réinitialiser la vitesse de lecture à 1x"
 }

internal/locale/translations/hi_IN.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "मंजूर है?",
     "confirm.question.refresh": "क्या आप बल द्वारा ताज़ा करना चाहते हैं?",
     "confirm.yes": "हाँ",
@@ -18,6 +19,8 @@
     "action.home_screen": "होम स्क्रीन में शामिल करें",
     "tooltip.keyboard_shortcuts": "कुंजीपटल संक्षिप्त रीति: %s",
     "tooltip.logged_user": "%s के रूप में लॉग इन किया",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "अपठित",
     "menu.starred": "तारांकित",
     "menu.history": "इतिहास",
@@ -32,6 +35,7 @@
     "menu.about": "के बारे में",
     "menu.export": "निर्यात करे",
     "menu.import": "आयात करे",
+    "menu.search": "खोज",
     "menu.create_category": "श्रेणी बनाए",
     "menu.mark_page_as_read": "इस पृष्ठ को पढ़ा हुआ चिह्नित करें",
     "menu.mark_all_as_read": "सभी को पढ़ा हुआ मार्क करें",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "साझा प्रविष्टियां",
     "search.label": "खोजे",
     "search.placeholder": "खोजे...",
+    "search.submit": "Search",
+    "pagination.last": "Last",
     "pagination.next": "अगला",
+    "pagination.first": "First",
     "pagination.previous": "पिछला",
     "entry.status.unread": "अपठित",
     "entry.status.read": "पढ़े",
@@ -81,11 +88,27 @@
     "entry.estimated_reading_time": [
         "पढ़ने मे %d मिनट मागेगा",
         "पढ़ने मे %d मिनट मागेगा"
-    ],    
+    ],
     "entry.tags.label": "टैग:",
     "page.shared_entries.title": "साझा किया हुआ प्रविष्टि",
+    "page.shared_entries_count": [
+        "%d shared entry",
+        "%d shared entries"
+    ],
     "page.unread.title": "अपठित",
+    "page.unread_entry_count": [
+        "%d unread entry",
+        "%d unread entries"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total",
+        "%d entries in total"
+    ],
     "page.starred.title": "तारांकित",
+    "page.starred_entry_count": [
+        "%d starred entry",
+        "%d starred entries"
+    ],
     "page.categories.title": "श्रेणियाँ",
     "page.categories.no_feed": "कोई फ़ीड नहीं है।",
     "page.categories.entries": "विषयवस्तुया",
@@ -94,21 +117,28 @@
         "%d फ़ीड बाकी है।",
         "%d फ़ीड बाकी है।"
     ],
-    "page.categories.unread_counter": "अपठित प्रविष्टिया",
+    "page.categories_count": [
+        "%d category",
+        "%d categories"
+    ],
     "page.new_category.title": "नया श्रेणी",
     "page.new_user.title": "नया उपभोक्ता",
     "page.edit_category.title": "%s श्रेणी संपाद करे",
     "page.edit_user.title": "%s उपभोक्ता संपाद करे",
     "page.feeds.title": "फ़ीड",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "आखरी जाँच",
     "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "अपठित विषयवस्तुया",
     "page.feeds.read_counter": "पड़े हुए विषयवस्तुया",
     "page.feeds.error_count": [
         "%d समस्या",
         "%d समस्याए"
     ],
     "page.history.title": "इतिहास",
+    "page.read_entry_count": [
+        "%d read entry",
+        "%d read entries"
+    ],
     "page.import.title": "आयात",
     "page.search.title": "खोज का परिणाम",
     "page.about.title": "पृष्ठ के बारे में",
@@ -150,6 +180,8 @@
     "page.keyboard_shortcuts.go_to_feed": "फ़ीड पर जाएं",
     "page.keyboard_shortcuts.go_to_previous_page": "पिछले पृष्ठ पर जाएं",
     "page.keyboard_shortcuts.go_to_next_page": "अगले पेज पर जाएं",
+    "page.keyboard_shortcuts.go_to_bottom_item": "निचले आइटम पर जाएँ",
+    "page.keyboard_shortcuts.go_to_top_item": "शीर्ष आइटम पर जाएँ",
     "page.keyboard_shortcuts.open_item": "चयनित आइटम खोलें",
     "page.keyboard_shortcuts.open_original": "मूल लिंक खोलें",
     "page.keyboard_shortcuts.open_original_same_window": "वर्तमान टैब में मूल लिंक खोलें",
@@ -178,8 +210,8 @@
     "page.settings.title": "समायोजन",
     "page.settings.link_google_account": "मेरा गूगल खाता जोरीय",
     "page.settings.unlink_google_account": "मेरा गूगल खाता हटाय",
-    "page.settings.link_oidc_account": "मेरा ओपन-ईद खाता जोरीय",
-    "page.settings.unlink_oidc_account": "मेरा ओपन-ईद खाता हटाय",
+    "page.settings.link_oidc_account": "मेरा ओपन-ईद खाता जोरीय (%s)",
+    "page.settings.unlink_oidc_account": "मेरा ओपन-ईद खाता हटाय (%s)",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Passkey Name",
@@ -193,7 +225,7 @@
     ],
     "page.login.title": "साइन इन करें",
     "page.login.google_signin": "गूगल के साथ साइन इन करें",
-    "page.login.oidc_signin": "ओपन-ईद के साथ साइन इन करें",
+    "page.login.oidc_signin": "ओपन-ईद के साथ साइन इन करें (%s)",
     "page.login.webauthn_login": "पासकी से लॉगिन करें",
     "page.login.webauthn_login.error": "पासकी से लॉगिन करने में असमर्थ",
     "page.integrations.title": "एकीकरण",
@@ -228,6 +260,7 @@
     "alert.no_bookmark": "इस समय कोई बुकमार्क नहीं है",
     "alert.no_category": "कोई श्रेणी नहीं है।",
     "alert.no_category_entry": "इस श्रेणी में कोई विषय-वस्तु नहीं है।",
+    "alert.no_tag_entry": "इस टैग से मेल खाती कोई प्रविष्टियाँ नहीं हैं।",
     "alert.no_feed_entry": "इस फ़ीड के लिए कोई विषय-वस्तु नहीं है।",
     "alert.no_feed": "आपके पास कोई सदस्यता नहीं है।",
     "alert.no_feed_in_category": "इस श्रेणी के लिए कोई सदस्यता नहीं है।",
@@ -269,6 +302,14 @@
     "error.password_min_length": "पासवर्ड में कम से कम 6 अक्षर होने चाहिए।",
     "error.settings_mandatory_fields": "उपयोगकर्ता नाम, विषयवस्तु, भाषा और समयक्षेत्र फ़ील्ड अनिवार्य हैं।",
     "error.settings_reading_speed_is_positive": "पढ़ने की गति सकारात्मक पूर्णांक होनी चाहिए।",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "प्रति पृष्ठ प्रविष्टियों की संख्या मान्य नहीं है।",
     "error.feed_mandatory_fields": "URL और श्रेणी अनिवार्य हैं।",
     "error.feed_already_exists": "यह फ़ीड पहले से मौजूद है.",
@@ -286,6 +327,7 @@
     "form.feed.label.title": "शीर्षक",
     "form.feed.label.site_url": "साइट यूआरएल",
     "form.feed.label.feed_url": "फ़ीड यूआरएल",
+    "form.feed.label.description": "विवरण",
     "form.feed.label.category": "श्रेणी",
     "form.feed.label.crawler": "मूल सामग्री प्राप्त करें",
     "form.feed.label.feed_username": "फ़ीड उपयोगकर्ता नाम",
@@ -300,10 +342,18 @@
     "form.feed.label.urlrewrite_rules": " यूआरएल पुनर्लेखन नियम",
     "form.feed.label.ignore_http_cache": "एचटीटीपी कैश पर ध्यान न दें",
     "form.feed.label.allow_self_signed_certificates": "स्व-हस्ताक्षरित या अमान्य प्रमाणपत्रों की अनुमति दें",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "प्रॉक्सी के माध्यम से प्राप्त करें",
     "form.feed.label.disabled": "इस फ़ीड को रीफ़्रेश न करें",
     "form.feed.label.no_media_player": "No media player (audio/video)",
     "form.feed.label.hide_globally": "वैश्विक अपठित सूची में प्रविष्टियां छिपाएं",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.fieldset.general": "General",
     "form.feed.fieldset.rules": "Rules",
     "form.feed.fieldset.network_settings": "Network Settings",
@@ -344,11 +394,18 @@
     "form.prefs.label.default_home_page": "डिफ़ॉल्ट होमपेज़",
     "form.prefs.label.categories_sorting_order": "श्रेणियाँ छँटाई",
     "form.prefs.label.mark_read_on_view": "देखे जाने पर स्वचालित रूप से प्रविष्टियों को पढ़ने के रूप में चिह्नित करें",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "Application Settings",
     "form.prefs.fieldset.authentication_settings": "Authentication Settings",
     "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "ओपीएमएल फ़ाइल",
     "form.import.label.url": "यूआरएल",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "फीवर एपीआई सक्रिय करें",
     "form.integration.fever_username": "फीवर उपयोगकर्ता नाम",
     "form.integration.fever_password": "फीवर पासवर्ड",
@@ -363,7 +420,7 @@
     "form.integration.pinboard_bookmark": "बुकमार्क को अपठित के रूप में चिह्नित करें",
     "form.integration.instapaper_activate": "विषय-वस्तु को इंस्टापेपर में सहेजें",
     "form.integration.instapaper_username": "इंस्टापेपर यूजरनेम",
-    "form.integration.instapaper_password": "इंस्टापेपर पासवर्ड", 
+    "form.integration.instapaper_password": "इंस्टापेपर पासवर्ड",
     "form.integration.pocket_activate": "विषय-कविता को पॉकेट में सहेजें",
     "form.integration.pocket_consumer_key": "पॉकेट उपभोक्ता कुंजी",
     "form.integration.pocket_access_token": "पॉकेट एक्सेस टोकन",
@@ -401,16 +458,34 @@
     "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
     "form.integration.telegram_bot_disable_notification": "Disable notification",
     "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "लिंक्डिन में विषयवस्तु सहेजें",
     "form.integration.linkding_endpoint": "लिंकिंग एपीआई समापन बिंदु",
     "form.integration.linkding_api_key": "लिंकिंग एपीआई कुंजी",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "बुकमार्क को अपठित के रूप में चिह्नित करें",
+    "form.integration.linkwarden_activate": "Save entries to Linkwarden",
+    "form.integration.linkwarden_endpoint": "Linkwarden API Endpoint",
+    "form.integration.linkwarden_api_key": "Linkwarden API key",
     "form.integration.matrix_bot_activate": "नए लेखों को मैट्रिक्स में स्थानांतरित करें",
     "form.integration.matrix_bot_user": "मैट्रिक्स के लिए उपयोगकर्ता नाम",
     "form.integration.matrix_bot_password": "मैट्रिक्स उपयोगकर्ता के लिए पासवर्ड",
     "form.integration.matrix_bot_url": "मैट्रिक्स सर्वर URL",
     "form.integration.matrix_bot_chat_id": "मैट्रिक्स रूम की आईडी",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Readeck में विषयवस्तु सहेजें",
+    "form.integration.readeck_endpoint": "Readeck·एपीआई·समापन·बिंदु",
+    "form.integration.readeck_api_key": "Readeck एपीआई कुंजी",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "केवल URL भेजें (पूर्ण सामग्री के बजाय)",
     "form.integration.shiori_activate": "Save articles to Shiori",
     "form.integration.shiori_endpoint": "Shiori API Endpoint",
     "form.integration.shiori_username": "Shiori Username",
@@ -423,6 +498,13 @@
     "form.integration.webhook_secret": "Webhook Secret",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "एपीआई कुंजी लेबल",
     "form.submit.loading": "लोड हो रहा है...",
     "form.submit.saving": "सहेजा जा रहा है...",
@@ -453,13 +535,16 @@
         "%d साल पहले",
         "%d वर्षों पहले"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again."
+    ],
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -478,5 +563,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "ऑडियो/वीडियो की प्लेबैक गति",
+    "error.settings_media_playback_rate_range": "प्लेबैक गति सीमा से बाहर है",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/id_ID.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "Apakah Anda yakin?",
     "confirm.question.refresh": "Apakah Anda ingin memaksa penyegaran?",
     "confirm.yes": "ya",
@@ -18,6 +19,8 @@
     "action.home_screen": "Tambahkan ke beranda",
     "tooltip.keyboard_shortcuts": "Pintasan Papan Tik: %s",
     "tooltip.logged_user": "Masuk sebagai %s",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "Belum Dibaca",
     "menu.starred": "Markah",
     "menu.history": "Riwayat",
@@ -32,6 +35,7 @@
     "menu.about": "Tentang",
     "menu.export": "Ekspor",
     "menu.import": "Impor",
+    "menu.search": "Cari",
     "menu.create_category": "Buat kategori",
     "menu.mark_page_as_read": "Tandai halaman ini sebagai telah dibaca",
     "menu.mark_all_as_read": "Tandai semua sebagai telah dibaca",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "Entri yang Dibagikan",
     "search.label": "Cari",
     "search.placeholder": "Cari...",
+    "search.submit": "Search",
     "pagination.next": "Berikutnya",
+    "pagination.last": "Last",
+    "pagination.first": "First",
     "pagination.previous": "Sebelumnya",
     "entry.status.unread": "Belum dibaca",
     "entry.status.read": "Telah dibaca",
@@ -79,33 +86,50 @@
     "entry.shared_entry.title": "Buka tautan publik",
     "entry.shared_entry.label": "Bagikan",
     "entry.estimated_reading_time": [
-    "%d menit untuk dibaca"
-    ],    
+        "%d menit untuk dibaca"
+    ],
     "entry.tags.label": "Tanda:",
     "page.shared_entries.title": "Entri yang Dibagikan",
+    "page.shared_entries_count": [
+        "%d shared entry"
+    ],
     "page.unread.title": "Belum Dibaca",
+    "page.unread_entry_count": [
+        "%d unread entry"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total"
+    ],
     "page.starred.title": "Markah",
+    "page.starred_entry_count": [
+        "%d starred entry"
+    ],
     "page.categories.title": "Kategori",
     "page.categories.no_feed": "Tidak ada umpan.",
     "page.categories.entries": "Artikel",
     "page.categories.feeds": "Langganan",
     "page.categories.feed_count": [
-    "Ada %d umpan."
+        "Ada %d umpan."
+    ],
+    "page.categories_count": [
+        "%d category"
     ],
-    "page.categories.unread_counter": "Jumlah entri yang belum dibaca",
     "page.new_category.title": "Kategori Baru",
     "page.new_user.title": "Pengguna Baru",
     "page.edit_category.title": "Sunting Kategori: %s",
     "page.edit_user.title": "Sunting Pengguna: %s",
     "page.feeds.title": "Umpan",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "Terakhir diperiksa:",
     "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "Jumlah entri yang belum dibaca",
     "page.feeds.read_counter": "Jumlah entri yang telah dibaca",
     "page.feeds.error_count": [
-    "%d galat"
+        "%d galat"
     ],
     "page.history.title": "Riwayat",
+    "page.read_entry_count": [
+        "%d read entry"
+    ],
     "page.import.title": "Impor",
     "page.search.title": "Hasil Pencarian",
     "page.about.title": "Tentang",
@@ -147,6 +171,8 @@
     "page.keyboard_shortcuts.go_to_feed": "Ke umpan",
     "page.keyboard_shortcuts.go_to_previous_page": "Ke halaman sebelumnya",
     "page.keyboard_shortcuts.go_to_next_page": "Ke halaman berikutnya",
+    "page.keyboard_shortcuts.go_to_bottom_item": "Pergi ke item paling bawah",
+    "page.keyboard_shortcuts.go_to_top_item": "Pergi ke item teratas",
     "page.keyboard_shortcuts.open_item": "Buka entri yang dipilih",
     "page.keyboard_shortcuts.open_original": "Buka tautan asli",
     "page.keyboard_shortcuts.open_original_same_window": "Buka tautan asli di bilah saat ini",
@@ -175,8 +201,8 @@
     "page.settings.title": "Pengaturan",
     "page.settings.link_google_account": "Tautkan akun Google saya",
     "page.settings.unlink_google_account": "Putuskan akun Google saya",
-    "page.settings.link_oidc_account": "Tautkan akun OpenID Connect saya",
-    "page.settings.unlink_oidc_account": "Putuskan akun OpenID Connect saya",
+    "page.settings.link_oidc_account": "Tautkan akun %s saya",
+    "page.settings.unlink_oidc_account": "Putuskan akun %s saya",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Passkey Name",
@@ -185,12 +211,11 @@
     "page.settings.webauthn.register": "Register passkey",
     "page.settings.webauthn.register.error": "Unable to register passkey",
     "page.settings.webauthn.delete": [
-        "Remove %d passkey",
-        "Remove %d passkeys"
+        "Remove %d passkey"
     ],
     "page.login.title": "Masuk",
     "page.login.google_signin": "Masuk dengan Google",
-    "page.login.oidc_signin": "Masuk dengan OpenID Connect",
+    "page.login.oidc_signin": "Masuk dengan %s",
     "page.login.webauthn_login": "Login with passkey",
     "page.login.webauthn_login.error": "Unable to login with passkey",
     "page.integrations.title": "Integrasi",
@@ -225,6 +250,7 @@
     "alert.no_bookmark": "Tidak ada markah.",
     "alert.no_category": "Tidak ada kategori.",
     "alert.no_category_entry": "Tidak ada artikel di kategori ini.",
+    "alert.no_tag_entry": "Tidak ada entri yang cocok dengan tag ini.",
     "alert.no_feed_entry": "Tidak ada artikel di umpan ini.",
     "alert.no_feed": "Anda tidak memiliki langganan.",
     "alert.no_feed_in_category": "Tidak ada langganan untuk kategori ini.",
@@ -266,6 +292,14 @@
     "error.password_min_length": "Kata sandi harus memiliki setidaknya 6 karakter.",
     "error.settings_mandatory_fields": "Harus ada nama pengguna, tema, bahasa, dan zona waktu.",
     "error.settings_reading_speed_is_positive": "Kecepatan membaca harus integer positif.",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "Jumlah entri per halaman tidak valid.",
     "error.feed_mandatory_fields": "Harus ada URL dan kategorinya.",
     "error.feed_already_exists": "Umpan ini sudah ada.",
@@ -283,6 +317,7 @@
     "form.feed.label.title": "Judul",
     "form.feed.label.site_url": "URL Situs",
     "form.feed.label.feed_url": "URL Umpan",
+    "form.feed.label.description": "Deskripsi",
     "form.feed.label.category": "Kategori",
     "form.feed.label.crawler": "Ambil konten asli",
     "form.feed.label.feed_username": "Nama Pengguna Umpan",
@@ -297,10 +332,18 @@
     "form.feed.label.urlrewrite_rules": "Aturan Tulis Ulang URL",
     "form.feed.label.ignore_http_cache": "Abaikan Tembolok HTTP",
     "form.feed.label.allow_self_signed_certificates": "Perbolehkan sertifikat web tidak valid atau sertifikasi sendiri",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "Ambil via Proksi",
     "form.feed.label.disabled": "Jangan perbarui umpan ini",
     "form.feed.label.no_media_player": "No media player (audio/video)",
     "form.feed.label.hide_globally": "Sembunyikan entri di daftar belum dibaca global",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.fieldset.general": "General",
     "form.feed.fieldset.rules": "Rules",
     "form.feed.fieldset.network_settings": "Network Settings",
@@ -341,11 +384,18 @@
     "form.prefs.label.default_home_page": "Beranda Baku",
     "form.prefs.label.categories_sorting_order": "Pengurutan Kategori",
     "form.prefs.label.mark_read_on_view": "Secara otomatis menandai entri sebagai telah dibaca saat dilihat",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "Application Settings",
     "form.prefs.fieldset.authentication_settings": "Authentication Settings",
     "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "Berkas OPML",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "Aktifkan API Fever",
     "form.integration.fever_username": "Nama Pengguna Fever",
     "form.integration.fever_password": "Kata Sandi Fever",
@@ -398,16 +448,34 @@
     "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
     "form.integration.telegram_bot_disable_notification": "Disable notification",
     "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "Simpan artikel ke Linkding",
     "form.integration.linkding_endpoint": "Titik URL API Linkding",
     "form.integration.linkding_api_key": "Kunci API Linkding",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "Tandai markah sebagai belum dibaca",
+    "form.integration.linkwarden_activate": "Simpan artikel ke Linkwarden",
+    "form.integration.linkwarden_endpoint": "Titik URL API Linkwarden",
+    "form.integration.linkwarden_api_key": "Kunci API Linkwarden",
     "form.integration.matrix_bot_activate": "Kirim entri baru ke Matrix",
     "form.integration.matrix_bot_user": "Nama Pengguna Matrix",
     "form.integration.matrix_bot_password": "Kata Sandi Matrix",
     "form.integration.matrix_bot_url": "URL Peladen Matrix",
     "form.integration.matrix_bot_chat_id": "ID Ruang Matrix",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Simpan artikel ke Readeck",
+    "form.integration.readeck_endpoint": "Titik URL API Readeck",
+    "form.integration.readeck_api_key": "Kunci API Readeck",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "Kirim hanya URL (alih-alih konten penuh)",
     "form.integration.shiori_activate": "Save articles to Shiori",
     "form.integration.shiori_endpoint": "Shiori API Endpoint",
     "form.integration.shiori_username": "Shiori Username",
@@ -420,6 +488,13 @@
     "form.integration.webhook_secret": "Webhook Secret",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "Label Kunci API",
     "form.submit.loading": "Memuat...",
     "form.submit.saving": "Menyimpan...",
@@ -427,30 +502,32 @@
     "time_elapsed.yesterday": "kemarin",
     "time_elapsed.now": "baru saja",
     "time_elapsed.minutes": [
-    "%d menit yang lalu"
+        "%d menit yang lalu"
     ],
     "time_elapsed.hours": [
-    "%d jam yang lalu"
+        "%d jam yang lalu"
     ],
     "time_elapsed.days": [
-    "%d hari yang lalu"
+        "%d hari yang lalu"
     ],
     "time_elapsed.weeks": [
-    "%d pekan yang lalu"
+        "%d pekan yang lalu"
     ],
     "time_elapsed.months": [
-    "%d bulan yang lalu"
+        "%d bulan yang lalu"
     ],
     "time_elapsed.years": [
-    "%d tahun yang lalu"
+        "%d tahun yang lalu"
+    ],
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again."
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -469,5 +546,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "Kecepatan pemutaran audio/video",
+    "error.settings_media_playback_rate_range": "Kecepatan pemutaran di luar jangkauan",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/it_IT.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "Sei sicuro?",
     "confirm.question.refresh": "Vuoi forzare l'aggiornamento?",
     "confirm.yes": "sì",
@@ -18,6 +19,8 @@
     "action.home_screen": "Aggiungere alla schermata Home",
     "tooltip.keyboard_shortcuts": "Scorciatoia da tastiera: %s",
     "tooltip.logged_user": "Autenticato come %s",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "Da leggere",
     "menu.starred": "Preferiti",
     "menu.history": "Cronologia",
@@ -32,6 +35,7 @@
     "menu.about": "Informazioni",
     "menu.export": "Esporta",
     "menu.import": "Importa",
+    "menu.search": "Cerca",
     "menu.create_category": "Aggiungi una categoria",
     "menu.mark_page_as_read": "Segna questa pagina come letta",
     "menu.mark_all_as_read": "Segna tutti gli articoli come letti",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "Voci condivise",
     "search.label": "Cerca",
     "search.placeholder": "Cerca...",
+    "search.submit": "Search",
     "pagination.next": "Successivo",
+    "pagination.last": "Last",
+    "pagination.first": "First",
     "pagination.previous": "Precedente",
     "entry.status.unread": "Da leggere",
     "entry.status.read": "Letto",
@@ -81,11 +88,27 @@
     "entry.estimated_reading_time": [
         "%d minuto di lettura",
         "%d minuti di lettura"
-    ],    
+    ],
     "entry.tags.label": "Tag:",
     "page.shared_entries.title": "Voci condivise",
+    "page.shared_entries_count": [
+        "%d shared entry",
+        "%d shared entries"
+    ],
     "page.unread.title": "Da leggere",
+    "page.unread_entry_count": [
+        "%d unread entry",
+        "%d unread entries"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total",
+        "%d entries in total"
+    ],
     "page.starred.title": "Preferiti",
+    "page.starred_entry_count": [
+        "%d starred entry",
+        "%d starred entries"
+    ],
     "page.categories.title": "Categorie",
     "page.categories.no_feed": "Nessun feed.",
     "page.categories.entries": "Articoli",
@@ -94,21 +117,28 @@
         "C'è %d feed.",
         "Ci sono %d feed."
     ],
-    "page.categories.unread_counter": "Numero di voci non lette",
+    "page.categories_count": [
+        "%d category",
+        "%d categories"
+    ],
     "page.new_category.title": "Nuova categoria",
     "page.new_user.title": "Nuovo utente",
     "page.edit_category.title": "Modifica categoria: %s",
     "page.edit_user.title": "Modifica utente: %s",
     "page.feeds.title": "Feed",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "Ultimo controllo:",
     "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "Numero di voci non lette",
     "page.feeds.read_counter": "Numero di voci lette",
     "page.feeds.error_count": [
         "%d errore",
         "%d errori"
     ],
     "page.history.title": "Cronologia",
+    "page.read_entry_count": [
+        "%d read entry",
+        "%d read entries"
+    ],
     "page.import.title": "Importa",
     "page.search.title": "Risultati della ricerca",
     "page.about.title": "Informazioni",
@@ -150,6 +180,8 @@
     "page.keyboard_shortcuts.go_to_feed": "Mostra il feed",
     "page.keyboard_shortcuts.go_to_previous_page": "Mostra la pagina precedente",
     "page.keyboard_shortcuts.go_to_next_page": "Mostra la pagina successiva",
+    "page.keyboard_shortcuts.go_to_bottom_item": "Vai all'elemento in fondo",
+    "page.keyboard_shortcuts.go_to_top_item": "Vai all'elemento principale",
     "page.keyboard_shortcuts.open_item": "Apri l'articolo selezionato",
     "page.keyboard_shortcuts.open_original": "Apri la pagina web originale",
     "page.keyboard_shortcuts.open_original_same_window": "Apri il link originale nella scheda corrente",
@@ -178,8 +210,8 @@
     "page.settings.title": "Impostazioni",
     "page.settings.link_google_account": "Collega il mio account Google",
     "page.settings.unlink_google_account": "Scollega il mio account Google",
-    "page.settings.link_oidc_account": "Collega il mio account OpenID Connect",
-    "page.settings.unlink_oidc_account": "Scollega il mio account OpenID Connect",
+    "page.settings.link_oidc_account": "Collega il mio account %s",
+    "page.settings.unlink_oidc_account": "Scollega il mio account %s",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Passkey Name",
@@ -193,7 +225,7 @@
     ],
     "page.login.title": "Accedi",
     "page.login.google_signin": "Accedi tramite Google",
-    "page.login.oidc_signin": "Accedi tramite OpenID Connect",
+    "page.login.oidc_signin": "Accedi tramite %s",
     "page.login.webauthn_login": "Accedi con passkey",
     "page.login.webauthn_login.error": "Impossibile accedere con passkey",
     "page.integrations.title": "Integrazioni",
@@ -228,6 +260,7 @@
     "alert.no_bookmark": "Nessun preferito disponibile.",
     "alert.no_category": "Nessuna categoria disponibile.",
     "alert.no_category_entry": "Questa categoria non contiene alcun articolo.",
+    "alert.no_tag_entry": "Non ci sono voci corrispondenti a questo tag.",
     "alert.no_feed_entry": "Questo feed non contiene alcun articolo.",
     "alert.no_feed": "Nessun feed disponibile.",
     "alert.no_feed_in_category": "Non esiste un abbonamento per questa categoria.",
@@ -262,6 +295,14 @@
     "error.password_min_length": "La password deve contenere almeno 6 caratteri.",
     "error.settings_mandatory_fields": "Il nome utente, il tema, la lingua ed il fuso orario sono campi obbligatori.",
     "error.settings_reading_speed_is_positive": "Le velocità di lettura devono essere numeri interi positivi.",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "Il numero di articoli per pagina non è valido.",
     "error.feed_mandatory_fields": "L'URL e la categoria sono obbligatori.",
     "error.feed_already_exists": "Questo feed esiste già.",
@@ -286,6 +327,7 @@
     "form.feed.label.title": "Titolo",
     "form.feed.label.site_url": "URL del sito",
     "form.feed.label.feed_url": "URL del feed",
+    "form.feed.label.description": "Descrizione",
     "form.feed.label.category": "Categoria",
     "form.feed.label.crawler": "Scarica il contenuto integrale",
     "form.feed.label.feed_username": "Nome utente del feed",
@@ -300,10 +342,18 @@
     "form.feed.label.urlrewrite_rules": "Regole di riscrittura URL",
     "form.feed.label.ignore_http_cache": "Ignora cache HTTP",
     "form.feed.label.allow_self_signed_certificates": "Consenti certificati autofirmati o non validi",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "Recuperare tramite proxy",
     "form.feed.label.disabled": "Non aggiornare questo feed",
     "form.feed.label.no_media_player": "No media player (audio/video)",
     "form.feed.label.hide_globally": "Nascondere le voci nella lista globale dei non letti",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.fieldset.general": "General",
     "form.feed.fieldset.rules": "Rules",
     "form.feed.fieldset.network_settings": "Network Settings",
@@ -344,11 +394,18 @@
     "form.prefs.label.default_home_page": "Pagina iniziale predefinita",
     "form.prefs.label.categories_sorting_order": "Ordinamento delle categorie",
     "form.prefs.label.mark_read_on_view": "Contrassegna automaticamente le voci come lette quando visualizzate",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "Application Settings",
     "form.prefs.fieldset.authentication_settings": "Authentication Settings",
     "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "File OPML",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "Abilita l'API di Fever",
     "form.integration.fever_username": "Nome utente dell'account Fever",
     "form.integration.fever_password": "Password dell'account Fever",
@@ -401,16 +458,34 @@
     "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
     "form.integration.telegram_bot_disable_notification": "Disable notification",
     "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.linkace_activate": "Salva gli articoli su LinkAce",
+    "form.integration.linkace_endpoint": "Endpoint dell'API di LinkAce",
+    "form.integration.linkace_api_key": "API key dell'account LinkAce",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Rendi i link privati",
+    "form.integration.linkace_check_disabled": "Disabilita i controlli",
     "form.integration.linkding_activate": "Salva gli articoli su Linkding",
     "form.integration.linkding_endpoint": "Endpoint dell'API di Linkding",
     "form.integration.linkding_api_key": "API key dell'account Linkding",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "Segna i preferiti come non letti",
+    "form.integration.linkwarden_activate": "Salva gli articoli su Linkwarden",
+    "form.integration.linkwarden_endpoint": "Endpoint dell'API di Linkwarden",
+    "form.integration.linkwarden_api_key": "API key dell'account Linkwarden",
     "form.integration.matrix_bot_activate": "Trasferimento di nuovi articoli a Matrix",
     "form.integration.matrix_bot_user": "Nome utente per Matrix",
     "form.integration.matrix_bot_password": "Password per l'utente Matrix",
     "form.integration.matrix_bot_url": "URL del server Matrix",
     "form.integration.matrix_bot_chat_id": "ID della stanza Matrix",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Salva gli articoli su Readeck",
+    "form.integration.readeck_endpoint": "Endpoint dell'API di Readeck",
+    "form.integration.readeck_api_key": "API key dell'account Readeck",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "Invia solo URL (invece del contenuto completo)",
     "form.integration.shiori_activate": "Salva gli articoli su Shiori",
     "form.integration.shiori_endpoint": "Endpoint dell'API di Shiori",
     "form.integration.shiori_username": "Nome utente dell'account Shiori",
@@ -424,6 +499,13 @@
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
     "form.api_key.label.description": "Etichetta chiave API",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.submit.loading": "Caricamento in corso...",
     "form.submit.saving": "Salvataggio in corso...",
     "time_elapsed.not_yet": "non ancora",
@@ -453,13 +535,16 @@
         "%d anno fa",
         "%d anni fa"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again."
+    ],
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -478,5 +563,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "Velocità di riproduzione dell'audio/video",
+    "error.settings_media_playback_rate_range": "La velocità di riproduzione non rientra nell'intervallo",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/ja_JP.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "よろしいですか?",
     "confirm.question.refresh": "強制的に更新しますか？",
     "confirm.yes": "はい",
@@ -18,6 +19,8 @@
     "action.home_screen": "ホームスクリーンに追加",
     "tooltip.keyboard_shortcuts": "キーボードショートカット: %s",
     "tooltip.logged_user": "%s としてログイン中",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "未読",
     "menu.starred": "星付き",
     "menu.history": "履歴",
@@ -32,6 +35,7 @@
     "menu.about": "ソフトウェア情報",
     "menu.export": "エクスポート",
     "menu.import": "インポート",
+    "menu.search": "検索",
     "menu.create_category": "カテゴリを作成",
     "menu.mark_page_as_read": "このページを既読にする",
     "menu.mark_all_as_read": "すべて既読にする",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "共有エントリ",
     "search.label": "検索",
     "search.placeholder": "…を検索",
+    "search.submit": "Search",
+    "pagination.last": "Last",
     "pagination.next": "次",
+    "pagination.first": "First",
     "pagination.previous": "前",
     "entry.status.unread": "未読にする",
     "entry.status.read": "既読にする",
@@ -79,36 +86,50 @@
     "entry.shared_entry.title": "公開リンクを開く",
     "entry.shared_entry.label": "共有する",
     "entry.estimated_reading_time": [
-        "%d 分で読めます",
         "%d 分で読めます"
     ],
     "entry.tags.label": "タグ:",
     "page.shared_entries.title": "共有エントリ",
+    "page.shared_entries_count": [
+        "%d shared entry"
+    ],
     "page.unread.title": "未読",
+    "page.unread_entry_count": [
+        "%d unread entry"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total"
+    ],
     "page.starred.title": "星付き",
+    "page.starred_entry_count": [
+        "%d starred entry"
+    ],
     "page.categories.title": "カテゴリ",
     "page.categories.no_feed": "フィードはありません。",
     "page.categories.entries": "記事一覧",
     "page.categories.feeds": "フィード一覧",
     "page.categories.feed_count": [
-        "%d 件のフィードがあります。",
         "%d 件のフィードがあります。"
     ],
-    "page.categories.unread_counter": "未読記事の数",
+    "page.categories_count": [
+        "%d category"
+    ],
     "page.new_category.title": "新規カテゴリ",
     "page.new_user.title": "新規ユーザー",
     "page.edit_category.title": "カテゴリを編集: %s",
     "page.edit_user.title": "ユーザーを編集: %s",
     "page.feeds.title": "フィード一覧",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "最終チェック:",
     "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "未読記事の数",
     "page.feeds.read_counter": "既読記事の数",
     "page.feeds.error_count": [
-        "%d 個のエラー",
         "%d 個のエラー"
     ],
     "page.history.title": "履歴",
+    "page.read_entry_count": [
+        "%d read entry"
+    ],
     "page.import.title": "インポート",
     "page.search.title": "検索結果",
     "page.about.title": "ソフトウェア情報",
@@ -150,6 +171,8 @@
     "page.keyboard_shortcuts.go_to_feed": "フィード",
     "page.keyboard_shortcuts.go_to_previous_page": "前のページ",
     "page.keyboard_shortcuts.go_to_next_page": "次のページ",
+    "page.keyboard_shortcuts.go_to_bottom_item": "一番下の項目に移動",
+    "page.keyboard_shortcuts.go_to_top_item": "先頭の項目に移動",
     "page.keyboard_shortcuts.open_item": "選択されたアイテムを開く",
     "page.keyboard_shortcuts.open_original": "オリジナルのリンクを開く",
     "page.keyboard_shortcuts.open_original_same_window": "現在のタブでオリジナルのリンクを開く",
@@ -178,8 +201,8 @@
     "page.settings.title": "設定",
     "page.settings.link_google_account": "Google アカウントと接続する",
     "page.settings.unlink_google_account": "Google アカウントと接続を解除する",
-    "page.settings.link_oidc_account": "OpenID Connect アカウントと接続する",
-    "page.settings.unlink_oidc_account": "OpenID Connect アカウントと接続を解除する",
+    "page.settings.link_oidc_account": "%s アカウントと接続する",
+    "page.settings.unlink_oidc_account": "%s アカウントと接続を解除する",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Passkey Name",
@@ -188,12 +211,11 @@
     "page.settings.webauthn.register": "パスキーを登録する",
     "page.settings.webauthn.register.error": "パスキーを登録できません",
     "page.settings.webauthn.delete": [
-        "%d 個のパスキーを削除",
         "%d 個のパスキーを削除"
     ],
     "page.login.title": "ログイン",
     "page.login.google_signin": "Google アカウントでログイン",
-    "page.login.oidc_signin": "OpenID Connect アカウントでログイン",
+    "page.login.oidc_signin": "%s アカウントでログイン",
     "page.login.webauthn_login": "パスキーでログイン",
     "page.login.webauthn_login.error": "パスキーでログインできない",
     "page.integrations.title": "連携",
@@ -228,6 +250,7 @@
     "alert.no_bookmark": "現在星付きはありません。",
     "alert.no_category": "カテゴリが存在しません。",
     "alert.no_category_entry": "このカテゴリには記事がありません。",
+    "alert.no_tag_entry": "このタグに一致するエントリーはありません。",
     "alert.no_feed_entry": "このフィードには記事がありません。",
     "alert.no_feed": "何も購読していません。",
     "alert.no_feed_in_category": "このカテゴリには購読中のフィードがありません。",
@@ -269,6 +292,14 @@
     "error.password_min_length": "パスワードは6文字以上である必要があります。",
     "error.settings_mandatory_fields": "ユーザー名、テーマ、言語、タイムゾーンのすべてが必要です。",
     "error.settings_reading_speed_is_positive": "読書速度は正の整数である必要があります。",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "ページあたりの記事数が無効です。",
     "error.feed_mandatory_fields": "URL と カテゴリが必要です。",
     "error.feed_already_exists": "このフィードは既に存在します。",
@@ -286,6 +317,7 @@
     "form.feed.label.title": "タイトル",
     "form.feed.label.site_url": "サイト URL",
     "form.feed.label.feed_url": "フィード URL",
+    "form.feed.label.description": "説明",
     "form.feed.label.category": "カテゴリ",
     "form.feed.label.crawler": "オリジナルの内容を取得",
     "form.feed.label.feed_username": "フィードのユーザー名",
@@ -300,10 +332,18 @@
     "form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
     "form.feed.label.ignore_http_cache": "HTTPキャッシュを無視",
     "form.feed.label.allow_self_signed_certificates": "自己署名証明書または無効な証明書を許可する",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "プロキシ経由で取得",
     "form.feed.label.disabled": "このフィードを更新しない",
     "form.feed.label.no_media_player": "No media player (audio/video)",
     "form.feed.label.hide_globally": "未読一覧に記事を表示しない",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.fieldset.general": "General",
     "form.feed.fieldset.rules": "Rules",
     "form.feed.fieldset.network_settings": "Network Settings",
@@ -344,11 +384,18 @@
     "form.prefs.label.default_home_page": "デフォルトのトップページ",
     "form.prefs.label.categories_sorting_order": "カテゴリの表示順",
     "form.prefs.label.mark_read_on_view": "表示時にエントリを自動的に既読としてマークします",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "Application Settings",
     "form.prefs.fieldset.authentication_settings": "Authentication Settings",
     "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "OPML ファイル",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "Fever API を有効にする",
     "form.integration.fever_username": "Fever のユーザー名",
     "form.integration.fever_password": "Fever のパスワード",
@@ -401,16 +448,34 @@
     "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
     "form.integration.telegram_bot_disable_notification": "Disable notification",
     "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "Linkding に記事を保存する",
     "form.integration.linkding_endpoint": "Linkding の API Endpoint",
     "form.integration.linkding_api_key": "Linkding の API key",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "ブックマークを未読にする",
+    "form.integration.linkwarden_activate": "Linkwarden に記事を保存する",
+    "form.integration.linkwarden_endpoint": "Linkwarden の API Endpoint",
+    "form.integration.linkwarden_api_key": "Linkwarden の API key",
     "form.integration.matrix_bot_activate": "新しい記事をMatrixに転送する",
     "form.integration.matrix_bot_user": "Matrixのユーザー名",
     "form.integration.matrix_bot_password": "Matrixユーザ用パスワード",
     "form.integration.matrix_bot_url": "MatrixサーバーのURL",
     "form.integration.matrix_bot_chat_id": "MatrixルームのID",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Readeck に記事を保存する",
+    "form.integration.readeck_endpoint": "Readeck の API Endpoint",
+    "form.integration.readeck_api_key": "Readeck の API key",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "URL のみを送信 (完全なコンテンツではなく)",
     "form.integration.shiori_activate": "Shiori に記事を保存する",
     "form.integration.shiori_endpoint": "Shiori の API Endpoint",
     "form.integration.shiori_username": "Shiori の ユーザー名",
@@ -423,6 +488,13 @@
     "form.integration.webhook_secret": "Webhook Secret",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "API キーラベル",
     "form.submit.loading": "読み込み中…",
     "form.submit.saving": "保存中…",
@@ -430,36 +502,32 @@
     "time_elapsed.yesterday": "昨日",
     "time_elapsed.now": "今",
     "time_elapsed.minutes": [
-        "%d 分前",
         "%d 分前"
     ],
     "time_elapsed.hours": [
-        "%d 時間前",
         "%d 時間前"
     ],
     "time_elapsed.days": [
-        "%d 日前",
         "%d 日前"
     ],
     "time_elapsed.weeks": [
-        "%d 週間前",
         "%d 週間前"
     ],
     "time_elapsed.months": [
-        "%d か月前",
         "%d か月前"
     ],
     "time_elapsed.years": [
-        "%d 年前",
         "%d 年前"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again."
+    ],
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -478,5 +546,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "オーディオ/ビデオの再生速度",
+    "error.settings_media_playback_rate_range": "再生速度が範囲外",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/nl_NL.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "Weet je het zeker?",
     "confirm.question.refresh": "Wil je een gedwongen vernieuwing uitvoeren?",
     "confirm.yes": "ja",
@@ -18,6 +19,8 @@
     "action.home_screen": "Toevoegen aan startscherm",
     "tooltip.keyboard_shortcuts": "Sneltoets: %s",
     "tooltip.logged_user": "Ingelogd als %s",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "Ongelezen",
     "menu.starred": "Favorieten",
     "menu.history": "Geschiedenis",
@@ -32,6 +35,7 @@
     "menu.about": "Over",
     "menu.export": "Exporteren",
     "menu.import": "Importeren",
+    "menu.search": "Zoeken",
     "menu.create_category": "Categorie toevoegen",
     "menu.mark_page_as_read": "Markeer deze pagina als gelezen",
     "menu.mark_all_as_read": "Markeer alle items als gelezen",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "Gedeelde vermeldingen",
     "search.label": "Zoeken",
     "search.placeholder": "Zoeken...",
+    "search.submit": "Search",
+    "pagination.last": "Last",
     "pagination.next": "Volgende",
+    "pagination.first": "First",
     "pagination.previous": "Vorige",
     "entry.status.unread": "Ongelezen",
     "entry.status.read": "Gelezen",
@@ -84,8 +91,24 @@
     ],
     "entry.tags.label": "Labels:",
     "page.shared_entries.title": "Gedeelde vermeldingen",
+    "page.shared_entries_count": [
+        "%d shared entry",
+        "%d shared entries"
+    ],
     "page.unread.title": "Ongelezen",
+    "page.unread_entry_count": [
+        "%d unread entry",
+        "%d unread entries"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total",
+        "%d entries in total"
+    ],
     "page.starred.title": "Favorieten",
+    "page.starred_entry_count": [
+        "%d starred entry",
+        "%d starred entries"
+    ],
     "page.categories.title": "Categorieën",
     "page.categories.no_feed": "Geen feeds.",
     "page.categories.entries": "Lidwoord",
@@ -94,21 +117,28 @@
         "Er is %d feed.",
         "Er zijn %d feeds."
     ],
-    "page.categories.unread_counter": "Aantal ongelezen vermeldingen",
+    "page.categories_count": [
+        "%d category",
+        "%d categories"
+    ],
     "page.new_category.title": "Nieuwe categorie",
     "page.new_user.title": "Nieuwe gebruiker",
     "page.edit_category.title": "Bewerken van categorie: %s",
     "page.edit_user.title": "Bewerk gebruiker: %s",
     "page.feeds.title": "Feeds",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "Laatste update:",
     "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "Aantal ongelezen vermeldingen",
     "page.feeds.read_counter": "Aantal gelezen vermeldingen",
     "page.feeds.error_count": [
         "%d error",
         "%d errors"
     ],
     "page.history.title": "Geschiedenis",
+    "page.read_entry_count": [
+        "%d read entry",
+        "%d read entries"
+    ],
     "page.import.title": "Importeren",
     "page.login.title": "Inloggen",
     "page.search.title": "Zoekresultaten",
@@ -151,6 +181,8 @@
     "page.keyboard_shortcuts.go_to_feed": "Ga naar feed",
     "page.keyboard_shortcuts.go_to_previous_page": "Vorige pagina",
     "page.keyboard_shortcuts.go_to_next_page": "Volgende pagina",
+    "page.keyboard_shortcuts.go_to_bottom_item": "Ga naar het onderste item",
+    "page.keyboard_shortcuts.go_to_top_item": "Ga naar het bovenste item",
     "page.keyboard_shortcuts.open_item": "Open geselecteerde link",
     "page.keyboard_shortcuts.open_original": "Open originele link",
     "page.keyboard_shortcuts.open_original_same_window": "Oorspronkelijke koppeling op huidig tabblad openen",
@@ -179,8 +211,8 @@
     "page.settings.title": "Instellingen",
     "page.settings.link_google_account": "Koppel mijn Google-account",
     "page.settings.unlink_google_account": "Ontkoppel mijn Google-account",
-    "page.settings.link_oidc_account": "Koppel mijn OpenID Connect-account",
-    "page.settings.unlink_oidc_account": "Ontkoppel mijn OpenID Connect-account",
+    "page.settings.link_oidc_account": "Koppel mijn %s-account",
+    "page.settings.unlink_oidc_account": "Ontkoppel mijn %s-account",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Passkey Name",
@@ -192,7 +224,7 @@
         "Verwijder %d wachtwoord",
         "Verwijder %d wachtwoordsleutels"
     ],
-    "page.login.oidc_signin": "Inloggen via OpenID Connect",
+    "page.login.oidc_signin": "Inloggen via %s",
     "page.login.webauthn_login": "Inloggen met wachtwoord",
     "page.login.webauthn_login.error": "Kan niet inloggen met wachtwoord",
     "page.login.google_signin": "Inloggen via Google",
@@ -228,6 +260,7 @@
     "alert.no_bookmark": "Er zijn op dit moment geen favorieten.",
     "alert.no_category": "Er zijn geen categorieën.",
     "alert.no_category_entry": "Deze categorie bevat geen feeds.",
+    "alert.no_tag_entry": "Er zijn geen items die overeenkomen met deze tag.",
     "alert.no_feed_entry": "Er zijn geen artikelen in deze feed.",
     "alert.no_feed": "Je hebt nog geen feeds geabboneerd staan.",
     "alert.no_feed_in_category": "Er is geen abonnement voor deze categorie.",
@@ -262,6 +295,14 @@
     "error.password_min_length": "Je moet minstens 6 tekens gebruiken.",
     "error.settings_mandatory_fields": "Gebruikersnaam, skin, taal en tijdzone zijn verplicht.",
     "error.settings_reading_speed_is_positive": "De leessnelheden moeten positieve gehele getallen zijn.",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "Het aantal inzendingen per pagina is niet geldig.",
     "error.feed_mandatory_fields": "The URL en de categorie zijn verplicht.",
     "error.feed_already_exists": "Deze feed bestaat al.",
@@ -286,6 +327,7 @@
     "form.feed.label.title": "Naam",
     "form.feed.label.site_url": "Website URL",
     "form.feed.label.feed_url": "Feed URL",
+    "form.feed.label.description": "Beschrijving",
     "form.feed.label.category": "Categorie",
     "form.feed.label.crawler": "Download originele content",
     "form.feed.label.feed_username": "Feed-gebruikersnaam",
@@ -300,10 +342,18 @@
     "form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
     "form.feed.label.ignore_http_cache": "Negeer HTTP-cache",
     "form.feed.label.allow_self_signed_certificates": "Sta zelfondertekende of ongeldige certificaten toe",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "Ophalen via proxy",
     "form.feed.label.disabled": "Vernieuw deze feed niet",
     "form.feed.label.no_media_player": "No media player (audio/video)",
     "form.feed.label.hide_globally": "Verberg items in de globale ongelezen lijst",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.fieldset.general": "General",
     "form.feed.fieldset.rules": "Rules",
     "form.feed.fieldset.network_settings": "Network Settings",
@@ -344,11 +394,18 @@
     "form.prefs.label.default_home_page": "Standaard startpagina",
     "form.prefs.label.categories_sorting_order": "Categorieën sorteren",
     "form.prefs.label.mark_read_on_view": "Items automatisch markeren als gelezen wanneer ze worden bekeken",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "Application Settings",
     "form.prefs.fieldset.authentication_settings": "Authentication Settings",
     "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "OPML-bestand",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "Activeer Fever API",
     "form.integration.fever_username": "Fever gebruikersnaam",
     "form.integration.fever_password": "Fever wachtwoord",
@@ -401,16 +458,34 @@
     "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
     "form.integration.telegram_bot_disable_notification": "Disable notification",
     "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "Opslaan naar Linkding",
     "form.integration.linkding_endpoint": "Linkding URL",
     "form.integration.linkding_api_key": "Linkding API-sleutel",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "Markeer bookmark als gelezen",
+    "form.integration.linkwarden_activate": "Opslaan naar Linkwarden",
+    "form.integration.linkwarden_endpoint": "Linkwarden URL",
+    "form.integration.linkwarden_api_key": "Linkwarden API-sleutel",
     "form.integration.matrix_bot_activate": "Nieuwe artikelen overbrengen naar Matrix",
     "form.integration.matrix_bot_user": "Gebruikersnaam voor Matrix",
     "form.integration.matrix_bot_password": "Wachtwoord voor Matrix-gebruiker",
     "form.integration.matrix_bot_url": "URL van de Matrix-server",
     "form.integration.matrix_bot_chat_id": "ID van Matrix-kamer",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Opslaan naar Readeck",
+    "form.integration.readeck_endpoint": "Readeck URL",
+    "form.integration.readeck_api_key": "Readeck API-sleutel",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "Alleen URL verzenden (in plaats van volledige inhoud)",
     "form.integration.shiori_activate": "Opslaan naar Shiori",
     "form.integration.shiori_endpoint": "Shiori URL",
     "form.integration.shiori_username": "Shiori gebruikersnaam",
@@ -423,6 +498,13 @@
     "form.integration.webhook_secret": "Webhook Secret",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "API-sleutellabel",
     "form.submit.loading": "Laden...",
     "form.submit.saving": "Opslaag...",
@@ -453,13 +535,16 @@
         "%d jaar geleden",
         "%d jaar geleden"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again."
+    ],
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -478,5 +563,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "Afspeelsnelheid van de audio/video",
+    "error.settings_media_playback_rate_range": "Afspeelsnelheid is buiten bereik",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/pl_PL.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "Czy jesteś pewny?",
     "confirm.question.refresh": "Czy chcesz wymusić odświeżenie?",
     "confirm.yes": "tak",
@@ -18,6 +19,8 @@
     "action.home_screen": "Dodaj do ekranu głównego",
     "tooltip.keyboard_shortcuts": "Skróty klawiszowe: %s",
     "tooltip.logged_user": "Zalogowany jako %s",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "Nieprzeczytane",
     "menu.starred": "Ulubione",
     "menu.history": "Historia",
@@ -32,6 +35,7 @@
     "menu.about": "O stronie",
     "menu.export": "Eksportuj",
     "menu.import": "Importuj",
+    "menu.search": "Szukaj",
     "menu.create_category": "Utwórz kategorię",
     "menu.mark_page_as_read": "Oznacz jako przeczytane",
     "menu.mark_all_as_read": "Oznacz wszystko jako przeczytane",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "Udostępnione wpisy",
     "search.label": "Szukaj",
     "search.placeholder": "Szukaj...",
+    "search.submit": "Search",
+    "pagination.last": "Ostatni",
     "pagination.next": "Następny",
+    "pagination.first": "Pierwszy",
     "pagination.previous": "Poprzedni",
     "entry.status.unread": "Nieprzeczytane",
     "entry.status.read": "Przeczytane",
@@ -80,12 +87,33 @@
     "entry.shared_entry.label": "Udostępnianie",
     "entry.estimated_reading_time": [
         "%d minuta czytania",
+        "%d minuty czytania",
         "%d minut czytania"
     ],
     "entry.tags.label": "Tagi:",
     "page.shared_entries.title": "Udostępnione wpisy",
+    "page.shared_entries_count": [
+        "%d shared entry",
+        "%d shared entry",
+        "%d shared entries"
+    ],
     "page.unread.title": "Nieprzeczytane",
+    "page.unread_entry_count": [
+        "%d unread entry",
+        "%d unread entry",
+        "%d unread entries"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total",
+        "%d entry in total",
+        "%d entries in total"
+    ],
     "page.starred.title": "Oznaczone gwiazdką",
+    "page.starred_entry_count": [
+        "%d starred entry",
+        "%d starred entry",
+        "%d starred entries"
+    ],
     "page.categories.title": "Kategorie",
     "page.categories.no_feed": "Brak kanałów.",
     "page.categories.entries": "Artykuły",
@@ -95,15 +123,19 @@
         "Są %d kanały.",
         "Jest %d kanałów."
     ],
-    "page.categories.unread_counter": "Liczba nieprzeczytanych wpisów",
+    "page.categories_count": [
+        "%d category",
+        "%d category",
+        "%d categories"
+    ],
     "page.new_category.title": "Nowa kategoria",
     "page.new_user.title": "Nowy użytkownik",
     "page.edit_category.title": "Edycja Kategorii: %s",
     "page.edit_user.title": "Edytuj użytkownika: %s",
     "page.feeds.title": "Kanały",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "Ostatnia aktualizacja:",
     "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "Liczba nieprzeczytanych wpisów",
     "page.feeds.read_counter": "Liczba przeczytanych wpisów",
     "page.feeds.error_count": [
         "%d błąd",
@@ -111,6 +143,11 @@
         "%d błędów"
     ],
     "page.history.title": "Historia",
+    "page.read_entry_count": [
+        "%d read entry",
+        "%d read entry",
+        "%d read entries"
+    ],
     "page.import.title": "Importuj",
     "page.search.title": "Wyniki wyszukiwania",
     "page.about.title": "O",
@@ -152,6 +189,8 @@
     "page.keyboard_shortcuts.go_to_feed": "Przejdź do subskrypcji",
     "page.keyboard_shortcuts.go_to_previous_page": "Przejdź do poprzedniej strony",
     "page.keyboard_shortcuts.go_to_next_page": "Przejdź do następnej strony",
+    "page.keyboard_shortcuts.go_to_bottom_item": "Przejdź do dolnego elementu",
+    "page.keyboard_shortcuts.go_to_top_item": "Przejdź do najwyższego elementu",
     "page.keyboard_shortcuts.open_item": "Otwórz zaznaczony artykuł",
     "page.keyboard_shortcuts.open_original": "Otwórz oryginalny artykuł",
     "page.keyboard_shortcuts.open_original_same_window": "Otwórz oryginalny link w bieżącej karcie",
@@ -180,8 +219,8 @@
     "page.settings.title": "Ustawienia",
     "page.settings.link_google_account": "Połącz z moim kontem Google",
     "page.settings.unlink_google_account": "Odłącz moje konto Google",
-    "page.settings.link_oidc_account": "Połącz z moim kontem OpenID Connect",
-    "page.settings.unlink_oidc_account": "Odłącz moje konto OpenID Connect",
+    "page.settings.link_oidc_account": "Połącz z moim kontem %s",
+    "page.settings.unlink_oidc_account": "Odłącz moje konto %s",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Passkey Name",
@@ -196,7 +235,7 @@
     ],
     "page.login.title": "Zaloguj się",
     "page.login.google_signin": "Zaloguj przez Google",
-    "page.login.oidc_signin": "Zaloguj przez OpenID Connect",
+    "page.login.oidc_signin": "Zaloguj przez %s",
     "page.login.webauthn_login": "Zaloguj się za pomocą hasła",
     "page.login.webauthn_login.error": "Nie można zalogować się za pomocą klucza dostępu",
     "page.integrations.title": "Usługi",
@@ -231,6 +270,7 @@
     "alert.no_bookmark": "Obecnie nie ma żadnych zakładek.",
     "alert.no_category": "Nie ma żadnej kategorii!",
     "alert.no_category_entry": "W tej kategorii nie ma żadnych artykułów",
+    "alert.no_tag_entry": "Nie ma wpisów pasujących do tego tagu.",
     "alert.no_feed_entry": "Nie ma artykułu dla tego kanału.",
     "alert.no_feed": "Nie masz żadnej subskrypcji.",
     "alert.no_feed_in_category": "Nie ma subskrypcji dla tej kategorii.",
@@ -265,6 +305,14 @@
     "error.password_min_length": "Musisz użyć co najmniej 6 znaków.",
     "error.settings_mandatory_fields": "Pola nazwy użytkownika, tematu, języka i strefy czasowej są obowiązkowe.",
     "error.settings_reading_speed_is_positive": "Prędkości odczytu muszą być dodatnimi liczbami całkowitymi.",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "Liczba wpisów na stronę jest nieprawidłowa.",
     "error.feed_mandatory_fields": "URL i kategoria są obowiązkowe.",
     "error.feed_already_exists": "Ten kanał już istnieje.",
@@ -289,6 +337,7 @@
     "form.feed.label.title": "Tytuł",
     "form.feed.label.site_url": "URL strony",
     "form.feed.label.feed_url": "URL kanału",
+    "form.feed.label.description": "Opis",
     "form.feed.label.category": "Kategoria",
     "form.feed.label.crawler": "Pobierz oryginalną treść",
     "form.feed.label.feed_username": "Subskrypcję nazwa użytkownika",
@@ -303,10 +352,18 @@
     "form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
     "form.feed.label.ignore_http_cache": "Zignoruj ​​pamięć podręczną HTTP",
     "form.feed.label.allow_self_signed_certificates": "Zezwalaj na certyfikaty z podpisem własnym lub nieprawidłowe certyfikaty",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "Pobierz przez proxy",
     "form.feed.label.disabled": "Nie odświeżaj tego kanału",
     "form.feed.label.no_media_player": "No media player (audio/video)",
     "form.feed.label.hide_globally": "Ukryj wpisy na globalnej liście nieprzeczytanych",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.fieldset.general": "General",
     "form.feed.fieldset.rules": "Rules",
     "form.feed.fieldset.network_settings": "Network Settings",
@@ -347,11 +404,18 @@
     "form.prefs.label.default_home_page": "Domyślna strona główna",
     "form.prefs.label.categories_sorting_order": "Sortowanie kategorii",
     "form.prefs.label.mark_read_on_view": "Automatycznie oznaczaj wpisy jako przeczytane podczas przeglądania",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "Application Settings",
     "form.prefs.fieldset.authentication_settings": "Authentication Settings",
     "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "Plik OPML",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "Aktywuj Fever API",
     "form.integration.fever_username": "Login do Fever",
     "form.integration.fever_password": "Hasło do Fever",
@@ -404,16 +468,34 @@
     "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
     "form.integration.telegram_bot_disable_notification": "Disable notification",
     "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "Zapisz artykuły do Linkding",
     "form.integration.linkding_endpoint": "Linkding URL",
     "form.integration.linkding_api_key": "Linkding API key",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "Zaznacz zakładkę jako nieprzeczytaną",
+    "form.integration.linkwarden_activate": "Zapisz artykuły do Linkwarden",
+    "form.integration.linkwarden_endpoint": "Linkwarden URL",
+    "form.integration.linkwarden_api_key": "Linkwarden API key",
     "form.integration.matrix_bot_activate": "Przenieś nowe artykuły do Matrix",
     "form.integration.matrix_bot_user": "Nazwa użytkownika dla Matrix",
     "form.integration.matrix_bot_password": "Hasło dla użytkownika Matrix",
     "form.integration.matrix_bot_url": "URL serwera Matrix",
     "form.integration.matrix_bot_chat_id": "Identyfikator pokoju Matrix",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Zapisz artykuły do Readeck",
+    "form.integration.readeck_endpoint": "Readeck URL",
+    "form.integration.readeck_api_key": "Readeck API key",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "Wyślij tylko adres URL (zamiast pełnej treści)",
     "form.integration.shiori_activate": "Zapisz artykuły do Shiori",
     "form.integration.shiori_endpoint": "Shiori URL",
     "form.integration.shiori_username": "Login do Shiori",
@@ -426,6 +508,13 @@
     "form.integration.webhook_secret": "Webhook Secret",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "Etykieta klucza API",
     "form.submit.loading": "Ładowanie...",
     "form.submit.saving": "Zapisywanie...",
@@ -462,13 +551,17 @@
         "%d lat temu",
         "%d lat temu"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again."
+    ],
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -487,5 +580,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "Prędkość odtwarzania audio/wideo",
+    "error.settings_media_playback_rate_range": "Prędkość odtwarzania jest poza zakresem",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/pt_BR.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "Tem certeza?",
     "confirm.question.refresh": "Você deseja forçar a atualização?",
     "confirm.yes": "Sim",
@@ -18,6 +19,8 @@
     "action.home_screen": "Voltar para a tela inicial",
     "tooltip.keyboard_shortcuts": "Atalho do teclado: %s",
     "tooltip.logged_user": "Autenticado como %s",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "Não lido",
     "menu.starred": "Favoritos",
     "menu.history": "Histórico",
@@ -32,6 +35,7 @@
     "menu.about": "Sobre",
     "menu.export": "Exportar",
     "menu.import": "Importar",
+    "menu.search": "Buscar",
     "menu.create_category": "Criar uma categoria",
     "menu.mark_page_as_read": "Marcar essa página como lida",
     "menu.mark_all_as_read": "Marcar todos como lido",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "Itens compartilhados",
     "search.label": "Buscar",
     "search.placeholder": "Buscar por...",
+    "search.submit": "Search",
+    "pagination.last": "Last",
     "pagination.next": "Próximo",
+    "pagination.first": "First",
     "pagination.previous": "Anterior",
     "entry.status.unread": "Não lido",
     "entry.status.read": "Lido",
@@ -84,8 +91,24 @@
     ],
     "entry.tags.label": "Etiquetas:",
     "page.shared_entries.title": "Itens compartilhados",
+    "page.shared_entries_count": [
+        "%d shared entry",
+        "%d shared entries"
+    ],
     "page.unread.title": "Não lidos",
+    "page.unread_entry_count": [
+        "%d unread entry",
+        "%d unread entries"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total",
+        "%d entries in total"
+    ],
     "page.starred.title": "Favoritos",
+    "page.starred_entry_count": [
+        "%d starred entry",
+        "%d starred entries"
+    ],
     "page.categories.title": "Categorias",
     "page.categories.no_feed": "Sem fonte.",
     "page.categories.entries": "Itens",
@@ -94,21 +117,28 @@
         "Existe %d fonte.",
         "Existem %d fontes."
     ],
-    "page.categories.unread_counter": "Numero de itens não lidos",
+    "page.categories_count": [
+        "%d category",
+        "%d categories"
+    ],
     "page.new_category.title": "Nova categoria",
     "page.new_user.title": "Novo usuário",
     "page.edit_category.title": "Editar categoria: %s",
     "page.edit_user.title": "Editar usuário: %s",
     "page.feeds.title": "Fontes",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "Última verificação:",
     "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "Numero de itens não lidos",
     "page.feeds.read_counter": "Número de itens lidos",
     "page.feeds.error_count": [
         "%d erro",
         "%d erros"
     ],
     "page.history.title": "Histórico",
+    "page.read_entry_count": [
+        "%d read entry",
+        "%d read entries"
+    ],
     "page.import.title": "Importar",
     "page.search.title": "Resultados da busca",
     "page.about.title": "Sobre",
@@ -150,6 +180,8 @@
     "page.keyboard_shortcuts.go_to_feed": "Ir a fonte",
     "page.keyboard_shortcuts.go_to_previous_page": "Ir a página anterior",
     "page.keyboard_shortcuts.go_to_next_page": "Ir a página seguinte",
+    "page.keyboard_shortcuts.go_to_bottom_item": "Ir para o item inferior",
+    "page.keyboard_shortcuts.go_to_top_item": "Ir para o item superior",
     "page.keyboard_shortcuts.open_item": "Abrir o item selecionado",
     "page.keyboard_shortcuts.open_original": "Abrir o conteúdo original",
     "page.keyboard_shortcuts.open_original_same_window": "Abrir o conteúdo original na janela atual",
@@ -178,8 +210,8 @@
     "page.settings.title": "Ajustes",
     "page.settings.link_google_account": "Vincular minha conta do Google",
     "page.settings.unlink_google_account": "Desvincular minha conta do Google",
-    "page.settings.link_oidc_account": "Vincular minha conta do OpenID Connect",
-    "page.settings.unlink_oidc_account": "Desvincular minha conta do OpenID Connect",
+    "page.settings.link_oidc_account": "Vincular minha conta do %s",
+    "page.settings.unlink_oidc_account": "Desvincular minha conta do %s",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Passkey Name",
@@ -193,7 +225,7 @@
     ],
     "page.login.title": "Iniciar Sessão",
     "page.login.google_signin": "Iniciar Sessão com sua conta do Google",
-    "page.login.oidc_signin": "Iniciar Sessão com sua conta do OpenID Connect",
+    "page.login.oidc_signin": "Iniciar Sessão com sua conta do %s",
     "page.login.webauthn_login": "Entrar com senha",
     "page.login.webauthn_login.error": "Não é possível fazer login com senha",
     "page.integrations.title": "Integrações",
@@ -228,6 +260,7 @@
     "alert.no_bookmark": "Não há favorito neste momento.",
     "alert.no_category": "Não há categoria.",
     "alert.no_category_entry": "Não há itens nesta categoria.",
+    "alert.no_tag_entry": "Não há itens que correspondam a esta etiqueta.",
     "alert.no_feed_entry": "Não há itens nessa fonte.",
     "alert.no_feed": "Não há inscrições.",
     "alert.no_feed_in_category": "Não há inscrições nessa categoria.",
@@ -262,6 +295,14 @@
     "error.password_min_length": "A senha deve ter no mínimo 6 caracteres.",
     "error.settings_mandatory_fields": "Os campos de nome de usuário, tema, idioma e fuso horário são obrigatórios.",
     "error.settings_reading_speed_is_positive": "As velocidades de leitura devem ser inteiros positivos.",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "O número de itens por página é inválido.",
     "error.feed_mandatory_fields": "O campo de URL e categoria são obrigatórios.",
     "error.feed_already_exists": "Este feed já existe.",
@@ -286,6 +327,7 @@
     "form.feed.label.title": "Título",
     "form.feed.label.site_url": "URL do site",
     "form.feed.label.feed_url": "URL da fonte",
+    "form.feed.label.description": "Descrição",
     "form.feed.label.category": "Categoria",
     "form.feed.label.crawler": "Obter conteúdo original",
     "form.feed.label.feed_username": "Nome de usuário da fonte",
@@ -300,10 +342,18 @@
     "form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
     "form.feed.label.ignore_http_cache": "Ignorar cache HTTP",
     "form.feed.label.allow_self_signed_certificates": "Permitir certificados autoassinados ou inválidos",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.disabled": "Não atualizar esta fonte",
     "form.feed.label.no_media_player": "No media player (audio/video)",
     "form.feed.label.fetch_via_proxy": "Buscar via proxy",
     "form.feed.label.hide_globally": "Ocultar entradas na lista global não lida",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.fieldset.general": "General",
     "form.feed.fieldset.rules": "Rules",
     "form.feed.fieldset.network_settings": "Network Settings",
@@ -344,11 +394,18 @@
     "form.prefs.label.default_home_page": "Página inicial predefinida",
     "form.prefs.label.categories_sorting_order": "Classificação das categorias",
     "form.prefs.label.mark_read_on_view": "Marcar automaticamente as entradas como lidas quando visualizadas",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "Application Settings",
     "form.prefs.fieldset.authentication_settings": "Authentication Settings",
     "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "Arquivo OPML",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "Ativar API do Fever",
     "form.integration.fever_username": "Nome de usuário do Fever",
     "form.integration.fever_password": "Senha do Fever",
@@ -401,16 +458,34 @@
     "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
     "form.integration.telegram_bot_disable_notification": "Disable notification",
     "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "Salvar itens no Linkding",
     "form.integration.linkding_endpoint": "Endpoint de API do Linkding",
     "form.integration.linkding_api_key": "Chave de API do Linkding",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "Salvar marcador como não lido",
+    "form.integration.linkwarden_activate": "Salvar itens no Linkwarden",
+    "form.integration.linkwarden_endpoint": "Endpoint de API do Linkwarden",
+    "form.integration.linkwarden_api_key": "Chave de API do Linkwarden",
     "form.integration.matrix_bot_activate": "Transferir novos artigos para o Matrix",
     "form.integration.matrix_bot_user": "Nome de utilizador para Matrix",
     "form.integration.matrix_bot_password": "Palavra-passe para utilizador da Matrix",
     "form.integration.matrix_bot_url": "URL do servidor Matrix",
     "form.integration.matrix_bot_chat_id": "Identificação da sala Matrix",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Salvar itens no Readeck",
+    "form.integration.readeck_endpoint": "Endpoint de API do Readeck",
+    "form.integration.readeck_api_key": "Chave de API do Readeck",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "Enviar apenas URL (em vez de conteúdo completo)",
     "form.integration.shiori_activate": "Salvar itens no Shiori",
     "form.integration.shiori_endpoint": "Endpoint da API do Shiori",
     "form.integration.shiori_username": "Nome de usuário do Shiori",
@@ -423,6 +498,13 @@
     "form.integration.webhook_secret": "Webhook Secret",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "Etiqueta da chave de API",
     "form.submit.loading": "Carregando...",
     "form.submit.saving": "Salvando...",
@@ -453,13 +535,16 @@
         "há %d ano",
         "há %d anos"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again."
+    ],
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -478,5 +563,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "Velocidade de reprodução do áudio/vídeo",
+    "error.settings_media_playback_rate_range": "A velocidade de reprodução está fora do intervalo",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/ru_RU.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "Вы уверены?",
     "confirm.question.refresh": "Вы хотите выполнить принудительное обновление?",
     "confirm.yes": "да",
@@ -18,6 +19,8 @@
     "action.home_screen": "Добавить на домашний экран",
     "tooltip.keyboard_shortcuts": "Сочетания клавиш: %s",
     "tooltip.logged_user": "Авторизован как %s",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "Непрочитанное",
     "menu.starred": "Избранное",
     "menu.history": "История",
@@ -32,6 +35,7 @@
     "menu.about": "О приложении",
     "menu.export": "Экспорт",
     "menu.import": "Импорт",
+    "menu.search": "Поиск",
     "menu.create_category": "Создать категорию",
     "menu.mark_page_as_read": "Отметить эту страницу прочитанной",
     "menu.mark_all_as_read": "Отметить всё как прочитанное",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "Общие записи",
     "search.label": "Поиск",
     "search.placeholder": "Поиск…",
+    "search.submit": "Search",
+    "pagination.last": "Last",
     "pagination.next": "Следующая",
+    "pagination.first": "First",
     "pagination.previous": "Предыдущая",
     "entry.status.unread": "Не прочитано",
     "entry.status.read": "Прочитано",
@@ -80,12 +87,33 @@
     "entry.shared_entry.label": "Поделиться",
     "entry.estimated_reading_time": [
         "%d минута чтения",
+        "%d минуты чтения",
         "%d минут чтения"
     ],
     "entry.tags.label": "Теги:",
     "page.shared_entries.title": "Общедоступные статьи",
+    "page.shared_entries_count": [
+        "%d shared entry",
+        "%d shared entries",
+        "%d shared entries"
+    ],
     "page.unread.title": "Непрочитанное",
+    "page.unread_entry_count": [
+        "%d unread entry",
+        "%d unread entries",
+        "%d unread entries"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total",
+        "%d entries in total",
+        "%d entries in total"
+    ],
     "page.starred.title": "Избранное",
+    "page.starred_entry_count": [
+        "%d starred entry",
+        "%d starred entries",
+        "%d starred entries"
+    ],
     "page.categories.title": "Категории",
     "page.categories.no_feed": "Нет подписок.",
     "page.categories.entries": "Cтатьи",
@@ -95,15 +123,19 @@
         "Есть %d подписки.",
         "Есть %d подписок."
     ],
-    "page.categories.unread_counter": "Количество непрочитанных статей",
+    "page.categories_count": [
+        "%d category",
+        "%d categories",
+        "%d categories"
+    ],
     "page.new_category.title": "Новая категория",
     "page.new_user.title": "Новый пользователь",
     "page.edit_category.title": "Изменить категорию: %s",
     "page.edit_user.title": "Изменить пользователя: %s",
     "page.feeds.title": "Подписки",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "Последняя проверка:",
     "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "Количество непрочитанных статей",
     "page.feeds.read_counter": "Количество прочитанных статей",
     "page.feeds.error_count": [
         "%d ошибка",
@@ -111,6 +143,11 @@
         "%d ошибок"
     ],
     "page.history.title": "История",
+    "page.read_entry_count": [
+        "%d read entry",
+        "%d read entries",
+        "%d read entries"
+    ],
     "page.import.title": "Импорт",
     "page.search.title": "Результаты поиска",
     "page.about.title": "О приложении",
@@ -152,6 +189,8 @@
     "page.keyboard_shortcuts.go_to_feed": "Перейти к подписке",
     "page.keyboard_shortcuts.go_to_previous_page": "Перейти к предыдущей странице",
     "page.keyboard_shortcuts.go_to_next_page": "Перейти к следующей странице",
+    "page.keyboard_shortcuts.go_to_bottom_item": "Перейти к нижнему элементу",
+    "page.keyboard_shortcuts.go_to_top_item": "Перейти к верхнему элементу",
     "page.keyboard_shortcuts.open_item": "Открыть выбранный элемент",
     "page.keyboard_shortcuts.open_original_same_window": "Открыть оригинальную ссылку в текущей вкладке",
     "page.keyboard_shortcuts.open_original": "Открыть оригинальную ссылку",
@@ -180,8 +219,8 @@
     "page.settings.title": "Настройки",
     "page.settings.link_google_account": "Привязать мой Google аккаунт",
     "page.settings.unlink_google_account": "Отвязать мой Google аккаунт",
-    "page.settings.link_oidc_account": "Привязать мой OpenID Connect аккаунт",
-    "page.settings.unlink_oidc_account": "Отвязать мой OpenID Connect аккаунт",
+    "page.settings.link_oidc_account": "Привязать мой %s аккаунт",
+    "page.settings.unlink_oidc_account": "Отвязать мой %s аккаунт",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Passkey Name",
@@ -196,7 +235,7 @@
     ],
     "page.login.title": "Войти",
     "page.login.google_signin": "Войти с помощью Google",
-    "page.login.oidc_signin": "Войти с помощью OpenID Connect",
+    "page.login.oidc_signin": "Войти с помощью %s",
     "page.login.webauthn_login": "Войти с паролем",
     "page.login.webauthn_login.error": "Невозможно войти с паролем",
     "page.integrations.title": "Интеграции",
@@ -231,6 +270,7 @@
     "alert.no_bookmark": "Избранное отсутствует.",
     "alert.no_category": "Категории отсутствуют.",
     "alert.no_category_entry": "В этой категории нет статей.",
+    "alert.no_tag_entry": "Нет записей, соответствующих этому тегу.",
     "alert.no_feed_entry": "В этой подписке отсутствуют статьи.",
     "alert.no_feed": "У вас нет ни одной подписки.",
     "alert.no_feed_in_category": "Для этой категории нет подписки.",
@@ -265,6 +305,14 @@
     "error.password_min_length": "Вы должны использовать минимум 6 символов.",
     "error.settings_mandatory_fields": "Имя пользователя, тема, язык и часовой пояс обязательны.",
     "error.settings_reading_speed_is_positive": "Скорость чтения должна быть целым положительным числом.",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "Недопустимое значение количества записей на странице.",
     "error.feed_mandatory_fields": "Ссылка и категория обязательны.",
     "error.feed_already_exists": "Эта подписка уже существует.",
@@ -289,6 +337,7 @@
     "form.feed.label.title": "Название",
     "form.feed.label.site_url": "Адрес сайта",
     "form.feed.label.feed_url": "Адрес подписки",
+    "form.feed.label.description": "Описание",
     "form.feed.label.category": "Категория",
     "form.feed.label.crawler": "Извлечь оригинальное содержимое",
     "form.feed.label.feed_username": "Имя пользователя подписки",
@@ -303,10 +352,18 @@
     "form.feed.label.apprise_service_urls": "Список ссылок сервисов Apprise, разделенный запятой",
     "form.feed.label.ignore_http_cache": "Игнорировать HTTP кеш",
     "form.feed.label.allow_self_signed_certificates": "Разрешить самоподписанные или недействительные сертификаты",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "Использовать прокси",
     "form.feed.label.disabled": "Не обновлять эту подписку",
     "form.feed.label.no_media_player": "Отключить медиаплеер (аудио и видео)",
     "form.feed.label.hide_globally": "Скрыть записи в глобальном списке непрочитанных",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.fieldset.general": "General",
     "form.feed.fieldset.rules": "Rules",
     "form.feed.fieldset.network_settings": "Network Settings",
@@ -347,11 +404,18 @@
     "form.prefs.label.default_home_page": "Домашняя страница по умолчанию",
     "form.prefs.label.categories_sorting_order": "Сортировка категорий",
     "form.prefs.label.mark_read_on_view": "Автоматически отмечать записи как прочитанные при просмотре",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "Application Settings",
     "form.prefs.fieldset.authentication_settings": "Authentication Settings",
     "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "OPML файл",
     "form.import.label.url": "Ссылка",
+    "form.integration.betula_activate": "Сохранять статьи в Бетулу",
+    "form.integration.betula_url": "Адрес сервера Бетулы",
+    "form.integration.betula_token": "Токен Бетулы",
     "form.integration.fever_activate": "Активировать Fever API",
     "form.integration.fever_username": "Имя пользователя Fever",
     "form.integration.fever_password": "Пароль Fever",
@@ -404,16 +468,34 @@
     "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
     "form.integration.telegram_bot_disable_notification": "Disable notification",
     "form.integration.telegram_bot_disable_buttons": "Disable buttons",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "Сохранять статьи в Linkding",
     "form.integration.linkding_endpoint": "Конечная точка Linkding API",
     "form.integration.linkding_api_key": "API-ключ Linkding",
     "form.integration.linkding_tags": "Теги Linkding",
     "form.integration.linkding_bookmark": "Помечать закладки как непрочитанное",
+    "form.integration.linkwarden_activate": "Сохранять статьи в Linkwarden",
+    "form.integration.linkwarden_endpoint": "Конечная точка Linkwarden API",
+    "form.integration.linkwarden_api_key": "API-ключ Linkwarden",
     "form.integration.matrix_bot_activate": "Репостить новые статьи в Matrix",
     "form.integration.matrix_bot_user": "Имя пользователя Matrix",
     "form.integration.matrix_bot_password": "Пароль пользователя Matrix",
     "form.integration.matrix_bot_url": "Ссылка на сервер Matrix",
     "form.integration.matrix_bot_chat_id": "ID комнаты Matrix",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Сохранять статьи в Readeck",
+    "form.integration.readeck_endpoint": "Конечная точка Readeck API",
+    "form.integration.readeck_api_key": "API-ключ Readeck",
+    "form.integration.readeck_labels": "Теги Readeck",
+    "form.integration.readeck_only_url": "Отправлять только ссылку (без содержимого)",
     "form.integration.shiori_activate": "Сохранять статьи в Shiori",
     "form.integration.shiori_endpoint": "Конечная точка Shiori API",
     "form.integration.shiori_username": "Имя пользователя Shiori",
@@ -426,6 +508,13 @@
     "form.integration.webhook_secret": "Секретный ключ для вебхуков",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "Описание API-ключа",
     "form.submit.loading": "Загрузка…",
     "form.submit.saving": "Сохранение…",
@@ -462,13 +551,17 @@
         "%d года назад",
         "%d лет назад"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again."
+    ],
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -487,5 +580,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "Скорость воспроизведения аудио/видео",
+    "error.settings_media_playback_rate_range": "Скорость воспроизведения выходит за пределы диапазона",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/uk_UA.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "Ви впевнені?",
     "confirm.question.refresh": "Ви хочете змусити оновити?",
     "confirm.yes": "так",
@@ -18,6 +19,8 @@
     "action.home_screen": "Додати до головного екрану",
     "tooltip.keyboard_shortcuts": "Комбінація клавіш: %s",
     "tooltip.logged_user": "Здійснено вхід як %s",
+    "menu.title": "Menu",
+    "menu.home_page": "Home page",
     "menu.unread": "Непрочитане",
     "menu.starred": "З зірочкою",
     "menu.history": "Історія",
@@ -32,6 +35,7 @@
     "menu.about": "Про додаток",
     "menu.export": "Експорт",
     "menu.import": "Імпорт",
+    "menu.search": "Пошук",
     "menu.create_category": "Створити категорію",
     "menu.mark_page_as_read": "Відмітити цю сторінку як прочитане",
     "menu.mark_all_as_read": "Відмітити все як прочитане",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "Спільні записи",
     "search.label": "Пошук",
     "search.placeholder": "Шукати...",
+    "search.submit": "Search",
+    "pagination.last": "Last",
     "pagination.next": "Вперед",
+    "pagination.first": "First",
     "pagination.previous": "Назад",
     "entry.status.unread": "Непрочитане",
     "entry.status.read": "Прочитане",
@@ -85,8 +92,28 @@
     ],
     "entry.tags.label": "Теги:",
     "page.shared_entries.title": "Спильні записи",
+    "page.shared_entries_count": [
+        "%d shared entry",
+        "%d shared entries",
+        "%d shared entries"
+    ],
     "page.unread.title": "Непрочитане",
+    "page.unread_entry_count": [
+        "%d unread entry",
+        "%d unread entries",
+        "%d unread entries"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total",
+        "%d entries in total",
+        "%d entries in total"
+    ],
     "page.starred.title": "З зірочкою",
+    "page.starred_entry_count": [
+        "%d starred entry",
+        "%d starred entries",
+        "%d starred entries"
+    ],
     "page.categories.title": "Категорії",
     "page.categories.no_feed": "Немає стрічки.",
     "page.categories.entries": "Статті",
@@ -96,15 +123,19 @@
         "Містить %d стрічки.",
         "Містить %d стрічок."
     ],
-    "page.categories.unread_counter": "Кількість непрочитаних записів",
+    "page.categories_count": [
+        "%d category",
+        "%d categories",
+        "%d categories"
+    ],
     "page.new_category.title": "Нова категорія",
     "page.new_user.title": "Новий користувач",
     "page.edit_category.title": "Редагування категорії: %s",
     "page.edit_user.title": "Редагування користувача: %s",
     "page.feeds.title": "Стрічки",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "Остання перевірка:",
     "page.feeds.next_check": "Next check:",
-    "page.feeds.unread_counter": "Кількість непрочитаних записів",
     "page.feeds.read_counter": "Кількість прочитаних записів",
     "page.feeds.error_count": [
         "%d помилка",
@@ -112,6 +143,11 @@
         "%d помилок"
     ],
     "page.history.title": "Історія",
+    "page.read_entry_count": [
+        "%d read entry",
+        "%d read entries",
+        "%d read entries"
+    ],
     "page.import.title": "Імпорт",
     "page.search.title": "Результати пошуку",
     "page.about.title": "Про додадок",
@@ -153,6 +189,8 @@
     "page.keyboard_shortcuts.go_to_feed": "Перейти до стрічки",
     "page.keyboard_shortcuts.go_to_previous_page": "Перейти до попередньої сторінки",
     "page.keyboard_shortcuts.go_to_next_page": "Перейти до наступної сторінки",
+    "page.keyboard_shortcuts.go_to_bottom_item": "Перейти до нижнього пункту",
+    "page.keyboard_shortcuts.go_to_top_item": "Перейти до верхнього пункту",
     "page.keyboard_shortcuts.open_item": "Відкрити виділений запис",
     "page.keyboard_shortcuts.open_original": "Відкрити оригінальне посилання",
     "page.keyboard_shortcuts.open_original_same_window": "Відкрити оригінальне посилання в поточній вкладці",
@@ -181,8 +219,8 @@
     "page.settings.title": "Налаштування ",
     "page.settings.link_google_account": "Підключити мій обліковий запис Google",
     "page.settings.unlink_google_account": "Відключити мій обліковий запис Google",
-    "page.settings.link_oidc_account": "Підключити мій обліковий запис OpenID Connect",
-    "page.settings.unlink_oidc_account": "Відключити мій обліковий запис OpenID Connect",
+    "page.settings.link_oidc_account": "Підключити мій обліковий запис %s",
+    "page.settings.unlink_oidc_account": "Відключити мій обліковий запис %s",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "Actions",
     "page.settings.webauthn.passkey_name": "Passkey Name",
@@ -197,7 +235,7 @@
     ],
     "page.login.title": "Вхід",
     "page.login.google_signin": "Увійти через Google",
-    "page.login.oidc_signin": "Увійти через OpenID Connect",
+    "page.login.oidc_signin": "Увійти через %s",
     "page.login.webauthn_login": "Увійти за допомогою пароля",
     "page.login.webauthn_login.error": "Неможливо ввійти за допомогою ключа доступу",
     "page.integrations.title": "Інтеграції",
@@ -232,6 +270,7 @@
     "alert.no_bookmark": "Наразі закладки відсутні.",
     "alert.no_category": "Немає категорії.",
     "alert.no_category_entry": "У цій категорії немає записів.",
+    "alert.no_tag_entry": "Немає записів, що відповідають цьому тегу.",
     "alert.no_feed_entry": "У цій стрічці немає записів.",
     "alert.no_feed": "У вас немає підписок.",
     "alert.no_feed_in_category": "У цій категорії немає підписок.",
@@ -273,6 +312,14 @@
     "error.password_min_length": "Пароль має складати щонайменше 6 символів.",
     "error.settings_mandatory_fields": "Поля імені, теми, мови та часового поясу є обов’язковими.",
     "error.settings_reading_speed_is_positive": "Швидкість читання має бути додатнім цілим числом.",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "Число записів на сторінку недійсне.",
     "error.feed_mandatory_fields": "URL та категорія є обов’язковими.",
     "error.feed_already_exists": "Така стрічка вже існує.",
@@ -290,6 +337,7 @@
     "form.feed.label.title": "Назва",
     "form.feed.label.site_url": "URL-адреса сайту",
     "form.feed.label.feed_url": "URL-адреса стрічки",
+    "form.feed.label.description": "Опис",
     "form.feed.label.category": "Категорія",
     "form.feed.label.crawler": "Завантажувати оригінальний вміст",
     "form.feed.label.feed_username": "Ім’я користувача для завантаження",
@@ -304,10 +352,18 @@
     "form.feed.label.apprise_service_urls": "Comma separated list of Apprise service URLs",
     "form.feed.label.ignore_http_cache": "Ігнорувати кеш HTTP",
     "form.feed.label.allow_self_signed_certificates": "Дозволити сертифікати з власним підписом або недійсні",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "Використати проксі-сервер",
     "form.feed.label.disabled": "Не оновлювати цю стрічку",
     "form.feed.label.no_media_player": "No media player (audio/video)",
     "form.feed.label.hide_globally": "Приховати записи в глобальному списку непрочитаного",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.category.label.title": "Назва",
     "form.category.hide_globally": "Приховати записи в глобальному списку непрочитаного",
     "form.feed.fieldset.general": "General",
@@ -348,11 +404,18 @@
     "form.prefs.label.default_home_page": "Домашня сторінка за умовчанням",
     "form.prefs.label.categories_sorting_order": "Сортування за категоріями",
     "form.prefs.label.mark_read_on_view": "Автоматично позначати записи як прочитані під час перегляду",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "Application Settings",
     "form.prefs.fieldset.authentication_settings": "Authentication Settings",
     "form.prefs.fieldset.reader_settings": "Reader Settings",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "Файл OPML",
     "form.import.label.url": "URL-адреса",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "Увімкнути API Fever",
     "form.integration.fever_username": "Ім’я користувача Fever",
     "form.integration.fever_password": "Пароль Fever",
@@ -405,16 +468,34 @@
     "form.integration.telegram_bot_disable_notification": "Disable notification",
     "form.integration.telegram_bot_disable_buttons": "Disable buttons",
     "form.integration.telegram_chat_id": "ID чату",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "Зберігати статті до Linkding",
     "form.integration.linkding_endpoint": "Linkding API Endpoint",
     "form.integration.linkding_api_key": "Ключ API Linkding",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "Відмічати закладку як непрочитану",
+    "form.integration.linkwarden_activate": "Зберігати статті до Linkwarden",
+    "form.integration.linkwarden_endpoint": "Linkwarden API Endpoint",
+    "form.integration.linkwarden_api_key": "Ключ API Linkwarden",
     "form.integration.matrix_bot_activate": "Перенесення нових статей в Матрицю",
     "form.integration.matrix_bot_user": "Ім'я користувача для Matrix",
     "form.integration.matrix_bot_password": "Пароль для користувача Matrix",
     "form.integration.matrix_bot_url": "URL-адреса сервера Матриці",
     "form.integration.matrix_bot_chat_id": "Ідентифікатор кімнати Матриці",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "Зберігати статті до Readeck",
+    "form.integration.readeck_endpoint": "Readeck API Endpoint",
+    "form.integration.readeck_api_key": "Ключ API Readeck",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "Надіслати лише URL (замість повного вмісту)",
     "form.integration.shiori_activate": "Save articles to Shiori",
     "form.integration.shiori_endpoint": "Shiori API Endpoint",
     "form.integration.shiori_username": "Shiori Username",
@@ -427,6 +508,13 @@
     "form.integration.webhook_secret": "Webhook Secret",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "Назва ключа API",
     "form.submit.loading": "Завантаження...",
     "form.submit.saving": "Зберігаю...",
@@ -463,13 +551,17 @@
         "%d роки тому",
         "%d років тому"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again.",
+        "You have triggered too many feed refreshes. Please wait %d minutes before trying again."
+    ],
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -488,5 +580,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "Швидкість відтворення аудіо/відео",
+    "error.settings_media_playback_rate_range": "Швидкість відтворення виходить за межі діапазону",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/locale/translations/zh_CN.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "跳转至内容",
     "confirm.question": "您确认吗？",
     "confirm.question.refresh": "您是否要强制刷新？",
     "confirm.yes": "是",
@@ -18,6 +19,8 @@
     "action.home_screen": "添加到主屏幕",
     "tooltip.keyboard_shortcuts": "快捷键: %s",
     "tooltip.logged_user": "当前登录 %s",
+    "menu.title": "菜单",
+    "menu.home_page": "首页",
     "menu.unread": "未读",
     "menu.starred": "收藏",
     "menu.history": "历史",
@@ -32,6 +35,7 @@
     "menu.about": "关于",
     "menu.export": "导出",
     "menu.import": "导入",
+    "menu.search": "搜索",
     "menu.create_category": "新建分类",
     "menu.mark_page_as_read": "标记为已读",
     "menu.mark_all_as_read": "全部标为已读",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "已分享的文章",
     "search.label": "搜索",
     "search.placeholder": "搜索…",
+    "search.submit": "查找",
+    "pagination.last": "最后一页",
     "pagination.next": "下一页",
+    "pagination.first": "第一页",
     "pagination.previous": "上一页",
     "entry.status.unread": "标为未读",
     "entry.status.read": "标为已读",
@@ -79,13 +86,24 @@
     "entry.shared_entry.title": "打开公共链接",
     "entry.shared_entry.label": "分享",
     "entry.estimated_reading_time": [
-        "需要 %d 分钟阅读",
         "需要 %d 分钟阅读"
     ],
     "entry.tags.label": "标签：",
     "page.shared_entries.title": "已分享的文章",
+    "page.shared_entries_count": [
+        "%d shared entry"
+    ],
     "page.unread.title": "未读",
+    "page.unread_entry_count": [
+        "%d unread entry"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total"
+    ],
     "page.starred.title": "收藏",
+    "page.starred_entry_count": [
+        "%d starred entry"
+    ],
     "page.categories.title": "分类",
     "page.categories.no_feed": "没有源",
     "page.categories.entries": "查看内容",
@@ -93,20 +111,25 @@
     "page.categories.feed_count": [
         "有 %d 个源"
     ],
-    "page.categories.unread_counter": "未读文章数",
+    "page.categories_count": [
+        "%d 分类"
+    ],
     "page.new_category.title": "新分类",
     "page.new_user.title": "新用户",
     "page.edit_category.title": "编辑分类 : %s",
     "page.edit_user.title": "编辑用户 : %s",
     "page.feeds.title": "源",
+    "page.category_label": "分类: %s",
     "page.feeds.last_check": "最后检查时间：",
     "page.feeds.next_check": "下次检查时间：",
-    "page.feeds.unread_counter": "未读文章数",
     "page.feeds.read_counter": "已读文章数",
     "page.feeds.error_count": [
         "%d 错误"
     ],
     "page.history.title": "历史",
+    "page.read_entry_count": [
+        "%d 阅读文章"
+    ],
     "page.import.title": "导入",
     "page.search.title": "搜索结果",
     "page.about.title": "关于",
@@ -148,6 +171,8 @@
     "page.keyboard_shortcuts.go_to_feed": "转到源页面",
     "page.keyboard_shortcuts.go_to_previous_page": "上一页",
     "page.keyboard_shortcuts.go_to_next_page": "下一页",
+    "page.keyboard_shortcuts.go_to_bottom_item": "转到底部项目",
+    "page.keyboard_shortcuts.go_to_top_item": "转到顶部项目",
     "page.keyboard_shortcuts.open_item": "打开选定的文章",
     "page.keyboard_shortcuts.open_original": "打开原始链接",
     "page.keyboard_shortcuts.open_original_same_window": "在当前标签页中打开原始链接",
@@ -176,8 +201,8 @@
     "page.settings.title": "设置",
     "page.settings.link_google_account": "关联我的 Google 账户",
     "page.settings.unlink_google_account": "解除 Google 账号关联",
-    "page.settings.link_oidc_account": "关联我的 OpenID Connect 账户",
-    "page.settings.unlink_oidc_account": "解除 OpenID Connect 账号关联",
+    "page.settings.link_oidc_account": "关联我的 %s 账户",
+    "page.settings.unlink_oidc_account": "解除 %s 账号关联",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "操作",
     "page.settings.webauthn.passkey_name": "Passkey 名称",
@@ -186,12 +211,11 @@
     "page.settings.webauthn.register": "注册 Passkey",
     "page.settings.webauthn.register.error": "无法注册 Passkey",
     "page.settings.webauthn.delete": [
-        "删除 %d 个 Passkey",
         "删除 %d 个 Passkey"
     ],
     "page.login.title": "登录",
     "page.login.google_signin": "使用 Google 登录",
-    "page.login.oidc_signin": "使用 OpenID Connect 登录",
+    "page.login.oidc_signin": "使用 %s 登录",
     "page.login.webauthn_login": "使用密码登录",
     "page.login.webauthn_login.error": "无法使用密码登录",
     "page.integrations.title": "集成",
@@ -226,6 +250,7 @@
     "alert.no_bookmark": "目前没有收藏",
     "alert.no_category": "目前没有分类",
     "alert.no_category_entry": "该分类下没有文章",
+    "alert.no_tag_entry": "没有与此标签匹配的条目。",
     "alert.no_feed_entry": "该源中没有文章",
     "alert.no_feed": "目前没有源",
     "alert.no_history": "目前没有历史",
@@ -268,6 +293,14 @@
     "error.site_url_not_empty": "源网站的网址不能为空。",
     "error.feed_title_not_empty": "订阅源的标题不能为空。",
     "error.settings_reading_speed_is_positive": "阅读速度必须是正整数。",
+    "error.settings_block_rule_fieldname_invalid": "无效的阻止规则: 规则 #%d 缺少合法的字段名 (可选: %s)",
+    "error.settings_block_rule_separator_required": "无效的阻止规则: 规则 #%d 的模式字符必须用‘=’分开。",
+    "error.settings_block_rule_regex_required": "无效的阻止规则: 规则 #%d 的模式字符没有提供。",
+    "error.settings_block_rule_invalid_regex": "无效的阻止规则: 规则 #%d 的模式字符不是合法的正则表达式。",
+    "error.settings_keep_rule_fieldname_invalid": "无效的保留规则: 规则 #%d 缺少合法的字段名 (可选: %s)",
+    "error.settings_keep_rule_separator_required": "无效的保留规则: 规则 #%d 的模式字符必须用‘=’分开。",
+    "error.settings_keep_rule_regex_required": "无效的保留规则: 规则 #%d 的模式字符没有提供。",
+    "error.settings_keep_rule_invalid_regex": "无效的保留规则: 规则 #%d 的模式字符不是合法的正则表达式。",
     "error.feed_category_not_found": "此类别不存在或不属于该用户。",
     "error.feed_invalid_blocklist_rule": "阻止列表规则无效。",
     "error.feed_invalid_keeplist_rule": "保留列表规则无效。",
@@ -284,6 +317,7 @@
     "form.feed.label.title": "标题",
     "form.feed.label.site_url": "源网站 URL",
     "form.feed.label.feed_url": "订阅源 URL",
+    "form.feed.label.description": "描述",
     "form.feed.label.category": "类别",
     "form.feed.label.crawler": "抓取全文内容",
     "form.feed.label.feed_username": "源用户名",
@@ -298,10 +332,18 @@
     "form.feed.label.apprise_service_urls": "使用逗号分隔的 Apprise 服务 URL 列表",
     "form.feed.label.ignore_http_cache": "忽略 HTTP 缓存",
     "form.feed.label.allow_self_signed_certificates": "允许自签名证书或无效证书",
+    "form.feed.label.disable_http2": "关闭 HTTP/2 避免记录指纹",
     "form.feed.label.fetch_via_proxy": "通过代理获取",
     "form.feed.label.disabled": "请勿刷新此源",
     "form.feed.label.no_media_player": "没有媒体播放器(音频/视频)",
     "form.feed.label.hide_globally": "隐藏全局未读列表中的文章",
+    "form.feed.label.ntfy_activate": "推送条目到ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy优先级",
+    "form.feed.label.ntfy_max_priority": "Ntfy最高优先级",
+    "form.feed.label.ntfy_high_priority": "Ntfy高优先级",
+    "form.feed.label.ntfy_default_priority": "Ntfy默认优先级",
+    "form.feed.label.ntfy_low_priority": "Ntfy低优先级",
+    "form.feed.label.ntfy_min_priority": "Ntfy最低优先级",
     "form.feed.fieldset.general": "通用",
     "form.feed.fieldset.rules": "规则",
     "form.feed.fieldset.network_settings": "网络设置",
@@ -342,11 +384,18 @@
     "form.prefs.label.default_home_page": "默认主页",
     "form.prefs.label.categories_sorting_order": "分类排序",
     "form.prefs.label.mark_read_on_view": "查看时自动将条目标记为已读",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "当浏览时标记条目为已读。对于音频/视频，当播放完成90%%时标记为已读",
+    "form.prefs.label.mark_read_on_media_completion": "仅当音频/视频播放完成90%%时标记为已读",
+    "form.prefs.label.mark_read_manually": "手动标记条目为已读",
     "form.prefs.fieldset.application_settings": "应用设置",
     "form.prefs.fieldset.authentication_settings": "用户认证设置",
     "form.prefs.fieldset.reader_settings": "阅读器设置",
+    "form.prefs.fieldset.global_feed_settings": "全局订阅源设置",
     "form.import.label.file": "OPML 文件",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "保存文章到 Betula",
+    "form.integration.betula_url": "Betula 服务地址",
+    "form.integration.betula_token": "Betula 密钥",
     "form.integration.fever_activate": "启用 Fever API",
     "form.integration.fever_username": "Fever 用户名",
     "form.integration.fever_password": "Fever 密码",
@@ -356,7 +405,7 @@
     "form.integration.googlereader_password": "Google Reader 密码",
     "form.integration.googlereader_endpoint": "Google Reader API 端点:",
     "form.integration.pinboard_activate": "保存文章到 Pinboard",
-    "form.integration.pinboard_token": "Pinboard API Token",
+    "form.integration.pinboard_token": "Pinboard API 密钥",
     "form.integration.pinboard_tags": "Pinboard 标签",
     "form.integration.pinboard_bookmark": "标记为未读",
     "form.integration.instapaper_activate": "保存文章到 Instapaper",
@@ -370,12 +419,12 @@
     "form.integration.wallabag_only_url": "仅发送 URL（而不是完整内容）",
     "form.integration.wallabag_endpoint": "Wallabag URL",
     "form.integration.wallabag_client_id": "Wallabag 客户端 ID",
-    "form.integration.wallabag_client_secret": "Wallabag 客户端 Secret",
+    "form.integration.wallabag_client_secret": "Wallabag 客户端 密钥",
     "form.integration.wallabag_username": "Wallabag 用户名",
     "form.integration.wallabag_password": "Wallabag 密码",
     "form.integration.notion_activate": "保存文章到 Notion",
-    "form.integration.notion_page_id": "Notion Page ID",
-    "form.integration.notion_token": "Notion Secret Token",
+    "form.integration.notion_page_id": "Notion 页面ID",
+    "form.integration.notion_token": "Notion 密钥",
     "form.integration.apprise_activate": "将新文章推送到 Apprise",
     "form.integration.apprise_url": "Apprise API URL",
     "form.integration.apprise_services_url": "使用逗号分隔的 Apprise 服务 URL 列表",
@@ -385,13 +434,13 @@
     "form.integration.omnivore_activate": "保存文章到 Omnivore",
     "form.integration.omnivore_url": "Omnivore API 端点",
     "form.integration.omnivore_api_key": "Omnivore API 密钥",
-    "form.integration.espial_activate":  "保存文章到 Espial",
-    "form.integration.espial_endpoint":  "Espial API 端点",
-    "form.integration.espial_api_key":  "Espial API 密钥",
+    "form.integration.espial_activate": "保存文章到 Espial",
+    "form.integration.espial_endpoint": "Espial API 端点",
+    "form.integration.espial_api_key": "Espial API 密钥",
     "form.integration.espial_tags": "Espial 标签",
     "form.integration.readwise_activate": "保存文章到 Readwise Reader",
-    "form.integration.readwise_api_key": "Readwise Reader Access Token",
-    "form.integration.readwise_api_key_link": "获取你的 Readwise Access Token",
+    "form.integration.readwise_api_key": "Readwise Reader 密钥",
+    "form.integration.readwise_api_key_link": "获取你的 Readwise 密钥",
     "form.integration.telegram_bot_activate": "将新文章推送到 Telegram",
     "form.integration.telegram_bot_token": "机器人令牌",
     "form.integration.telegram_topic_id": "Topic ID",
@@ -399,28 +448,53 @@
     "form.integration.telegram_bot_disable_notification": "禁用通知",
     "form.integration.telegram_bot_disable_buttons": "不展示按钮",
     "form.integration.telegram_chat_id": "聊天ID",
+    "form.integration.linkace_activate": "保存文章到 LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API URL",
+    "form.integration.linkace_api_key": "LinkAce API 密钥",
+    "form.integration.linkace_tags": "LinkAce 标签",
+    "form.integration.linkace_is_private": "将链接标记为私有",
+    "form.integration.linkace_check_disabled": "关闭链接检查",
     "form.integration.linkding_activate": "保存文章到 Linkding",
     "form.integration.linkding_endpoint": "Linkding API 端点",
     "form.integration.linkding_api_key": "Linkding API 密钥",
     "form.integration.linkding_tags": "Linkding 默认标签",
     "form.integration.linkding_bookmark": "标记为未读",
+    "form.integration.linkwarden_activate": "保存文章到 Linkwarden",
+    "form.integration.linkwarden_endpoint": "Linkwarden API 端点",
+    "form.integration.linkwarden_api_key": "Linkwarden API 密钥",
     "form.integration.matrix_bot_activate": "将新文章推送到 Matrix",
     "form.integration.matrix_bot_user": "Matrix Bot 用户名",
     "form.integration.matrix_bot_password": "Matrix Bot 密码",
     "form.integration.matrix_bot_url": "Matrix 服务器 URL",
     "form.integration.matrix_bot_chat_id": "Matrix 聊天 ID",
+    "form.integration.raindrop_activate": "保存文章到 Raindrop",
+    "form.integration.raindrop_token": "(Test) 密钥",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "保存文章到 Readeck",
+    "form.integration.readeck_endpoint": "Readeck API 端点",
+    "form.integration.readeck_api_key": "Readeck API 密钥",
+    "form.integration.readeck_labels": "Readeck 默认标签",
+    "form.integration.readeck_only_url": "仅发送 URL（而不是完整内容）",
     "form.integration.shiori_activate": "保存文章到 Shiori",
     "form.integration.shiori_endpoint": "Shiori API 端点",
     "form.integration.shiori_username": "Shiori 用户名",
     "form.integration.shiori_password": "Shiori 密码",
     "form.integration.shaarli_activate": "保存文章到 Shaarli",
     "form.integration.shaarli_endpoint": "Shaarli URL",
-    "form.integration.shaarli_api_secret": "Shaarli API Secret",
+    "form.integration.shaarli_api_secret": "Shaarli API 密钥",
     "form.integration.webhook_activate": "启用 Webhook",
     "form.integration.webhook_url": "Webhook URL",
-    "form.integration.webhook_secret": "Webhook Secret",
+    "form.integration.webhook_secret": "Webhook 密钥",
     "form.integration.rssbridge_activate": "添加订阅时检查 RSS-Bridge",
     "form.integration.rssbridge_url": "RSS-Bridge 服务器 URL",
+    "form.integration.ntfy_activate": "推送条目到ntfy",
+    "form.integration.ntfy_topic": "Ntfy主题",
+    "form.integration.ntfy_url": "Ntfy URL（可选，默认为ntfy.sh）",
+    "form.integration.ntfy_api_token": "Ntfy API令牌（可选）",
+    "form.integration.ntfy_username": "Ntfy用户名（可选）",
+    "form.integration.ntfy_password": "Ntfy密码（可选）",
+    "form.integration.ntfy_icon_url": "Ntfy图标URL（可选）",
     "form.api_key.label.description": "API密钥标签",
     "form.submit.loading": "载入中…",
     "form.submit.saving": "保存中…",
@@ -445,30 +519,43 @@
     "time_elapsed.years": [
         "%d 年前"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
-    "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
-    "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
-    "error.http_body_read": "Unable to read the HTTP body: %v.",
-    "error.http_empty_response_body": "The HTTP response body is empty.",
-    "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
-    "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
-    "error.network_timeout": "This website is too slow and the request timed out: %v",
-    "error.http_client_error": "HTTP client error: %v.",
-    "error.http_not_authorized": "Access to this website is not authorized. It could be a bad username or password.",
-    "error.http_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
-    "error.http_forbidden": "Access to this website is forbidden. Perhaps, this website has a bot protection mechanism?",
-    "error.http_resource_not_found": "The requested resource is not found. Please, verify the URL.",
-    "error.http_internal_server_error": "The website is not available at the moment due to a server error. The problem is not on Miniflux side. Please, try again later.",
-    "error.http_bad_gateway": "The website is not available at the moment due to a bad gateway error. The problem is not on Miniflux side. Please, try again later.",
-    "error.http_service_unavailable": "The website is not available at the moment due to an internal server error. The problem is not on Miniflux side. Please, try again later.",
-    "error.http_gateway_timeout": "The website is not available at the moment due to a gateway timeout error. The problem is not on Miniflux side. Please, try again later.",
-    "error.http_unexpected_status_code": "The website is not available at the moment due to an unexpected HTTP status code: %d. The problem is not on Miniflux side. Please, try again later.",
-    "error.database_error": "Database error: %v.",
-    "error.category_not_found": "This category does not exist or does not belong to this user.",
-    "error.duplicated_feed": "This feed already exists.",
-    "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
-    "error.feed_not_found": "This feed does not exist or does not belong to this user.",
-    "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "alert.too_many_feeds_refresh": [
+        "多次触发订阅源更新，请等待 %d 分钟后重试。"
+    ],
+    "alert.background_feed_refresh": "所有的订阅源都在后台刷新中。您可以继续使用Miniflux，同时此过程正在运行。",
+    "error.http_response_too_large": "HTTP响应内容过大，您可以在全局设置中增加HTTP响应大小限制（需要服务器重新启动）。",
+    "error.http_body_read": "无法读取HTTP主体: %v。",
+    "error.http_empty_response_body": "HTTP响应主体为空。",
+    "error.http_empty_response": "HTTP响应内容为空，该网站可能正在使用机器人保护机制。",
+    "error.tls_error": "TLS 错误: %q。如果您愿意的话可以在订阅源设置里关闭TLS验证。",
+    "error.network_operation": "Miniflux无法访问该网站由于网络错误: %v。",
+    "error.network_timeout": "该网站响应过慢，请求超时: %v",
+    "error.http_client_error": "HTTP 客户端错误r: %v。",
+    "error.http_not_authorized": "该网站访问未授权，可能用户名和密码错误。",
+    "error.http_too_many_requests": "Miniflux 对该网站请求过多次数，请稍后重试或修改应用配置项。",
+    "error.http_forbidden": "该网站被禁止访问，网站可能有机器人保护机制？",
+    "error.http_resource_not_found": "请求资源无法找到，请检查URL。",
+    "error.http_internal_server_error": "当前由于服务器错误导致该网站无法访问，问题不在Miniflux，请稍后重试。",
+    "error.http_bad_gateway": "当前由于错误的网关导致该网站无法访问，问题不在Miniflux，请稍后重试。",
+    "error.http_service_unavailable": "当前由于服务器内部错误导致该网站无法访问，问题不在Miniflux，请稍后重试。",
+    "error.http_gateway_timeout": "当前由于网关超时导致该网站无法访问，问题不在Miniflux，请稍后重试。",
+    "error.http_unexpected_status_code": "当前由于意外的HTTP状态码：%d 导致该网站无法访问，问题不在Miniflux，请稍后重试。",
+    "error.database_error": "数据库错误: %v。",
+    "error.category_not_found": "该分类不存在或不属于该用户。",
+    "error.duplicated_feed": "该订阅源已经存在。",
+    "error.unable_to_parse_feed": "无法解析该订阅源: %v。",
+    "error.feed_not_found": "该订阅源不存在或不属于该用户。",
+    "error.unable_to_detect_rssbridge": "无法使用RSS-Bridge去检测订阅源: %v。",
+    "error.feed_format_not_detected": "无法解析订阅源格式: %v。",
+    "form.prefs.label.media_playback_rate": "音频/视频的播放速度",
+    "error.settings_media_playback_rate_range": "播放速度超出范围",
+    "enclosure_media_controls.seek" : "查找:",
+    "enclosure_media_controls.seek.title" : "查找 %s 秒",
+    "enclosure_media_controls.speed" : "速度:",
+    "enclosure_media_controls.speed.faster" : "快进",
+    "enclosure_media_controls.speed.faster.title" : "速度快进到 %sx",
+    "enclosure_media_controls.speed.slower" : "减慢",
+    "enclosure_media_controls.speed.slower.title" : "速度减慢到 %sx",
+    "enclosure_media_controls.speed.reset" : "重置",
+    "enclosure_media_controls.speed.reset.title" : "重置速度到 1x"
 }

internal/locale/translations/zh_TW.json

@@ -1,4 +1,5 @@
 {
+    "skip_to_content": "Skip to content",
     "confirm.question": "您確認嗎？",
     "confirm.question.refresh": "您想要強制刷新嗎？",
     "confirm.yes": "是",
@@ -18,6 +19,8 @@
     "action.home_screen": "新增到主螢幕",
     "tooltip.keyboard_shortcuts": "快捷鍵: %s",
     "tooltip.logged_user": "當前登入 %s",
+    "menu.title": "導覽",
+    "menu.home_page": "主頁",
     "menu.unread": "未讀",
     "menu.starred": "收藏",
     "menu.history": "歷史",
@@ -32,6 +35,7 @@
     "menu.about": "關於",
     "menu.export": "匯出",
     "menu.import": "匯入",
+    "menu.search": "搜尋",
     "menu.create_category": "新建分類",
     "menu.mark_page_as_read": "將此頁面標記為已讀",
     "menu.mark_all_as_read": "全部標為已讀",
@@ -50,7 +54,10 @@
     "menu.shared_entries": "已分享的文章",
     "search.label": "搜尋",
     "search.placeholder": "搜尋…",
+    "search.submit": "送出",
+    "pagination.last": "Last",
     "pagination.next": "下一頁",
+    "pagination.first": "First",
     "pagination.previous": "上一頁",
     "entry.status.unread": "標為未讀",
     "entry.status.read": "標為已讀",
@@ -79,36 +86,50 @@
     "entry.shared_entry.title": "開啟公共連結",
     "entry.shared_entry.label": "分享",
     "entry.estimated_reading_time": [
-        "需要 %d 分鐘閱讀",
         "需要 %d 分鐘閱讀"
     ],
     "entry.tags.label": "標籤：",
     "page.shared_entries.title": "已分享的文章",
+    "page.shared_entries_count": [
+        "%d shared entry"
+    ],
     "page.unread.title": "未讀",
+    "page.unread_entry_count": [
+        "%d unread entry"
+    ],
+    "page.total_entry_count": [
+        "%d entry in total"
+    ],
     "page.starred.title": "收藏",
+    "page.starred_entry_count": [
+        "%d starred entry"
+    ],
     "page.categories.title": "分類",
     "page.categories.no_feed": "沒有Feed",
     "page.categories.entries": "檢視內容",
     "page.categories.feeds": "檢視Feeds",
     "page.categories.feed_count": [
-        "有 %d 個Feed",
-        "有 %d 個Feeds"
+        "有 %d 個Feed"
+    ],
+    "page.categories_count": [
+        "%d category"
     ],
-    "page.categories.unread_counter": "未讀文章數",
     "page.new_category.title": "新分類",
     "page.new_user.title": "新使用者",
     "page.edit_category.title": "編輯分類 : %s",
     "page.edit_user.title": "編輯使用者 : %s",
     "page.feeds.title": "Feeds",
+    "page.category_label": "Category: %s",
     "page.feeds.last_check": "最後檢查時間：",
     "page.feeds.next_check": "下次檢查時間:",
-    "page.feeds.unread_counter": "未讀文章數",
     "page.feeds.read_counter": "已讀文章數",
     "page.feeds.error_count": [
-        "%d 錯誤",
         "%d 錯誤"
     ],
     "page.history.title": "歷史",
+    "page.read_entry_count": [
+        "%d read entry"
+    ],
     "page.import.title": "匯入",
     "page.search.title": "搜尋結果",
     "page.about.title": "關於",
@@ -150,6 +171,8 @@
     "page.keyboard_shortcuts.go_to_feed": "轉到Feed頁面",
     "page.keyboard_shortcuts.go_to_previous_page": "上一頁",
     "page.keyboard_shortcuts.go_to_next_page": "下一頁",
+    "page.keyboard_shortcuts.go_to_bottom_item": "转到底部项目",
+    "page.keyboard_shortcuts.go_to_top_item": "转到顶部项目",
     "page.keyboard_shortcuts.open_item": "開啟選定的文章",
     "page.keyboard_shortcuts.open_original": "開啟原始連結",
     "page.keyboard_shortcuts.open_original_same_window": "在當前標籤頁中開啟原始連結",
@@ -178,8 +201,8 @@
     "page.settings.title": "設定",
     "page.settings.link_google_account": "關聯我的 Google 賬戶",
     "page.settings.unlink_google_account": "解除 Google 帳號關聯",
-    "page.settings.link_oidc_account": "關聯我的 OpenID Connect 賬戶",
-    "page.settings.unlink_oidc_account": "解除 OpenID Connect 帳號關聯",
+    "page.settings.link_oidc_account": "關聯我的 %s 賬戶",
+    "page.settings.unlink_oidc_account": "解除 %s 帳號關聯",
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.actions": "操作",
     "page.settings.webauthn.passkey_name": "Passkey 名稱",
@@ -188,12 +211,11 @@
     "page.settings.webauthn.register": "註冊 Passkey",
     "page.settings.webauthn.register.error": "無法註冊 Passkey",
     "page.settings.webauthn.delete": [
-        "刪除 %d 個 Passkey",
         "刪除 %d 個 Passkey"
     ],
     "page.login.title": "登入",
     "page.login.google_signin": "使用 Google 登入",
-    "page.login.oidc_signin": "使用 OpenID Connect 登入",
+    "page.login.oidc_signin": "使用 %s 登入",
     "page.login.webauthn_login": "使用密碼登錄",
     "page.login.webauthn_login.error": "無法使用密碼登錄",
     "page.integrations.title": "整合",
@@ -228,6 +250,7 @@
     "alert.no_bookmark": "目前沒有收藏",
     "alert.no_category": "目前沒有分類",
     "alert.no_category_entry": "該分類下沒有文章",
+    "alert.no_tag_entry": "沒有與此標籤相符的條目。",
     "alert.no_feed_entry": "該Feed中沒有文章",
     "alert.no_feed": "目前沒有Feed",
     "alert.no_history": "目前沒有歷史",
@@ -262,6 +285,14 @@
     "error.password_min_length": "請至少輸入 6 個字元",
     "error.settings_mandatory_fields": "必須填寫使用者名稱、主題、語言以及時區",
     "error.settings_reading_speed_is_positive": "閱讀速度必須是正整數。",
+    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
+    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
+    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
+    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
+    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
     "error.entries_per_page_invalid": "每頁的文章數無效。",
     "error.feed_mandatory_fields": "必須填寫網址和分類",
     "error.feed_already_exists": "此Feed已存在。",
@@ -282,10 +313,11 @@
     "error.invalid_entry_direction": "無效的輸入方向。",
     "error.invalid_display_mode": "無效的網頁應用顯示模式。",
     "error.invalid_gesture_nav": "手勢導航無效.",
-    "error.invalid_default_home_page": "默認主頁無效！",
+    "error.invalid_default_home_page": "預設主頁無效！",
     "form.feed.label.title": "標題",
     "form.feed.label.site_url": "網站 URL",
     "form.feed.label.feed_url": "訂閱 Feed URL",
+    "form.feed.label.description": "描述",
     "form.feed.label.category": "類別",
     "form.feed.label.crawler": "下載原文內容",
     "form.feed.label.feed_username": "Feed 使用者名稱",
@@ -300,10 +332,18 @@
     "form.feed.label.apprise_service_urls": "使用逗號分隔的 Apprise 服務 URL 列表",
     "form.feed.label.ignore_http_cache": "忽略 HTTP 快取",
     "form.feed.label.allow_self_signed_certificates": "允許自簽章憑證或無效憑證",
+    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
     "form.feed.label.fetch_via_proxy": "透過代理獲取",
     "form.feed.label.disabled": "請勿更新此 Feed",
     "form.feed.label.no_media_player": "沒有媒體播放器(音訊/視訊)",
     "form.feed.label.hide_globally": "隱藏全域性未讀列表中的文章",
+    "form.feed.label.ntfy_activate": "Push entries to ntfy",
+    "form.feed.label.ntfy_priority": "Ntfy priority",
+    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
+    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
+    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
+    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.fieldset.general": "通用",
     "form.feed.fieldset.rules": "規則",
     "form.feed.fieldset.network_settings": "網路設定",
@@ -341,14 +381,21 @@
     "form.prefs.label.show_reading_time": "顯示文章的預計閱讀時間",
     "form.prefs.label.custom_css": "自定義 CSS",
     "form.prefs.label.entry_order": "文章排序依據",
-    "form.prefs.label.default_home_page": "默認主頁",
+    "form.prefs.label.default_home_page": "預設主頁",
     "form.prefs.label.categories_sorting_order": "分類排序",
     "form.prefs.label.mark_read_on_view": "查看時自動將條目標記為已讀",
+    "form.prefs.label.mark_read_on_view_or_media_completion": "Mark entries as read when viewed. For audio/video, mark as read at 90%% completion",
+    "form.prefs.label.mark_read_on_media_completion": "Only mark as read when audio/video playback reaches 90%% completion",
+    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
     "form.prefs.fieldset.application_settings": "應用程式設定",
     "form.prefs.fieldset.authentication_settings": "使用者認證設定",
     "form.prefs.fieldset.reader_settings": "閱讀器設定",
+    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
     "form.import.label.file": "OPML 檔案",
     "form.import.label.url": "URL",
+    "form.integration.betula_activate": "Save entries to Betula",
+    "form.integration.betula_url": "Betula server URL",
+    "form.integration.betula_token": "Betula Token",
     "form.integration.fever_activate": "啟用 Fever API",
     "form.integration.fever_username": "Fever 使用者名稱",
     "form.integration.fever_password": "Fever 密碼",
@@ -401,16 +448,34 @@
     "form.integration.telegram_bot_disable_web_page_preview": "停用網頁預覽",
     "form.integration.telegram_bot_disable_notification": "停用通知",
     "form.integration.telegram_bot_disable_buttons": "不展示按鈕",
+    "form.integration.linkace_activate": "Save entries to LinkAce",
+    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
+    "form.integration.linkace_api_key": "LinkAce API key",
+    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_is_private": "Mark link as private",
+    "form.integration.linkace_check_disabled": "Disable link check",
     "form.integration.linkding_activate": "儲存文章到 Linkding",
     "form.integration.linkding_endpoint": "Linkding API 端點",
     "form.integration.linkding_api_key": "Linkding API 金鑰",
     "form.integration.linkding_tags": "Linkding Tags",
     "form.integration.linkding_bookmark": "標記為未讀",
+    "form.integration.linkwarden_activate": "儲存文章到 Linkwarden",
+    "form.integration.linkwarden_endpoint": "Linkwarden API 端點",
+    "form.integration.linkwarden_api_key": "Linkwarden API 金鑰",
     "form.integration.matrix_bot_activate": "推送文章到 Matrix",
     "form.integration.matrix_bot_user": "Matrix 的用戶名",
     "form.integration.matrix_bot_password": "Matrix 的密碼",
     "form.integration.matrix_bot_url": "Matrix 伺服器的 URL",
     "form.integration.matrix_bot_chat_id": "Matrix 房間 ID",
+    "form.integration.raindrop_activate": "Save entries to Raindrop",
+    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.raindrop_collection_id": "Collection ID",
+    "form.integration.raindrop_tags": "Tags (comma-separated)",
+    "form.integration.readeck_activate": "儲存文章到 Readeck",
+    "form.integration.readeck_endpoint": "Readeck API 端點",
+    "form.integration.readeck_api_key": "Readeck API 金鑰",
+    "form.integration.readeck_labels": "Readeck Labels",
+    "form.integration.readeck_only_url": "仅发送 URL（而不是完整内容）",
     "form.integration.shiori_activate": "儲存文章到 Shiori",
     "form.integration.shiori_endpoint": "Shiori API 端點",
     "form.integration.shiori_username": "Shiori 使用者名稱",
@@ -423,6 +488,13 @@
     "form.integration.webhook_secret": "Webhook Secret",
     "form.integration.rssbridge_activate": "新增訂閱時檢查 RSS-Bridge",
     "form.integration.rssbridge_url": "RSS-Bridge 伺服器的 URL",
+    "form.integration.ntfy_activate": "Push entries to ntfy",
+    "form.integration.ntfy_topic": "Ntfy topic",
+    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
+    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
+    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_password": "Ntfy Password (optional)",
+    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
     "form.api_key.label.description": "API金鑰標籤",
     "form.submit.loading": "載入中…",
     "form.submit.saving": "儲存中…",
@@ -430,36 +502,32 @@
     "time_elapsed.yesterday": "昨天",
     "time_elapsed.now": "剛剛",
     "time_elapsed.minutes": [
-        "%d 分鐘前",
         "%d 分鐘前"
     ],
     "time_elapsed.hours": [
-        "%d 小時前",
         "%d 小時前"
     ],
     "time_elapsed.days": [
-        "%d 天前",
         "%d 天前"
     ],
     "time_elapsed.weeks": [
-        "%d 周前",
         "%d 周前"
     ],
     "time_elapsed.months": [
-        "%d 月前",
         "%d 月前"
     ],
     "time_elapsed.years": [
-        "%d 年前",
         "%d 年前"
     ],
-    "alert.too_many_feeds_refresh": "You have triggered too many feed refreshes. Please wait 30 minutes before trying again.",
+    "alert.too_many_feeds_refresh": [
+        "You have triggered too many feed refreshes. Please wait %d minute before trying again."
+    ],
     "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
     "error.http_response_too_large": "The HTTP response is too large. You could increase the HTTP response size limit in the global settings (requires a server restart).",
     "error.http_body_read": "Unable to read the HTTP body: %v.",
     "error.http_empty_response_body": "The HTTP response body is empty.",
     "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.tls_error": "TLS error: %v. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
     "error.network_operation": "Miniflux is not able to reach this website due to a network error: %v.",
     "error.network_timeout": "This website is too slow and the request timed out: %v",
     "error.http_client_error": "HTTP client error: %v.",
@@ -478,5 +546,16 @@
     "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
     "error.feed_not_found": "This feed does not exist or does not belong to this user.",
     "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v."
+    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "form.prefs.label.media_playback_rate": "音訊/視訊的播放速度",
+    "error.settings_media_playback_rate_range": "播放速度超出範圍",
+    "enclosure_media_controls.seek" : "Seek:",
+    "enclosure_media_controls.seek.title" : "Seek %s seconds",
+    "enclosure_media_controls.speed" : "Speed:",
+    "enclosure_media_controls.speed.faster" : "Faster",
+    "enclosure_media_controls.speed.faster.title" : "Faster by %sx",
+    "enclosure_media_controls.speed.slower" : "Slower",
+    "enclosure_media_controls.speed.slower.title" : "Slower by %sx",
+    "enclosure_media_controls.speed.reset" : "Reset",
+    "enclosure_media_controls.speed.reset.title" : "Reset speed to 1x"
 }

internal/mediaproxy/media_proxy_test.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package proxy // import "miniflux.app/v2/internal/proxy"
+package mediaproxy // import "miniflux.app/v2/internal/mediaproxy"
 
 import (
 	"net/http"
@@ -29,11 +29,11 @@ func TestProxyFilterWithHttpDefault(t *testing.T) {
 	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
 
 	input := `<p><img src="http://website/folder/image.png" alt="Test"/></p>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 	expected := `<p><img src="/proxy/okK5PsdNY8F082UMQEAbLPeUFfbe2WnNfInNmR9T4WA=/aHR0cDovL3dlYnNpdGUvZm9sZGVyL2ltYWdlLnBuZw==" alt="Test"/></p>`
 
 	if expected != output {
-		t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected)
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
 	}
 }
 
@@ -53,11 +53,11 @@ func TestProxyFilterWithHttpsDefault(t *testing.T) {
 	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
 
 	input := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 	expected := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
 
 	if expected != output {
-		t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected)
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
 	}
 }
 
@@ -76,11 +76,11 @@ func TestProxyFilterWithHttpNever(t *testing.T) {
 	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
 
 	input := `<p><img src="http://website/folder/image.png" alt="Test"/></p>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 	expected := input
 
 	if expected != output {
-		t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected)
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
 	}
 }
 
@@ -99,11 +99,11 @@ func TestProxyFilterWithHttpsNever(t *testing.T) {
 	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
 
 	input := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 	expected := input
 
 	if expected != output {
-		t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected)
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
 	}
 }
 
@@ -124,11 +124,11 @@ func TestProxyFilterWithHttpAlways(t *testing.T) {
 	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
 
 	input := `<p><img src="http://website/folder/image.png" alt="Test"/></p>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 	expected := `<p><img src="/proxy/okK5PsdNY8F082UMQEAbLPeUFfbe2WnNfInNmR9T4WA=/aHR0cDovL3dlYnNpdGUvZm9sZGVyL2ltYWdlLnBuZw==" alt="Test"/></p>`
 
 	if expected != output {
-		t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected)
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
 	}
 }
 
@@ -149,11 +149,89 @@ func TestProxyFilterWithHttpsAlways(t *testing.T) {
 	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
 
 	input := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 	expected := `<p><img src="/proxy/LdPNR1GBDigeeNp2ArUQRyZsVqT_PWLfHGjYFrrWWIY=/aHR0cHM6Ly93ZWJzaXRlL2ZvbGRlci9pbWFnZS5wbmc=" alt="Test"/></p>`
 
 	if expected != output {
-		t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected)
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
+	}
+}
+
+func TestAbsoluteProxyFilterWithHttpsAlways(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("PROXY_OPTION", "all")
+	os.Setenv("PROXY_MEDIA_TYPES", "image")
+	os.Setenv("PROXY_PRIVATE_KEY", "test")
+
+	var err error
+	parser := config.NewParser()
+	config.Opts, err = parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	r := mux.NewRouter()
+	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
+
+	input := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
+	output := RewriteDocumentWithAbsoluteProxyURL(r, input)
+	expected := `<p><img src="http://localhost/proxy/LdPNR1GBDigeeNp2ArUQRyZsVqT_PWLfHGjYFrrWWIY=/aHR0cHM6Ly93ZWJzaXRlL2ZvbGRlci9pbWFnZS5wbmc=" alt="Test"/></p>`
+
+	if expected != output {
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
+	}
+}
+
+func TestAbsoluteProxyFilterWithCustomPortInBaseURL(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("BASE_URL", "http://example.org:88/folder/")
+	os.Setenv("MEDIA_PROXY_PRIVATE_KEY", "test")
+
+	var err error
+	parser := config.NewParser()
+	config.Opts, err = parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	if config.Opts.BaseURL() != "http://example.org:88/folder" {
+		t.Fatalf(`Unexpected base URL, got "%s"`, config.Opts.BaseURL())
+	}
+
+	r := mux.NewRouter()
+	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
+
+	input := `<p><img src="http://website/folder/image.png" alt="Test"/></p>`
+	output := RewriteDocumentWithAbsoluteProxyURL(r, input)
+	expected := `<p><img src="http://example.org:88/folder/proxy/okK5PsdNY8F082UMQEAbLPeUFfbe2WnNfInNmR9T4WA=/aHR0cDovL3dlYnNpdGUvZm9sZGVyL2ltYWdlLnBuZw==" alt="Test"/></p>`
+
+	if expected != output {
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
+	}
+}
+
+func TestAbsoluteProxyFilterWithHttpsAlwaysAndAudioTag(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("PROXY_OPTION", "all")
+	os.Setenv("PROXY_MEDIA_TYPES", "audio")
+	os.Setenv("PROXY_PRIVATE_KEY", "test")
+
+	var err error
+	parser := config.NewParser()
+	config.Opts, err = parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	r := mux.NewRouter()
+	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
+
+	input := `<audio src="https://website/folder/audio.mp3"></audio>`
+	output := RewriteDocumentWithAbsoluteProxyURL(r, input)
+	expected := `<audio src="http://localhost/proxy/EmBTvmU5B17wGuONkeknkptYopW_Tl6Y6_W8oYbN_Xs=/aHR0cHM6Ly93ZWJzaXRlL2ZvbGRlci9hdWRpby5tcDM="></audio>`
+
+	if expected != output {
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
 	}
 }
 
@@ -174,11 +252,61 @@ func TestProxyFilterWithHttpsAlwaysAndCustomProxyServer(t *testing.T) {
 	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
 
 	input := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 	expected := `<p><img src="https://proxy-example/proxy/aHR0cHM6Ly93ZWJzaXRlL2ZvbGRlci9pbWFnZS5wbmc=" alt="Test"/></p>`
 
 	if expected != output {
-		t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected)
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
+	}
+}
+
+func TestProxyFilterWithHttpsAlwaysAndIncorrectCustomProxyServer(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("PROXY_OPTION", "all")
+	os.Setenv("PROXY_MEDIA_TYPES", "image")
+	os.Setenv("PROXY_URL", "http://:8080example.com")
+
+	var err error
+	parser := config.NewParser()
+	config.Opts, err = parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	r := mux.NewRouter()
+	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
+
+	input := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
+	expected := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
+
+	if expected != output {
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
+	}
+}
+
+func TestAbsoluteProxyFilterWithHttpsAlwaysAndCustomProxyServer(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("MEDIA_PROXY_MODE", "all")
+	os.Setenv("MEDIA_PROXY_RESOURCE_TYPES", "image")
+	os.Setenv("MEDIA_PROXY_CUSTOM_URL", "https://proxy-example/proxy")
+
+	var err error
+	parser := config.NewParser()
+	config.Opts, err = parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	r := mux.NewRouter()
+	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
+
+	input := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
+	output := RewriteDocumentWithAbsoluteProxyURL(r, input)
+	expected := `<p><img src="https://proxy-example/proxy/aHR0cHM6Ly93ZWJzaXRlL2ZvbGRlci9pbWFnZS5wbmc=" alt="Test"/></p>`
+
+	if expected != output {
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
 	}
 }
 
@@ -198,11 +326,11 @@ func TestProxyFilterWithHttpInvalid(t *testing.T) {
 	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
 
 	input := `<p><img src="http://website/folder/image.png" alt="Test"/></p>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 	expected := `<p><img src="/proxy/okK5PsdNY8F082UMQEAbLPeUFfbe2WnNfInNmR9T4WA=/aHR0cDovL3dlYnNpdGUvZm9sZGVyL2ltYWdlLnBuZw==" alt="Test"/></p>`
 
 	if expected != output {
-		t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected)
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
 	}
 }
 
@@ -222,11 +350,11 @@ func TestProxyFilterWithHttpsInvalid(t *testing.T) {
 	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
 
 	input := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 	expected := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
 
 	if expected != output {
-		t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected)
+		t.Errorf(`Not expected output: got %q instead of %q`, output, expected)
 	}
 }
 
@@ -248,7 +376,7 @@ func TestProxyFilterWithSrcset(t *testing.T) {
 
 	input := `<p><img src="http://website/folder/image.png" srcset="http://website/folder/image2.png 656w, http://website/folder/image3.png 360w" alt="test"></p>`
 	expected := `<p><img src="/proxy/okK5PsdNY8F082UMQEAbLPeUFfbe2WnNfInNmR9T4WA=/aHR0cDovL3dlYnNpdGUvZm9sZGVyL2ltYWdlLnBuZw==" srcset="/proxy/aY5Hb4urDnUCly2vTJ7ExQeeaVS-52O7kjUr2v9VrAs=/aHR0cDovL3dlYnNpdGUvZm9sZGVyL2ltYWdlMi5wbmc= 656w, /proxy/QgAmrJWiAud_nNAsz3F8OTxaIofwAiO36EDzH_YfMzo=/aHR0cDovL3dlYnNpdGUvZm9sZGVyL2ltYWdlMy5wbmc= 360w" alt="test"/></p>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 
 	if expected != output {
 		t.Errorf(`Not expected output: got %s`, output)
@@ -273,7 +401,7 @@ func TestProxyFilterWithEmptySrcset(t *testing.T) {
 
 	input := `<p><img src="http://website/folder/image.png" srcset="" alt="test"></p>`
 	expected := `<p><img src="/proxy/okK5PsdNY8F082UMQEAbLPeUFfbe2WnNfInNmR9T4WA=/aHR0cDovL3dlYnNpdGUvZm9sZGVyL2ltYWdlLnBuZw==" srcset="" alt="test"/></p>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 
 	if expected != output {
 		t.Errorf(`Not expected output: got %s`, output)
@@ -298,7 +426,7 @@ func TestProxyFilterWithPictureSource(t *testing.T) {
 
 	input := `<picture><source srcset="http://website/folder/image2.png 656w,   http://website/folder/image3.png 360w, https://website/some,image.png 2x"></picture>`
 	expected := `<picture><source srcset="/proxy/aY5Hb4urDnUCly2vTJ7ExQeeaVS-52O7kjUr2v9VrAs=/aHR0cDovL3dlYnNpdGUvZm9sZGVyL2ltYWdlMi5wbmc= 656w, /proxy/QgAmrJWiAud_nNAsz3F8OTxaIofwAiO36EDzH_YfMzo=/aHR0cDovL3dlYnNpdGUvZm9sZGVyL2ltYWdlMy5wbmc= 360w, /proxy/ZIw0hv8WhSTls5aSqhnFaCXlUrKIqTnBRaY0-NaLnds=/aHR0cHM6Ly93ZWJzaXRlL3NvbWUsaW1hZ2UucG5n 2x"/></picture>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 
 	if expected != output {
 		t.Errorf(`Not expected output: got %s`, output)
@@ -323,7 +451,7 @@ func TestProxyFilterOnlyNonHTTPWithPictureSource(t *testing.T) {
 
 	input := `<picture><source srcset="http://website/folder/image2.png 656w, https://website/some,image.png 2x"></picture>`
 	expected := `<picture><source srcset="/proxy/aY5Hb4urDnUCly2vTJ7ExQeeaVS-52O7kjUr2v9VrAs=/aHR0cDovL3dlYnNpdGUvZm9sZGVyL2ltYWdlMi5wbmc= 656w, https://website/some,image.png 2x"/></picture>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 
 	if expected != output {
 		t.Errorf(`Not expected output: got %s`, output)
@@ -347,7 +475,7 @@ func TestProxyWithImageDataURL(t *testing.T) {
 
 	input := `<img src="data:image/gif;base64,test">`
 	expected := `<img src="data:image/gif;base64,test"/>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 
 	if expected != output {
 		t.Errorf(`Not expected output: got %s`, output)
@@ -371,7 +499,82 @@ func TestProxyWithImageSourceDataURL(t *testing.T) {
 
 	input := `<picture><source srcset="data:image/gif;base64,test"/></picture>`
 	expected := `<picture><source srcset="data:image/gif;base64,test"/></picture>`
-	output := ProxyRewriter(r, input)
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
+
+	if expected != output {
+		t.Errorf(`Not expected output: got %s`, output)
+	}
+}
+
+func TestProxyFilterWithVideo(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("PROXY_OPTION", "all")
+	os.Setenv("PROXY_MEDIA_TYPES", "video")
+	os.Setenv("PROXY_PRIVATE_KEY", "test")
+
+	var err error
+	parser := config.NewParser()
+	config.Opts, err = parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	r := mux.NewRouter()
+	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
+
+	input := `<video poster="https://example.com/img.png" src="https://example.com/video.mp4"></video>`
+	expected := `<video poster="/proxy/aDFfroYL57q5XsojIzATT6OYUCkuVSPXYJQAVrotnLw=/aHR0cHM6Ly9leGFtcGxlLmNvbS9pbWcucG5n" src="/proxy/0y3LR8zlx8S8qJkj1qWFOO6x3a-5yf2gLWjGIJV5yyc=/aHR0cHM6Ly9leGFtcGxlLmNvbS92aWRlby5tcDQ="></video>`
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
+
+	if expected != output {
+		t.Errorf(`Not expected output: got %s`, output)
+	}
+}
+
+func TestProxyFilterVideoPoster(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("PROXY_OPTION", "all")
+	os.Setenv("PROXY_MEDIA_TYPES", "image")
+	os.Setenv("PROXY_PRIVATE_KEY", "test")
+
+	var err error
+	parser := config.NewParser()
+	config.Opts, err = parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	r := mux.NewRouter()
+	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
+
+	input := `<video poster="https://example.com/img.png" src="https://example.com/video.mp4"></video>`
+	expected := `<video poster="/proxy/aDFfroYL57q5XsojIzATT6OYUCkuVSPXYJQAVrotnLw=/aHR0cHM6Ly9leGFtcGxlLmNvbS9pbWcucG5n" src="https://example.com/video.mp4"></video>`
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
+
+	if expected != output {
+		t.Errorf(`Not expected output: got %s`, output)
+	}
+}
+
+func TestProxyFilterVideoPosterOnce(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("PROXY_OPTION", "all")
+	os.Setenv("PROXY_MEDIA_TYPES", "image,video")
+	os.Setenv("PROXY_PRIVATE_KEY", "test")
+
+	var err error
+	parser := config.NewParser()
+	config.Opts, err = parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	r := mux.NewRouter()
+	r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
+
+	input := `<video poster="https://example.com/img.png" src="https://example.com/video.mp4"></video>`
+	expected := `<video poster="/proxy/aDFfroYL57q5XsojIzATT6OYUCkuVSPXYJQAVrotnLw=/aHR0cHM6Ly9leGFtcGxlLmNvbS9pbWcucG5n" src="/proxy/0y3LR8zlx8S8qJkj1qWFOO6x3a-5yf2gLWjGIJV5yyc=/aHR0cHM6Ly9leGFtcGxlLmNvbS92aWRlby5tcDQ="></video>`
+	output := RewriteDocumentWithRelativeProxyURL(r, input)
 
 	if expected != output {
 		t.Errorf(`Not expected output: got %s`, output)

internal/mediaproxy/rewriter.go

@@ -0,0 +1,113 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package mediaproxy // import "miniflux.app/v2/internal/mediaproxy"
+
+import (
+	"slices"
+	"strings"
+
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/reader/sanitizer"
+	"miniflux.app/v2/internal/urllib"
+
+	"github.com/PuerkitoBio/goquery"
+	"github.com/gorilla/mux"
+)
+
+type urlProxyRewriter func(router *mux.Router, url string) string
+
+func RewriteDocumentWithRelativeProxyURL(router *mux.Router, htmlDocument string) string {
+	return genericProxyRewriter(router, ProxifyRelativeURL, htmlDocument)
+}
+
+func RewriteDocumentWithAbsoluteProxyURL(router *mux.Router, htmlDocument string) string {
+	return genericProxyRewriter(router, ProxifyAbsoluteURL, htmlDocument)
+}
+
+func genericProxyRewriter(router *mux.Router, proxifyFunction urlProxyRewriter, htmlDocument string) string {
+	proxyOption := config.Opts.MediaProxyMode()
+	if proxyOption == "none" {
+		return htmlDocument
+	}
+
+	doc, err := goquery.NewDocumentFromReader(strings.NewReader(htmlDocument))
+	if err != nil {
+		return htmlDocument
+	}
+
+	for _, mediaType := range config.Opts.MediaProxyResourceTypes() {
+		switch mediaType {
+		case "image":
+			doc.Find("img, picture source").Each(func(i int, img *goquery.Selection) {
+				if srcAttrValue, ok := img.Attr("src"); ok {
+					if shouldProxy(srcAttrValue, proxyOption) {
+						img.SetAttr("src", proxifyFunction(router, srcAttrValue))
+					}
+				}
+
+				if srcsetAttrValue, ok := img.Attr("srcset"); ok {
+					proxifySourceSet(img, router, proxifyFunction, proxyOption, srcsetAttrValue)
+				}
+			})
+
+			if !slices.Contains(config.Opts.MediaProxyResourceTypes(), "video") {
+				doc.Find("video").Each(func(i int, video *goquery.Selection) {
+					if posterAttrValue, ok := video.Attr("poster"); ok {
+						if shouldProxy(posterAttrValue, proxyOption) {
+							video.SetAttr("poster", proxifyFunction(router, posterAttrValue))
+						}
+					}
+				})
+			}
+
+		case "audio":
+			doc.Find("audio, audio source").Each(func(i int, audio *goquery.Selection) {
+				if srcAttrValue, ok := audio.Attr("src"); ok {
+					if shouldProxy(srcAttrValue, proxyOption) {
+						audio.SetAttr("src", proxifyFunction(router, srcAttrValue))
+					}
+				}
+			})
+
+		case "video":
+			doc.Find("video, video source").Each(func(i int, video *goquery.Selection) {
+				if srcAttrValue, ok := video.Attr("src"); ok {
+					if shouldProxy(srcAttrValue, proxyOption) {
+						video.SetAttr("src", proxifyFunction(router, srcAttrValue))
+					}
+				}
+
+				if posterAttrValue, ok := video.Attr("poster"); ok {
+					if shouldProxy(posterAttrValue, proxyOption) {
+						video.SetAttr("poster", proxifyFunction(router, posterAttrValue))
+					}
+				}
+			})
+		}
+	}
+
+	output, err := doc.Find("body").First().Html()
+	if err != nil {
+		return htmlDocument
+	}
+
+	return output
+}
+
+func proxifySourceSet(element *goquery.Selection, router *mux.Router, proxifyFunction urlProxyRewriter, proxyOption, srcsetAttrValue string) {
+	imageCandidates := sanitizer.ParseSrcSetAttribute(srcsetAttrValue)
+
+	for _, imageCandidate := range imageCandidates {
+		if shouldProxy(imageCandidate.ImageURL, proxyOption) {
+			imageCandidate.ImageURL = proxifyFunction(router, imageCandidate.ImageURL)
+		}
+	}
+
+	element.SetAttr("srcset", imageCandidates.String())
+}
+
+func shouldProxy(attrValue, proxyOption string) bool {
+	return !strings.HasPrefix(attrValue, "data:") &&
+		(proxyOption == "all" || !urllib.IsHTTPS(attrValue))
+}

internal/mediaproxy/url.go

@@ -0,0 +1,68 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package mediaproxy // import "miniflux.app/v2/internal/mediaproxy"
+
+import (
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/base64"
+	"log/slog"
+	"net/url"
+
+	"github.com/gorilla/mux"
+
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/http/route"
+)
+
+func ProxifyRelativeURL(router *mux.Router, mediaURL string) string {
+	if mediaURL == "" {
+		return ""
+	}
+
+	if customProxyURL := config.Opts.MediaCustomProxyURL(); customProxyURL != "" {
+		return proxifyURLWithCustomProxy(mediaURL, customProxyURL)
+	}
+
+	mac := hmac.New(sha256.New, config.Opts.MediaProxyPrivateKey())
+	mac.Write([]byte(mediaURL))
+	digest := mac.Sum(nil)
+	return route.Path(router, "proxy", "encodedDigest", base64.URLEncoding.EncodeToString(digest), "encodedURL", base64.URLEncoding.EncodeToString([]byte(mediaURL)))
+}
+
+func ProxifyAbsoluteURL(router *mux.Router, mediaURL string) string {
+	if mediaURL == "" {
+		return ""
+	}
+
+	if customProxyURL := config.Opts.MediaCustomProxyURL(); customProxyURL != "" {
+		return proxifyURLWithCustomProxy(mediaURL, customProxyURL)
+	}
+
+	proxifiedUrl := ProxifyRelativeURL(router, mediaURL)
+
+	absoluteURL, err := url.JoinPath(config.Opts.BaseURL(), proxifiedUrl)
+	if err != nil {
+		return mediaURL
+	}
+
+	return absoluteURL
+}
+
+func proxifyURLWithCustomProxy(mediaURL, customProxyURL string) string {
+	if customProxyURL == "" {
+		return mediaURL
+	}
+
+	absoluteURL, err := url.JoinPath(customProxyURL, base64.URLEncoding.EncodeToString([]byte(mediaURL)))
+	if err != nil {
+		slog.Error("Incorrect custom media proxy URL",
+			slog.String("custom_proxy_url", customProxyURL),
+			slog.Any("error", err),
+		)
+		return mediaURL
+	}
+
+	return absoluteURL
+}

internal/model/app_session.go

@@ -67,5 +67,5 @@ type Session struct {
 }
 
 func (s *Session) String() string {
-	return fmt.Sprintf(`ID="%s", Data={%v}`, s.ID, s.Data)
+	return fmt.Sprintf(`ID=%q, Data={%v}`, s.ID, s.Data)
 }

internal/model/enclosure.go

@@ -2,7 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 package model // import "miniflux.app/v2/internal/model"
-import "strings"
+import (
+	"strings"
+
+	"github.com/gorilla/mux"
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/mediaproxy"
+	"miniflux.app/v2/internal/urllib"
+)
 
 // Enclosure represents an attachment.
 type Enclosure struct {
@@ -15,20 +22,56 @@ type Enclosure struct {
 	MediaProgression int64  `json:"media_progression"`
 }
 
+type EnclosureUpdateRequest struct {
+	MediaProgression int64 `json:"media_progression"`
+}
+
 // Html5MimeType will modify the actual MimeType to allow direct playback from HTML5 player for some kind of MimeType
 func (e Enclosure) Html5MimeType() string {
-	if strings.HasPrefix(e.MimeType, "video") {
-		switch e.MimeType {
-		// Solution from this stackoverflow discussion:
-		// https://stackoverflow.com/questions/15277147/m4v-mimetype-video-mp4-or-video-m4v/66945470#66945470
-		// tested at the time of this commit (06/2023) on latest Firefox & Vivaldi on this feed
-		// https://www.florenceporcel.com/podcast/lfhdu.xml
-		case "video/m4v":
-			return "video/x-m4v"
-		}
+	if e.MimeType == "video/m4v" {
+		return "video/x-m4v"
 	}
 	return e.MimeType
 }
 
 // EnclosureList represents a list of attachments.
 type EnclosureList []*Enclosure
+
+func (el EnclosureList) ContainsAudioOrVideo() bool {
+	for _, enclosure := range el {
+		if strings.Contains(enclosure.MimeType, "audio/") || strings.Contains(enclosure.MimeType, "video/") {
+			return true
+		}
+	}
+	return false
+}
+
+func (el EnclosureList) ProxifyEnclosureURL(router *mux.Router) {
+	proxyOption := config.Opts.MediaProxyMode()
+
+	if proxyOption == "all" || proxyOption != "none" {
+		for i := range el {
+			if urllib.IsHTTPS(el[i].URL) {
+				for _, mediaType := range config.Opts.MediaProxyResourceTypes() {
+					if strings.HasPrefix(el[i].MimeType, mediaType+"/") {
+						el[i].URL = mediaproxy.ProxifyAbsoluteURL(router, el[i].URL)
+						break
+					}
+				}
+			}
+		}
+	}
+}
+
+func (e *Enclosure) ProxifyEnclosureURL(router *mux.Router) {
+	proxyOption := config.Opts.MediaProxyMode()
+
+	if proxyOption == "all" || proxyOption != "none" && !urllib.IsHTTPS(e.URL) {
+		for _, mediaType := range config.Opts.MediaProxyResourceTypes() {
+			if strings.HasPrefix(e.MimeType, mediaType+"/") {
+				e.URL = mediaproxy.ProxifyAbsoluteURL(router, e.URL)
+				break
+			}
+		}
+	}
+}

internal/model/entry.go

@@ -50,6 +50,22 @@ func NewEntry() *Entry {
 	}
 }
 
+// ShouldMarkAsReadOnView Return whether the entry should be marked as viewed considering all user settings and entry state.
+func (e *Entry) ShouldMarkAsReadOnView(user *User) bool {
+	// Already read, no need to mark as read again. Removed entries are not marked as read
+	if e.Status != EntryStatusUnread {
+		return false
+	}
+
+	// There is an enclosure, markAsRead will happen at enclosure completion time, no need to mark as read on view
+	if user.MarkReadOnMediaPlayerCompletion && e.Enclosures.ContainsAudioOrVideo() {
+		return false
+	}
+
+	// The user wants to mark as read on view
+	return user.MarkReadOnView
+}
+
 // Entries represents a list of entries.
 type Entries []*Entry
 

internal/model/feed.go

@@ -28,6 +28,7 @@ type Feed struct {
 	FeedURL                     string    `json:"feed_url"`
 	SiteURL                     string    `json:"site_url"`
 	Title                       string    `json:"title"`
+	Description                 string    `json:"description"`
 	CheckedAt                   time.Time `json:"checked_at"`
 	NextCheckAt                 time.Time `json:"next_check_at"`
 	EtagHeader                  string    `json:"etag_header"`
@@ -50,7 +51,10 @@ type Feed struct {
 	AllowSelfSignedCertificates bool      `json:"allow_self_signed_certificates"`
 	FetchViaProxy               bool      `json:"fetch_via_proxy"`
 	HideGlobally                bool      `json:"hide_globally"`
+	DisableHTTP2                bool      `json:"disable_http2"`
 	AppriseServiceURLs          string    `json:"apprise_service_urls"`
+	NtfyEnabled                 bool      `json:"ntfy_enabled"`
+	NtfyPriority                int       `json:"ntfy_priority"`
 
 	// Non persisted attributes
 	Category *Category `json:"category,omitempty"`
@@ -150,6 +154,7 @@ type FeedCreationRequest struct {
 	KeeplistRules               string `json:"keeplist_rules"`
 	HideGlobally                bool   `json:"hide_globally"`
 	UrlRewriteRules             string `json:"urlrewrite_rules"`
+	DisableHTTP2                bool   `json:"disable_http2"`
 }
 
 type FeedCreationRequestFromSubscriptionDiscovery struct {
@@ -157,24 +162,7 @@ type FeedCreationRequestFromSubscriptionDiscovery struct {
 	ETag         string
 	LastModified string
 
-	FeedURL                     string `json:"feed_url"`
-	CategoryID                  int64  `json:"category_id"`
-	UserAgent                   string `json:"user_agent"`
-	Cookie                      string `json:"cookie"`
-	Username                    string `json:"username"`
-	Password                    string `json:"password"`
-	Crawler                     bool   `json:"crawler"`
-	Disabled                    bool   `json:"disabled"`
-	NoMediaPlayer               bool   `json:"no_media_player"`
-	IgnoreHTTPCache             bool   `json:"ignore_http_cache"`
-	AllowSelfSignedCertificates bool   `json:"allow_self_signed_certificates"`
-	FetchViaProxy               bool   `json:"fetch_via_proxy"`
-	ScraperRules                string `json:"scraper_rules"`
-	RewriteRules                string `json:"rewrite_rules"`
-	BlocklistRules              string `json:"blocklist_rules"`
-	KeeplistRules               string `json:"keeplist_rules"`
-	HideGlobally                bool   `json:"hide_globally"`
-	UrlRewriteRules             string `json:"urlrewrite_rules"`
+	FeedCreationRequest
 }
 
 // FeedModificationRequest represents the request to update a feed.
@@ -182,6 +170,7 @@ type FeedModificationRequest struct {
 	FeedURL                     *string `json:"feed_url"`
 	SiteURL                     *string `json:"site_url"`
 	Title                       *string `json:"title"`
+	Description                 *string `json:"description"`
 	ScraperRules                *string `json:"scraper_rules"`
 	RewriteRules                *string `json:"rewrite_rules"`
 	BlocklistRules              *string `json:"blocklist_rules"`
@@ -199,6 +188,7 @@ type FeedModificationRequest struct {
 	AllowSelfSignedCertificates *bool   `json:"allow_self_signed_certificates"`
 	FetchViaProxy               *bool   `json:"fetch_via_proxy"`
 	HideGlobally                *bool   `json:"hide_globally"`
+	DisableHTTP2                *bool   `json:"disable_http2"`
 }
 
 // Patch updates a feed with modified values.
@@ -215,6 +205,10 @@ func (f *FeedModificationRequest) Patch(feed *Feed) {
 		feed.Title = *f.Title
 	}
 
+	if f.Description != nil && *f.Description != "" {
+		feed.Description = *f.Description
+	}
+
 	if f.ScraperRules != nil {
 		feed.ScraperRules = *f.ScraperRules
 	}
@@ -282,6 +276,10 @@ func (f *FeedModificationRequest) Patch(feed *Feed) {
 	if f.HideGlobally != nil {
 		feed.HideGlobally = *f.HideGlobally
 	}
+
+	if f.DisableHTTP2 != nil {
+		feed.DisableHTTP2 = *f.DisableHTTP2
+	}
 }
 
 // Feeds is a list of feed

internal/model/integration.go

@@ -6,6 +6,9 @@ package model // import "miniflux.app/v2/internal/model"
 // Integration represents user integration settings.
 type Integration struct {
 	UserID                           int64
+	BetulaEnabled                    bool
+	BetulaURL                        string
+	BetulaToken                      string
 	PinboardEnabled                  bool
 	PinboardToken                    string
 	PinboardTags                     string
@@ -48,11 +51,20 @@ type Integration struct {
 	TelegramBotDisableWebPagePreview bool
 	TelegramBotDisableNotification   bool
 	TelegramBotDisableButtons        bool
+	LinkAceEnabled                   bool
+	LinkAceURL                       string
+	LinkAceAPIKey                    string
+	LinkAceTags                      string
+	LinkAcePrivate                   bool
+	LinkAceCheckDisabled             bool
 	LinkdingEnabled                  bool
 	LinkdingURL                      string
 	LinkdingAPIKey                   string
 	LinkdingTags                     string
 	LinkdingMarkAsUnread             bool
+	LinkwardenEnabled                bool
+	LinkwardenURL                    string
+	LinkwardenAPIKey                 string
 	MatrixBotEnabled                 bool
 	MatrixBotUser                    string
 	MatrixBotPassword                string
@@ -61,6 +73,11 @@ type Integration struct {
 	AppriseEnabled                   bool
 	AppriseURL                       string
 	AppriseServicesURL               string
+	ReadeckEnabled                   bool
+	ReadeckURL                       string
+	ReadeckAPIKey                    string
+	ReadeckLabels                    string
+	ReadeckOnlyURL                   bool
 	ShioriEnabled                    bool
 	ShioriURL                        string
 	ShioriUsername                   string
@@ -76,4 +93,15 @@ type Integration struct {
 	OmnivoreEnabled                  bool
 	OmnivoreAPIKey                   string
 	OmnivoreURL                      string
+	RaindropEnabled                  bool
+	RaindropToken                    string
+	RaindropCollectionID             string
+	RaindropTags                     string
+	NtfyEnabled                      bool
+	NtfyTopic                        string
+	NtfyURL                          string
+	NtfyAPIToken                     string
+	NtfyUsername                     string
+	NtfyPassword                     string
+	NtfyIconURL                      string
 }

internal/model/model.go

@@ -3,26 +3,20 @@
 
 package model // import "miniflux.app/v2/internal/model"
 
-// OptionalString populates an optional string field.
+type Number interface {
+	int | int64 | float64
+}
+
+func OptionalNumber[T Number](value T) *T {
+	if value > 0 {
+		return &value
+	}
+	return nil
+}
+
 func OptionalString(value string) *string {
 	if value != "" {
 		return &value
 	}
 	return nil
 }
-
-// OptionalInt populates an optional int field.
-func OptionalInt(value int) *int {
-	if value > 0 {
-		return &value
-	}
-	return nil
-}
-
-// OptionalInt64 populates an optional int64 field.
-func OptionalInt64(value int64) *int64 {
-	if value > 0 {
-		return &value
-	}
-	return nil
-}

internal/model/subscription.go

@@ -12,4 +12,5 @@ type SubscriptionDiscoveryRequest struct {
 	Password                    string `json:"password"`
 	FetchViaProxy               bool   `json:"fetch_via_proxy"`
 	AllowSelfSignedCertificates bool   `json:"allow_self_signed_certificates"`
+	DisableHTTP2                bool   `json:"disable_http2"`
 }

internal/model/user.go

@@ -11,30 +11,34 @@ import (
 
 // User represents a user in the system.
 type User struct {
-	ID                     int64      `json:"id"`
-	Username               string     `json:"username"`
-	Password               string     `json:"-"`
-	IsAdmin                bool       `json:"is_admin"`
-	Theme                  string     `json:"theme"`
-	Language               string     `json:"language"`
-	Timezone               string     `json:"timezone"`
-	EntryDirection         string     `json:"entry_sorting_direction"`
-	EntryOrder             string     `json:"entry_sorting_order"`
-	Stylesheet             string     `json:"stylesheet"`
-	GoogleID               string     `json:"google_id"`
-	OpenIDConnectID        string     `json:"openid_connect_id"`
-	EntriesPerPage         int        `json:"entries_per_page"`
-	KeyboardShortcuts      bool       `json:"keyboard_shortcuts"`
-	ShowReadingTime        bool       `json:"show_reading_time"`
-	EntrySwipe             bool       `json:"entry_swipe"`
-	GestureNav             string     `json:"gesture_nav"`
-	LastLoginAt            *time.Time `json:"last_login_at"`
-	DisplayMode            string     `json:"display_mode"`
-	DefaultReadingSpeed    int        `json:"default_reading_speed"`
-	CJKReadingSpeed        int        `json:"cjk_reading_speed"`
-	DefaultHomePage        string     `json:"default_home_page"`
-	CategoriesSortingOrder string     `json:"categories_sorting_order"`
-	MarkReadOnView         bool       `json:"mark_read_on_view"`
+	ID                              int64      `json:"id"`
+	Username                        string     `json:"username"`
+	Password                        string     `json:"-"`
+	IsAdmin                         bool       `json:"is_admin"`
+	Theme                           string     `json:"theme"`
+	Language                        string     `json:"language"`
+	Timezone                        string     `json:"timezone"`
+	EntryDirection                  string     `json:"entry_sorting_direction"`
+	EntryOrder                      string     `json:"entry_sorting_order"`
+	Stylesheet                      string     `json:"stylesheet"`
+	GoogleID                        string     `json:"google_id"`
+	OpenIDConnectID                 string     `json:"openid_connect_id"`
+	EntriesPerPage                  int        `json:"entries_per_page"`
+	KeyboardShortcuts               bool       `json:"keyboard_shortcuts"`
+	ShowReadingTime                 bool       `json:"show_reading_time"`
+	EntrySwipe                      bool       `json:"entry_swipe"`
+	GestureNav                      string     `json:"gesture_nav"`
+	LastLoginAt                     *time.Time `json:"last_login_at"`
+	DisplayMode                     string     `json:"display_mode"`
+	DefaultReadingSpeed             int        `json:"default_reading_speed"`
+	CJKReadingSpeed                 int        `json:"cjk_reading_speed"`
+	DefaultHomePage                 string     `json:"default_home_page"`
+	CategoriesSortingOrder          string     `json:"categories_sorting_order"`
+	MarkReadOnView                  bool       `json:"mark_read_on_view"`
+	MarkReadOnMediaPlayerCompletion bool       `json:"mark_read_on_media_player_completion"`
+	MediaPlaybackRate               float64    `json:"media_playback_rate"`
+	BlockFilterEntryRules           string     `json:"block_filter_entry_rules"`
+	KeepFilterEntryRules            string     `json:"keep_filter_entry_rules"`
 }
 
 // UserCreationRequest represents the request to create a user.
@@ -48,28 +52,32 @@ type UserCreationRequest struct {
 
 // UserModificationRequest represents the request to update a user.
 type UserModificationRequest struct {
-	Username               *string `json:"username"`
-	Password               *string `json:"password"`
-	Theme                  *string `json:"theme"`
-	Language               *string `json:"language"`
-	Timezone               *string `json:"timezone"`
-	EntryDirection         *string `json:"entry_sorting_direction"`
-	EntryOrder             *string `json:"entry_sorting_order"`
-	Stylesheet             *string `json:"stylesheet"`
-	GoogleID               *string `json:"google_id"`
-	OpenIDConnectID        *string `json:"openid_connect_id"`
-	EntriesPerPage         *int    `json:"entries_per_page"`
-	IsAdmin                *bool   `json:"is_admin"`
-	KeyboardShortcuts      *bool   `json:"keyboard_shortcuts"`
-	ShowReadingTime        *bool   `json:"show_reading_time"`
-	EntrySwipe             *bool   `json:"entry_swipe"`
-	GestureNav             *string `json:"gesture_nav"`
-	DisplayMode            *string `json:"display_mode"`
-	DefaultReadingSpeed    *int    `json:"default_reading_speed"`
-	CJKReadingSpeed        *int    `json:"cjk_reading_speed"`
-	DefaultHomePage        *string `json:"default_home_page"`
-	CategoriesSortingOrder *string `json:"categories_sorting_order"`
-	MarkReadOnView         *bool   `json:"mark_read_on_view"`
+	Username                        *string  `json:"username"`
+	Password                        *string  `json:"password"`
+	Theme                           *string  `json:"theme"`
+	Language                        *string  `json:"language"`
+	Timezone                        *string  `json:"timezone"`
+	EntryDirection                  *string  `json:"entry_sorting_direction"`
+	EntryOrder                      *string  `json:"entry_sorting_order"`
+	Stylesheet                      *string  `json:"stylesheet"`
+	GoogleID                        *string  `json:"google_id"`
+	OpenIDConnectID                 *string  `json:"openid_connect_id"`
+	EntriesPerPage                  *int     `json:"entries_per_page"`
+	IsAdmin                         *bool    `json:"is_admin"`
+	KeyboardShortcuts               *bool    `json:"keyboard_shortcuts"`
+	ShowReadingTime                 *bool    `json:"show_reading_time"`
+	EntrySwipe                      *bool    `json:"entry_swipe"`
+	GestureNav                      *string  `json:"gesture_nav"`
+	DisplayMode                     *string  `json:"display_mode"`
+	DefaultReadingSpeed             *int     `json:"default_reading_speed"`
+	CJKReadingSpeed                 *int     `json:"cjk_reading_speed"`
+	DefaultHomePage                 *string  `json:"default_home_page"`
+	CategoriesSortingOrder          *string  `json:"categories_sorting_order"`
+	MarkReadOnView                  *bool    `json:"mark_read_on_view"`
+	MarkReadOnMediaPlayerCompletion *bool    `json:"mark_read_on_media_player_completion"`
+	MediaPlaybackRate               *float64 `json:"media_playback_rate"`
+	BlockFilterEntryRules           *string  `json:"block_filter_entry_rules"`
+	KeepFilterEntryRules            *string  `json:"keep_filter_entry_rules"`
 }
 
 // Patch updates the User object with the modification request.
@@ -161,6 +169,22 @@ func (u *UserModificationRequest) Patch(user *User) {
 	if u.MarkReadOnView != nil {
 		user.MarkReadOnView = *u.MarkReadOnView
 	}
+
+	if u.MarkReadOnMediaPlayerCompletion != nil {
+		user.MarkReadOnMediaPlayerCompletion = *u.MarkReadOnMediaPlayerCompletion
+	}
+
+	if u.MediaPlaybackRate != nil {
+		user.MediaPlaybackRate = *u.MediaPlaybackRate
+	}
+
+	if u.BlockFilterEntryRules != nil {
+		user.BlockFilterEntryRules = *u.BlockFilterEntryRules
+	}
+
+	if u.KeepFilterEntryRules != nil {
+		user.KeepFilterEntryRules = *u.KeepFilterEntryRules
+	}
 }
 
 // UseTimezone converts last login date to the given timezone.

internal/model/user_session.go

@@ -21,7 +21,7 @@ type UserSession struct {
 }
 
 func (u *UserSession) String() string {
-	return fmt.Sprintf(`ID="%d", UserID="%d", IP="%s", Token="%s"`, u.ID, u.UserID, u.IP, u.Token)
+	return fmt.Sprintf(`ID=%q, UserID=%q, IP=%q, Token=%q`, u.ID, u.UserID, u.IP, u.Token)
 }
 
 // UseTimezone converts creation date to the given timezone.

internal/proxy/media_proxy.go

@@ -1,122 +0,0 @@
-// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package proxy // import "miniflux.app/v2/internal/proxy"
-
-import (
-	"strings"
-
-	"miniflux.app/v2/internal/config"
-	"miniflux.app/v2/internal/reader/sanitizer"
-	"miniflux.app/v2/internal/urllib"
-
-	"github.com/PuerkitoBio/goquery"
-	"github.com/gorilla/mux"
-)
-
-type urlProxyRewriter func(router *mux.Router, url string) string
-
-// ProxyRewriter replaces media URLs with internal proxy URLs.
-func ProxyRewriter(router *mux.Router, data string) string {
-	return genericProxyRewriter(router, ProxifyURL, data)
-}
-
-// AbsoluteProxyRewriter do the same as ProxyRewriter except it uses absolute URLs.
-func AbsoluteProxyRewriter(router *mux.Router, host, data string) string {
-	proxifyFunction := func(router *mux.Router, url string) string {
-		return AbsoluteProxifyURL(router, host, url)
-	}
-	return genericProxyRewriter(router, proxifyFunction, data)
-}
-
-func genericProxyRewriter(router *mux.Router, proxifyFunction urlProxyRewriter, data string) string {
-	proxyOption := config.Opts.ProxyOption()
-	if proxyOption == "none" {
-		return data
-	}
-
-	doc, err := goquery.NewDocumentFromReader(strings.NewReader(data))
-	if err != nil {
-		return data
-	}
-
-	for _, mediaType := range config.Opts.ProxyMediaTypes() {
-		switch mediaType {
-		case "image":
-			doc.Find("img").Each(func(i int, img *goquery.Selection) {
-				if srcAttrValue, ok := img.Attr("src"); ok {
-					if !isDataURL(srcAttrValue) && (proxyOption == "all" || !urllib.IsHTTPS(srcAttrValue)) {
-						img.SetAttr("src", proxifyFunction(router, srcAttrValue))
-					}
-				}
-
-				if srcsetAttrValue, ok := img.Attr("srcset"); ok {
-					proxifySourceSet(img, router, proxifyFunction, proxyOption, srcsetAttrValue)
-				}
-			})
-
-			doc.Find("picture source").Each(func(i int, sourceElement *goquery.Selection) {
-				if srcsetAttrValue, ok := sourceElement.Attr("srcset"); ok {
-					proxifySourceSet(sourceElement, router, proxifyFunction, proxyOption, srcsetAttrValue)
-				}
-			})
-
-		case "audio":
-			doc.Find("audio").Each(func(i int, audio *goquery.Selection) {
-				if srcAttrValue, ok := audio.Attr("src"); ok {
-					if !isDataURL(srcAttrValue) && (proxyOption == "all" || !urllib.IsHTTPS(srcAttrValue)) {
-						audio.SetAttr("src", proxifyFunction(router, srcAttrValue))
-					}
-				}
-			})
-
-			doc.Find("audio source").Each(func(i int, sourceElement *goquery.Selection) {
-				if srcAttrValue, ok := sourceElement.Attr("src"); ok {
-					if !isDataURL(srcAttrValue) && (proxyOption == "all" || !urllib.IsHTTPS(srcAttrValue)) {
-						sourceElement.SetAttr("src", proxifyFunction(router, srcAttrValue))
-					}
-				}
-			})
-
-		case "video":
-			doc.Find("video").Each(func(i int, video *goquery.Selection) {
-				if srcAttrValue, ok := video.Attr("src"); ok {
-					if !isDataURL(srcAttrValue) && (proxyOption == "all" || !urllib.IsHTTPS(srcAttrValue)) {
-						video.SetAttr("src", proxifyFunction(router, srcAttrValue))
-					}
-				}
-			})
-
-			doc.Find("video source").Each(func(i int, sourceElement *goquery.Selection) {
-				if srcAttrValue, ok := sourceElement.Attr("src"); ok {
-					if !isDataURL(srcAttrValue) && (proxyOption == "all" || !urllib.IsHTTPS(srcAttrValue)) {
-						sourceElement.SetAttr("src", proxifyFunction(router, srcAttrValue))
-					}
-				}
-			})
-		}
-	}
-
-	output, err := doc.Find("body").First().Html()
-	if err != nil {
-		return data
-	}
-
-	return output
-}
-
-func proxifySourceSet(element *goquery.Selection, router *mux.Router, proxifyFunction urlProxyRewriter, proxyOption, srcsetAttrValue string) {
-	imageCandidates := sanitizer.ParseSrcSetAttribute(srcsetAttrValue)
-
-	for _, imageCandidate := range imageCandidates {
-		if !isDataURL(imageCandidate.ImageURL) && (proxyOption == "all" || !urllib.IsHTTPS(imageCandidate.ImageURL)) {
-			imageCandidate.ImageURL = proxifyFunction(router, imageCandidate.ImageURL)
-		}
-	}
-
-	element.SetAttr("srcset", imageCandidates.String())
-}
-
-func isDataURL(s string) bool {
-	return strings.HasPrefix(s, "data:")
-}

internal/proxy/proxy.go

@@ -1,69 +0,0 @@
-// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package proxy // import "miniflux.app/v2/internal/proxy"
-
-import (
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/base64"
-	"net/url"
-	"path"
-
-	"miniflux.app/v2/internal/http/route"
-
-	"github.com/gorilla/mux"
-
-	"miniflux.app/v2/internal/config"
-)
-
-// ProxifyURL generates a relative URL for a proxified resource.
-func ProxifyURL(router *mux.Router, link string) string {
-	if link != "" {
-		proxyImageUrl := config.Opts.ProxyUrl()
-
-		if proxyImageUrl == "" {
-			mac := hmac.New(sha256.New, config.Opts.ProxyPrivateKey())
-			mac.Write([]byte(link))
-			digest := mac.Sum(nil)
-			return route.Path(router, "proxy", "encodedDigest", base64.URLEncoding.EncodeToString(digest), "encodedURL", base64.URLEncoding.EncodeToString([]byte(link)))
-		}
-
-		proxyUrl, err := url.Parse(proxyImageUrl)
-		if err != nil {
-			return ""
-		}
-
-		proxyUrl.Path = path.Join(proxyUrl.Path, base64.URLEncoding.EncodeToString([]byte(link)))
-		return proxyUrl.String()
-	}
-	return ""
-}
-
-// AbsoluteProxifyURL generates an absolute URL for a proxified resource.
-func AbsoluteProxifyURL(router *mux.Router, host, link string) string {
-	if link != "" {
-		proxyImageUrl := config.Opts.ProxyUrl()
-
-		if proxyImageUrl == "" {
-			mac := hmac.New(sha256.New, config.Opts.ProxyPrivateKey())
-			mac.Write([]byte(link))
-			digest := mac.Sum(nil)
-			path := route.Path(router, "proxy", "encodedDigest", base64.URLEncoding.EncodeToString(digest), "encodedURL", base64.URLEncoding.EncodeToString([]byte(link)))
-			if config.Opts.HTTPS {
-				return "https://" + host + path
-			} else {
-				return "http://" + host + path
-			}
-		}
-
-		proxyUrl, err := url.Parse(proxyImageUrl)
-		if err != nil {
-			return ""
-		}
-
-		proxyUrl.Path = path.Join(proxyUrl.Path, base64.URLEncoding.EncodeToString([]byte(link)))
-		return proxyUrl.String()
-	}
-	return ""
-}

internal/reader/atom/atom_03.go

@@ -6,158 +6,114 @@ package atom // import "miniflux.app/v2/internal/reader/atom"
 import (
 	"encoding/base64"
 	"html"
-	"log/slog"
 	"strings"
-	"time"
-
-	"miniflux.app/v2/internal/crypto"
-	"miniflux.app/v2/internal/model"
-	"miniflux.app/v2/internal/reader/date"
-	"miniflux.app/v2/internal/reader/sanitizer"
-	"miniflux.app/v2/internal/urllib"
 )
 
 // Specs: http://web.archive.org/web/20060811235523/http://www.mnot.net/drafts/draft-nottingham-atom-format-02.html
-type atom03Feed struct {
-	ID      string        `xml:"id"`
-	Title   atom03Text    `xml:"title"`
-	Author  atomPerson    `xml:"author"`
-	Links   atomLinks     `xml:"link"`
-	Entries []atom03Entry `xml:"entry"`
+type Atom03Feed struct {
+	Version string `xml:"version,attr"`
+
+	// The "atom:id" element's content conveys a permanent, globally unique identifier for the feed.
+	// It MUST NOT change over time, even if the feed is relocated. atom:feed elements MAY contain an atom:id element,
+	// but MUST NOT contain more than one. The content of this element, when present, MUST be a URI.
+	ID string `xml:"http://purl.org/atom/ns# id"`
+
+	// The "atom:title" element is a Content construct that conveys a human-readable title for the feed.
+	// atom:feed elements MUST contain exactly one atom:title element.
+	// If the feed describes a Web resource, its content SHOULD be the same as that resource's title.
+	Title Atom03Content `xml:"http://purl.org/atom/ns# title"`
+
+	// The "atom:link" element is a Link construct that conveys a URI associated with the feed.
+	// The nature of the relationship as well as the link itself is determined by the element's content.
+	// atom:feed elements MUST contain at least one atom:link element with a rel attribute value of "alternate".
+	// atom:feed elements MUST NOT contain more than one atom:link element with a rel attribute value of "alternate" that has the same type attribute value.
+	// atom:feed elements MAY contain additional atom:link elements beyond those described above.
+	Links AtomLinks `xml:"http://purl.org/atom/ns# link"`
+
+	// The "atom:author" element is a Person construct that indicates the default author of the feed.
+	// atom:feed elements MUST contain exactly one atom:author element,
+	// UNLESS all of the atom:feed element's child atom:entry elements contain an atom:author element.
+	// atom:feed elements MUST NOT contain more than one atom:author element.
+	Author AtomPerson `xml:"http://purl.org/atom/ns# author"`
+
+	// The "atom:entry" element's represents an individual entry that is contained by the feed.
+	// atom:feed elements MAY contain one or more atom:entry elements.
+	Entries []Atom03Entry `xml:"http://purl.org/atom/ns# entry"`
 }
 
-func (a *atom03Feed) Transform(baseURL string) *model.Feed {
-	var err error
+type Atom03Entry struct {
+	// The "atom:id" element's content conveys a permanent, globally unique identifier for the entry.
+	// It MUST NOT change over time, even if other representations of the entry (such as a web representation pointed to by the entry's atom:link element) are relocated.
+	// If the same entry is syndicated in two atom:feeds published by the same entity, the entry's atom:id MUST be the same in both feeds.
+	ID string `xml:"id"`
 
-	feed := new(model.Feed)
+	// The "atom:title" element is a Content construct that conveys a human-readable title for the entry.
+	// atom:entry elements MUST have exactly one "atom:title" element.
+	// If an entry describes a Web resource, its content SHOULD be the same as that resource's title.
+	Title Atom03Content `xml:"title"`
 
-	feedURL := a.Links.firstLinkWithRelation("self")
-	feed.FeedURL, err = urllib.AbsoluteURL(baseURL, feedURL)
-	if err != nil {
-		feed.FeedURL = feedURL
-	}
+	// The "atom:modified" element is a Date construct that indicates the time that the entry was last modified.
+	// atom:entry elements MUST contain an atom:modified element, but MUST NOT contain more than one.
+	// The content of an atom:modified element MUST have a time zone whose value SHOULD be "UTC".
+	Modified string `xml:"modified"`
 
-	siteURL := a.Links.originalLink()
-	feed.SiteURL, err = urllib.AbsoluteURL(baseURL, siteURL)
-	if err != nil {
-		feed.SiteURL = siteURL
-	}
+	// The "atom:issued" element is a Date construct that indicates the time that the entry was issued.
+	// atom:entry elements MUST contain an atom:issued element, but MUST NOT contain more than one.
+	// The content of an atom:issued element MAY omit a time zone.
+	Issued string `xml:"issued"`
 
-	feed.Title = a.Title.String()
-	if feed.Title == "" {
-		feed.Title = feed.SiteURL
-	}
+	// The "atom:created" element is a Date construct that indicates the time that the entry was created.
+	// atom:entry elements MAY contain an atom:created element, but MUST NOT contain more than one.
+	// The content of an atom:created element MUST have a time zone whose value SHOULD be "UTC".
+	// If atom:created is not present, its content MUST considered to be the same as that of atom:modified.
+	Created string `xml:"created"`
 
-	for _, entry := range a.Entries {
-		item := entry.Transform()
-		entryURL, err := urllib.AbsoluteURL(feed.SiteURL, item.URL)
-		if err == nil {
-			item.URL = entryURL
-		}
+	// The "atom:link" element is a Link construct that conveys a URI associated with the entry.
+	// The nature of the relationship as well as the link itself is determined by the element's content.
+	// atom:entry elements MUST contain at least one atom:link element with a rel attribute value of "alternate".
+	// atom:entry elements MUST NOT contain more than one atom:link element with a rel attribute value of "alternate" that has the same type attribute value.
+	// atom:entry elements MAY contain additional atom:link elements beyond those described above.
+	Links AtomLinks `xml:"link"`
 
-		if item.Author == "" {
-			item.Author = a.Author.String()
-		}
+	// The "atom:summary" element is a Content construct that conveys a short summary, abstract or excerpt of the entry.
+	// atom:entry elements MAY contain an atom:created element, but MUST NOT contain more than one.
+	Summary Atom03Content `xml:"summary"`
 
-		if item.Title == "" {
-			item.Title = sanitizer.TruncateHTML(item.Content, 100)
-		}
+	// The "atom:content" element is a Content construct that conveys the content of the entry.
+	// atom:entry elements MAY contain one or more atom:content elements.
+	Content Atom03Content `xml:"content"`
 
-		if item.Title == "" {
-			item.Title = item.URL
-		}
-
-		feed.Entries = append(feed.Entries, item)
-	}
-
-	return feed
+	// The "atom:author" element is a Person construct that indicates the default author of the entry.
+	// atom:entry elements MUST contain exactly one atom:author element,
+	// UNLESS the atom:feed element containing them contains an atom:author element itself.
+	// atom:entry elements MUST NOT contain more than one atom:author element.
+	Author AtomPerson `xml:"author"`
 }
 
-type atom03Entry struct {
-	ID       string     `xml:"id"`
-	Title    atom03Text `xml:"title"`
-	Modified string     `xml:"modified"`
-	Issued   string     `xml:"issued"`
-	Created  string     `xml:"created"`
-	Links    atomLinks  `xml:"link"`
-	Summary  atom03Text `xml:"summary"`
-	Content  atom03Text `xml:"content"`
-	Author   atomPerson `xml:"author"`
-}
+type Atom03Content struct {
+	// Content constructs MAY have a "type" attribute, whose value indicates the media type of the content.
+	// When present, this attribute's value MUST be a registered media type [RFC2045].
+	// If not present, its value MUST be considered to be "text/plain".
+	Type string `xml:"type,attr"`
 
-func (a *atom03Entry) Transform() *model.Entry {
-	entry := model.NewEntry()
-	entry.URL = a.Links.originalLink()
-	entry.Date = a.entryDate()
-	entry.Author = a.Author.String()
-	entry.Hash = a.entryHash()
-	entry.Content = a.entryContent()
-	entry.Title = a.entryTitle()
-	return entry
-}
+	// Content constructs MAY have a "mode" attribute, whose value indicates the method used to encode the content.
+	// When present, this attribute's value MUST be listed below.
+	// If not present, its value MUST be considered to be "xml".
+	//
+	// "xml": A mode attribute with the value "xml" indicates that the element's content is inline xml (for example, namespace-qualified XHTML).
+	//
+	// "escaped": A mode attribute with the value "escaped" indicates that the element's content is an escaped string.
+	// Processors MUST unescape the element's content before considering it as content of the indicated media type.
+	//
+	// "base64": A mode attribute with the value "base64" indicates that the element's content is base64-encoded [RFC2045].
+	// Processors MUST decode the element's content before considering it as content of the the indicated media type.
+	Mode string `xml:"mode,attr"`
 
-func (a *atom03Entry) entryTitle() string {
-	return sanitizer.StripTags(a.Title.String())
-}
-
-func (a *atom03Entry) entryContent() string {
-	content := a.Content.String()
-	if content != "" {
-		return content
-	}
-
-	summary := a.Summary.String()
-	if summary != "" {
-		return summary
-	}
-
-	return ""
-}
-
-func (a *atom03Entry) entryDate() time.Time {
-	dateText := ""
-	for _, value := range []string{a.Issued, a.Modified, a.Created} {
-		if value != "" {
-			dateText = value
-			break
-		}
-	}
-
-	if dateText != "" {
-		result, err := date.Parse(dateText)
-		if err != nil {
-			slog.Debug("Unable to parse date from Atom 0.3 feed",
-				slog.String("date", dateText),
-				slog.String("id", a.ID),
-				slog.Any("error", err),
-			)
-			return time.Now()
-		}
-
-		return result
-	}
-
-	return time.Now()
-}
-
-func (a *atom03Entry) entryHash() string {
-	for _, value := range []string{a.ID, a.Links.originalLink()} {
-		if value != "" {
-			return crypto.Hash(value)
-		}
-	}
-
-	return ""
-}
-
-type atom03Text struct {
-	Type     string `xml:"type,attr"`
-	Mode     string `xml:"mode,attr"`
 	CharData string `xml:",chardata"`
 	InnerXML string `xml:",innerxml"`
 }
 
-func (a *atom03Text) String() string {
+func (a *Atom03Content) Content() string {
 	content := ""
 
 	switch {

internal/reader/atom/atom_03_adapter.go

@@ -0,0 +1,115 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package atom // import "miniflux.app/v2/internal/reader/atom"
+
+import (
+	"log/slog"
+	"time"
+
+	"miniflux.app/v2/internal/crypto"
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/reader/date"
+	"miniflux.app/v2/internal/reader/sanitizer"
+	"miniflux.app/v2/internal/urllib"
+)
+
+type Atom03Adapter struct {
+	atomFeed *Atom03Feed
+}
+
+func NewAtom03Adapter(atomFeed *Atom03Feed) *Atom03Adapter {
+	return &Atom03Adapter{atomFeed}
+}
+
+func (a *Atom03Adapter) BuildFeed(baseURL string) *model.Feed {
+	feed := new(model.Feed)
+
+	// Populate the feed URL.
+	feedURL := a.atomFeed.Links.firstLinkWithRelation("self")
+	if feedURL != "" {
+		if absoluteFeedURL, err := urllib.AbsoluteURL(baseURL, feedURL); err == nil {
+			feed.FeedURL = absoluteFeedURL
+		}
+	} else {
+		feed.FeedURL = baseURL
+	}
+
+	// Populate the site URL.
+	siteURL := a.atomFeed.Links.OriginalLink()
+	if siteURL != "" {
+		if absoluteSiteURL, err := urllib.AbsoluteURL(baseURL, siteURL); err == nil {
+			feed.SiteURL = absoluteSiteURL
+		}
+	} else {
+		feed.SiteURL = baseURL
+	}
+
+	// Populate the feed title.
+	feed.Title = a.atomFeed.Title.Content()
+	if feed.Title == "" {
+		feed.Title = feed.SiteURL
+	}
+
+	for _, atomEntry := range a.atomFeed.Entries {
+		entry := model.NewEntry()
+
+		// Populate the entry URL.
+		entry.URL = atomEntry.Links.OriginalLink()
+		if entry.URL != "" {
+			if absoluteEntryURL, err := urllib.AbsoluteURL(feed.SiteURL, entry.URL); err == nil {
+				entry.URL = absoluteEntryURL
+			}
+		}
+
+		// Populate the entry content.
+		entry.Content = atomEntry.Content.Content()
+		if entry.Content == "" {
+			entry.Content = atomEntry.Summary.Content()
+		}
+
+		// Populate the entry title.
+		entry.Title = atomEntry.Title.Content()
+		if entry.Title == "" {
+			entry.Title = sanitizer.TruncateHTML(entry.Content, 100)
+		}
+		if entry.Title == "" {
+			entry.Title = entry.URL
+		}
+
+		// Populate the entry author.
+		entry.Author = atomEntry.Author.PersonName()
+		if entry.Author == "" {
+			entry.Author = a.atomFeed.Author.PersonName()
+		}
+
+		// Populate the entry date.
+		for _, value := range []string{atomEntry.Issued, atomEntry.Modified, atomEntry.Created} {
+			if parsedDate, err := date.Parse(value); err == nil {
+				entry.Date = parsedDate
+				break
+			} else {
+				slog.Debug("Unable to parse date from Atom 0.3 feed",
+					slog.String("date", value),
+					slog.String("id", atomEntry.ID),
+					slog.Any("error", err),
+				)
+			}
+		}
+		if entry.Date.IsZero() {
+			entry.Date = time.Now()
+		}
+
+		// Generate the entry hash.
+		for _, value := range []string{atomEntry.ID, atomEntry.Links.OriginalLink()} {
+			if value != "" {
+				entry.Hash = crypto.Hash(value)
+				break
+			}
+		}
+
+		feed.Entries = append(feed.Entries, entry)
+	}
+
+	return feed
+}

internal/reader/atom/atom_03_test.go

@@ -27,7 +27,7 @@ func TestParseAtom03(t *testing.T) {
 		</entry>
 	</feed>`
 
-	feed, err := Parse("http://diveintomark.org/", bytes.NewBufferString(data))
+	feed, err := Parse("http://diveintomark.org/atom.xml", bytes.NewReader([]byte(data)), "0.3")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -36,7 +36,7 @@ func TestParseAtom03(t *testing.T) {
 		t.Errorf("Incorrect title, got: %s", feed.Title)
 	}
 
-	if feed.FeedURL != "http://diveintomark.org/" {
+	if feed.FeedURL != "http://diveintomark.org/atom.xml" {
 		t.Errorf("Incorrect feed URL, got: %s", feed.FeedURL)
 	}
 
@@ -74,6 +74,28 @@ func TestParseAtom03(t *testing.T) {
 	}
 }
 
+func TestParseAtom03WithoutSiteURL(t *testing.T) {
+	data := `<?xml version="1.0" encoding="utf-8"?>
+	<feed version="0.3" xmlns="http://purl.org/atom/ns#">
+		<modified>2003-12-13T18:30:02Z</modified>
+		<author><name>Mark Pilgrim</name></author>
+		<entry>
+			<title>Atom 0.3 snapshot</title>
+			<link rel="alternate" type="text/html" href="http://diveintomark.org/2003/12/13/atom03"/>
+			<id>tag:diveintomark.org,2003:3.2397</id>
+		</entry>
+	</feed>`
+
+	feed, err := Parse("http://diveintomark.org/atom.xml", bytes.NewReader([]byte(data)), "0.3")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if feed.SiteURL != "http://diveintomark.org/atom.xml" {
+		t.Errorf("Incorrect title, got: %s", feed.Title)
+	}
+}
+
 func TestParseAtom03WithoutFeedTitle(t *testing.T) {
 	data := `<?xml version="1.0" encoding="utf-8"?>
 	<feed version="0.3" xmlns="http://purl.org/atom/ns#">
@@ -87,7 +109,7 @@ func TestParseAtom03WithoutFeedTitle(t *testing.T) {
 		</entry>
 	</feed>`
 
-	feed, err := Parse("http://diveintomark.org/", bytes.NewBufferString(data))
+	feed, err := Parse("http://diveintomark.org/", bytes.NewReader([]byte(data)), "0.3")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -110,7 +132,7 @@ func TestParseAtom03WithoutEntryTitleButWithLink(t *testing.T) {
 		</entry>
 	</feed>`
 
-	feed, err := Parse("http://diveintomark.org/", bytes.NewBufferString(data))
+	feed, err := Parse("http://diveintomark.org/", bytes.NewReader([]byte(data)), "0.3")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -138,7 +160,7 @@ func TestParseAtom03WithoutEntryTitleButWithSummary(t *testing.T) {
 		</entry>
 	</feed>`
 
-	feed, err := Parse("http://diveintomark.org/", bytes.NewBufferString(data))
+	feed, err := Parse("http://diveintomark.org/", bytes.NewReader([]byte(data)), "0.3")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -166,7 +188,7 @@ func TestParseAtom03WithoutEntryTitleButWithXMLContent(t *testing.T) {
 		</entry>
 	</feed>`
 
-	feed, err := Parse("http://diveintomark.org/", bytes.NewBufferString(data))
+	feed, err := Parse("http://diveintomark.org/", bytes.NewReader([]byte(data)), "0.3")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -197,7 +219,7 @@ func TestParseAtom03WithSummaryOnly(t *testing.T) {
 		</entry>
 	</feed>`
 
-	feed, err := Parse("http://diveintomark.org/", bytes.NewBufferString(data))
+	feed, err := Parse("http://diveintomark.org/", bytes.NewReader([]byte(data)), "0.3")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -228,7 +250,7 @@ func TestParseAtom03WithXMLContent(t *testing.T) {
 		</entry>
 	</feed>`
 
-	feed, err := Parse("http://diveintomark.org/", bytes.NewBufferString(data))
+	feed, err := Parse("http://diveintomark.org/", bytes.NewReader([]byte(data)), "0.3")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -259,7 +281,7 @@ func TestParseAtom03WithBase64Content(t *testing.T) {
 		</entry>
 	</feed>`
 
-	feed, err := Parse("http://diveintomark.org/", bytes.NewBufferString(data))
+	feed, err := Parse("http://diveintomark.org/", bytes.NewReader([]byte(data)), "0.3")
 	if err != nil {
 		t.Fatal(err)
 	}

internal/reader/atom/atom_10.go

@@ -6,286 +6,200 @@ package atom // import "miniflux.app/v2/internal/reader/atom"
 import (
 	"encoding/xml"
 	"html"
-	"log/slog"
-	"strconv"
 	"strings"
-	"time"
 
-	"miniflux.app/v2/internal/crypto"
-	"miniflux.app/v2/internal/model"
-	"miniflux.app/v2/internal/reader/date"
 	"miniflux.app/v2/internal/reader/media"
 	"miniflux.app/v2/internal/reader/sanitizer"
-	"miniflux.app/v2/internal/urllib"
 )
 
+// The "atom:feed" element is the document (i.e., top-level) element of
+// an Atom Feed Document, acting as a container for metadata and data
+// associated with the feed. Its element children consist of metadata
+// elements followed by zero or more atom:entry child elements.
+//
 // Specs:
 // https://tools.ietf.org/html/rfc4287
 // https://validator.w3.org/feed/docs/atom.html
-type atom10Feed struct {
-	XMLName xml.Name      `xml:"http://www.w3.org/2005/Atom feed"`
-	ID      string        `xml:"id"`
-	Title   atom10Text    `xml:"title"`
-	Authors atomAuthors   `xml:"author"`
-	Icon    string        `xml:"icon"`
-	Links   atomLinks     `xml:"link"`
-	Entries []atom10Entry `xml:"entry"`
+type Atom10Feed struct {
+	XMLName xml.Name `xml:"http://www.w3.org/2005/Atom feed"`
+
+	// The "atom:id" element conveys a permanent, universally unique
+	// identifier for an entry or feed.
+	//
+	// Its content MUST be an IRI, as defined by [RFC3987].  Note that the
+	// definition of "IRI" excludes relative references.  Though the IRI
+	// might use a dereferencable scheme, Atom Processors MUST NOT assume it
+	// can be dereferenced.
+	//
+	// atom:feed elements MUST contain exactly one atom:id element.
+	ID string `xml:"http://www.w3.org/2005/Atom id"`
+
+	// The "atom:title" element is a Text construct that conveys a human-
+	// readable title for an entry or feed.
+	//
+	// atom:feed elements MUST contain exactly one atom:title element.
+	Title Atom10Text `xml:"http://www.w3.org/2005/Atom title"`
+
+	// The "atom:author" element is a Person construct that indicates the
+	// author of the entry or feed.
+	//
+	// atom:feed elements MUST contain one or more atom:author elements,
+	// unless all of the atom:feed element's child atom:entry elements
+	// contain at least one atom:author element.
+	Authors AtomPersons `xml:"http://www.w3.org/2005/Atom author"`
+
+	// The "atom:icon" element's content is an IRI reference [RFC3987] that
+	// identifies an image that provides iconic visual identification for a
+	// feed.
+	//
+	// atom:feed elements MUST NOT contain more than one atom:icon element.
+	Icon string `xml:"http://www.w3.org/2005/Atom icon"`
+
+	// The "atom:logo" element's content is an IRI reference [RFC3987] that
+	// identifies an image that provides visual identification for a feed.
+	//
+	// atom:feed elements MUST NOT contain more than one atom:logo element.
+	Logo string `xml:"http://www.w3.org/2005/Atom logo"`
+
+	// atom:feed elements SHOULD contain one atom:link element with a rel
+	// attribute value of "self". This is the preferred URI for
+	// retrieving Atom Feed Documents representing this Atom feed.
+	//
+	// atom:feed elements MUST NOT contain more than one atom:link
+	// element with a rel attribute value of "alternate" that has the
+	// same combination of type and hreflang attribute values.
+	Links AtomLinks `xml:"http://www.w3.org/2005/Atom link"`
+
+	// The "atom:category" element conveys information about a category
+	// associated with an entry or feed.  This specification assigns no
+	// meaning to the content (if any) of this element.
+	//
+	// atom:feed elements MAY contain any number of atom:category
+	// elements.
+	Categories AtomCategories `xml:"http://www.w3.org/2005/Atom category"`
+
+	Entries []Atom10Entry `xml:"http://www.w3.org/2005/Atom entry"`
 }
 
-func (a *atom10Feed) Transform(baseURL string) *model.Feed {
-	var err error
+type Atom10Entry struct {
+	// The "atom:id" element conveys a permanent, universally unique
+	// identifier for an entry or feed.
+	//
+	// Its content MUST be an IRI, as defined by [RFC3987].  Note that the
+	// definition of "IRI" excludes relative references.  Though the IRI
+	// might use a dereferencable scheme, Atom Processors MUST NOT assume it
+	// can be dereferenced.
+	//
+	// atom:entry elements MUST contain exactly one atom:id element.
+	ID string `xml:"http://www.w3.org/2005/Atom id"`
 
-	feed := new(model.Feed)
+	// The "atom:title" element is a Text construct that conveys a human-
+	// readable title for an entry or feed.
+	//
+	// atom:entry elements MUST contain exactly one atom:title element.
+	Title Atom10Text `xml:"http://www.w3.org/2005/Atom title"`
 
-	feedURL := a.Links.firstLinkWithRelation("self")
-	feed.FeedURL, err = urllib.AbsoluteURL(baseURL, feedURL)
-	if err != nil {
-		feed.FeedURL = feedURL
-	}
+	// The "atom:published" element is a Date construct indicating an
+	// instant in time associated with an event early in the life cycle of
+	// the entry.
+	Published string `xml:"http://www.w3.org/2005/Atom published"`
 
-	siteURL := a.Links.originalLink()
-	feed.SiteURL, err = urllib.AbsoluteURL(baseURL, siteURL)
-	if err != nil {
-		feed.SiteURL = siteURL
-	}
+	// The "atom:updated" element is a Date construct indicating the most
+	// recent instant in time when an entry or feed was modified in a way
+	// the publisher considers significant. Therefore, not all
+	// modifications necessarily result in a changed atom:updated value.
+	//
+	// atom:entry elements MUST contain exactly one atom:updated element.
+	Updated string `xml:"http://www.w3.org/2005/Atom updated"`
 
-	feed.Title = html.UnescapeString(a.Title.String())
-	if feed.Title == "" {
-		feed.Title = feed.SiteURL
-	}
+	// atom:entry elements MUST NOT contain more than one atom:link
+	// element with a rel attribute value of "alternate" that has the
+	// same combination of type and hreflang attribute values.
+	Links AtomLinks `xml:"http://www.w3.org/2005/Atom link"`
 
-	feed.IconURL = strings.TrimSpace(a.Icon)
+	// atom:entry elements MUST contain an atom:summary element in either
+	// of the following cases:
+	// *  the atom:entry contains an atom:content that has a "src"
+	//    attribute (and is thus empty).
+	// *  the atom:entry contains content that is encoded in Base64;
+	//    i.e., the "type" attribute of atom:content is a MIME media type
+	//    [MIMEREG], but is not an XML media type [RFC3023], does not
+	//    begin with "text/", and does not end with "/xml" or "+xml".
+	//
+	// atom:entry elements MUST NOT contain more than one atom:summary
+	// element.
+	Summary Atom10Text `xml:"http://www.w3.org/2005/Atom summary"`
 
-	for _, entry := range a.Entries {
-		item := entry.Transform()
-		entryURL, err := urllib.AbsoluteURL(feed.SiteURL, item.URL)
-		if err == nil {
-			item.URL = entryURL
-		}
+	// atom:entry elements MUST NOT contain more than one atom:content
+	// element.
+	Content Atom10Text `xml:"http://www.w3.org/2005/Atom content"`
 
-		if item.Author == "" {
-			item.Author = a.Authors.String()
-		}
+	// The "atom:author" element is a Person construct that indicates the
+	// author of the entry or feed.
+	//
+	// atom:entry elements MUST contain one or more atom:author elements
+	Authors AtomPersons `xml:"http://www.w3.org/2005/Atom author"`
 
-		if item.Title == "" {
-			item.Title = sanitizer.TruncateHTML(item.Content, 100)
-		}
+	// The "atom:category" element conveys information about a category
+	// associated with an entry or feed.  This specification assigns no
+	// meaning to the content (if any) of this element.
+	//
+	// atom:entry elements MAY contain any number of atom:category
+	// elements.
+	Categories AtomCategories `xml:"http://www.w3.org/2005/Atom category"`
 
-		if item.Title == "" {
-			item.Title = item.URL
-		}
-
-		feed.Entries = append(feed.Entries, item)
-	}
-
-	return feed
-}
-
-type atom10Entry struct {
-	ID         string           `xml:"id"`
-	Title      atom10Text       `xml:"title"`
-	Published  string           `xml:"published"`
-	Updated    string           `xml:"updated"`
-	Links      atomLinks        `xml:"link"`
-	Summary    atom10Text       `xml:"summary"`
-	Content    atom10Text       `xml:"http://www.w3.org/2005/Atom content"`
-	Authors    atomAuthors      `xml:"author"`
-	Categories []atom10Category `xml:"category"`
-	media.Element
-}
-
-func (a *atom10Entry) Transform() *model.Entry {
-	entry := model.NewEntry()
-	entry.URL = a.Links.originalLink()
-	entry.Date = a.entryDate()
-	entry.Author = a.Authors.String()
-	entry.Hash = a.entryHash()
-	entry.Content = a.entryContent()
-	entry.Title = a.entryTitle()
-	entry.Enclosures = a.entryEnclosures()
-	entry.CommentsURL = a.entryCommentsURL()
-	entry.Tags = a.entryCategories()
-	return entry
-}
-
-func (a *atom10Entry) entryTitle() string {
-	return html.UnescapeString(a.Title.String())
-}
-
-func (a *atom10Entry) entryContent() string {
-	content := a.Content.String()
-	if content != "" {
-		return content
-	}
-
-	summary := a.Summary.String()
-	if summary != "" {
-		return summary
-	}
-
-	mediaDescription := a.FirstMediaDescription()
-	if mediaDescription != "" {
-		return mediaDescription
-	}
-
-	return ""
-}
-
-// Note: The published date represents the original creation date for YouTube feeds.
-// Example:
-// <published>2019-01-26T08:02:28+00:00</published>
-// <updated>2019-01-29T07:27:27+00:00</updated>
-func (a *atom10Entry) entryDate() time.Time {
-	dateText := a.Published
-	if dateText == "" {
-		dateText = a.Updated
-	}
-
-	if dateText != "" {
-		result, err := date.Parse(dateText)
-		if err != nil {
-			slog.Debug("Unable to parse date from Atom 0.3 feed",
-				slog.String("date", dateText),
-				slog.String("id", a.ID),
-				slog.Any("error", err),
-			)
-			return time.Now()
-		}
-
-		return result
-	}
-
-	return time.Now()
-}
-
-func (a *atom10Entry) entryHash() string {
-	for _, value := range []string{a.ID, a.Links.originalLink()} {
-		if value != "" {
-			return crypto.Hash(value)
-		}
-	}
-
-	return ""
-}
-
-func (a *atom10Entry) entryEnclosures() model.EnclosureList {
-	enclosures := make(model.EnclosureList, 0)
-	duplicates := make(map[string]bool)
-
-	for _, mediaThumbnail := range a.AllMediaThumbnails() {
-		if _, found := duplicates[mediaThumbnail.URL]; !found {
-			duplicates[mediaThumbnail.URL] = true
-			enclosures = append(enclosures, &model.Enclosure{
-				URL:      mediaThumbnail.URL,
-				MimeType: mediaThumbnail.MimeType(),
-				Size:     mediaThumbnail.Size(),
-			})
-		}
-	}
-
-	for _, link := range a.Links {
-		if strings.ToLower(link.Rel) == "enclosure" {
-			if link.URL == "" {
-				continue
-			}
-
-			if _, found := duplicates[link.URL]; !found {
-				duplicates[link.URL] = true
-				length, _ := strconv.ParseInt(link.Length, 10, 0)
-				enclosures = append(enclosures, &model.Enclosure{URL: link.URL, MimeType: link.Type, Size: length})
-			}
-		}
-	}
-
-	for _, mediaContent := range a.AllMediaContents() {
-		if _, found := duplicates[mediaContent.URL]; !found {
-			duplicates[mediaContent.URL] = true
-			enclosures = append(enclosures, &model.Enclosure{
-				URL:      mediaContent.URL,
-				MimeType: mediaContent.MimeType(),
-				Size:     mediaContent.Size(),
-			})
-		}
-	}
-
-	for _, mediaPeerLink := range a.AllMediaPeerLinks() {
-		if _, found := duplicates[mediaPeerLink.URL]; !found {
-			duplicates[mediaPeerLink.URL] = true
-			enclosures = append(enclosures, &model.Enclosure{
-				URL:      mediaPeerLink.URL,
-				MimeType: mediaPeerLink.MimeType(),
-				Size:     mediaPeerLink.Size(),
-			})
-		}
-	}
-
-	return enclosures
-}
-
-func (r *atom10Entry) entryCategories() []string {
-	categoryList := make([]string, 0)
-
-	for _, atomCategory := range r.Categories {
-		if strings.TrimSpace(atomCategory.Label) != "" {
-			categoryList = append(categoryList, strings.TrimSpace(atomCategory.Label))
-		} else {
-			categoryList = append(categoryList, strings.TrimSpace(atomCategory.Term))
-		}
-	}
-
-	return categoryList
-}
-
-// See https://tools.ietf.org/html/rfc4685#section-4
-// If the type attribute of the atom:link is omitted, its value is assumed to be "application/atom+xml".
-// We accept only HTML or XHTML documents for now since the intention is to have the same behavior as RSS.
-func (a *atom10Entry) entryCommentsURL() string {
-	commentsURL := a.Links.firstLinkWithRelationAndType("replies", "text/html", "application/xhtml+xml")
-	if urllib.IsAbsoluteURL(commentsURL) {
-		return commentsURL
-	}
-	return ""
-}
-
-type atom10Text struct {
-	Type             string               `xml:"type,attr"`
-	CharData         string               `xml:",chardata"`
-	InnerXML         string               `xml:",innerxml"`
-	XHTMLRootElement atomXHTMLRootElement `xml:"http://www.w3.org/1999/xhtml div"`
-}
-
-type atom10Category struct {
-	Term  string `xml:"term,attr"`
-	Label string `xml:"label,attr"`
+	media.MediaItemElement
 }
 
+// A Text construct contains human-readable text, usually in small
+// quantities. The content of Text constructs is Language-Sensitive.
+// Specs: https://datatracker.ietf.org/doc/html/rfc4287#section-3.1
 // Text: https://datatracker.ietf.org/doc/html/rfc4287#section-3.1.1.1
 // HTML: https://datatracker.ietf.org/doc/html/rfc4287#section-3.1.1.2
 // XHTML: https://datatracker.ietf.org/doc/html/rfc4287#section-3.1.1.3
-func (a *atom10Text) String() string {
+type Atom10Text struct {
+	Type             string               `xml:"type,attr"`
+	CharData         string               `xml:",chardata"`
+	InnerXML         string               `xml:",innerxml"`
+	XHTMLRootElement AtomXHTMLRootElement `xml:"http://www.w3.org/1999/xhtml div"`
+}
+
+func (a *Atom10Text) Body() string {
 	var content string
-	switch {
-	case a.Type == "", a.Type == "text", a.Type == "text/plain":
-		if strings.HasPrefix(strings.TrimSpace(a.InnerXML), `<![CDATA[`) {
-			content = html.EscapeString(a.CharData)
-		} else {
-			content = a.InnerXML
-		}
-	case a.Type == "xhtml":
-		var root = a.XHTMLRootElement
-		if root.XMLName.Local == "div" {
-			content = root.InnerXML
-		} else {
-			content = a.InnerXML
-		}
-	default:
+
+	if strings.EqualFold(a.Type, "xhtml") {
+		content = a.xhtmlContent()
+	} else {
 		content = a.CharData
 	}
 
 	return strings.TrimSpace(content)
 }
 
-type atomXHTMLRootElement struct {
+func (a *Atom10Text) Title() string {
+	var content string
+
+	switch {
+	case strings.EqualFold(a.Type, "xhtml"):
+		content = a.xhtmlContent()
+	case strings.Contains(a.InnerXML, "<![CDATA["):
+		content = html.UnescapeString(a.CharData)
+	default:
+		content = a.CharData
+	}
+
+	content = sanitizer.StripTags(content)
+	return strings.TrimSpace(content)
+}
+
+func (a *Atom10Text) xhtmlContent() string {
+	if a.XHTMLRootElement.XMLName.Local == "div" {
+		return a.XHTMLRootElement.InnerXML
+	}
+	return a.InnerXML
+}
+
+type AtomXHTMLRootElement struct {
 	XMLName  xml.Name `xml:"div"`
 	InnerXML string   `xml:",innerxml"`
 }