docs(changelog): update release notes for version 2.2.9

- Added new routes: /liveness, /healthz, /readiness, /readyz
- These routes do not take the base path into consideration and are always available at the root of the server

.github/ISSUE_TEMPLATE/documentation.yml

@@ -0,0 +1,81 @@
+name: "Documentation Issue"
+description: "Report issues or suggest improvements for the documentation"
+title: "[Docs]: "
+type: "Documentation"
+labels: ["triage needed"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for helping improve the Miniflux documentation! Clear and accurate documentation helps everyone.
+
+  - type: dropdown
+    id: issue_type
+    attributes:
+      label: "Documentation Issue Type"
+      description: "What kind of documentation issue are you reporting?"
+      options:
+        - "Missing Information"
+        - "Incorrect Information"
+        - "Outdated Information"
+        - "Unclear Explanation"
+        - "Formatting/Structural Issue"
+        - "Typo/Grammar Error"
+        - "Documentation Request"
+        - "Other"
+    validations:
+      required: true
+
+  - type: input
+    id: summary
+    attributes:
+      label: "Summary"
+      description: "Briefly describe the documentation issue."
+      placeholder: "e.g., The API authentication section is outdated"
+    validations:
+      required: true
+
+  - type: input
+    id: location
+    attributes:
+      label: "Location"
+      description: "Where is the documentation you're referring to? Provide URLs, file paths, or section names."
+      placeholder: "e.g., README.md, docs/api.md, Installation section of the website"
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: "Detailed Description"
+      description: "Provide a detailed description of the issue or improvement."
+      placeholder: "e.g., The API authentication section doesn't mention the new token-based authentication method introduced in version 2.0.5."
+    validations:
+      required: true
+
+  - type: textarea
+    id: current_content
+    attributes:
+      label: "Current Content (if applicable)"
+      description: "What does the current documentation say?"
+      placeholder: "Paste the current documentation text here."
+    validations:
+      required: false
+
+  - type: textarea
+    id: suggested_content
+    attributes:
+      label: "Suggested Changes"
+      description: "If you have specific suggestions for how to improve the documentation, please provide them here."
+      placeholder: "e.g., Add a new section about token-based authentication with these details..."
+    validations:
+      required: false
+
+  - type: input
+    id: version
+    attributes:
+      label: "Version"
+      description: "Which version of Miniflux does this documentation issue relate to?"
+      placeholder: "e.g., 2.2.6, or 'all versions'"
+    validations:
+      required: false

.github/dependabot.yml

@@ -4,52 +4,28 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    reviewers:
-      - "fguillot"
-    assignees:
-      - "fguillot"
 
   - package-ecosystem: "docker"
     directory: "/packaging/docker/alpine"
     schedule:
       interval: "weekly"
-    reviewers:
-      - "fguillot"
-    assignees:
-      - "fguillot"
 
   - package-ecosystem: "docker"
     directory: "/packaging/docker/distroless"
     schedule:
       interval: "weekly"
-    reviewers:
-      - "fguillot"
-    assignees:
-      - "fguillot"
 
   - package-ecosystem: "docker"
     directory: "packaging/debian"
     schedule:
       interval: "weekly"
-    reviewers:
-      - "fguillot"
-    assignees:
-      - "fguillot"
 
   - package-ecosystem: "docker"
     directory: "packaging/rpm"
     schedule:
       interval: "weekly"
-    reviewers:
-      - "fguillot"
-    assignees:
-      - "fguillot"
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
-    reviewers:
-      - "fguillot"
-    assignees:
-      - "fguillot"

.github/workflows/linters.yml

@@ -29,7 +29,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: "1.24.x"
-      - uses: golangci/golangci-lint-action@v7
+      - uses: golangci/golangci-lint-action@v8
         with:
           args: >
             --timeout 10m
@@ -39,19 +39,16 @@ jobs:
         run: gofmt -d -e .
 
   commitlint:
+    if: github.event_name == 'pull_request'
     name: Commit Linter
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          node-version: "lts/*"
-      - name: Install commitlint
-        run: |
-          npm install --save-dev @commitlint/config-conventional @commitlint/cli
-          echo "module.exports = {extends: ['@commitlint/config-conventional']}" > commitlint.config.js
+          python-version: '3.13'
       - name: Validate PR commits
-        run: npx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }} --verbose
+        run: python3 .github/workflows/scripts/commit-checker.py --base ${{ github.event.pull_request.base.sha }} --head ${{ github.event.pull_request.head.sha }}

.github/workflows/scripts/commit-checker.py

@@ -0,0 +1,93 @@
+import subprocess
+import re
+import sys
+import argparse
+from typing import Match
+
+# Conventional commit pattern
+CONVENTIONAL_COMMIT_PATTERN: str = r"^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\([a-z0-9-]+\))?!?: .{1,100}"
+
+
+def get_commit_message(commit_hash: str) -> str:
+    """Get the commit message for a given commit hash."""
+    try:
+        result: subprocess.CompletedProcess = subprocess.run(
+            ["git", "show", "-s", "--format=%B", commit_hash],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        return result.stdout.strip()
+    except subprocess.CalledProcessError as e:
+        print(f"Error retrieving commit message: {e}")
+        sys.exit(1)
+
+
+def check_commit_message(
+    message: str, pattern: str = CONVENTIONAL_COMMIT_PATTERN
+) -> bool:
+    """Check if commit message follows conventional commit format."""
+    first_line: str = message.split("\n")[0]
+    match: Match[str] | None = re.match(pattern, first_line)
+    return bool(match)
+
+
+def check_commit_range(base_ref: str, head_ref: str) -> list[dict[str, str]]:
+    """Check all commits in a range for compliance."""
+    try:
+        result: subprocess.CompletedProcess = subprocess.run(
+            ["git", "log", "--format=%H", f"{base_ref}..{head_ref}"],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        commit_hashes: list[str] = result.stdout.strip().split("\n")
+
+        # Filter out empty lines
+        commit_hashes = [hash for hash in commit_hashes if hash]
+
+        non_compliant: list[dict[str, str]] = []
+        for commit_hash in commit_hashes:
+            message: str = get_commit_message(commit_hash)
+            if not check_commit_message(message):
+                non_compliant.append(
+                    {"hash": commit_hash, "message": message.split("\n")[0]}
+                )
+
+        return non_compliant
+    except subprocess.CalledProcessError as e:
+        print(f"Error checking commit range: {e}")
+        sys.exit(1)
+
+
+def main() -> None:
+    parser: argparse.ArgumentParser = argparse.ArgumentParser(
+        description="Check conventional commit compliance"
+    )
+    parser.add_argument(
+        "--base", required=True, help="Base ref (starting commit, exclusive)"
+    )
+    parser.add_argument(
+        "--head", required=True, help="Head ref (ending commit, inclusive)"
+    )
+    args: argparse.Namespace = parser.parse_args()
+
+    non_compliant: list[dict[str, str]] = check_commit_range(args.base, args.head)
+
+    if non_compliant:
+        print("The following commits do not follow the conventional commit format:")
+        for commit in non_compliant:
+            print(f"- {commit['hash'][:8]}: {commit['message']}")
+        print("\nPlease ensure your commit messages follow the format:")
+        print("type(scope): subject")
+        print(
+            "\nWhere type is one of: build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test"
+        )
+        sys.exit(1)
+    else:
+        print("All commits follow the conventional commit format!")
+        sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()

.gitignore

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

ChangeLog

@@ -1,3 +1,74 @@
+Version 2.2.9 (May 26, 2025)
+----------------------------
+
+* refactor(googlereader): remove redundant log message
+* refactor(googlereader): move constants to separate files
+* fix(webauthn): correct argument in debug log
+* fix(sanitizer): MathML tags are not fully supported by `golang.org/x/net/html`
+* fix(migrations): prevent failure at version 45 with long entry URLs
+* fix(locale): localize Git commit label in about page
+* fix(googlereader): return a 400 instead of 500 for invalid edit requests
+* fix(googlereader): handle various item ID formats
+* fix(googlereader): avoid panic for inexisting feed or category
+* fix(googlereader): `/items/contents` should accept short form item IDs
+* feat(webauthn): prefer creation of a client-side discoverable credential
+* feat(urlcleaner): remove the `ref` parameter from url
+* feat(settings): replace `div.panel` with paragraph tags for OAuth2 links
+* feat(settings): add validation for entry order and categories sorting order
+* feat(settings): add option to always open articles externally
+* feat(server): add liveness and readiness probes
+* feat(sanitizer): add MathML tags to the sanitizer
+* feat(sanitized): allow Spotify iframes
+* feat(rssbridge): support authentication token for RSS-Bridge
+* feat(response): change error response content type to plain text and escape HTML
+* feat(reader): populate feed description automatically
+* feat(locale): update Russian translation
+* feat(locale): update Polish translation
+* feat(locale): update French translation
+* feat(googlereader): avoid SQL query to fetch username in streamItemContentsHandler
+* feat(googlereader): add `mark-all-as-read` endpoint
+* feat(api): add new endpoints to manage API keys
+* ci: remove deprecated `reviewers` field from `dependantbot.yml`
+* chore(gitignore): ignore miniflux binary in root directory
+* build(deps): bump `golangci/golangci-lint-action` from `7` to `8`
+* build(deps): bump `golang.org/x/oauth2` from `0.29.0` to `0.30.0`
+* build(deps): bump `golang.org/x/net` from `0.39.0` to `0.40.0`
+* build(deps): bump `golang.org/x/image` from `0.26.0` to `0.27.0`
+* build(deps): bump `golang.org/x/crypto` from `0.37.0` to `0.38.0`
+* build(deps): bump `github.com/tdewolff/minify/v2` from `2.23.3` to `2.23.8`
+* build(deps): bump `github.com/tdewolff/minify/v2` from `2.23.1` to `2.23.3`
+* build(deps): bump `github.com/go-webauthn/webauthn` from `0.12.3` to `0.13.0`
+
+Version 2.2.8 (April 22, 2025)
+------------------------------
+
+* refactor(js): replace `DomHelper` methods with standalone functions
+* refactor: avoid logging twice the feed errors in the background worker
+* fix(api): `hide_globally` categories field should be a boolean
+* fix(ui): add missing `await` when calling `navigator.share()` method
+* fix(ui): replace share link with a form button for better accessibility
+* feat(telegrambot): replace "Go to website" button with "Go to Miniflux"
+* feat(locale): update Polish translation
+* feat(locale): update German translation
+* feat(locale): update Chinese translation
+* feat(config): add `SCHEDULER_ROUND_ROBIN_MAX_INTERVAL` option
+* feat(cli): add `-reset-feed-next-check-at` argument
+* feat(api): add `update_content` query parameter to `/entries/{entryID}/fetch-content` endpoint
+* feat: use `Cache-Control` max-age and `Expires` headers to calculate next check
+* feat: implement proxy URL per feed
+* feat: add proxy rotation functionality
+* ci(linter): replace commitlint with a Python script
+* ci: add documentation issue template
+* build(deps): bump `golang.org/x/oauth2` from `0.28.0` to `0.29.0`
+* build(deps): bump `golang.org/x/net` from `0.38.0` to `0.39.0`
+* build(deps): bump `golang.org/x/image` from `0.25.0` to `0.26.0`
+* build(deps): bump `github.com/tdewolff/minify/v2` from `2.22.4` to `2.23.1`
+* build(deps): bump `github.com/PuerkitoBio/goquery` from `1.10.2` to `1.10.3`
+* build(deps): bump `github.com/prometheus/client_golang`
+* build(deps): bump `github.com/mattn/go-sqlite3` from `1.14.24` to `1.14.28`
+* build(deps): bump `github.com/go-webauthn/webauthn` from `0.12.2` to `0.12.3`
+* build(deps): bump `github.com/coreos/go-oidc/v3` from `3.13.0` to `3.14.1`
+
 Version 2.2.7 (April 1, 2025)
 -----------------------------
 

Makefile

@@ -144,7 +144,7 @@ integration-test:
 	ADMIN_PASSWORD=test123 \
 	CREATE_ADMIN=1 \
 	RUN_MIGRATIONS=1 \
-	DEBUG=1 \
+	LOG_LEVEL=debug \
 	./miniflux-test >/tmp/miniflux.log 2>&1 & echo "$$!" > "/tmp/miniflux.pid"
 
 	while ! nc -z localhost 8080; do sleep 1; done

client/client.go

@@ -180,6 +180,45 @@ func (c *Client) DeleteUser(userID int64) error {
 	return c.request.Delete(fmt.Sprintf("/v1/users/%d", userID))
 }
 
+// APIKeys returns all API keys for the authenticated user.
+func (c *Client) APIKeys() (APIKeys, error) {
+	body, err := c.request.Get("/v1/api-keys")
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	var apiKeys APIKeys
+	if err := json.NewDecoder(body).Decode(&apiKeys); err != nil {
+		return nil, fmt.Errorf("miniflux: response error (%v)", err)
+	}
+
+	return apiKeys, nil
+}
+
+// CreateAPIKey creates a new API key for the authenticated user.
+func (c *Client) CreateAPIKey(description string) (*APIKey, error) {
+	body, err := c.request.Post("/v1/api-keys", &APIKeyCreationRequest{
+		Description: description,
+	})
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	var apiKey *APIKey
+	if err := json.NewDecoder(body).Decode(&apiKey); err != nil {
+		return nil, fmt.Errorf("miniflux: response error (%v)", err)
+	}
+
+	return apiKey, nil
+}
+
+// DeleteAPIKey removes an API key for the authenticated user.
+func (c *Client) DeleteAPIKey(apiKeyID int64) error {
+	return c.request.Delete(fmt.Sprintf("/v1/api-keys/%d", apiKeyID))
+}
+
 // MarkAllAsRead marks all unread entries as read for a given user.
 func (c *Client) MarkAllAsRead(userID int64) error {
 	_, err := c.request.Put(fmt.Sprintf("/v1/users/%d/mark-all-as-read", userID), nil)
@@ -239,8 +278,8 @@ func (c *Client) Categories() (Categories, error) {
 
 // CreateCategory creates a new category.
 func (c *Client) CreateCategory(title string) (*Category, error) {
-	body, err := c.request.Post("/v1/categories", map[string]interface{}{
-		"title": title,
+	body, err := c.request.Post("/v1/categories", &CategoryCreationRequest{
+		Title: title,
 	})
 	if err != nil {
 		return nil, err
@@ -255,10 +294,25 @@ func (c *Client) CreateCategory(title string) (*Category, error) {
 	return category, nil
 }
 
+// CreateCategoryWithOptions creates a new category with options.
+func (c *Client) CreateCategoryWithOptions(createRequest *CategoryCreationRequest) (*Category, error) {
+	body, err := c.request.Post("/v1/categories", createRequest)
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	var category *Category
+	if err := json.NewDecoder(body).Decode(&category); err != nil {
+		return nil, fmt.Errorf("miniflux: response error (%v)", err)
+	}
+	return category, nil
+}
+
 // UpdateCategory updates a category.
 func (c *Client) UpdateCategory(categoryID int64, title string) (*Category, error) {
-	body, err := c.request.Put(fmt.Sprintf("/v1/categories/%d", categoryID), map[string]interface{}{
-		"title": title,
+	body, err := c.request.Put(fmt.Sprintf("/v1/categories/%d", categoryID), &CategoryModificationRequest{
+		Title: SetOptionalField(title),
 	})
 	if err != nil {
 		return nil, err
@@ -273,6 +327,22 @@ func (c *Client) UpdateCategory(categoryID int64, title string) (*Category, erro
 	return category, nil
 }
 
+// UpdateCategoryWithOptions updates a category with options.
+func (c *Client) UpdateCategoryWithOptions(categoryID int64, categoryChanges *CategoryModificationRequest) (*Category, error) {
+	body, err := c.request.Put(fmt.Sprintf("/v1/categories/%d", categoryID), categoryChanges)
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	var category *Category
+	if err := json.NewDecoder(body).Decode(&category); err != nil {
+		return nil, fmt.Errorf("miniflux: response error (%v)", err)
+	}
+
+	return category, nil
+}
+
 // MarkCategoryAsRead marks all unread entries in a category as read.
 func (c *Client) MarkCategoryAsRead(categoryID int64) error {
 	_, err := c.request.Put(fmt.Sprintf("/v1/categories/%d/mark-all-as-read", categoryID), nil)

client/model.go

@@ -17,35 +17,36 @@ const (
 
 // User represents a user in the system.
 type User struct {
-	ID                     int64      `json:"id"`
-	Username               string     `json:"username"`
-	Password               string     `json:"password,omitempty"`
-	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"`
-	CustomJS               string     `json:"custom_js"`
-	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"`
-	MediaPlaybackRate      float64    `json:"media_playback_rate"`
-	BlockFilterEntryRules  string     `json:"block_filter_entry_rules"`
-	KeepFilterEntryRules   string     `json:"keep_filter_entry_rules"`
-	ExternalFontHosts      string     `json:"external_font_hosts"`
+	ID                      int64      `json:"id"`
+	Username                string     `json:"username"`
+	Password                string     `json:"password,omitempty"`
+	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"`
+	CustomJS                string     `json:"custom_js"`
+	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"`
+	MediaPlaybackRate       float64    `json:"media_playback_rate"`
+	BlockFilterEntryRules   string     `json:"block_filter_entry_rules"`
+	KeepFilterEntryRules    string     `json:"keep_filter_entry_rules"`
+	ExternalFontHosts       string     `json:"external_font_hosts"`
+	AlwaysOpenExternalLinks bool       `json:"always_open_external_links"`
 }
 
 func (u User) String() string {
@@ -63,33 +64,34 @@ 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"`
-	CustomJS               *string  `json:"custom_js"`
-	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"`
-	ExternalFontHosts      *string  `json:"external_font_hosts"`
+	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"`
+	CustomJS                *string  `json:"custom_js"`
+	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"`
+	ExternalFontHosts       *string  `json:"external_font_hosts"`
+	AlwaysOpenExternalLinks *bool    `json:"always_open_external_links"`
 }
 
 // Users represents a list of users.
@@ -97,9 +99,12 @@ type Users []User
 
 // Category represents a feed category.
 type Category struct {
-	ID     int64  `json:"id,omitempty"`
-	Title  string `json:"title,omitempty"`
-	UserID int64  `json:"user_id,omitempty"`
+	ID           int64  `json:"id"`
+	Title        string `json:"title"`
+	UserID       int64  `json:"user_id,omitempty"`
+	HideGlobally bool   `json:"hide_globally,omitempty"`
+	FeedCount    *int   `json:"feed_count,omitempty"`
+	TotalUnread  *int   `json:"total_unread,omitempty"`
 }
 
 func (c Category) String() string {
@@ -109,6 +114,18 @@ func (c Category) String() string {
 // Categories represents a list of categories.
 type Categories []*Category
 
+// CategoryCreationRequest represents the request to create a category.
+type CategoryCreationRequest struct {
+	Title        string `json:"title"`
+	HideGlobally bool   `json:"hide_globally"`
+}
+
+// CategoryModificationRequest represents the request to update a category.
+type CategoryModificationRequest struct {
+	Title        *string `json:"title"`
+	HideGlobally *bool   `json:"hide_globally"`
+}
+
 // Subscription represents a feed subscription.
 type Subscription struct {
 	Title string `json:"title"`
@@ -151,6 +168,7 @@ type Feed struct {
 	Category                    *Category `json:"category,omitempty"`
 	HideGlobally                bool      `json:"hide_globally"`
 	DisableHTTP2                bool      `json:"disable_http2"`
+	ProxyURL                    string    `json:"proxy_url"`
 }
 
 // FeedCreationRequest represents the request to create a feed.
@@ -172,6 +190,7 @@ type FeedCreationRequest struct {
 	KeeplistRules               string `json:"keeplist_rules"`
 	HideGlobally                bool   `json:"hide_globally"`
 	DisableHTTP2                bool   `json:"disable_http2"`
+	ProxyURL                    string `json:"proxy_url"`
 }
 
 // FeedModificationRequest represents the request to update a feed.
@@ -195,6 +214,7 @@ type FeedModificationRequest struct {
 	FetchViaProxy               *bool   `json:"fetch_via_proxy"`
 	HideGlobally                *bool   `json:"hide_globally"`
 	DisableHTTP2                *bool   `json:"disable_http2"`
+	ProxyURL                    *string `json:"proxy_url"`
 }
 
 // FeedIcon represents the feed icon.
@@ -307,6 +327,24 @@ type VersionResponse struct {
 	OS        string `json:"os"`
 }
 
+// APIKey represents an application API key.
+type APIKey struct {
+	ID          int64      `json:"id"`
+	UserID      int64      `json:"user_id"`
+	Token       string     `json:"token"`
+	Description string     `json:"description"`
+	LastUsedAt  *time.Time `json:"last_used_at"`
+	CreatedAt   time.Time  `json:"created_at"`
+}
+
+// APIKeys represents a collection of API keys.
+type APIKeys []*APIKey
+
+// APIKeyCreationRequest represents the request to create an API key.
+type APIKeyCreationRequest struct {
+	Description string `json:"description"`
+}
+
 func SetOptionalField[T any](value T) *T {
 	return &value
 }

go.mod

@@ -3,46 +3,45 @@ module miniflux.app/v2
 // +heroku goVersion go1.23
 
 require (
-	github.com/PuerkitoBio/goquery v1.10.2
+	github.com/PuerkitoBio/goquery v1.10.3
 	github.com/andybalholm/brotli v1.1.1
-	github.com/coreos/go-oidc/v3 v3.13.0
-	github.com/go-webauthn/webauthn v0.12.2
+	github.com/coreos/go-oidc/v3 v3.14.1
+	github.com/go-webauthn/webauthn v0.13.0
 	github.com/gorilla/mux v1.8.1
 	github.com/lib/pq v1.10.9
-	github.com/mattn/go-sqlite3 v1.14.24
-	github.com/prometheus/client_golang v1.21.1
-	github.com/tdewolff/minify/v2 v2.22.4
-	golang.org/x/crypto v0.36.0
-	golang.org/x/image v0.25.0
-	golang.org/x/net v0.38.0
-	golang.org/x/oauth2 v0.28.0
-	golang.org/x/term v0.30.0
+	github.com/mattn/go-sqlite3 v1.14.28
+	github.com/prometheus/client_golang v1.22.0
+	github.com/tdewolff/minify/v2 v2.23.8
+	golang.org/x/crypto v0.38.0
+	golang.org/x/image v0.27.0
+	golang.org/x/net v0.40.0
+	golang.org/x/oauth2 v0.30.0
+	golang.org/x/term v0.32.0
 )
 
 require (
-	github.com/go-webauthn/x v0.1.19 // indirect
+	github.com/go-webauthn/x v0.1.21 // indirect
 	github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
-	github.com/google/go-tpm v0.9.3 // indirect
+	github.com/google/go-tpm v0.9.5 // indirect
 )
 
 require (
 	github.com/andybalholm/cascadia v1.3.3 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
 	github.com/go-jose/go-jose/v4 v4.0.5 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // 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.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/tdewolff/parse/v2 v2.7.21 // indirect
+	github.com/tdewolff/parse/v2 v2.8.1 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
-	google.golang.org/protobuf v1.36.1 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 )
 
 go 1.23.0

go.sum

@@ -1,5 +1,5 @@
-github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9HqT2AM8=
-github.com/PuerkitoBio/goquery v1.10.2/go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU=
+github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo=
+github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y=
 github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
 github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
 github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
@@ -8,44 +8,45 @@ 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.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/coreos/go-oidc/v3 v3.13.0 h1:M66zd0pcc5VxvBNM4pB331Wrsanby+QomQYjN8HamW8=
-github.com/coreos/go-oidc/v3 v3.13.0/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
+github.com/coreos/go-oidc/v3 v3.14.1 h1:9ePWwfdwC4QKRlCXsJGou56adA/owXczOzwKdOumLqk=
+github.com/coreos/go-oidc/v3 v3.14.1/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
 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.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
-github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
+github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
+github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
 github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
 github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
-github.com/go-webauthn/webauthn v0.12.2 h1:yLaNPgBUEXDQtWnOjhsGhMMCEWbXwjg/aNkC8riJQI8=
-github.com/go-webauthn/webauthn v0.12.2/go.mod h1:Q8SZPPj4sZ469fNTcQXxRpzJOdb30jQrn/36FX8jilA=
-github.com/go-webauthn/x v0.1.19 h1:IUfdHiBRoTdujpBA/14qbrMXQ3LGzYe/PRGWdZcmudg=
-github.com/go-webauthn/x v0.1.19/go.mod h1:C5arLuTQ3pVHKPw89v7CDGnqAZSZJj+4Jnr40dsn7tk=
+github.com/go-webauthn/webauthn v0.13.0 h1:cJIL1/1l+22UekVhipziAaSgESJxokYkowUqAIsWs0Y=
+github.com/go-webauthn/webauthn v0.13.0/go.mod h1:Oy9o2o79dbLKRPZWWgRIOdtBGAhKnDIaBp2PFkICRHs=
+github.com/go-webauthn/x v0.1.21 h1:nFbckQxudvHEJn2uy1VEi713MeSpApoAv9eRqsb9AdQ=
+github.com/go-webauthn/x v0.1.21/go.mod h1:sEYohtg1zL4An1TXIUIQ5csdmoO+WO0R4R2pGKaHYKA=
 github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
 github.com/golang-jwt/jwt/v5 v5.2.2/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.3 h1:+yx0/anQuGzi+ssRqeD6WpXjW2L/V0dItUayO0i9sRc=
-github.com/google/go-tpm v0.9.3/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-tpm v0.9.5 h1:ocUmnDebX54dnW+MQWGQRbdaAcJELsa6PqZhJ48KwVU=
+github.com/google/go-tpm v0.9.5/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
 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.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 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/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
-github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/mattn/go-sqlite3 v1.14.28 h1:ThEiQrnbtumT+QMknw63Befp/ce/nUPgBPMlRFEum7A=
+github.com/mattn/go-sqlite3 v1.14.28/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 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.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
-github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
+github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
 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.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
@@ -54,10 +55,10 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tdewolff/minify/v2 v2.22.4 h1:0/8K2fheOuYr5B4e5oCE1hGBVX6DQHLP0EGzdsDlYeg=
-github.com/tdewolff/minify/v2 v2.22.4/go.mod h1:K/R8TT7aivpcU8QCNUU1UdR6etfnFPr7L11TO/X7shk=
-github.com/tdewolff/parse/v2 v2.7.21 h1:OCuPFtGr4mXdnfKikQlUb0n654ROJANhBqCk+wioJ/A=
-github.com/tdewolff/parse/v2 v2.7.21/go.mod h1:I7TXO37t3aSG9SlPUBefAhgIF8nt7yYUwVGgETIoBcA=
+github.com/tdewolff/minify/v2 v2.23.8 h1:tvjHzRer46kwOfpdCBCWsDblCw3QtnLJRd61pTVkyZ8=
+github.com/tdewolff/minify/v2 v2.23.8/go.mod h1:VW3ISUd3gDOZuQ/jwZr4sCzsuX+Qvsx87FDMjk6Rvno=
+github.com/tdewolff/parse/v2 v2.8.1 h1:J5GSHru6o3jF1uLlEKVXkDxxcVx6yzOlIVIotK4w2po=
+github.com/tdewolff/parse/v2 v2.8.1/go.mod h1:Hwlni2tiVNKyzR1o6nUs4FOF07URA+JLBLd6dlIXYqo=
 github.com/tdewolff/test v1.0.11 h1:FdLbwQVHxqG16SlkGveC0JVyrJN62COWTRyUFzfbtBE=
 github.com/tdewolff/test v1.0.11/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
@@ -71,10 +72,10 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
-golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
-golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
+golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
+golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
+golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w=
+golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g=
 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/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -89,10 +90,10 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
-golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
+golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
+golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
+golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
+golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 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=
@@ -111,8 +112,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 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=
@@ -122,8 +123,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
-golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
-golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
+golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
+golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
 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.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -133,8 +134,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 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=
@@ -142,7 +143,7 @@ golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
-google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/api/api.go

@@ -76,6 +76,9 @@ func Serve(router *mux.Router, store *storage.Storage, pool *worker.Pool) {
 	sr.HandleFunc("/enclosures/{enclosureID}", handler.updateEnclosureByID).Methods(http.MethodPut)
 	sr.HandleFunc("/integrations/status", handler.getIntegrationsStatus).Methods(http.MethodGet)
 	sr.HandleFunc("/version", handler.versionHandler).Methods(http.MethodGet)
+	sr.HandleFunc("/api-keys", handler.createAPIKey).Methods(http.MethodPost)
+	sr.HandleFunc("/api-keys", handler.getAPIKeys).Methods(http.MethodGet)
+	sr.HandleFunc("/api-keys/{apiKeyID}", handler.deleteAPIKey).Methods(http.MethodDelete)
 }
 
 func (h *handler) versionHandler(w http.ResponseWriter, r *http.Request) {

internal/api/api_integration_test.go

@@ -729,6 +729,116 @@ func TestRegularUsersCannotUpdateOtherUsers(t *testing.T) {
 	}
 }
 
+func TestAPIKeysEndpoint(t *testing.T) {
+	testConfig := newIntegrationTestConfig()
+	if !testConfig.isConfigured() {
+		t.Skip(skipIntegrationTestsMessage)
+	}
+
+	adminClient := miniflux.NewClient(testConfig.testBaseURL, testConfig.testAdminUsername, testConfig.testAdminPassword)
+	regularTestUser, err := adminClient.CreateUser(testConfig.genRandomUsername(), testConfig.testRegularPassword, false)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer adminClient.DeleteUser(regularTestUser.ID)
+
+	regularUserClient := miniflux.NewClient(testConfig.testBaseURL, regularTestUser.Username, testConfig.testRegularPassword)
+	apiKeys, err := regularUserClient.APIKeys()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(apiKeys) != 0 {
+		t.Fatalf(`Expected no API keys, got %d`, len(apiKeys))
+	}
+
+	// Create an API key for the user.
+	apiKey, err := regularUserClient.CreateAPIKey("Test API Key")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if apiKey.ID == 0 {
+		t.Fatalf(`Invalid API key ID, got "%v"`, apiKey.ID)
+	}
+	if apiKey.UserID != regularTestUser.ID {
+		t.Fatalf(`Invalid user ID for API key, got "%v" instead of "%v"`, apiKey.UserID, regularTestUser.ID)
+	}
+	if apiKey.Token == "" {
+		t.Fatalf(`Invalid API key token, got "%v"`, apiKey.Token)
+	}
+	if apiKey.Description != "Test API Key" {
+		t.Fatalf(`Invalid API key description, got "%v" instead of "Test API Key"`, apiKey.Description)
+	}
+
+	// Create a duplicate API key with the same description.
+	if _, err := regularUserClient.CreateAPIKey("Test API Key"); err == nil {
+		t.Fatal(`Creating a duplicate API key with the same description should raise an error`)
+	}
+
+	// Fetch the API keys again.
+	apiKeys, err = regularUserClient.APIKeys()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(apiKeys) != 1 {
+		t.Fatalf(`Expected 1 API key, got %d`, len(apiKeys))
+	}
+	if apiKeys[0].ID != apiKey.ID {
+		t.Fatalf(`Invalid API key ID, got "%v" instead of "%v"`, apiKeys[0].ID, apiKey.ID)
+	}
+	if apiKeys[0].UserID != regularTestUser.ID {
+		t.Fatalf(`Invalid user ID for API key, got "%v" instead of "%v"`, apiKeys[0].UserID, regularTestUser.ID)
+	}
+	if apiKeys[0].Token != apiKey.Token {
+		t.Fatalf(`Invalid API key token, got "%v" instead of "%v"`, apiKeys[0].Token, apiKey.Token)
+	}
+	if apiKeys[0].Description != "Test API Key" {
+		t.Fatalf(`Invalid API key description, got "%v" instead of "Test API Key"`, apiKeys[0].Description)
+	}
+
+	// Create a new client using the API key.
+	apiKeyClient := miniflux.NewClient(testConfig.testBaseURL, apiKey.Token)
+
+	// Fetch the user using the API key client.
+	user, err := apiKeyClient.Me()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Verify the user matches the regular test user.
+	if user.ID != regularTestUser.ID {
+		t.Fatalf(`Expected user ID %d, got %d`, regularTestUser.ID, user.ID)
+	}
+
+	// Delete the API key.
+	if err := regularUserClient.DeleteAPIKey(apiKey.ID); err != nil {
+		t.Fatal(err)
+	}
+
+	// Verify the API key is deleted.
+	apiKeys, err = regularUserClient.APIKeys()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(apiKeys) != 0 {
+		t.Fatalf(`Expected no API keys after deletion, got %d`, len(apiKeys))
+	}
+
+	// Try to delete the API key again, it should return an error.
+	err = regularUserClient.DeleteAPIKey(apiKey.ID)
+	if err == nil {
+		t.Fatal(`Deleting a non-existent API key should raise an error`)
+	}
+	if !errors.Is(err, miniflux.ErrNotFound) {
+		t.Fatalf(`Expected "not found" error, got %v`, err)
+	}
+
+	// Try to create an API key with an empty description.
+	if _, err := regularUserClient.CreateAPIKey(""); err == nil {
+		t.Fatal(`Creating an API key with an empty description should raise an error`)
+	}
+}
+
 func TestMarkUserAsReadEndpoint(t *testing.T) {
 	testConfig := newIntegrationTestConfig()
 	if !testConfig.isConfigured() {
@@ -824,6 +934,10 @@ func TestCreateCategoryEndpoint(t *testing.T) {
 	if category.Title != categoryName {
 		t.Errorf(`Invalid title, got "%v" instead of "%v"`, category.Title, categoryName)
 	}
+
+	if category.HideGlobally {
+		t.Errorf(`Invalid hide globally value, got "%v"`, category.HideGlobally)
+	}
 }
 
 func TestCreateCategoryWithEmptyTitle(t *testing.T) {
@@ -865,7 +979,49 @@ func TestCannotCreateDuplicatedCategory(t *testing.T) {
 	}
 }
 
-func TestUpdateCatgoryEndpoint(t *testing.T) {
+func TestCreateCategoryWithOptions(t *testing.T) {
+	testConfig := newIntegrationTestConfig()
+	if !testConfig.isConfigured() {
+		t.Skip(skipIntegrationTestsMessage)
+	}
+
+	adminClient := miniflux.NewClient(testConfig.testBaseURL, testConfig.testAdminUsername, testConfig.testAdminPassword)
+
+	regularTestUser, err := adminClient.CreateUser(testConfig.genRandomUsername(), testConfig.testRegularPassword, false)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer adminClient.DeleteUser(regularTestUser.ID)
+
+	regularUserClient := miniflux.NewClient(testConfig.testBaseURL, regularTestUser.Username, testConfig.testRegularPassword)
+
+	newCategory, err := regularUserClient.CreateCategoryWithOptions(&miniflux.CategoryCreationRequest{
+		Title:        "My category",
+		HideGlobally: true,
+	})
+	if err != nil {
+		t.Fatalf(`Creating a category with options should not raise an error: %v`, err)
+	}
+
+	categories, err := regularUserClient.Categories()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for _, category := range categories {
+		if category.ID == newCategory.ID {
+			if category.Title != newCategory.Title {
+				t.Errorf(`Invalid title, got %q instead of %q`, category.Title, newCategory.Title)
+			}
+			if category.HideGlobally != true {
+				t.Errorf(`Invalid hide globally value, got "%v"`, category.HideGlobally)
+			}
+			break
+		}
+	}
+}
+
+func TestUpdateCategoryEndpoint(t *testing.T) {
 	testConfig := newIntegrationTestConfig()
 	if !testConfig.isConfigured() {
 		t.Skip(skipIntegrationTestsMessage)
@@ -903,6 +1059,91 @@ func TestUpdateCatgoryEndpoint(t *testing.T) {
 	if updatedCategory.Title != "new title" {
 		t.Errorf(`Invalid title, got "%v" instead of "%v"`, updatedCategory.Title, "new title")
 	}
+
+	if updatedCategory.HideGlobally {
+		t.Errorf(`Invalid hide globally value, got "%v"`, updatedCategory.HideGlobally)
+	}
+}
+
+func TestUpdateCategoryWithOptions(t *testing.T) {
+	testConfig := newIntegrationTestConfig()
+	if !testConfig.isConfigured() {
+		t.Skip(skipIntegrationTestsMessage)
+	}
+
+	adminClient := miniflux.NewClient(testConfig.testBaseURL, testConfig.testAdminUsername, testConfig.testAdminPassword)
+
+	regularTestUser, err := adminClient.CreateUser(testConfig.genRandomUsername(), testConfig.testRegularPassword, false)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer adminClient.DeleteUser(regularTestUser.ID)
+
+	regularUserClient := miniflux.NewClient(testConfig.testBaseURL, regularTestUser.Username, testConfig.testRegularPassword)
+
+	newCategory, err := regularUserClient.CreateCategoryWithOptions(&miniflux.CategoryCreationRequest{
+		Title: "My category",
+	})
+	if err != nil {
+		t.Fatalf(`Creating a category with options should not raise an error: %v`, err)
+	}
+
+	updatedCategory, err := regularUserClient.UpdateCategoryWithOptions(newCategory.ID, &miniflux.CategoryModificationRequest{
+		Title: miniflux.SetOptionalField("new title"),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if updatedCategory.ID != newCategory.ID {
+		t.Errorf(`Invalid categoryID, got "%v"`, updatedCategory.ID)
+	}
+
+	if updatedCategory.Title != "new title" {
+		t.Errorf(`Invalid title, got "%v" instead of "%v"`, updatedCategory.Title, "new title")
+	}
+
+	if updatedCategory.HideGlobally {
+		t.Errorf(`Invalid hide globally value, got "%v"`, updatedCategory.HideGlobally)
+	}
+
+	updatedCategory, err = regularUserClient.UpdateCategoryWithOptions(newCategory.ID, &miniflux.CategoryModificationRequest{
+		HideGlobally: miniflux.SetOptionalField(true),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if updatedCategory.ID != newCategory.ID {
+		t.Errorf(`Invalid categoryID, got "%v"`, updatedCategory.ID)
+	}
+
+	if updatedCategory.Title != "new title" {
+		t.Errorf(`Invalid title, got "%v" instead of "%v"`, updatedCategory.Title, "new title")
+	}
+
+	if !updatedCategory.HideGlobally {
+		t.Errorf(`Invalid hide globally value, got "%v"`, updatedCategory.HideGlobally)
+	}
+
+	updatedCategory, err = regularUserClient.UpdateCategoryWithOptions(newCategory.ID, &miniflux.CategoryModificationRequest{
+		HideGlobally: miniflux.SetOptionalField(false),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if updatedCategory.ID != newCategory.ID {
+		t.Errorf(`Invalid categoryID, got %q`, updatedCategory.ID)
+	}
+
+	if updatedCategory.Title != "new title" {
+		t.Errorf(`Invalid title, got %q instead of %q`, updatedCategory.Title, "new title")
+	}
+
+	if updatedCategory.HideGlobally {
+		t.Errorf(`Invalid hide globally value, got "%v"`, updatedCategory.HideGlobally)
+	}
 }
 
 func TestUpdateInexistingCategory(t *testing.T) {

internal/api/api_key.go

@@ -0,0 +1,64 @@
+// 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"
+	"errors"
+	"net/http"
+
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/http/response/json"
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/storage"
+	"miniflux.app/v2/internal/validator"
+)
+
+func (h *handler) createAPIKey(w http.ResponseWriter, r *http.Request) {
+	userID := request.UserID(r)
+
+	var apiKeyCreationRequest model.APIKeyCreationRequest
+	if err := json_parser.NewDecoder(r.Body).Decode(&apiKeyCreationRequest); err != nil {
+		json.BadRequest(w, r, err)
+		return
+	}
+
+	if validationErr := validator.ValidateAPIKeyCreation(h.store, userID, &apiKeyCreationRequest); validationErr != nil {
+		json.BadRequest(w, r, validationErr.Error())
+		return
+	}
+
+	apiKey, err := h.store.CreateAPIKey(userID, apiKeyCreationRequest.Description)
+	if err != nil {
+		json.ServerError(w, r, err)
+		return
+	}
+
+	json.Created(w, r, apiKey)
+}
+
+func (h *handler) getAPIKeys(w http.ResponseWriter, r *http.Request) {
+	userID := request.UserID(r)
+	apiKeys, err := h.store.APIKeys(userID)
+	if err != nil {
+		json.ServerError(w, r, err)
+		return
+	}
+	json.OK(w, r, apiKeys)
+}
+
+func (h *handler) deleteAPIKey(w http.ResponseWriter, r *http.Request) {
+	userID := request.UserID(r)
+	apiKeyID := request.RouteInt64Param(r, "apiKeyID")
+
+	if err := h.store.DeleteAPIKey(userID, apiKeyID); err != nil {
+		if errors.Is(err, storage.ErrAPIKeyNotFound) {
+			json.NotFound(w, r)
+			return
+		}
+		json.ServerError(w, r, err)
+		return
+	}
+	json.NoContent(w, r)
+}

internal/api/category.go

@@ -19,18 +19,18 @@ import (
 func (h *handler) createCategory(w http.ResponseWriter, r *http.Request) {
 	userID := request.UserID(r)
 
-	var categoryRequest model.CategoryRequest
-	if err := json_parser.NewDecoder(r.Body).Decode(&categoryRequest); err != nil {
+	var categoryCreationRequest model.CategoryCreationRequest
+	if err := json_parser.NewDecoder(r.Body).Decode(&categoryCreationRequest); err != nil {
 		json.BadRequest(w, r, err)
 		return
 	}
 
-	if validationErr := validator.ValidateCategoryCreation(h.store, userID, &categoryRequest); validationErr != nil {
+	if validationErr := validator.ValidateCategoryCreation(h.store, userID, &categoryCreationRequest); validationErr != nil {
 		json.BadRequest(w, r, validationErr.Error())
 		return
 	}
 
-	category, err := h.store.CreateCategory(userID, &categoryRequest)
+	category, err := h.store.CreateCategory(userID, &categoryCreationRequest)
 	if err != nil {
 		json.ServerError(w, r, err)
 		return
@@ -54,20 +54,20 @@ func (h *handler) updateCategory(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var categoryRequest model.CategoryRequest
-	if err := json_parser.NewDecoder(r.Body).Decode(&categoryRequest); err != nil {
+	var categoryModificationRequest model.CategoryModificationRequest
+	if err := json_parser.NewDecoder(r.Body).Decode(&categoryModificationRequest); err != nil {
 		json.BadRequest(w, r, err)
 		return
 	}
 
-	if validationErr := validator.ValidateCategoryModification(h.store, userID, category.ID, &categoryRequest); validationErr != nil {
+	if validationErr := validator.ValidateCategoryModification(h.store, userID, category.ID, &categoryModificationRequest); validationErr != nil {
 		json.BadRequest(w, r, validationErr.Error())
 		return
 	}
 
-	categoryRequest.Patch(category)
-	err = h.store.UpdateCategory(category)
-	if err != nil {
+	categoryModificationRequest.Patch(category)
+
+	if err := h.store.UpdateCategory(category); err != nil {
 		json.ServerError(w, r, err)
 		return
 	}

internal/api/entry.go

@@ -331,6 +331,18 @@ func (h *handler) fetchContent(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	shouldUpdateContent := request.QueryBoolParam(r, "update_content", false)
+	if shouldUpdateContent {
+		if err := h.store.UpdateEntryTitleAndContent(entry); err != nil {
+			json.ServerError(w, r, err)
+			return
+		}
+
+		json.OK(w, r, map[string]interface{}{"content": mediaproxy.RewriteDocumentWithRelativeProxyURL(h.router, entry.Content), "reading_time": entry.ReadingTime})
+
+		return
+	}
+
 	json.OK(w, r, map[string]string{"content": entry.Content})
 }
 

internal/api/subscription.go

@@ -11,6 +11,7 @@ import (
 	"miniflux.app/v2/internal/http/request"
 	"miniflux.app/v2/internal/http/response/json"
 	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/proxyrotator"
 	"miniflux.app/v2/internal/reader/fetcher"
 	"miniflux.app/v2/internal/reader/subscription"
 	"miniflux.app/v2/internal/validator"
@@ -29,24 +30,29 @@ func (h *handler) discoverSubscriptions(w http.ResponseWriter, r *http.Request)
 	}
 
 	var rssbridgeURL string
+	var rssbridgeToken string
 	intg, err := h.store.Integration(request.UserID(r))
 	if err == nil && intg != nil && intg.RSSBridgeEnabled {
 		rssbridgeURL = intg.RSSBridgeURL
+		rssbridgeToken = intg.RSSBridgeToken
 	}
 
 	requestBuilder := fetcher.NewRequestBuilder()
 	requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
-	requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
+	requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
+	requestBuilder.WithCustomFeedProxyURL(subscriptionDiscoveryRequest.ProxyURL)
+	requestBuilder.WithCustomApplicationProxyURL(config.Opts.HTTPClientProxyURL())
+	requestBuilder.UseCustomApplicationProxyURL(subscriptionDiscoveryRequest.FetchViaProxy)
 	requestBuilder.WithUserAgent(subscriptionDiscoveryRequest.UserAgent, config.Opts.HTTPClientUserAgent())
 	requestBuilder.WithCookie(subscriptionDiscoveryRequest.Cookie)
 	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,
 		rssbridgeURL,
+		rssbridgeToken,
 	)
 
 	if localizedError != nil {

internal/cli/cli.go

@@ -13,46 +13,49 @@ import (
 
 	"miniflux.app/v2/internal/config"
 	"miniflux.app/v2/internal/database"
+	"miniflux.app/v2/internal/proxyrotator"
 	"miniflux.app/v2/internal/storage"
 	"miniflux.app/v2/internal/ui/static"
 	"miniflux.app/v2/internal/version"
 )
 
 const (
-	flagInfoHelp            = "Show build information"
-	flagVersionHelp         = "Show application version"
-	flagMigrateHelp         = "Run SQL migrations"
-	flagFlushSessionsHelp   = "Flush all sessions (disconnect users)"
-	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"
-	flagConfigFileHelp      = "Load configuration file"
-	flagConfigDumpHelp      = "Print parsed configuration values"
-	flagHealthCheckHelp     = `Perform a health check on the given endpoint (the value "auto" try to guess the health check endpoint).`
-	flagRefreshFeedsHelp    = "Refresh a batch of feeds and exit"
-	flagRunCleanupTasksHelp = "Run cleanup tasks (delete old sessions and archives old entries)"
-	flagExportUserFeedsHelp = "Export user feeds (provide the username as argument)"
+	flagInfoHelp             = "Show build information"
+	flagVersionHelp          = "Show application version"
+	flagMigrateHelp          = "Run SQL migrations"
+	flagFlushSessionsHelp    = "Flush all sessions (disconnect users)"
+	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"
+	flagConfigFileHelp       = "Load configuration file"
+	flagConfigDumpHelp       = "Print parsed configuration values"
+	flagHealthCheckHelp      = `Perform a health check on the given endpoint (the value "auto" try to guess the health check endpoint).`
+	flagRefreshFeedsHelp     = "Refresh a batch of feeds and exit"
+	flagRunCleanupTasksHelp  = "Run cleanup tasks (delete old sessions and archives old entries)"
+	flagExportUserFeedsHelp  = "Export user feeds (provide the username as argument)"
+	flagResetNextCheckAtHelp = "Reset the next check time for all feeds"
 )
 
 // Parse parses command line arguments.
 func Parse() {
 	var (
-		err                 error
-		flagInfo            bool
-		flagVersion         bool
-		flagMigrate         bool
-		flagFlushSessions   bool
-		flagCreateAdmin     bool
-		flagResetPassword   bool
-		flagResetFeedErrors bool
-		flagDebugMode       bool
-		flagConfigFile      string
-		flagConfigDump      bool
-		flagHealthCheck     string
-		flagRefreshFeeds    bool
-		flagRunCleanupTasks bool
-		flagExportUserFeeds string
+		err                      error
+		flagInfo                 bool
+		flagVersion              bool
+		flagMigrate              bool
+		flagFlushSessions        bool
+		flagCreateAdmin          bool
+		flagResetPassword        bool
+		flagResetFeedErrors      bool
+		flagResetFeedNextCheckAt bool
+		flagDebugMode            bool
+		flagConfigFile           string
+		flagConfigDump           bool
+		flagHealthCheck          string
+		flagRefreshFeeds         bool
+		flagRunCleanupTasks      bool
+		flagExportUserFeeds      string
 	)
 
 	flag.BoolVar(&flagInfo, "info", false, flagInfoHelp)
@@ -64,6 +67,7 @@ func Parse() {
 	flag.BoolVar(&flagCreateAdmin, "create-admin", false, flagCreateAdminHelp)
 	flag.BoolVar(&flagResetPassword, "reset-password", false, flagResetPasswordHelp)
 	flag.BoolVar(&flagResetFeedErrors, "reset-feed-errors", false, flagResetFeedErrorsHelp)
+	flag.BoolVar(&flagResetFeedNextCheckAt, "reset-feed-next-check-at", false, flagResetNextCheckAtHelp)
 	flag.BoolVar(&flagDebugMode, "debug", false, flagDebugModeHelp)
 	flag.StringVar(&flagConfigFile, "config-file", "", flagConfigFileHelp)
 	flag.StringVar(&flagConfigFile, "c", "", flagConfigFileHelp)
@@ -189,7 +193,16 @@ func Parse() {
 	}
 
 	if flagResetFeedErrors {
-		store.ResetFeedErrors()
+		if err := store.ResetFeedErrors(); err != nil {
+			printErrorAndExit(err)
+		}
+		return
+	}
+
+	if flagResetFeedNextCheckAt {
+		if err := store.ResetNextCheckAt(); err != nil {
+			printErrorAndExit(err)
+		}
 		return
 	}
 
@@ -228,6 +241,14 @@ func Parse() {
 		createAdminUserFromEnvironmentVariables(store)
 	}
 
+	if config.Opts.HasHTTPClientProxiesConfigured() {
+		slog.Info("Initializing proxy rotation", slog.Int("proxies_count", len(config.Opts.HTTPClientProxies())))
+		proxyrotator.ProxyRotatorInstance, err = proxyrotator.NewProxyRotator(config.Opts.HTTPClientProxies())
+		if err != nil {
+			printErrorAndExit(fmt.Errorf("unable to initialize proxy rotator: %v", err))
+		}
+	}
+
 	if flagRefreshFeeds {
 		refreshFeeds(store)
 		return

internal/config/config_test.go

@@ -1028,6 +1028,41 @@ func TestSchedulerRoundRobin(t *testing.T) {
 	}
 }
 
+func TestDefaultSchedulerRoundRobinMaxIntervalValue(t *testing.T) {
+	os.Clearenv()
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := defaultSchedulerRoundRobinMaxInterval
+	result := opts.SchedulerRoundRobinMaxInterval()
+
+	if result != expected {
+		t.Fatalf(`Unexpected SCHEDULER_ROUND_ROBIN_MAX_INTERVAL value, got %v instead of %v`, result, expected)
+	}
+}
+
+func TestSchedulerRoundRobinMaxInterval(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("SCHEDULER_ROUND_ROBIN_MAX_INTERVAL", "150")
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := 150
+	result := opts.SchedulerRoundRobinMaxInterval()
+
+	if result != expected {
+		t.Fatalf(`Unexpected SCHEDULER_ROUND_ROBIN_MAX_INTERVAL value, got %v instead of %v`, result, expected)
+	}
+}
+
 func TestPollingParsingErrorLimit(t *testing.T) {
 	os.Clearenv()
 	os.Setenv("POLLING_PARSING_ERROR_LIMIT", "100")
@@ -2186,3 +2221,71 @@ func TestParseConfigDumpOutput(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestHTTPClientProxies(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("HTTP_CLIENT_PROXIES", "http://proxy1.example.com,http://proxy2.example.com")
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := []string{"http://proxy1.example.com", "http://proxy2.example.com"}
+	result := opts.HTTPClientProxies()
+
+	if len(expected) != len(result) {
+		t.Fatalf(`Unexpected HTTP_CLIENT_PROXIES value, got %v instead of %v`, result, expected)
+	}
+
+	for i, proxy := range expected {
+		if result[i] != proxy {
+			t.Fatalf(`Unexpected HTTP_CLIENT_PROXIES value at index %d, got %q instead of %q`, i, result[i], proxy)
+		}
+	}
+}
+
+func TestDefaultHTTPClientProxiesValue(t *testing.T) {
+	os.Clearenv()
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := []string{}
+	result := opts.HTTPClientProxies()
+
+	if len(expected) != len(result) {
+		t.Fatalf(`Unexpected default HTTP_CLIENT_PROXIES value, got %v instead of %v`, result, expected)
+	}
+}
+
+func TestHTTPClientProxy(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("HTTP_CLIENT_PROXY", "http://proxy.example.com")
+
+	parser := NewParser()
+	opts, err := parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	expected := "http://proxy.example.com"
+	if opts.HTTPClientProxyURL() == nil || opts.HTTPClientProxyURL().String() != expected {
+		t.Fatalf(`Unexpected HTTP_CLIENT_PROXY value, got %v instead of %v`, opts.HTTPClientProxyURL(), expected)
+	}
+}
+
+func TestInvalidHTTPClientProxy(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("HTTP_CLIENT_PROXY", "sche|me://invalid-proxy-url")
+
+	parser := NewParser()
+	_, err := parser.ParseEnvironmentVariables()
+	if err == nil {
+		t.Fatalf(`Expected error for invalid HTTP_CLIENT_PROXY value, but got none`)
+	}
+}

internal/config/options.go

@@ -5,6 +5,7 @@ package config // import "miniflux.app/v2/internal/config"
 
 import (
 	"fmt"
+	"net/url"
 	"sort"
 	"strings"
 	"time"
@@ -36,6 +37,7 @@ const (
 	defaultSchedulerEntryFrequencyMaxInterval = 24 * 60
 	defaultSchedulerEntryFrequencyFactor      = 1
 	defaultSchedulerRoundRobinMinInterval     = 60
+	defaultSchedulerRoundRobinMaxInterval     = 1440
 	defaultPollingParsingErrorLimit           = 3
 	defaultRunMigrations                      = false
 	defaultDatabaseURL                        = "user=postgres password=postgres dbname=miniflux2 sslmode=disable"
@@ -136,6 +138,7 @@ type Options struct {
 	schedulerEntryFrequencyMaxInterval int
 	schedulerEntryFrequencyFactor      int
 	schedulerRoundRobinMinInterval     int
+	schedulerRoundRobinMaxInterval     int
 	pollingParsingErrorLimit           int
 	workerPoolSize                     int
 	createAdmin                        bool
@@ -163,7 +166,8 @@ type Options struct {
 	pocketConsumerKey                  string
 	httpClientTimeout                  int
 	httpClientMaxBodySize              int64
-	httpClientProxy                    string
+	httpClientProxyURL                 *url.URL
+	httpClientProxies                  []string
 	httpClientUserAgent                string
 	httpServerTimeout                  int
 	authProxyHeader                    string
@@ -218,6 +222,7 @@ func NewOptions() *Options {
 		schedulerEntryFrequencyMaxInterval: defaultSchedulerEntryFrequencyMaxInterval,
 		schedulerEntryFrequencyFactor:      defaultSchedulerEntryFrequencyFactor,
 		schedulerRoundRobinMinInterval:     defaultSchedulerRoundRobinMinInterval,
+		schedulerRoundRobinMaxInterval:     defaultSchedulerRoundRobinMaxInterval,
 		pollingParsingErrorLimit:           defaultPollingParsingErrorLimit,
 		workerPoolSize:                     defaultWorkerPoolSize,
 		createAdmin:                        defaultCreateAdmin,
@@ -243,7 +248,8 @@ func NewOptions() *Options {
 		pocketConsumerKey:                  defaultPocketConsumerKey,
 		httpClientTimeout:                  defaultHTTPClientTimeout,
 		httpClientMaxBodySize:              defaultHTTPClientMaxBodySize * 1024 * 1024,
-		httpClientProxy:                    defaultHTTPClientProxy,
+		httpClientProxyURL:                 nil,
+		httpClientProxies:                  []string{},
 		httpClientUserAgent:                defaultHTTPClientUserAgent,
 		httpServerTimeout:                  defaultHTTPServerTimeout,
 		authProxyHeader:                    defaultAuthProxyHeader,
@@ -430,6 +436,10 @@ func (o *Options) SchedulerRoundRobinMinInterval() int {
 	return o.schedulerRoundRobinMinInterval
 }
 
+func (o *Options) SchedulerRoundRobinMaxInterval() int {
+	return o.schedulerRoundRobinMaxInterval
+}
+
 // PollingParsingErrorLimit returns the limit of errors when to stop polling.
 func (o *Options) PollingParsingErrorLimit() int {
 	return o.pollingParsingErrorLimit
@@ -587,9 +597,24 @@ func (o *Options) HTTPClientMaxBodySize() int64 {
 	return o.httpClientMaxBodySize
 }
 
-// HTTPClientProxy returns the proxy URL for HTTP client.
-func (o *Options) HTTPClientProxy() string {
-	return o.httpClientProxy
+// HTTPClientProxyURL returns the client HTTP proxy URL if configured.
+func (o *Options) HTTPClientProxyURL() *url.URL {
+	return o.httpClientProxyURL
+}
+
+// HasHTTPClientProxyURLConfigured returns true if the client HTTP proxy URL if configured.
+func (o *Options) HasHTTPClientProxyURLConfigured() bool {
+	return o.httpClientProxyURL != nil
+}
+
+// HTTPClientProxies returns the list of proxies.
+func (o *Options) HTTPClientProxies() []string {
+	return o.httpClientProxies
+}
+
+// HTTPClientProxiesString returns true if the list of rotating proxies are configured.
+func (o *Options) HasHTTPClientProxiesConfigured() bool {
+	return len(o.httpClientProxies) > 0
 }
 
 // HTTPServerTimeout returns the time limit in seconds before the HTTP server cancel the request.
@@ -597,11 +622,6 @@ func (o *Options) HTTPServerTimeout() int {
 	return o.httpServerTimeout
 }
 
-// HasHTTPClientProxyConfigured returns true if the HTTP proxy is configured.
-func (o *Options) HasHTTPClientProxyConfigured() bool {
-	return o.httpClientProxy != ""
-}
-
 // AuthProxyHeader returns an HTTP header name that contains username for
 // authentication using auth proxy.
 func (o *Options) AuthProxyHeader() string {
@@ -664,6 +684,33 @@ func (o *Options) FilterEntryMaxAgeDays() int {
 
 // SortedOptions returns options as a list of key value pairs, sorted by keys.
 func (o *Options) SortedOptions(redactSecret bool) []*Option {
+	var clientProxyURLRedacted string
+	if o.httpClientProxyURL != nil {
+		if redactSecret {
+			clientProxyURLRedacted = o.httpClientProxyURL.Redacted()
+		} else {
+			clientProxyURLRedacted = o.httpClientProxyURL.String()
+		}
+	}
+
+	var clientProxyURLsRedacted string
+	if len(o.httpClientProxies) > 0 {
+		if redactSecret {
+			var proxyURLs []string
+			for range o.httpClientProxies {
+				proxyURLs = append(proxyURLs, "<redacted>")
+			}
+			clientProxyURLsRedacted = strings.Join(proxyURLs, ",")
+		} else {
+			clientProxyURLsRedacted = strings.Join(o.httpClientProxies, ",")
+		}
+	}
+
+	var mediaProxyPrivateKeyValue string
+	if len(o.mediaProxyPrivateKey) > 0 {
+		mediaProxyPrivateKeyValue = "<binary-data>"
+	}
+
 	var keyValues = map[string]interface{}{
 		"ADMIN_PASSWORD":                         redactSecretValue(o.adminPassword, redactSecret),
 		"ADMIN_USERNAME":                         o.adminUsername,
@@ -694,7 +741,8 @@ func (o *Options) SortedOptions(redactSecret bool) []*Option {
 		"FETCH_BILIBILI_WATCH_TIME":              o.fetchBilibiliWatchTime,
 		"HTTPS":                                  o.HTTPS,
 		"HTTP_CLIENT_MAX_BODY_SIZE":              o.httpClientMaxBodySize,
-		"HTTP_CLIENT_PROXY":                      o.httpClientProxy,
+		"HTTP_CLIENT_PROXIES":                    clientProxyURLsRedacted,
+		"HTTP_CLIENT_PROXY":                      clientProxyURLRedacted,
 		"HTTP_CLIENT_TIMEOUT":                    o.httpClientTimeout,
 		"HTTP_CLIENT_USER_AGENT":                 o.httpClientUserAgent,
 		"HTTP_SERVER_TIMEOUT":                    o.httpServerTimeout,
@@ -729,7 +777,7 @@ func (o *Options) SortedOptions(redactSecret bool) []*Option {
 		"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_PRIVATE_KEY":                mediaProxyPrivateKeyValue,
 		"MEDIA_PROXY_CUSTOM_URL":                 o.mediaProxyCustomURL,
 		"ROOT_URL":                               o.rootURL,
 		"RUN_MIGRATIONS":                         o.runMigrations,
@@ -737,6 +785,7 @@ func (o *Options) SortedOptions(redactSecret bool) []*Option {
 		"SCHEDULER_ENTRY_FREQUENCY_MIN_INTERVAL": o.schedulerEntryFrequencyMinInterval,
 		"SCHEDULER_ENTRY_FREQUENCY_FACTOR":       o.schedulerEntryFrequencyFactor,
 		"SCHEDULER_ROUND_ROBIN_MIN_INTERVAL":     o.schedulerRoundRobinMinInterval,
+		"SCHEDULER_ROUND_ROBIN_MAX_INTERVAL":     o.schedulerRoundRobinMaxInterval,
 		"SCHEDULER_SERVICE":                      o.schedulerService,
 		"SERVER_TIMING_HEADER":                   o.serverTimingHeader,
 		"WATCHDOG":                               o.watchdog,

internal/config/parser.go

@@ -160,6 +160,8 @@ func (p *Parser) parseLines(lines []string) (err error) {
 			p.opts.schedulerEntryFrequencyFactor = parseInt(value, defaultSchedulerEntryFrequencyFactor)
 		case "SCHEDULER_ROUND_ROBIN_MIN_INTERVAL":
 			p.opts.schedulerRoundRobinMinInterval = parseInt(value, defaultSchedulerRoundRobinMinInterval)
+		case "SCHEDULER_ROUND_ROBIN_MAX_INTERVAL":
+			p.opts.schedulerRoundRobinMaxInterval = parseInt(value, defaultSchedulerRoundRobinMaxInterval)
 		case "POLLING_PARSING_ERROR_LIMIT":
 			p.opts.pollingParsingErrorLimit = parseInt(value, defaultPollingParsingErrorLimit)
 		case "PROXY_IMAGES":
@@ -240,7 +242,12 @@ func (p *Parser) parseLines(lines []string) (err error) {
 		case "HTTP_CLIENT_MAX_BODY_SIZE":
 			p.opts.httpClientMaxBodySize = int64(parseInt(value, defaultHTTPClientMaxBodySize) * 1024 * 1024)
 		case "HTTP_CLIENT_PROXY":
-			p.opts.httpClientProxy = parseString(value, defaultHTTPClientProxy)
+			p.opts.httpClientProxyURL, err = url.Parse(parseString(value, defaultHTTPClientProxy))
+			if err != nil {
+				return fmt.Errorf("config: invalid HTTP_CLIENT_PROXY value: %w", err)
+			}
+		case "HTTP_CLIENT_PROXIES":
+			p.opts.httpClientProxies = parseStringList(value, []string{})
 		case "HTTP_CLIENT_USER_AGENT":
 			p.opts.httpClientUserAgent = parseString(value, defaultHTTPClientUserAgent)
 		case "HTTP_SERVER_TIMEOUT":

internal/database/migrations.go

@@ -509,7 +509,7 @@ var migrations = []func(tx *sql.Tx, driver string) error{
 	},
 	func(tx *sql.Tx, _ string) (err error) {
 		_, err = tx.Exec(`
-			CREATE INDEX entries_feed_url_idx ON entries(feed_id, url);
+			CREATE INDEX entries_feed_url_idx ON entries(feed_id, url) WHERE length(url) < 2000;
 			CREATE INDEX entries_user_status_feed_idx ON entries(user_id, status, feed_id);
 			CREATE INDEX entries_user_status_changed_idx ON entries(user_id, status, changed_at);
 		`)
@@ -1062,4 +1062,19 @@ var migrations = []func(tx *sql.Tx, driver string) error{
 
 		return nil
 	},
+	func(tx *sql.Tx, _ string) (err error) {
+		_, err = tx.Exec(`ALTER TABLE feeds ADD COLUMN proxy_url text default ''`)
+		return err
+	},
+	func(tx *sql.Tx, _ string) (err error) {
+		sql := `
+			ALTER TABLE integrations ADD COLUMN rssbridge_token text default '';
+		`
+		_, err = tx.Exec(sql)
+		return
+	},
+	func(tx *sql.Tx, _ string) (err error) {
+		_, err = tx.Exec(`ALTER TABLE users ADD COLUMN always_open_external_links bool default 'f'`)
+		return err
+	},
 }

internal/googlereader/handler.go

@@ -9,7 +9,6 @@ import (
 	"log/slog"
 	"net/http"
 	"strconv"
-	"strings"
 	"time"
 
 	"miniflux.app/v2/internal/config"
@@ -20,6 +19,7 @@ import (
 	"miniflux.app/v2/internal/integration"
 	"miniflux.app/v2/internal/mediaproxy"
 	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/proxyrotator"
 	"miniflux.app/v2/internal/reader/fetcher"
 	mff "miniflux.app/v2/internal/reader/handler"
 	mfs "miniflux.app/v2/internal/reader/subscription"
@@ -34,178 +34,12 @@ type handler struct {
 	router *mux.Router
 }
 
-const (
-	// StreamPrefix is the prefix for astreams (read/starred/reading list and so on)
-	StreamPrefix = "user/-/state/com.google/"
-	// UserStreamPrefix is the user specific prefix for streams (read/starred/reading list and so on)
-	UserStreamPrefix = "user/%d/state/com.google/"
-	// LabelPrefix is the prefix for a label stream
-	LabelPrefix = "user/-/label/"
-	// UserLabelPrefix is the user specific prefix prefix for a label stream
-	UserLabelPrefix = "user/%d/label/"
-	// FeedPrefix is the prefix for a feed stream
-	FeedPrefix = "feed/"
-	// Read is the suffix for read stream
-	Read = "read"
-	// Starred is the suffix for starred stream
-	Starred = "starred"
-	// ReadingList is the suffix for reading list stream
-	ReadingList = "reading-list"
-	// KeptUnread is the suffix for kept unread stream
-	KeptUnread = "kept-unread"
-	// Broadcast is the suffix for broadcast stream
-	Broadcast = "broadcast"
-	// BroadcastFriends is the suffix for broadcast friends stream
-	BroadcastFriends = "broadcast-friends"
-	// Like is the suffix for like stream
-	Like = "like"
-	// EntryIDLong is the long entry id representation
-	EntryIDLong = "tag:google.com,2005:reader/item/%016x"
+var (
+	errEmptyFeedTitle   = errors.New("googlereader: empty feed title")
+	errFeedNotFound     = errors.New("googlereader: feed not found")
+	errCategoryNotFound = errors.New("googlereader: category not found")
 )
 
-const (
-	// ParamItemIDs - name of the parameter with the item ids
-	ParamItemIDs = "i"
-	// ParamStreamID - name of the parameter containing the stream to be included
-	ParamStreamID = "s"
-	// ParamStreamExcludes - name of the parameter containing streams to be excluded
-	ParamStreamExcludes = "xt"
-	// ParamStreamFilters - name of the parameter containing streams to be included
-	ParamStreamFilters = "it"
-	// ParamStreamMaxItems - name of the parameter containing number of items per page/max items returned
-	ParamStreamMaxItems = "n"
-	// ParamStreamOrder - name of the parameter containing the sort criteria
-	ParamStreamOrder = "r"
-	// ParamStreamStartTime - name of the parameter containing epoch timestamp, filtering items older than
-	ParamStreamStartTime = "ot"
-	// ParamStreamStopTime - name of the parameter containing epoch timestamp, filtering items newer than
-	ParamStreamStopTime = "nt"
-	// ParamTagsRemove - name of the parameter containing tags (streams) to be removed
-	ParamTagsRemove = "r"
-	// ParamTagsAdd - name of the parameter containing tags (streams) to be added
-	ParamTagsAdd = "a"
-	// ParamSubscribeAction - name of the parameter indicating the action to take for subscription/edit
-	ParamSubscribeAction = "ac"
-	// ParamTitle - name of the parameter for the title of the subscription
-	ParamTitle = "t"
-	// ParamQuickAdd - name of the parameter for a URL being quick subscribed to
-	ParamQuickAdd = "quickadd"
-	// ParamDestination - name of the parameter for the new name of a tag
-	ParamDestination = "dest"
-	// ParamContinuation -  name of the parameter for callers to pass to receive the next page of results
-	ParamContinuation = "c"
-)
-
-// StreamType represents the possible stream types
-type StreamType int
-
-const (
-	// NoStream - no stream type
-	NoStream StreamType = iota
-	// ReadStream - read stream type
-	ReadStream
-	// StarredStream - starred stream type
-	StarredStream
-	// ReadingListStream - reading list stream type
-	ReadingListStream
-	// KeptUnreadStream - kept unread stream type
-	KeptUnreadStream
-	// BroadcastStream - broadcast stream type
-	BroadcastStream
-	// BroadcastFriendsStream - broadcast friends stream type
-	BroadcastFriendsStream
-	// LabelStream - label stream type
-	LabelStream
-	// FeedStream - feed stream type
-	FeedStream
-	// LikeStream - like stream type
-	LikeStream
-)
-
-// Stream defines a stream type and its ID.
-type Stream struct {
-	Type StreamType
-	ID   string
-}
-
-func (s Stream) String() string {
-	return fmt.Sprintf("%v - '%s'", s.Type, s.ID)
-}
-
-func (st StreamType) String() string {
-	switch st {
-	case NoStream:
-		return "NoStream"
-	case ReadStream:
-		return "ReadStream"
-	case StarredStream:
-		return "StarredStream"
-	case ReadingListStream:
-		return "ReadingListStream"
-	case KeptUnreadStream:
-		return "KeptUnreadStream"
-	case BroadcastStream:
-		return "BroadcastStream"
-	case BroadcastFriendsStream:
-		return "BroadcastFriendsStream"
-	case LabelStream:
-		return "LabelStream"
-	case FeedStream:
-		return "FeedStream"
-	case LikeStream:
-		return "LikeStream"
-	default:
-		return st.String()
-	}
-}
-
-// RequestModifiers are the parsed request parameters.
-type RequestModifiers struct {
-	ExcludeTargets    []Stream
-	FilterTargets     []Stream
-	Streams           []Stream
-	Count             int
-	Offset            int
-	SortDirection     string
-	StartTime         int64
-	StopTime          int64
-	ContinuationToken string
-	UserID            int64
-}
-
-func (r RequestModifiers) String() string {
-	var results []string
-
-	results = append(results, fmt.Sprintf("UserID: %d", r.UserID))
-
-	var streamStr []string
-	for _, s := range r.Streams {
-		streamStr = append(streamStr, s.String())
-	}
-	results = append(results, fmt.Sprintf("Streams: [%s]", strings.Join(streamStr, ", ")))
-
-	var exclusions []string
-	for _, s := range r.ExcludeTargets {
-		exclusions = append(exclusions, s.String())
-	}
-	results = append(results, fmt.Sprintf("Exclusions: [%s]", strings.Join(exclusions, ", ")))
-
-	var filters []string
-	for _, s := range r.FilterTargets {
-		filters = append(filters, s.String())
-	}
-	results = append(results, fmt.Sprintf("Filters: [%s]", strings.Join(filters, ", ")))
-
-	results = append(results, fmt.Sprintf("Count: %d", r.Count))
-	results = append(results, fmt.Sprintf("Offset: %d", r.Offset))
-	results = append(results, fmt.Sprintf("Sort Direction: %s", r.SortDirection))
-	results = append(results, fmt.Sprintf("Continuation Token: %s", r.ContinuationToken))
-	results = append(results, fmt.Sprintf("Start Time: %d", r.StartTime))
-	results = append(results, fmt.Sprintf("Stop Time: %d", r.StopTime))
-
-	return strings.Join(results, "; ")
-}
-
 // Serve handles Google Reader API calls.
 func Serve(router *mux.Router, store *storage.Storage) {
 	handler := &handler{store, router}
@@ -227,102 +61,22 @@ func Serve(router *mux.Router, store *storage.Storage) {
 	sr.HandleFunc("/subscription/quickadd", handler.quickAddHandler).Methods(http.MethodPost).Name("QuickAdd")
 	sr.HandleFunc("/stream/items/ids", handler.streamItemIDsHandler).Methods(http.MethodGet).Name("StreamItemIDs")
 	sr.HandleFunc("/stream/items/contents", handler.streamItemContentsHandler).Methods(http.MethodPost).Name("StreamItemsContents")
+	sr.HandleFunc("/mark-all-as-read", handler.markAllAsReadHandler).Methods(http.MethodPost).Name("MarkAllAsRead")
 	sr.PathPrefix("/").HandlerFunc(handler.serveHandler).Methods(http.MethodPost, http.MethodGet).Name("GoogleReaderApiEndpoint")
 }
 
-func getStreamFilterModifiers(r *http.Request) (RequestModifiers, error) {
-	userID := request.UserID(r)
-
-	result := RequestModifiers{
-		SortDirection: "desc",
-		UserID:        userID,
-	}
-	streamOrder := request.QueryStringParam(r, ParamStreamOrder, "d")
-	if streamOrder == "o" {
-		result.SortDirection = "asc"
-	}
-	var err error
-	result.Streams, err = getStreams(request.QueryStringParamList(r, ParamStreamID), userID)
-	if err != nil {
-		return RequestModifiers{}, err
-	}
-	result.ExcludeTargets, err = getStreams(request.QueryStringParamList(r, ParamStreamExcludes), userID)
-	if err != nil {
-		return RequestModifiers{}, err
-	}
-
-	result.FilterTargets, err = getStreams(request.QueryStringParamList(r, ParamStreamFilters), userID)
-	if err != nil {
-		return RequestModifiers{}, err
-	}
-
-	result.Count = request.QueryIntParam(r, ParamStreamMaxItems, 0)
-	result.Offset = request.QueryIntParam(r, ParamContinuation, 0)
-	result.StartTime = request.QueryInt64Param(r, ParamStreamStartTime, int64(0))
-	result.StopTime = request.QueryInt64Param(r, ParamStreamStopTime, int64(0))
-	return result, nil
-}
-
-func getStream(streamID string, userID int64) (Stream, error) {
-	switch {
-	case strings.HasPrefix(streamID, FeedPrefix):
-		return Stream{Type: FeedStream, ID: strings.TrimPrefix(streamID, FeedPrefix)}, nil
-	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 {
-		case Read:
-			return Stream{ReadStream, ""}, nil
-		case Starred:
-			return Stream{StarredStream, ""}, nil
-		case ReadingList:
-			return Stream{ReadingListStream, ""}, nil
-		case KeptUnread:
-			return Stream{KeptUnreadStream, ""}, nil
-		case Broadcast:
-			return Stream{BroadcastStream, ""}, nil
-		case BroadcastFriends:
-			return Stream{BroadcastFriendsStream, ""}, nil
-		case Like:
-			return Stream{LikeStream, ""}, nil
-		default:
-			return Stream{NoStream, ""}, fmt.Errorf("googlereader: unknown stream with id: %s", id)
-		}
-	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
-	case streamID == "":
-		return Stream{NoStream, ""}, nil
-	default:
-		return Stream{NoStream, ""}, fmt.Errorf("googlereader: unknown stream type: %s", streamID)
-	}
-}
-
-func getStreams(streamIDs []string, userID int64) ([]Stream, error) {
-	streams := make([]Stream, 0)
-	for _, streamID := range streamIDs {
-		stream, err := getStream(streamID, userID)
-		if err != nil {
-			return []Stream{}, err
-		}
-		streams = append(streams, stream)
-	}
-	return streams, nil
-}
-
 func checkAndSimplifyTags(addTags []Stream, removeTags []Stream) (map[StreamType]bool, error) {
 	tags := make(map[StreamType]bool)
 	for _, s := range addTags {
 		switch s.Type {
 		case ReadStream:
 			if _, ok := tags[KeptUnreadStream]; ok {
-				return nil, fmt.Errorf("googlereader: %s ad %s should not be supplied simultaneously", KeptUnread, Read)
+				return nil, fmt.Errorf("googlereader: %s and %s should not be supplied simultaneously", KeptUnread, Read)
 			}
 			tags[ReadStream] = true
 		case KeptUnreadStream:
 			if _, ok := tags[ReadStream]; ok {
-				return nil, fmt.Errorf("googlereader: %s ad %s should not be supplied simultaneously", KeptUnread, Read)
+				return nil, fmt.Errorf("googlereader: %s and %s should not be supplied simultaneously", KeptUnread, Read)
 			}
 			tags[ReadStream] = false
 		case StarredStream:
@@ -337,12 +91,12 @@ func checkAndSimplifyTags(addTags []Stream, removeTags []Stream) (map[StreamType
 		switch s.Type {
 		case ReadStream:
 			if _, ok := tags[ReadStream]; ok {
-				return nil, fmt.Errorf("googlereader: %s ad %s should not be supplied simultaneously", KeptUnread, Read)
+				return nil, fmt.Errorf("googlereader: %s and %s should not be supplied simultaneously", KeptUnread, Read)
 			}
 			tags[ReadStream] = false
 		case KeptUnreadStream:
 			if _, ok := tags[ReadStream]; ok {
-				return nil, fmt.Errorf("googlereader: %s ad %s should not be supplied simultaneously", KeptUnread, Read)
+				return nil, fmt.Errorf("googlereader: %s and %s should not be supplied simultaneously", KeptUnread, Read)
 			}
 			tags[ReadStream] = true
 		case StarredStream:
@@ -360,28 +114,6 @@ func checkAndSimplifyTags(addTags []Stream, removeTags []Stream) (map[StreamType
 	return tags, nil
 }
 
-func getItemIDs(r *http.Request) ([]int64, error) {
-	items := r.Form[ParamItemIDs]
-	if len(items) == 0 {
-		return nil, fmt.Errorf("googlereader: no items requested")
-	}
-
-	itemIDs := make([]int64, len(items))
-
-	for i, item := range items {
-		var itemID int64
-		_, err := fmt.Sscanf(item, EntryIDLong, &itemID)
-		if err != nil {
-			itemID, err = strconv.ParseInt(item, 16, 64)
-			if err != nil {
-				return nil, fmt.Errorf("googlereader: could not parse item: %v", item)
-			}
-		}
-		itemIDs[i] = itemID
-	}
-	return itemIDs, nil
-}
-
 func checkOutputFormat(r *http.Request) error {
 	var output string
 	if r.Method == http.MethodPost {
@@ -558,9 +290,9 @@ func (h *handler) editTagHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	itemIDs, err := getItemIDs(r)
+	itemIDs, err := parseItemIDsFromRequest(r)
 	if err != nil {
-		json.ServerError(w, r, err)
+		json.BadRequest(w, r, err)
 		return
 	}
 
@@ -683,14 +415,16 @@ func (h *handler) quickAddHandler(w http.ResponseWriter, r *http.Request) {
 
 	requestBuilder := fetcher.NewRequestBuilder()
 	requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
-	requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
+	requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
 
 	var rssBridgeURL string
+	var rssBridgeToken string
 	if intg, err := h.store.Integration(userID); err == nil && intg != nil && intg.RSSBridgeEnabled {
 		rssBridgeURL = intg.RSSBridgeURL
+		rssBridgeToken = intg.RSSBridgeToken
 	}
 
-	subscriptions, localizedError := mfs.NewSubscriptionFinder(requestBuilder).FindSubscriptions(feedURL, rssBridgeURL)
+	subscriptions, localizedError := mfs.NewSubscriptionFinder(requestBuilder).FindSubscriptions(feedURL, rssBridgeURL, rssBridgeToken)
 	if localizedError != nil {
 		json.ServerError(w, r, localizedError.Error())
 		return
@@ -735,17 +469,16 @@ func getFeed(stream Stream, store *storage.Storage, userID int64) (*model.Feed,
 	return store.FeedByID(userID, feedID)
 }
 
-func getOrCreateCategory(category Stream, store *storage.Storage, userID int64) (*model.Category, error) {
+func getOrCreateCategory(streamCategory Stream, store *storage.Storage, userID int64) (*model.Category, error) {
 	switch {
-	case category.ID == "":
+	case streamCategory.ID == "":
 		return store.FirstCategory(userID)
-	case store.CategoryTitleExists(userID, category.ID):
-		return store.CategoryByTitle(userID, category.ID)
+	case store.CategoryTitleExists(userID, streamCategory.ID):
+		return store.CategoryByTitle(userID, streamCategory.ID)
 	default:
-		catRequest := model.CategoryRequest{
-			Title: category.ID,
-		}
-		return store.CreateCategory(userID, &catRequest)
+		return store.CreateCategory(userID, &model.CategoryCreationRequest{
+			Title: streamCategory.ID,
+		})
 	}
 }
 
@@ -796,14 +529,25 @@ func unsubscribe(streams []Stream, store *storage.Storage, userID int64) error {
 	return nil
 }
 
-func rename(stream Stream, title string, store *storage.Storage, userID int64) error {
+func rename(feedStream Stream, title string, store *storage.Storage, userID int64) error {
+	slog.Debug("[GoogleReader] Renaming feed",
+		slog.Int64("user_id", userID),
+		slog.Any("feed_stream", feedStream),
+		slog.String("new_title", title),
+	)
+
 	if title == "" {
-		return errors.New("empty title")
+		return errEmptyFeedTitle
 	}
-	feed, err := getFeed(stream, store, userID)
+
+	feed, err := getFeed(feedStream, store, userID)
 	if err != nil {
 		return err
 	}
+	if feed == nil {
+		return errFeedNotFound
+	}
+
 	feedModification := model.FeedModificationRequest{
 		Title: &title,
 	}
@@ -811,15 +555,29 @@ func rename(stream Stream, title string, store *storage.Storage, userID int64) e
 	return store.UpdateFeed(feed)
 }
 
-func move(stream Stream, destination Stream, store *storage.Storage, userID int64) error {
-	feed, err := getFeed(stream, store, userID)
+func move(feedStream Stream, labelStream Stream, store *storage.Storage, userID int64) error {
+	slog.Debug("[GoogleReader] Moving feed",
+		slog.Int64("user_id", userID),
+		slog.Any("feed_stream", feedStream),
+		slog.Any("label_stream", labelStream),
+	)
+
+	feed, err := getFeed(feedStream, store, userID)
 	if err != nil {
 		return err
 	}
-	category, err := getOrCreateCategory(destination, store, userID)
+	if feed == nil {
+		return errFeedNotFound
+	}
+
+	category, err := getOrCreateCategory(labelStream, store, userID)
 	if err != nil {
 		return err
 	}
+	if category == nil {
+		return errCategoryNotFound
+	}
+
 	feedModification := model.FeedModificationRequest{
 		CategoryID: &category.ID,
 	}
@@ -882,7 +640,11 @@ func (h *handler) editSubscriptionHandler(w http.ResponseWriter, r *http.Request
 	case "edit":
 		if title != "" {
 			if err := rename(streamIds[0], title, h.store, userID); err != nil {
-				json.ServerError(w, r, err)
+				if errors.Is(err, errFeedNotFound) || errors.Is(err, errEmptyFeedTitle) {
+					json.BadRequest(w, r, err)
+				} else {
+					json.ServerError(w, r, err)
+				}
 				return
 			}
 		}
@@ -894,12 +656,16 @@ func (h *handler) editSubscriptionHandler(w http.ResponseWriter, r *http.Request
 			}
 
 			if err := move(streamIds[0], newLabel, h.store, userID); err != nil {
-				json.ServerError(w, r, err)
+				if errors.Is(err, errFeedNotFound) || errors.Is(err, errCategoryNotFound) {
+					json.BadRequest(w, r, err)
+				} else {
+					json.ServerError(w, r, err)
+				}
 				return
 			}
 		}
 	default:
-		json.ServerError(w, r, fmt.Errorf("googlereader: unrecognized action %s", action))
+		json.BadRequest(w, r, fmt.Errorf("googlereader: unrecognized action %s", action))
 		return
 	}
 
@@ -908,6 +674,7 @@ func (h *handler) editSubscriptionHandler(w http.ResponseWriter, r *http.Request
 
 func (h *handler) streamItemContentsHandler(w http.ResponseWriter, r *http.Request) {
 	userID := request.UserID(r)
+	userName := request.UserName(r)
 	clientIP := request.ClientIP(r)
 
 	slog.Debug("[GoogleReader] Handle /stream/items/contents",
@@ -927,13 +694,8 @@ func (h *handler) streamItemContentsHandler(w http.ResponseWriter, r *http.Reque
 		json.ServerError(w, r, err)
 		return
 	}
-	var user *model.User
-	if user, err = h.store.UserByID(userID); err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
 
-	requestModifiers, err := getStreamFilterModifiers(r)
+	requestModifiers, err := parseStreamFilterFromRequest(r)
 	if err != nil {
 		json.ServerError(w, r, err)
 		return
@@ -943,9 +705,9 @@ func (h *handler) streamItemContentsHandler(w http.ResponseWriter, r *http.Reque
 	userRead := fmt.Sprintf(UserStreamPrefix, userID) + Read
 	userStarred := fmt.Sprintf(UserStreamPrefix, userID) + Starred
 
-	itemIDs, err := getItemIDs(r)
+	itemIDs, err := parseItemIDsFromRequest(r)
 	if err != nil {
-		json.ServerError(w, r, err)
+		json.BadRequest(w, r, err)
 		return
 	}
 
@@ -969,28 +731,17 @@ func (h *handler) streamItemContentsHandler(w http.ResponseWriter, r *http.Reque
 		return
 	}
 
-	if len(entries) == 0 {
-		json.BadRequest(w, r, fmt.Errorf("googlereader: no items returned from the database for item IDs: %v", itemIDs))
-		return
-	}
-
 	result := streamContentItems{
 		Direction: "ltr",
-		ID:        fmt.Sprintf("feed/%d", entries[0].FeedID),
-		Title:     entries[0].Feed.Title,
-		Alternate: []contentHREFType{
-			{
-				HREF: entries[0].Feed.SiteURL,
-				Type: "text/html",
-			},
-		},
-		Updated: time.Now().Unix(),
+		ID:        "user/-/state/com.google/reading-list",
+		Title:     "Reading List",
+		Updated:   time.Now().Unix(),
 		Self: []contentHREF{
 			{
 				HREF: config.Opts.RootURL() + route.Path(h.router, "StreamItemsContents"),
 			},
 		},
-		Author: user.Username,
+		Author: userName,
 	}
 	contentItems := make([]contentItem, len(entries))
 	for i, entry := range entries {
@@ -1016,7 +767,7 @@ func (h *handler) streamItemContentsHandler(w http.ResponseWriter, r *http.Reque
 		entry.Enclosures.ProxifyEnclosureURL(h.router)
 
 		contentItems[i] = contentItem{
-			ID:            fmt.Sprintf(EntryIDLong, entry.ID),
+			ID:            convertEntryIDToLongFormItemID(entry.ID),
 			Title:         entry.Title,
 			Author:        entry.Author,
 			TimestampUsec: fmt.Sprintf("%d", entry.Date.UnixMicro()),
@@ -1143,20 +894,23 @@ func (h *handler) renameTagHandler(w http.ResponseWriter, r *http.Request) {
 		json.NotFound(w, r)
 		return
 	}
-	categoryRequest := model.CategoryRequest{
-		Title: destination.ID,
+
+	categoryModificationRequest := model.CategoryModificationRequest{
+		Title: model.SetOptionalField(destination.ID),
 	}
-	verr := validator.ValidateCategoryModification(h.store, userID, category.ID, &categoryRequest)
-	if verr != nil {
-		json.BadRequest(w, r, verr.Error())
+
+	if validationError := validator.ValidateCategoryModification(h.store, userID, category.ID, &categoryModificationRequest); validationError != nil {
+		json.BadRequest(w, r, validationError.Error())
 		return
 	}
-	categoryRequest.Patch(category)
-	err = h.store.UpdateCategory(category)
-	if err != nil {
+
+	categoryModificationRequest.Patch(category)
+
+	if err := h.store.UpdateCategory(category); err != nil {
 		json.ServerError(w, r, err)
 		return
 	}
+
 	OK(w, r)
 }
 
@@ -1282,7 +1036,7 @@ func (h *handler) streamItemIDsHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	rm, err := getStreamFilterModifiers(r)
+	rm, err := parseStreamFilterFromRequest(r)
 	if err != nil {
 		json.ServerError(w, r, err)
 		return
@@ -1509,3 +1263,82 @@ func (h *handler) handleFeedStreamHandler(w http.ResponseWriter, r *http.Request
 
 	json.OK(w, r, streamIDResponse{itemRefs, continuation})
 }
+
+func (h *handler) markAllAsReadHandler(w http.ResponseWriter, r *http.Request) {
+	userID := request.UserID(r)
+	clientIP := request.ClientIP(r)
+
+	slog.Debug("[GoogleReader] Handle /mark-all-as-read",
+		slog.String("handler", "markAllAsReadHandler"),
+		slog.String("client_ip", clientIP),
+		slog.String("user_agent", r.UserAgent()),
+	)
+
+	if err := r.ParseForm(); err != nil {
+		json.BadRequest(w, r, err)
+		return
+	}
+
+	stream, err := getStream(r.Form.Get(ParamStreamID), userID)
+	if err != nil {
+		json.BadRequest(w, r, err)
+		return
+	}
+
+	var before time.Time
+	if timestampParamValue := r.Form.Get(ParamTimestamp); timestampParamValue != "" {
+		timestampParsedValue, err := strconv.ParseInt(timestampParamValue, 10, 64)
+		if err != nil {
+			json.BadRequest(w, r, err)
+			return
+		}
+
+		if timestampParsedValue > 0 {
+			// It's unclear if the timestamp is in seconds or microseconds, so we try both using a naive approach.
+			if len(timestampParamValue) >= 16 {
+				before = time.UnixMicro(timestampParsedValue)
+			} else {
+				before = time.Unix(timestampParsedValue, 0)
+			}
+		}
+	}
+
+	if before.IsZero() {
+		before = time.Now()
+	}
+
+	switch stream.Type {
+	case FeedStream:
+		feedID, err := strconv.ParseInt(stream.ID, 10, 64)
+		if err != nil {
+			json.BadRequest(w, r, err)
+			return
+		}
+		err = h.store.MarkFeedAsRead(userID, feedID, before)
+		if err != nil {
+			json.ServerError(w, r, err)
+			return
+		}
+	case LabelStream:
+		category, err := h.store.CategoryByTitle(userID, stream.ID)
+		if err != nil {
+			json.ServerError(w, r, err)
+			return
+		}
+		if category == nil {
+			json.NotFound(w, r)
+			return
+		}
+		if err := h.store.MarkCategoryAsRead(userID, category.ID, before); err != nil {
+			json.ServerError(w, r, err)
+			return
+		}
+	case ReadingListStream:
+		if err = h.store.MarkAllAsReadBeforeDate(userID, before); err != nil {
+			json.ServerError(w, r, err)
+			return
+		}
+	}
+
+	OK(w, r)
+}

internal/googlereader/item.go

@@ -0,0 +1,74 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package googlereader // import "miniflux.app/v2/internal/googlereader"
+
+import (
+	"fmt"
+	"net/http"
+	"strconv"
+	"strings"
+)
+
+const (
+	ItemIDPrefix = "tag:google.com,2005:reader/item/"
+	ItemIDFormat = "tag:google.com,2005:reader/item/%016x"
+)
+
+func convertEntryIDToLongFormItemID(entryID int64) string {
+	// The entry ID is a 64-bit integer, so we need to format it as a 16-character hexadecimal string.
+	return fmt.Sprintf(ItemIDFormat, entryID)
+}
+
+// Expected format: "tag:google.com,2005:reader/item/00000000148b9369" (hexadecimal string with prefix and padding)
+// NetNewsWire uses this format: "tag:google.com,2005:reader/item/2f2" (hexadecimal string with prefix and no padding)
+// Reeder uses this format: "000000000000048c" (hexadecimal string without prefix and padding)
+// Liferea uses this format: "12345" (decimal string)
+// It returns the parsed ID as a int64 and an error if parsing fails.
+func parseItemID(itemIDValue string) (int64, error) {
+	var itemID int64
+	if strings.HasPrefix(itemIDValue, ItemIDPrefix) {
+		n, err := fmt.Sscanf(itemIDValue, ItemIDFormat, &itemID)
+		if err != nil {
+			return 0, fmt.Errorf("failed to parse hexadecimal item ID %s: %w", itemIDValue, err)
+		}
+		if n != 1 {
+			return 0, fmt.Errorf("failed to parse hexadecimal item ID %s: expected 1 value, got %d", itemIDValue, n)
+		}
+		if itemID == 0 {
+			return 0, fmt.Errorf("failed to parse hexadecimal item ID %s: item ID is zero", itemIDValue)
+		}
+		return itemID, nil
+	}
+
+	if len(itemIDValue) == 16 {
+		if n, err := fmt.Sscanf(itemIDValue, "%016x", &itemID); err == nil && n == 1 {
+			return itemID, nil
+		}
+	}
+
+	itemID, err := strconv.ParseInt(itemIDValue, 10, 64)
+	if err != nil {
+		return 0, fmt.Errorf("failed to parse decimal item ID %s: %w", itemIDValue, err)
+	}
+
+	return itemID, nil
+}
+
+func parseItemIDsFromRequest(r *http.Request) ([]int64, error) {
+	items := r.Form[ParamItemIDs]
+	if len(items) == 0 {
+		return nil, fmt.Errorf("googlereader: no items requested")
+	}
+
+	itemIDs := make([]int64, len(items))
+	for i, item := range items {
+		itemID, err := parseItemID(item)
+		if err != nil {
+			return nil, fmt.Errorf("googlereader: failed to parse item ID %s: %w", item, err)
+		}
+		itemIDs[i] = itemID
+	}
+
+	return itemIDs, nil
+}

internal/googlereader/item_test.go

@@ -0,0 +1,104 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package googlereader // import "miniflux.app/v2/internal/googlereader"
+
+import (
+	"net/http"
+	"net/url"
+	"reflect"
+	"testing"
+)
+
+func TestConvertEntryIDToLongFormItemID(t *testing.T) {
+	entryID := int64(344691561)
+	expected := "tag:google.com,2005:reader/item/00000000148b9369"
+	result := convertEntryIDToLongFormItemID(entryID)
+
+	if result != expected {
+		t.Errorf("expected %s, got %s", expected, result)
+	}
+}
+
+func TestParseItemIDsFromRequest(t *testing.T) {
+	formValues := url.Values{}
+	formValues.Add("i", "12345")
+	formValues.Add("i", "tag:google.com,2005:reader/item/00000000148b9369")
+	formValues.Add("i", "tag:google.com,2005:reader/item/2f2")
+	formValues.Add("i", "000000000000046f")
+	formValues.Add("i", "tag:google.com,2005:reader/item/272")
+
+	request := &http.Request{
+		Form: formValues,
+	}
+
+	result, err := parseItemIDsFromRequest(request)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	var expected = []int64{12345, 344691561, 754, 1135, 626}
+	if !reflect.DeepEqual(result, expected) {
+		t.Errorf("expected %v, got %v", expected, result)
+	}
+
+	// Test with no item IDs
+	formValues = url.Values{}
+	request = &http.Request{
+		Form: formValues,
+	}
+	_, err = parseItemIDsFromRequest(request)
+	if err == nil {
+		t.Fatalf("expected error, got nil")
+	}
+}
+
+func TestParseItemID(t *testing.T) {
+	// Test with long form ID and hex ID
+	result, err := parseItemID("tag:google.com,2005:reader/item/0000000000000001")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	expected := int64(1)
+	if result != expected {
+		t.Errorf("expected %d, got %d", expected, result)
+	}
+
+	// Test with hexadecimal long form ID
+	result, err = parseItemID("0000000000000468")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	expected = int64(1128)
+	if result != expected {
+		t.Errorf("expected %d, got %d", expected, result)
+	}
+
+	// Test with short form ID
+	result, err = parseItemID("12345")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	expected = int64(12345)
+	if result != expected {
+		t.Errorf("expected %d, got %d", expected, result)
+	}
+
+	// Test with invalid long form ID
+	_, err = parseItemID("tag:google.com,2005:reader/item/000000000000000g")
+	if err == nil {
+		t.Fatalf("expected error, got nil")
+	}
+
+	// Test with invalid short form ID
+	_, err = parseItemID("invalid_id")
+	if err == nil {
+		t.Fatalf("expected error, got nil")
+	}
+
+	// Test with empty ID
+	_, err = parseItemID("")
+	if err == nil {
+		t.Fatalf("expected error, got nil")
+	}
+}

internal/googlereader/middleware.go

@@ -173,18 +173,11 @@ func (m *middleware) apiKeyAuth(next http.Handler) http.Handler {
 			return
 		}
 
-		slog.Info("[GoogleReader] User authenticated successfully",
-			slog.Bool("authentication_successful", true),
-			slog.String("client_ip", clientIP),
-			slog.String("user_agent", r.UserAgent()),
-			slog.Int64("user_id", user.ID),
-			slog.String("username", user.Username),
-		)
-
 		m.store.SetLastLogin(integration.UserID)
 
 		ctx := r.Context()
 		ctx = context.WithValue(ctx, request.UserIDContextKey, user.ID)
+		ctx = context.WithValue(ctx, request.UserNameContextKey, user.Username)
 		ctx = context.WithValue(ctx, request.UserTimezoneContextKey, user.Timezone)
 		ctx = context.WithValue(ctx, request.IsAdminUserContextKey, user.IsAdmin)
 		ctx = context.WithValue(ctx, request.IsAuthenticatedContextKey, true)

internal/googlereader/parameters.go

@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package googlereader // import "miniflux.app/v2/internal/googlereader"
+
+const (
+	// ParamItemIDs - name of the parameter with the item ids
+	ParamItemIDs = "i"
+	// ParamStreamID - name of the parameter containing the stream to be included
+	ParamStreamID = "s"
+	// ParamStreamExcludes - name of the parameter containing streams to be excluded
+	ParamStreamExcludes = "xt"
+	// ParamStreamFilters - name of the parameter containing streams to be included
+	ParamStreamFilters = "it"
+	// ParamStreamMaxItems - name of the parameter containing number of items per page/max items returned
+	ParamStreamMaxItems = "n"
+	// ParamStreamOrder - name of the parameter containing the sort criteria
+	ParamStreamOrder = "r"
+	// ParamStreamStartTime - name of the parameter containing epoch timestamp, filtering items older than
+	ParamStreamStartTime = "ot"
+	// ParamStreamStopTime - name of the parameter containing epoch timestamp, filtering items newer than
+	ParamStreamStopTime = "nt"
+	// ParamTagsRemove - name of the parameter containing tags (streams) to be removed
+	ParamTagsRemove = "r"
+	// ParamTagsAdd - name of the parameter containing tags (streams) to be added
+	ParamTagsAdd = "a"
+	// ParamSubscribeAction - name of the parameter indicating the action to take for subscription/edit
+	ParamSubscribeAction = "ac"
+	// ParamTitle - name of the parameter for the title of the subscription
+	ParamTitle = "t"
+	// ParamQuickAdd - name of the parameter for a URL being quick subscribed to
+	ParamQuickAdd = "quickadd"
+	// ParamDestination - name of the parameter for the new name of a tag
+	ParamDestination = "dest"
+	// ParamContinuation -  name of the parameter for callers to pass to receive the next page of results
+	ParamContinuation = "c"
+	// ParamStreamType - name of the parameter for unix timestamp
+	ParamTimestamp = "ts"
+)

internal/googlereader/prefix_suffix.go

@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package googlereader // import "miniflux.app/v2/internal/googlereader"
+
+const (
+	// StreamPrefix is the prefix for astreams (read/starred/reading list and so on)
+	StreamPrefix = "user/-/state/com.google/"
+	// UserStreamPrefix is the user specific prefix for streams (read/starred/reading list and so on)
+	UserStreamPrefix = "user/%d/state/com.google/"
+	// LabelPrefix is the prefix for a label stream
+	LabelPrefix = "user/-/label/"
+	// UserLabelPrefix is the user specific prefix prefix for a label stream
+	UserLabelPrefix = "user/%d/label/"
+	// FeedPrefix is the prefix for a feed stream
+	FeedPrefix = "feed/"
+	// Read is the suffix for read stream
+	Read = "read"
+	// Starred is the suffix for starred stream
+	Starred = "starred"
+	// ReadingList is the suffix for reading list stream
+	ReadingList = "reading-list"
+	// KeptUnread is the suffix for kept unread stream
+	KeptUnread = "kept-unread"
+	// Broadcast is the suffix for broadcast stream
+	Broadcast = "broadcast"
+	// BroadcastFriends is the suffix for broadcast friends stream
+	BroadcastFriends = "broadcast-friends"
+	// Like is the suffix for like stream
+	Like = "like"
+)

internal/googlereader/request_modifier.go

@@ -0,0 +1,91 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package googlereader // import "miniflux.app/v2/internal/googlereader"
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+
+	"miniflux.app/v2/internal/http/request"
+)
+
+type RequestModifiers struct {
+	ExcludeTargets    []Stream
+	FilterTargets     []Stream
+	Streams           []Stream
+	Count             int
+	Offset            int
+	SortDirection     string
+	StartTime         int64
+	StopTime          int64
+	ContinuationToken string
+	UserID            int64
+}
+
+func (r RequestModifiers) String() string {
+	var results []string
+
+	results = append(results, fmt.Sprintf("UserID: %d", r.UserID))
+
+	var streamStr []string
+	for _, s := range r.Streams {
+		streamStr = append(streamStr, s.String())
+	}
+	results = append(results, fmt.Sprintf("Streams: [%s]", strings.Join(streamStr, ", ")))
+
+	var exclusions []string
+	for _, s := range r.ExcludeTargets {
+		exclusions = append(exclusions, s.String())
+	}
+	results = append(results, fmt.Sprintf("Exclusions: [%s]", strings.Join(exclusions, ", ")))
+
+	var filters []string
+	for _, s := range r.FilterTargets {
+		filters = append(filters, s.String())
+	}
+	results = append(results, fmt.Sprintf("Filters: [%s]", strings.Join(filters, ", ")))
+
+	results = append(results, fmt.Sprintf("Count: %d", r.Count))
+	results = append(results, fmt.Sprintf("Offset: %d", r.Offset))
+	results = append(results, fmt.Sprintf("Sort Direction: %s", r.SortDirection))
+	results = append(results, fmt.Sprintf("Continuation Token: %s", r.ContinuationToken))
+	results = append(results, fmt.Sprintf("Start Time: %d", r.StartTime))
+	results = append(results, fmt.Sprintf("Stop Time: %d", r.StopTime))
+
+	return strings.Join(results, "; ")
+}
+
+func parseStreamFilterFromRequest(r *http.Request) (RequestModifiers, error) {
+	userID := request.UserID(r)
+	result := RequestModifiers{
+		SortDirection: "desc",
+		UserID:        userID,
+	}
+
+	streamOrder := request.QueryStringParam(r, ParamStreamOrder, "d")
+	if streamOrder == "o" {
+		result.SortDirection = "asc"
+	}
+	var err error
+	result.Streams, err = getStreams(request.QueryStringParamList(r, ParamStreamID), userID)
+	if err != nil {
+		return RequestModifiers{}, err
+	}
+	result.ExcludeTargets, err = getStreams(request.QueryStringParamList(r, ParamStreamExcludes), userID)
+	if err != nil {
+		return RequestModifiers{}, err
+	}
+
+	result.FilterTargets, err = getStreams(request.QueryStringParamList(r, ParamStreamFilters), userID)
+	if err != nil {
+		return RequestModifiers{}, err
+	}
+
+	result.Count = request.QueryIntParam(r, ParamStreamMaxItems, 0)
+	result.Offset = request.QueryIntParam(r, ParamContinuation, 0)
+	result.StartTime = request.QueryInt64Param(r, ParamStreamStartTime, int64(0))
+	result.StopTime = request.QueryInt64Param(r, ParamStreamStopTime, int64(0))
+	return result, nil
+}

internal/googlereader/response.go

@@ -68,14 +68,13 @@ type tagsResponse struct {
 }
 
 type streamContentItems struct {
-	Direction string            `json:"direction"`
-	ID        string            `json:"id"`
-	Title     string            `json:"title"`
-	Self      []contentHREF     `json:"self"`
-	Alternate []contentHREFType `json:"alternate"`
-	Updated   int64             `json:"updated"`
-	Items     []contentItem     `json:"items"`
-	Author    string            `json:"author"`
+	Direction string        `json:"direction"`
+	ID        string        `json:"id"`
+	Title     string        `json:"title"`
+	Self      []contentHREF `json:"self"`
+	Updated   int64         `json:"updated"`
+	Items     []contentItem `json:"items"`
+	Author    string        `json:"author"`
 }
 
 type contentItem struct {

internal/googlereader/stream.go

@@ -0,0 +1,119 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package googlereader // import "miniflux.app/v2/internal/googlereader"
+
+import (
+	"fmt"
+	"strings"
+)
+
+type StreamType int
+
+const (
+	// NoStream - no stream type
+	NoStream StreamType = iota
+	// ReadStream - read stream type
+	ReadStream
+	// StarredStream - starred stream type
+	StarredStream
+	// ReadingListStream - reading list stream type
+	ReadingListStream
+	// KeptUnreadStream - kept unread stream type
+	KeptUnreadStream
+	// BroadcastStream - broadcast stream type
+	BroadcastStream
+	// BroadcastFriendsStream - broadcast friends stream type
+	BroadcastFriendsStream
+	// LabelStream - label stream type
+	LabelStream
+	// FeedStream - feed stream type
+	FeedStream
+	// LikeStream - like stream type
+	LikeStream
+)
+
+// Stream defines a stream type and its ID.
+type Stream struct {
+	Type StreamType
+	ID   string
+}
+
+func (s Stream) String() string {
+	return fmt.Sprintf("%v - '%s'", s.Type, s.ID)
+}
+
+func (st StreamType) String() string {
+	switch st {
+	case NoStream:
+		return "NoStream"
+	case ReadStream:
+		return "ReadStream"
+	case StarredStream:
+		return "StarredStream"
+	case ReadingListStream:
+		return "ReadingListStream"
+	case KeptUnreadStream:
+		return "KeptUnreadStream"
+	case BroadcastStream:
+		return "BroadcastStream"
+	case BroadcastFriendsStream:
+		return "BroadcastFriendsStream"
+	case LabelStream:
+		return "LabelStream"
+	case FeedStream:
+		return "FeedStream"
+	case LikeStream:
+		return "LikeStream"
+	default:
+		return st.String()
+	}
+}
+
+func getStream(streamID string, userID int64) (Stream, error) {
+	switch {
+	case strings.HasPrefix(streamID, FeedPrefix):
+		return Stream{Type: FeedStream, ID: strings.TrimPrefix(streamID, FeedPrefix)}, nil
+	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 {
+		case Read:
+			return Stream{ReadStream, ""}, nil
+		case Starred:
+			return Stream{StarredStream, ""}, nil
+		case ReadingList:
+			return Stream{ReadingListStream, ""}, nil
+		case KeptUnread:
+			return Stream{KeptUnreadStream, ""}, nil
+		case Broadcast:
+			return Stream{BroadcastStream, ""}, nil
+		case BroadcastFriends:
+			return Stream{BroadcastFriendsStream, ""}, nil
+		case Like:
+			return Stream{LikeStream, ""}, nil
+		default:
+			return Stream{NoStream, ""}, fmt.Errorf("googlereader: unknown stream with id: %s", id)
+		}
+	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
+	case streamID == "":
+		return Stream{NoStream, ""}, nil
+	default:
+		return Stream{NoStream, ""}, fmt.Errorf("googlereader: unknown stream type: %s", streamID)
+	}
+}
+
+func getStreams(streamIDs []string, userID int64) ([]Stream, error) {
+	streams := make([]Stream, 0)
+	for _, streamID := range streamIDs {
+		stream, err := getStream(streamID, userID)
+		if err != nil {
+			return []Stream{}, err
+		}
+		streams = append(streams, stream)
+	}
+	return streams, nil
+}

internal/http/request/context.go

@@ -16,6 +16,7 @@ type ContextKey int
 // List of context keys.
 const (
 	UserIDContextKey ContextKey = iota
+	UserNameContextKey
 	UserTimezoneContextKey
 	IsAdminUserContextKey
 	IsAuthenticatedContextKey
@@ -64,6 +65,15 @@ func UserID(r *http.Request) int64 {
 	return getContextInt64Value(r, UserIDContextKey)
 }
 
+// UserName returns the username of the logged user.
+func UserName(r *http.Request) string {
+	value := getContextStringValue(r, UserNameContextKey)
+	if value == "" {
+		value = "unknown"
+	}
+	return value
+}
+
 // UserTimezone returns the timezone used by the logged user.
 func UserTimezone(r *http.Request) string {
 	value := getContextStringValue(r, UserTimezoneContextKey)

internal/http/response/html/html.go

@@ -4,6 +4,7 @@
 package html // import "miniflux.app/v2/internal/http/response/html"
 
 import (
+	"html"
 	"log/slog"
 	"net/http"
 
@@ -38,9 +39,9 @@ func ServerError(w http.ResponseWriter, r *http.Request, err error) {
 	builder := response.New(w, r)
 	builder.WithStatus(http.StatusInternalServerError)
 	builder.WithHeader("Content-Security-Policy", response.ContentSecurityPolicyForUntrustedContent)
-	builder.WithHeader("Content-Type", "text/html; charset=utf-8")
+	builder.WithHeader("Content-Type", "text/plain; charset=utf-8")
 	builder.WithHeader("Cache-Control", "no-cache, max-age=0, must-revalidate, no-store")
-	builder.WithBody(err)
+	builder.WithBody(html.EscapeString(err.Error()))
 	builder.Write()
 }
 
@@ -62,9 +63,9 @@ func BadRequest(w http.ResponseWriter, r *http.Request, err error) {
 	builder := response.New(w, r)
 	builder.WithStatus(http.StatusBadRequest)
 	builder.WithHeader("Content-Security-Policy", response.ContentSecurityPolicyForUntrustedContent)
-	builder.WithHeader("Content-Type", "text/html; charset=utf-8")
+	builder.WithHeader("Content-Type", "text/plain; charset=utf-8")
 	builder.WithHeader("Cache-Control", "no-cache, max-age=0, must-revalidate, no-store")
-	builder.WithBody(err)
+	builder.WithBody(html.EscapeString(err.Error()))
 	builder.Write()
 }
 

internal/http/response/html/html_test.go

@@ -58,7 +58,7 @@ func TestServerErrorResponse(t *testing.T) {
 	w := httptest.NewRecorder()
 
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ServerError(w, r, errors.New("Some error"))
+		ServerError(w, r, errors.New("Some error with injected HTML <script>alert('XSS')</script>"))
 	})
 
 	handler.ServeHTTP(w, r)
@@ -69,13 +69,13 @@ func TestServerErrorResponse(t *testing.T) {
 		t.Fatalf(`Unexpected status code, got %d instead of %d`, resp.StatusCode, expectedStatusCode)
 	}
 
-	expectedBody := `Some error`
+	expectedBody := `Some error with injected HTML &lt;script&gt;alert(&#39;XSS&#39;)&lt;/script&gt;`
 	actualBody := w.Body.String()
 	if actualBody != expectedBody {
 		t.Fatalf(`Unexpected body, got %s instead of %s`, actualBody, expectedBody)
 	}
 
-	expectedContentType := "text/html; charset=utf-8"
+	expectedContentType := "text/plain; charset=utf-8"
 	actualContentType := resp.Header.Get("Content-Type")
 	if actualContentType != expectedContentType {
 		t.Fatalf(`Unexpected content type, got %q instead of %q`, actualContentType, expectedContentType)
@@ -91,7 +91,7 @@ func TestBadRequestResponse(t *testing.T) {
 	w := httptest.NewRecorder()
 
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		BadRequest(w, r, errors.New("Some error"))
+		BadRequest(w, r, errors.New("Some error with injected HTML <script>alert('XSS')</script>"))
 	})
 
 	handler.ServeHTTP(w, r)
@@ -102,13 +102,13 @@ func TestBadRequestResponse(t *testing.T) {
 		t.Fatalf(`Unexpected status code, got %d instead of %d`, resp.StatusCode, expectedStatusCode)
 	}
 
-	expectedBody := `Some error`
+	expectedBody := `Some error with injected HTML &lt;script&gt;alert(&#39;XSS&#39;)&lt;/script&gt;`
 	actualBody := w.Body.String()
 	if actualBody != expectedBody {
 		t.Fatalf(`Unexpected body, got %s instead of %s`, actualBody, expectedBody)
 	}
 
-	expectedContentType := "text/html; charset=utf-8"
+	expectedContentType := "text/plain; charset=utf-8"
 	actualContentType := resp.Header.Get("Content-Type")
 	if actualContentType != expectedContentType {
 		t.Fatalf(`Unexpected content type, got %q instead of %q`, actualContentType, expectedContentType)

internal/http/server/httpd.go

@@ -173,43 +173,58 @@ func startHTTPServer(server *http.Server) {
 }
 
 func setupHandler(store *storage.Storage, pool *worker.Pool) *mux.Router {
+	livenessProbe := func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte("OK"))
+	}
+	readinessProbe := func(w http.ResponseWriter, r *http.Request) {
+		if err := store.Ping(); err != nil {
+			http.Error(w, fmt.Sprintf("Database Connection Error: %q", err), http.StatusServiceUnavailable)
+			return
+		}
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte("OK"))
+	}
+
 	router := mux.NewRouter()
 
+	// These routes do not take the base path into consideration and are always available at the root of the server.
+	router.HandleFunc("/liveness", livenessProbe).Name("liveness")
+	router.HandleFunc("/healthz", livenessProbe).Name("healthz")
+	router.HandleFunc("/readiness", readinessProbe).Name("readiness")
+	router.HandleFunc("/readyz", readinessProbe).Name("readyz")
+
+	var subrouter *mux.Router
 	if config.Opts.BasePath() != "" {
-		router = router.PathPrefix(config.Opts.BasePath()).Subrouter()
+		subrouter = router.PathPrefix(config.Opts.BasePath()).Subrouter()
+	} else {
+		subrouter = router.NewRoute().Subrouter()
 	}
 
 	if config.Opts.HasMaintenanceMode() {
-		router.Use(func(next http.Handler) http.Handler {
+		subrouter.Use(func(next http.Handler) http.Handler {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				w.Write([]byte(config.Opts.MaintenanceMessage()))
 			})
 		})
 	}
 
-	router.Use(middleware)
+	subrouter.Use(middleware)
 
-	fever.Serve(router, store)
-	googlereader.Serve(router, store)
-	api.Serve(router, store, pool)
-	ui.Serve(router, store, pool)
+	fever.Serve(subrouter, store)
+	googlereader.Serve(subrouter, store)
+	api.Serve(subrouter, store, pool)
+	ui.Serve(subrouter, store, pool)
 
-	router.HandleFunc("/healthcheck", func(w http.ResponseWriter, r *http.Request) {
-		if err := store.Ping(); err != nil {
-			http.Error(w, "Database Connection Error", http.StatusInternalServerError)
-			return
-		}
+	subrouter.HandleFunc("/healthcheck", readinessProbe).Name("healthcheck")
 
-		w.Write([]byte("OK"))
-	}).Name("healthcheck")
-
-	router.HandleFunc("/version", func(w http.ResponseWriter, r *http.Request) {
+	subrouter.HandleFunc("/version", func(w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte(version.Version))
 	}).Name("version")
 
 	if config.Opts.HasMetricsCollector() {
-		router.Handle("/metrics", promhttp.Handler()).Name("metrics")
-		router.Use(func(next http.Handler) http.Handler {
+		subrouter.Handle("/metrics", promhttp.Handler()).Name("metrics")
+		subrouter.Use(func(next http.Handler) http.Handler {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				route := mux.CurrentRoute(r)
 

internal/integration/rssbridge/rssbridge.go

@@ -24,13 +24,16 @@ type BridgeMeta struct {
 	Name string `json:"name"`
 }
 
-func DetectBridges(rssBridgeURL, websiteURL string) ([]*Bridge, error) {
+func DetectBridges(rssBridgeURL, rssBridgeToken, websiteURL string) ([]*Bridge, error) {
 	endpointURL, err := url.Parse(rssBridgeURL)
 	if err != nil {
 		return nil, fmt.Errorf("RSS-Bridge: unable to parse bridge URL: %w", err)
 	}
 
 	values := endpointURL.Query()
+	if rssBridgeToken != "" {
+		values.Add("token", rssBridgeToken)
+	}
 	values.Add("action", "findfeed")
 	values.Add("format", "atom")
 	values.Add("url", websiteURL)
@@ -78,6 +81,15 @@ func DetectBridges(rssBridgeURL, websiteURL string) ([]*Bridge, error) {
 				slog.String("url", bridge.URL),
 			)
 		}
+
+		if rssBridgeToken != "" {
+			bridge.URL = bridge.URL + "&token=" + rssBridgeToken
+
+			slog.Debug("Appended token to RSS bridge URL",
+				slog.String("name", bridge.BridgeMeta.Name),
+				slog.String("url", bridge.URL),
+			)
+		}
 	}
 
 	return bridgeResponse, nil

internal/integration/telegrambot/telegrambot.go

@@ -5,8 +5,12 @@ package telegrambot // import "miniflux.app/v2/internal/integration/telegrambot"
 
 import (
 	"fmt"
+	"log/slog"
+	"strconv"
 
+	"miniflux.app/v2/internal/config"
 	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/urllib"
 )
 
 func PushEntry(feed *model.Feed, entry *model.Entry, botToken, chatID string, topicID *int64, disableWebPagePreview, disableNotification bool, disableButtons bool) error {
@@ -32,8 +36,16 @@ func PushEntry(feed *model.Feed, entry *model.Entry, botToken, chatID string, to
 	if !disableButtons {
 		var markupRow []*InlineKeyboardButton
 
-		websiteURLButton := InlineKeyboardButton{Text: "Go to website", URL: feed.SiteURL}
-		markupRow = append(markupRow, &websiteURLButton)
+		baseURL := config.Opts.BaseURL()
+		entryPath := "/unread/entry/" + strconv.FormatInt(entry.ID, 10)
+
+		minifluxEntryURL, err := urllib.JoinBaseURLAndPath(baseURL, entryPath)
+		if err != nil {
+			slog.Error("Unable to create Miniflux entry URL", slog.Any("error", err))
+		} else {
+			minifluxEntryURLButton := InlineKeyboardButton{Text: "Go to Miniflux", URL: minifluxEntryURL}
+			markupRow = append(markupRow, &minifluxEntryURLButton)
+		}
 
 		articleURLButton := InlineKeyboardButton{Text: "Go to article", URL: entry.URL}
 		markupRow = append(markupRow, &articleURLButton)

internal/locale/translations/de_DE.json

@@ -72,10 +72,10 @@
     "entry.state.loading": "Lade...",
     "entry.state.saving": "Speichern...",
     "entry.status.mark_as_read": "Als gelesen markieren",
+    "entry.status.mark_as_unread": "Als ungelesen markieren",
     "entry.status.title": "Status des Artikels ändern",
     "entry.status.toast.read": "Als gelesen markiert",
     "entry.status.toast.unread": "Als ungelesen markiert",
-    "entry.status.mark_as_unread": "Als ungelesen markieren",
     "entry.tags.label": "Stichworte:",
     "entry.unshare.label": "Nicht teilen",
     "error.api_key_already_exists": "Dieser API-Schlüssel ist bereits vorhanden.",
@@ -114,9 +114,12 @@
     "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_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_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.invalid_categories_sorting_order": "Ungültige Kategorie-Sortierreihenfolge.",
     "error.invalid_default_home_page": "Ungültige Standard-Startseite!",
     "error.invalid_display_mode": "Progressive-Web-App- (PWA-)Anzeigemodus",
     "error.invalid_entry_direction": "Ungültige Sortierreihenfolge.",
+    "error.invalid_entry_order": "Ungültige Sortierreihenfolge.",
+    "error.invalid_feed_proxy_url": "Ungültige Proxy-URL.",
     "error.invalid_feed_url": "Ungültiger Feed-URL.",
     "error.invalid_gesture_nav": "Ungültige Gestennavigation.",
     "error.invalid_language": "Ungültige Sprache.",
@@ -128,6 +131,7 @@
     "error.password_min_length": "Wenigstens 6 Zeichen müssen genutzt werden.",
     "error.pocket_access_token": "Zugriffstoken konnte nicht von Pocket abgerufen werden!",
     "error.pocket_request_token": "Anfrage-Token konnte nicht von Pocket abgerufen werden!",
+    "error.proxy_url_not_empty": "Die Proxy-URL darf nicht leer sein.",
     "error.settings_block_rule_fieldname_invalid": "Ungültige Blockierregel: Regel #%d hat keinen gültigen Feldnamen (Optionen: %s)",
     "error.settings_block_rule_invalid_regex": "Ungültige Blockierregel: Das Muster für Regel #%d ist kein zulässiger regulärer Ausdruck",
     "error.settings_block_rule_regex_required": "Ungültige Blockierregel: Regel #%d hat kein Muster",
@@ -174,7 +178,7 @@
     "form.feed.label.feed_password": "Passwort des Abonnements",
     "form.feed.label.feed_url": "URL des Abonnements",
     "form.feed.label.feed_username": "Benutzername des Abonnements",
-    "form.feed.label.fetch_via_proxy": "Über Proxy abrufen",
+    "form.feed.label.fetch_via_proxy": "Den auf Anwendungsebene konfigurierten Proxy verwenden",
     "form.feed.label.hide_globally": "Einträge in der globalen Ungelesen-Liste ausblenden",
     "form.feed.label.ignore_http_cache": "Ignoriere HTTP-Cache",
     "form.feed.label.keeplist_rules": "Erlaubnisregeln",
@@ -187,13 +191,14 @@
     "form.feed.label.ntfy_min_priority": "Niedrigste Ntfy-Priorität",
     "form.feed.label.ntfy_priority": "Ntfy-Priorität",
     "form.feed.label.ntfy_topic": "Ntfy-Thema (optional)",
-    "form.feed.label.pushover_activate": "Push entries to pushover.net",
-    "form.feed.label.pushover_default_priority": "Pushover default priority",
-    "form.feed.label.pushover_high_priority": "Pushover high priority",
-    "form.feed.label.pushover_low_priority": "Pushover low priority",
-    "form.feed.label.pushover_max_priority": "Pushover max priority",
-    "form.feed.label.pushover_min_priority": "Pushover min priority",
-    "form.feed.label.pushover_priority": "Pushover message priority",
+    "form.feed.label.proxy_url": "Proxy-URL",
+    "form.feed.label.pushover_activate": "Einträge an pushover.net senden",
+    "form.feed.label.pushover_default_priority": "Pushover-Standardpriorität",
+    "form.feed.label.pushover_high_priority": "Hohe Pushoverpriorität",
+    "form.feed.label.pushover_low_priority": "Niedrige Pushoverpriorität",
+    "form.feed.label.pushover_max_priority": "Höchste Pushoverpriorität",
+    "form.feed.label.pushover_min_priority": "Niedrigste Pushoverpriorität",
+    "form.feed.label.pushover_priority": "Pushover-Nachrichtenpriorität",
     "form.feed.label.rewrite_rules": "Umschreiberegeln",
     "form.feed.label.scraper_rules": "Extraktionsregeln",
     "form.feed.label.site_url": "URL der Webseite",
@@ -272,11 +277,11 @@
     "form.integration.pocket_activate": "Einträge in Pocket speichern",
     "form.integration.pocket_connect_link": "Verbinden Sie Ihr Pocket-Konto",
     "form.integration.pocket_consumer_key": "Pocket-Verbraucher-Schlüssel",
-    "form.integration.pushover_activate": "Push entries to Pushover",
-    "form.integration.pushover_device": "Pushover device (optional)",
-    "form.integration.pushover_prefix": "Pushover URL prefix (optional)",
-    "form.integration.pushover_token": "Pushover application API token",
-    "form.integration.pushover_user": "Pushover user key",
+    "form.integration.pushover_activate": "Einträge an Pushover senden",
+    "form.integration.pushover_device": "Pushovergerät (optional)",
+    "form.integration.pushover_prefix": "Pushover-URL-Präfix (optional)",
+    "form.integration.pushover_token": "Pushover-Anwendungs-API-Token",
+    "form.integration.pushover_user": "Pushover-Benutzerschlüssel",
     "form.integration.raindrop_activate": "Einträge in Raindrop speichern",
     "form.integration.raindrop_collection_id": "Sammlungs-ID",
     "form.integration.raindrop_tags": "Tags (kommagetrennt)",
@@ -290,6 +295,7 @@
     "form.integration.readwise_api_key": "Readwise-Reader-Zugangstoken",
     "form.integration.readwise_api_key_link": "Erhalten Sie Ihren Readwise-Zugangstoken",
     "form.integration.rssbridge_activate": "Beim Hinzufügen von Abonnements RSS-Bridge prüfen.",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge-Server-URL",
     "form.integration.shaarli_activate": "Artikel in Shaarli speichern",
     "form.integration.shaarli_api_secret": "Shaarli-API-Geheimnis",
@@ -342,6 +348,7 @@
     "form.prefs.label.mark_read_on_view": "Einträge automatisch als gelesen markieren, wenn sie angezeigt werden",
     "form.prefs.label.mark_read_on_view_or_media_completion": "Einträge automatisch als gelesen markieren, wenn sie angezeigt werden. Audio/Video bei 90%% Wiedergabe als gelesen markieren",
     "form.prefs.label.media_playback_rate": "Wiedergabegeschwindigkeit von Audio/Video",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Geschätzte Lesezeit für Artikel anzeigen",
     "form.prefs.label.theme": "Thema",
     "form.prefs.label.timezone": "Zeitzone",
@@ -401,7 +408,8 @@
     "page.about.author": "Autor:",
     "page.about.build_date": "Datum der Kompilierung:",
     "page.about.credits": "Urheberrechte",
-    "page.about.db_usage": "Database size:",
+    "page.about.db_usage": "Datenbankgröße:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "Globale Konfigurationsoptionen",
     "page.about.go_version": "Go-Version:",
     "page.about.license": "Lizenz:",

internal/locale/translations/el_EL.json

@@ -72,10 +72,10 @@
     "entry.state.loading": "Φόρτωση...",
     "entry.state.saving": "Aποθήκευση...",
     "entry.status.mark_as_read": "Επισήμανση ως αναγνωσμένο",
+    "entry.status.mark_as_unread": "Επισήμανση ως μη αναγνωσμένο",
     "entry.status.title": "Αλλαγή κατάστασης καταχώρησης",
     "entry.status.toast.read": "Επισήμανση ως αναγνωσμένο",
     "entry.status.toast.unread": "Επισήμανση ως μη αναγνωσμένο",
-    "entry.status.mark_as_unread": "Επισήμανση ως μη αναγνωσμένο",
     "entry.tags.label": "Ετικέτες:",
     "entry.unshare.label": "Aναίρεση Διαμοιρασμού",
     "error.api_key_already_exists": "Αυτό το κλειδί API υπάρχει ήδη.",
@@ -114,9 +114,12 @@
     "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_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
     "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.invalid_categories_sorting_order": "Η κατηγορία δεν μπορεί να είναι κενή.",
     "error.invalid_default_home_page": "Μη έγκυρη προεπιλεγμένη αρχική σελίδα!",
     "error.invalid_display_mode": "Μη έγκυρη λειτουργία εμφάνισης εφαρμογών ιστού.",
     "error.invalid_entry_direction": "Μη έγκυρη κατεύθυνση ταξινόμησης άρθρων.",
+    "error.invalid_entry_order": "Η σειρά των καταχωρήσεων είναι μη έγκυρη.",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "Μη έγκυρη διεύθυνση URL ροής.",
     "error.invalid_gesture_nav": "Μη έγκυρη πλοήγηση με χειρονομίες.",
     "error.invalid_language": "Μη έγκυρη γλώσσα.",
@@ -128,6 +131,7 @@
     "error.password_min_length": "Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον 6 χαρακτήρες.",
     "error.pocket_access_token": "Δεν είναι δυνατή η λήψη του access token από το Pocket!",
     "error.pocket_request_token": "Δεν είναι δυνατή η λήψη του request token από το Pocket!",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
     "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
     "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
@@ -174,7 +178,7 @@
     "form.feed.label.feed_password": "Κωδικός Πρόσβασης ροής",
     "form.feed.label.feed_url": "Διεύθυνση URL ροής",
     "form.feed.label.feed_username": "Όνομα Χρήστη ροής",
-    "form.feed.label.fetch_via_proxy": "Λήψη μέσω διακομιστή μεσολάβησης",
+    "form.feed.label.fetch_via_proxy": "Χρησιμοποιήστε τον διακομιστή μεσολάβησης που έχει ρυθμιστεί σε επίπεδο εφαρμογής",
     "form.feed.label.hide_globally": "Απόκρυψη καταχωρήσεων σε γενική λίστα μη αναγνωσμένων",
     "form.feed.label.ignore_http_cache": "Αγνοήστε την προσωρινή μνήμη HTTP",
     "form.feed.label.keeplist_rules": "Κρατήστε Κανόνες",
@@ -187,6 +191,7 @@
     "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.label.ntfy_priority": "Ntfy priority",
     "form.feed.label.ntfy_topic": "Ntfy topic (optional)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to pushover.net",
     "form.feed.label.pushover_default_priority": "Pushover default priority",
     "form.feed.label.pushover_high_priority": "Pushover high priority",
@@ -290,6 +295,7 @@
     "form.integration.readwise_api_key": "Readwise Reader Access Token",
     "form.integration.readwise_api_key_link": "Get your Readwise Access Token",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
     "form.integration.shaarli_activate": "Save articles to Shaarli",
     "form.integration.shaarli_api_secret": "Shaarli API Secret",
@@ -342,6 +348,7 @@
     "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.media_playback_rate": "Ταχύτητα αναπαραγωγής του ήχου/βίντεο",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Εμφάνιση εκτιμώμενου χρόνου ανάγνωσης για άρθρα",
     "form.prefs.label.theme": "Θέμα",
     "form.prefs.label.timezone": "Ζώνη Ώρας",
@@ -402,6 +409,7 @@
     "page.about.build_date": "Ημερομηνία Κατασκευής:",
     "page.about.credits": "Συνεισφέροντες",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "Γενικές ρυθμίσεις",
     "page.about.go_version": "Έκδοση Go:",
     "page.about.license": "Άδεια:",

internal/locale/translations/en_US.json

@@ -72,10 +72,10 @@
     "entry.state.loading": "Loading…",
     "entry.state.saving": "Saving…",
     "entry.status.mark_as_read": "Mark as read",
+    "entry.status.mark_as_unread": "Mark as unread",
     "entry.status.title": "Change entry status",
     "entry.status.toast.read": "Marked as read",
     "entry.status.toast.unread": "Marked as unread",
-    "entry.status.mark_as_unread": "Mark as unread",
     "entry.tags.label": "Tags:",
     "entry.unshare.label": "Unshare",
     "error.api_key_already_exists": "This API Key already exists.",
@@ -114,9 +114,12 @@
     "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_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
     "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.invalid_categories_sorting_order": "Invalid categories sorting order.",
     "error.invalid_default_home_page": "Invalid default homepage!",
     "error.invalid_display_mode": "Invalid web app display mode.",
     "error.invalid_entry_direction": "Invalid entry direction.",
+    "error.invalid_entry_order": "Invalid entry order.",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "Invalid feed URL.",
     "error.invalid_gesture_nav": "Invalid gesture navigation.",
     "error.invalid_language": "Invalid language.",
@@ -128,6 +131,7 @@
     "error.password_min_length": "The password must have at least 6 characters.",
     "error.pocket_access_token": "Unable to fetch access token from Pocket!",
     "error.pocket_request_token": "Unable to fetch request token from Pocket!",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
     "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
     "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
@@ -174,7 +178,7 @@
     "form.feed.label.feed_password": "Feed Password",
     "form.feed.label.feed_url": "Feed URL",
     "form.feed.label.feed_username": "Feed Username",
-    "form.feed.label.fetch_via_proxy": "Fetch via proxy",
+    "form.feed.label.fetch_via_proxy": "Use the proxy configured at the application level",
     "form.feed.label.hide_globally": "Hide entries in global unread list",
     "form.feed.label.ignore_http_cache": "Ignore HTTP cache",
     "form.feed.label.keeplist_rules": "Keep Rules",
@@ -187,6 +191,7 @@
     "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.label.ntfy_priority": "Ntfy priority",
     "form.feed.label.ntfy_topic": "Ntfy topic (optional)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to Pushover",
     "form.feed.label.pushover_default_priority": "Default priority",
     "form.feed.label.pushover_high_priority": "High priority",
@@ -290,6 +295,7 @@
     "form.integration.readwise_api_key": "Readwise Reader Access Token",
     "form.integration.readwise_api_key_link": "Get your Readwise Access Token",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
     "form.integration.shaarli_activate": "Save articles to Shaarli",
     "form.integration.shaarli_api_secret": "Shaarli API Secret",
@@ -342,6 +348,7 @@
     "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.media_playback_rate": "Playback speed of the audio/video",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Show estimated reading time for entries",
     "form.prefs.label.theme": "Theme",
     "form.prefs.label.timezone": "Timezone",
@@ -402,6 +409,7 @@
     "page.about.build_date": "Build Date:",
     "page.about.credits": "Credits",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "Global configuration options",
     "page.about.go_version": "Go version:",
     "page.about.license": "License:",
@@ -421,10 +429,6 @@
     "page.api_keys.table.last_used_at": "Last Used",
     "page.api_keys.table.token": "Token",
     "page.api_keys.title": "API Keys",
-    "page.categories_count": [
-        "%d category",
-        "%d categories"
-    ],
     "page.categories.entries": "Entries",
     "page.categories.feed_count": [
         "There is %d feed.",
@@ -433,6 +437,10 @@
     "page.categories.feeds": "Feeds",
     "page.categories.no_feed": "No feed.",
     "page.categories.title": "Categories",
+    "page.categories_count": [
+        "%d category",
+        "%d categories"
+    ],
     "page.category_label": "Category: %s",
     "page.edit_category.title": "Edit Category: %s",
     "page.edit_feed.etag_header": "ETag header:",
@@ -538,25 +546,25 @@
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.register": "Register passkey",
     "page.settings.webauthn.register.error": "Unable to register passkey",
+    "page.shared_entries.title": "Shared entries",
     "page.shared_entries_count": [
         "%d shared entry",
         "%d shared entries"
     ],
-    "page.shared_entries.title": "Shared entries",
+    "page.starred.title": "Starred",
     "page.starred_entry_count": [
         "%d starred entry",
         "%d starred entries"
     ],
-    "page.starred.title": "Starred",
     "page.total_entry_count": [
         "%d entry in total",
         "%d entries in total"
     ],
+    "page.unread.title": "Unread",
     "page.unread_entry_count": [
         "%d unread entry",
         "%d unread entries"
     ],
-    "page.unread.title": "Unread",
     "page.users.actions": "Actions",
     "page.users.admin.no": "No",
     "page.users.admin.yes": "Yes",
@@ -603,4 +611,4 @@
     "time_elapsed.yesterday": "yesterday",
     "tooltip.keyboard_shortcuts": "Keyboard Shortcut: %s",
     "tooltip.logged_user": "Logged in as %s"
-}
+}

internal/locale/translations/es_ES.json

@@ -72,10 +72,10 @@
     "entry.state.loading": "Cargando...",
     "entry.state.saving": "Guardando...",
     "entry.status.mark_as_read": "Marcar como leído",
+    "entry.status.mark_as_unread": "Marcar como no leído",
     "entry.status.title": "Cambiar estado del artículo",
     "entry.status.toast.read": "Marcado como leído",
     "entry.status.toast.unread": "Marcado como no leído",
-    "entry.status.mark_as_unread": "Marcar como no leído",
     "entry.tags.label": "Etiquetas:",
     "entry.unshare.label": "No compartir",
     "error.api_key_already_exists": "Esta clave API ya existe.",
@@ -114,9 +114,12 @@
     "error.http_service_unavailable": "El sitio web no está disponible en estos momentos debido a un error interno del servidor. El problema no está en el lado de Miniflux. Por favor, inténtalo de nuevo más tarde.",
     "error.http_too_many_requests": "Miniflux generó demasiadas solicitudes a este sitio web. Por favor, inténtalo de nuevo más tarde o cambia la configuración de la aplicación.",
     "error.http_unexpected_status_code": "El sitio web no está disponible en este momento debido a un código de estado HTTP inesperado: %d. El problema no está en el lado de Miniflux. Por favor, inténtalo de nuevo más tarde.",
+    "error.invalid_categories_sorting_order": "Orden de clasificación de categorías no válido.",
     "error.invalid_default_home_page": "¡Página de inicio por defecto no válida!",
     "error.invalid_display_mode": "Modo de visualización de la aplicación web no válido.",
     "error.invalid_entry_direction": "Dirección de artículo no válida.",
+    "error.invalid_entry_order": "Orden de artículo no válido.",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "URL de feed no válida.",
     "error.invalid_gesture_nav": "Navegación por gestos no válida.",
     "error.invalid_language": "Idioma no válido.",
@@ -128,6 +131,7 @@
     "error.password_min_length": "La contraseña debería tener al menos 6 caracteres.",
     "error.pocket_access_token": "Incapaz de obtener un token de acceso de Pocket!",
     "error.pocket_request_token": "Incapaz de obtener un token de solicitud de Pocket!",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Regla de bloqueo no válida: a la regla #%d le falta un nombre de campo válido (Opciones: %s)",
     "error.settings_block_rule_invalid_regex": "Regla de bloqueo no válida: el patrón de la regla #%d no es una expresión regular válida",
     "error.settings_block_rule_regex_required": "Regla de bloqueo no válida: no se ha proporcionado el patrón de la regla #%d",
@@ -174,7 +178,7 @@
     "form.feed.label.feed_password": "Contraseña de la fuente",
     "form.feed.label.feed_url": "URL de la fuente",
     "form.feed.label.feed_username": "Nombre de usuario de la fuente",
-    "form.feed.label.fetch_via_proxy": "Buscar a través de proxy",
+    "form.feed.label.fetch_via_proxy": "Usar el proxy configurado a nivel de la aplicación",
     "form.feed.label.hide_globally": "Ocultar artículos en la lista global de no leídos",
     "form.feed.label.ignore_http_cache": "Ignorar caché HTTP",
     "form.feed.label.keeplist_rules": "Reglas de Filtrado (Permitir)",
@@ -187,6 +191,7 @@
     "form.feed.label.ntfy_min_priority": "Prioridad mínima a Ntfy",
     "form.feed.label.ntfy_priority": "Prioridad Ntfy",
     "form.feed.label.ntfy_topic": "Tema Ntfy (opcional)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to pushover.net",
     "form.feed.label.pushover_default_priority": "Pushover default priority",
     "form.feed.label.pushover_high_priority": "Pushover high priority",
@@ -290,6 +295,7 @@
     "form.integration.readwise_api_key": "Token de acceso a Readwise Reader",
     "form.integration.readwise_api_key_link": "Obtener tu token de acceso a Readwise",
     "form.integration.rssbridge_activate": "Vericar RSS-Bridge al agregar suscripciones",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "URL del servidro RSS-Bridge",
     "form.integration.shaarli_activate": "Guardar artículos en Shaarli",
     "form.integration.shaarli_api_secret": "Secreto API de Shaarli",
@@ -342,6 +348,7 @@
     "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": "Marcar las entradas como leídas cuando se vean. Para audio/video, marcar como leído al 90%% de finalización",
     "form.prefs.label.media_playback_rate": "Velocidad de reproducción del audio/vídeo",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Mostrar el tiempo estimado de lectura de los artículos",
     "form.prefs.label.theme": "Tema",
     "form.prefs.label.timezone": "Zona horaria",
@@ -402,6 +409,7 @@
     "page.about.build_date": "Fecha de compilación:",
     "page.about.credits": "Créditos",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "Opciones de configuración global",
     "page.about.go_version": "Go versión:",
     "page.about.license": "Licencia:",

internal/locale/translations/fi_FI.json

@@ -72,10 +72,10 @@
     "entry.state.loading": "Ladataan...",
     "entry.state.saving": "Tallennetaan...",
     "entry.status.mark_as_read": "Merkitse luetuksi",
+    "entry.status.mark_as_unread": "Merkitse lukemattomaksi",
     "entry.status.title": "Vaihda artikkelin tilaa",
     "entry.status.toast.read": "Merkitty luetuksi",
     "entry.status.toast.unread": "Merkitty lukemattomaksi",
-    "entry.status.mark_as_unread": "Merkitse lukemattomaksi",
     "entry.tags.label": "Tags:",
     "entry.unshare.label": "Poista jako",
     "error.api_key_already_exists": "API-avain on jo olemassa.",
@@ -114,9 +114,12 @@
     "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_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
     "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.invalid_categories_sorting_order": "Virheellinen kategorioiden lajittelujärjestys.",
     "error.invalid_default_home_page": "Väärä oletusarvoinen kotisivu!",
     "error.invalid_display_mode": "Virheellinen verkkosovelluksen näyttötila.",
     "error.invalid_entry_direction": "Invalid entry direction.",
+    "error.invalid_entry_order": "Virheellinen artikkelin lajittelu.",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "Virheellinen syötteen URL-osoite.",
     "error.invalid_gesture_nav": "Virheellinen ele-navigointi.",
     "error.invalid_language": "Virheellinen kieli.",
@@ -128,6 +131,7 @@
     "error.password_min_length": "Salasanassa on oltava vähintään 6 merkkiä.",
     "error.pocket_access_token": "Unable to fetch access token from Pocket!",
     "error.pocket_request_token": "Unable to fetch request token from Pocket!",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
     "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
     "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
@@ -174,7 +178,7 @@
     "form.feed.label.feed_password": "Syötteen salasana",
     "form.feed.label.feed_url": "Syötteen URL-osoite",
     "form.feed.label.feed_username": "Syötteen käyttäjätunnus",
-    "form.feed.label.fetch_via_proxy": "Nouda välityspalvelimen kautta",
+    "form.feed.label.fetch_via_proxy": "Käytä sovellustasolla määritettyä välityspalvelinta",
     "form.feed.label.hide_globally": "Piilota artikkelit lukemattomien listassa",
     "form.feed.label.ignore_http_cache": "Ohita HTTP-välimuisti",
     "form.feed.label.keeplist_rules": "Keep-säännöt",
@@ -187,6 +191,7 @@
     "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.label.ntfy_priority": "Ntfy priority",
     "form.feed.label.ntfy_topic": "Ntfy topic (optional)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to pushover.net",
     "form.feed.label.pushover_default_priority": "Pushover default priority",
     "form.feed.label.pushover_high_priority": "Pushover high priority",
@@ -290,6 +295,7 @@
     "form.integration.readwise_api_key": "Readwise Reader Access Token",
     "form.integration.readwise_api_key_link": "Get your Readwise Access Token",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
     "form.integration.shaarli_activate": "Save articles to Shaarli",
     "form.integration.shaarli_api_secret": "Shaarli API Secret",
@@ -342,6 +348,7 @@
     "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.media_playback_rate": "Äänen/videon toistonopeus",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Näytä artikkeleiden arvioitu lukuaika",
     "form.prefs.label.theme": "Teema",
     "form.prefs.label.timezone": "Aikavyöhyke",
@@ -402,6 +409,7 @@
     "page.about.build_date": "Valmistuspäivä:",
     "page.about.credits": "Kiitokset",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "Yleiset asetukset",
     "page.about.go_version": "Go-versio:",
     "page.about.license": "Lisenssi:",

internal/locale/translations/fr_FR.json

@@ -72,10 +72,10 @@
     "entry.state.loading": "Chargement...",
     "entry.state.saving": "Sauvegarde en cours...",
     "entry.status.mark_as_read": "Marquer comme lu",
+    "entry.status.mark_as_unread": "Marquer comme non lu",
     "entry.status.title": "Changer le statut de l'entrée",
     "entry.status.toast.read": "Marqué comme lu",
     "entry.status.toast.unread": "Marqué comme non lu",
-    "entry.status.mark_as_unread": "Marquer comme non lu",
     "entry.tags.label": "Libellés :",
     "entry.unshare.label": "Enlever le partage",
     "error.api_key_already_exists": "Cette clé d'API existe déjà.",
@@ -114,9 +114,12 @@
     "error.http_service_unavailable": "Le site web n'est pas disponible pour le moment. Le problème ne vient pas de Miniflux. Veuillez réessayer plus tard.",
     "error.http_too_many_requests": "Miniflux a généré trop de requêtes vers ce site web. Veuillez réessayer plus tard ou changez la configuration de l'application.",
     "error.http_unexpected_status_code": "Le site web a répondu avec un code HTTP inattendu : %d. Le problème ne vient pas de Miniflux. Veuillez réessayer plus tard.",
+    "error.invalid_categories_sorting_order": "L'ordre de tri des catégories n'est pas valide.",
     "error.invalid_default_home_page": "Page d'accueil par défaut invalide !",
     "error.invalid_display_mode": "Mode d'affichage de l'application web non valide.",
     "error.invalid_entry_direction": "Ordre de trie non valide.",
+    "error.invalid_entry_order": "Ordre de tri non valide.",
+    "error.invalid_feed_proxy_url": "L'URL du proxy n'est pas valide.",
     "error.invalid_feed_url": "URL de flux non valide.",
     "error.invalid_gesture_nav": "Navigation gestuelle non valide.",
     "error.invalid_language": "Langue non valide.",
@@ -128,6 +131,7 @@
     "error.password_min_length": "Vous devez utiliser au moins 6 caractères pour le mot de passe.",
     "error.pocket_access_token": "Impossible de récupérer le jeton d'accès depuis Pocket !",
     "error.pocket_request_token": "Impossible de récupérer le jeton d'accès depuis Pocket !",
+    "error.proxy_url_not_empty": "L'URL du proxy ne peut pas être vide.",
     "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_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_block_rule_regex_required": "Règle de blocage invalide : le motif de la règle n°%d n'est pas fourni",
@@ -174,7 +178,7 @@
     "form.feed.label.feed_password": "Mot de passe du flux",
     "form.feed.label.feed_url": "URL du flux",
     "form.feed.label.feed_username": "Nom d'utilisateur du flux",
-    "form.feed.label.fetch_via_proxy": "Récupérer via proxy",
+    "form.feed.label.fetch_via_proxy": "Utiliser le proxy configuré au niveau de l'application",
     "form.feed.label.hide_globally": "Masquer les entrées dans la liste globale non lue",
     "form.feed.label.ignore_http_cache": "Ignorer le cache HTTP",
     "form.feed.label.keeplist_rules": "Règles d'autorisation",
@@ -187,6 +191,7 @@
     "form.feed.label.ntfy_min_priority": "Priorité minimale de notification",
     "form.feed.label.ntfy_priority": "Priorité de notification",
     "form.feed.label.ntfy_topic": "Sujet Ntfy (facultatif)",
+    "form.feed.label.proxy_url": "URL du proxy",
     "form.feed.label.pushover_activate": "Activer les notifications vers Pushover",
     "form.feed.label.pushover_default_priority": "Priorité par défaut",
     "form.feed.label.pushover_high_priority": "Priorité élevée",
@@ -209,8 +214,8 @@
     "form.integration.betula_activate": "Sauvegarder les entrées vers Betula",
     "form.integration.betula_token": "Jeton de sécurité de l'API de Betula",
     "form.integration.betula_url": "URL du serveur Betula",
-    "form.integration.cubox_activate": "Save entries to Cubox",
-    "form.integration.cubox_api_link": "Cubox API link",
+    "form.integration.cubox_activate": "Sauvegarder les entrées vers Cubox",
+    "form.integration.cubox_api_link": "Lien API Cubox",
     "form.integration.discord_activate": "Envoyer les articles vers Discord",
     "form.integration.discord_webhook_link": "URL du Webhook Discord",
     "form.integration.espial_activate": "Sauvegarder les articles vers Espial",
@@ -289,8 +294,9 @@
     "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.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
-    "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.rssbridge_activate": "Vérifier RSS-Bridge lors de l'ajout d'abonnements",
+    "form.integration.rssbridge_token": "Jeton d'authentification RSS-Bridge",
+    "form.integration.rssbridge_url": "URL du serveur RSS-Bridge",
     "form.integration.shaarli_activate": "Sauvegarder les articles vers Shaarli",
     "form.integration.shaarli_api_secret": "Clé d'API de Shaarli API",
     "form.integration.shaarli_endpoint": "URL de l'API de Shaarli",
@@ -342,6 +348,7 @@
     "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.media_playback_rate": "Vitesse de lecture de l'audio/vidéo",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Afficher le temps de lecture estimé des articles",
     "form.prefs.label.theme": "Thème",
     "form.prefs.label.timezone": "Fuseau horaire",
@@ -401,7 +408,8 @@
     "page.about.author": "Auteur :",
     "page.about.build_date": "Date de la compilation :",
     "page.about.credits": "Crédits",
-    "page.about.db_usage": "Database size:",
+    "page.about.db_usage": "Taille de la base de données :",
+    "page.about.git_commit": "Commit Git :",
     "page.about.global_config_options": "Options de configuration globales",
     "page.about.go_version": "Version de Go :",
     "page.about.license": "Licence :",
@@ -496,7 +504,7 @@
     "page.keyboard_shortcuts.subtitle.sections": "Navigation entre les sections",
     "page.keyboard_shortcuts.title": "Raccourcis clavier",
     "page.keyboard_shortcuts.toggle_bookmark_status": "Ajouter/Enlever favoris",
-    "page.keyboard_shortcuts.toggle_entry_attachments": "Toggle open/close entry attachments",
+    "page.keyboard_shortcuts.toggle_entry_attachments": "Ouvrir/Fermer les pièces jointes de l'entrée",
     "page.keyboard_shortcuts.toggle_read_status_next": "Basculer entre lu/non lu, et changer le focus sur l'élément suivant",
     "page.keyboard_shortcuts.toggle_read_status_prev": "Basculer entre lu/non lu, et changer le focus sur l'élément précédent",
     "page.login.google_signin": "Se connecter avec Google",
@@ -512,8 +520,8 @@
     "page.offline.refresh_page": "Essayez de rafraîchir la page",
     "page.offline.title": "Mode Hors-Ligne",
     "page.read_entry_count": [
-        "%d read entry",
-        "%d read entries"
+        "%d entrée lue",
+        "%d entrées lues"
     ],
     "page.search.title": "Résultats de la recherche",
     "page.sessions.table.actions": "Actions",
@@ -565,7 +573,7 @@
     "page.users.never_logged": "Jamais",
     "page.users.title": "Utilisateurs",
     "page.users.username": "Nom d'utilisateur",
-    "page.webauthn_rename.title": "Rename Passkey",
+    "page.webauthn_rename.title": "Renommer la clé d'accès",
     "pagination.first": "Première page",
     "pagination.last": "Dernière page",
     "pagination.next": "Suivant",

internal/locale/translations/hi_IN.json

@@ -72,10 +72,10 @@
     "entry.state.loading": "लोड हो रहा है...",
     "entry.state.saving": "सहेजा जा रहा है...",
     "entry.status.mark_as_read": "पढ़े हुए का चिह्न",
+    "entry.status.mark_as_unread": "अपठित के रूप में चिह्नित करें",
     "entry.status.title": "प्रविष्टि स्थिति बदलें",
     "entry.status.toast.read": "पढ़ा हुआ चिह्नित करे",
     "entry.status.toast.unread": "अपठित के रूप में चिह्नित",
-    "entry.status.mark_as_unread": "अपठित के रूप में चिह्नित करें",
     "entry.tags.label": "टैग:",
     "entry.unshare.label": "न साझा कारें",
     "error.api_key_already_exists": "यह एपीआई कुंजी पहले से मौजूद है।",
@@ -114,9 +114,12 @@
     "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_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
     "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.invalid_categories_sorting_order": "अमान्य श्रेणी क्रम।",
     "error.invalid_default_home_page": "अमान्य डिफ़ॉल्ट मुखपृष्ठ!",
     "error.invalid_display_mode": "अमान्य वेब ऐप्लिकेशन प्रदर्शन मोड.",
     "error.invalid_entry_direction": "अमान्य प्रवेश दिशा।",
+    "error.invalid_entry_order": "अमान्य प्रविष्टि क्रम।",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "दृष्टिकोण यूआरएल.",
     "error.invalid_gesture_nav": "अमान्य इशारा नेविगेशन।",
     "error.invalid_language": "अमान्य भाषा.",
@@ -128,6 +131,7 @@
     "error.password_min_length": "पासवर्ड में कम से कम 6 अक्षर होने चाहिए।",
     "error.pocket_access_token": "पॉकेट से एक्सेस टोकन प्राप्त करने में असमर्थ!",
     "error.pocket_request_token": "पॉकेट से अनुरोध टोकन लाने में असमर्थ!",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
     "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
     "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
@@ -174,7 +178,7 @@
     "form.feed.label.feed_password": "फ़ीड पासवर्ड",
     "form.feed.label.feed_url": "फ़ीड यूआरएल",
     "form.feed.label.feed_username": "फ़ीड उपयोगकर्ता नाम",
-    "form.feed.label.fetch_via_proxy": "प्रॉक्सी के माध्यम से प्राप्त करें",
+    "form.feed.label.fetch_via_proxy": "एप्लिकेशन स्तर पर कॉन्फ़िगर किए गए प्रॉक्सी का उपयोग करें",
     "form.feed.label.hide_globally": "वैश्विक अपठित सूची में प्रविष्टियां छिपाएं",
     "form.feed.label.ignore_http_cache": "एचटीटीपी कैश पर ध्यान न दें",
     "form.feed.label.keeplist_rules": "नियम बनाए रखें",
@@ -187,6 +191,7 @@
     "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.label.ntfy_priority": "Ntfy priority",
     "form.feed.label.ntfy_topic": "Ntfy topic (optional)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to pushover.net",
     "form.feed.label.pushover_default_priority": "Pushover default priority",
     "form.feed.label.pushover_high_priority": "Pushover high priority",
@@ -290,6 +295,7 @@
     "form.integration.readwise_api_key": "Readwise Reader Access Token",
     "form.integration.readwise_api_key_link": "Get your Readwise Access Token",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
     "form.integration.shaarli_activate": "Save articles to Shaarli",
     "form.integration.shaarli_api_secret": "Shaarli API Secret",
@@ -342,6 +348,7 @@
     "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.media_playback_rate": "ऑडियो/वीडियो की प्लेबैक गति",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "विषय के लिए अनुमानित पढ़ने का समय दिखाएं",
     "form.prefs.label.theme": "थीम",
     "form.prefs.label.timezone": "समय क्षेत्र",
@@ -402,6 +409,7 @@
     "page.about.build_date": "बनाने की तिथि:",
     "page.about.credits": "आभार सूची",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "वैश्विक विन्यास विकल्प",
     "page.about.go_version": "गो संस्करण:",
     "page.about.license": "अनुज्ञा:",

internal/locale/translations/id_ID.json

@@ -70,10 +70,10 @@
     "entry.state.loading": "Memuat...",
     "entry.state.saving": "Menyimpan...",
     "entry.status.mark_as_read": "Telah dibaca",
+    "entry.status.mark_as_unread": "Belum dibaca",
     "entry.status.title": "Ubah status entri",
     "entry.status.toast.read": "Ditandai sebagai telah dibaca",
     "entry.status.toast.unread": "Ditandai sebagai belum dibaca",
-    "entry.status.mark_as_unread": "Belum dibaca",
     "entry.tags.label": "Tanda:",
     "entry.unshare.label": "Batal bagikan",
     "error.api_key_already_exists": "Kunci API ini sudah ada.",
@@ -112,9 +112,12 @@
     "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_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
     "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.invalid_categories_sorting_order": "Urutan penyortiran kategori tidak valid.",
     "error.invalid_default_home_page": "Beranda baku tidak valid!",
     "error.invalid_display_mode": "Mode tampilan aplikasi web tidak valid.",
     "error.invalid_entry_direction": "Urutan entri tidak valid.",
+    "error.invalid_entry_order": "Urutan entri tidak valid.",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "URL umpan tidak valid.",
     "error.invalid_gesture_nav": "Navigasi gestur tidak valid.",
     "error.invalid_language": "Bahasa tidak valid.",
@@ -126,6 +129,7 @@
     "error.password_min_length": "Kata sandi harus memiliki setidaknya 6 karakter.",
     "error.pocket_access_token": "Tidak bisa mendapatkan token akses dari Pocket!",
     "error.pocket_request_token": "Tidak bisa mendapatkan token permintaan dari Pocket!",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
     "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
     "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
@@ -172,7 +176,7 @@
     "form.feed.label.feed_password": "Kata Sandi Umpan",
     "form.feed.label.feed_url": "URL Umpan",
     "form.feed.label.feed_username": "Nama Pengguna Umpan",
-    "form.feed.label.fetch_via_proxy": "Ambil via Proksi",
+    "form.feed.label.fetch_via_proxy": "Gunakan proxy yang dikonfigurasi di tingkat aplikasi",
     "form.feed.label.hide_globally": "Sembunyikan entri di daftar belum dibaca global",
     "form.feed.label.ignore_http_cache": "Abaikan Tembolok HTTP",
     "form.feed.label.keeplist_rules": "Aturan Simpan",
@@ -185,6 +189,7 @@
     "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.label.ntfy_priority": "Ntfy priority",
     "form.feed.label.ntfy_topic": "Ntfy topic (optional)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to pushover.net",
     "form.feed.label.pushover_default_priority": "Pushover default priority",
     "form.feed.label.pushover_high_priority": "Pushover high priority",
@@ -288,6 +293,7 @@
     "form.integration.readwise_api_key": "Readwise Reader Access Token",
     "form.integration.readwise_api_key_link": "Get your Readwise Access Token",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
     "form.integration.shaarli_activate": "Save articles to Shaarli",
     "form.integration.shaarli_api_secret": "Shaarli API Secret",
@@ -340,6 +346,7 @@
     "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.media_playback_rate": "Kecepatan pemutaran audio/video",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Tampilkan perkiraan waktu baca untuk artikel",
     "form.prefs.label.theme": "Tema",
     "form.prefs.label.timezone": "Zona Waktu",
@@ -400,6 +407,7 @@
     "page.about.build_date": "Tanggal Penyusunan:",
     "page.about.credits": "Pengembang",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "Pengaturan Konfigurasi Global",
     "page.about.go_version": "Versi Go:",
     "page.about.license": "Lisensi:",

internal/locale/translations/it_IT.json

@@ -72,10 +72,10 @@
     "entry.state.loading": "Caricamento in corso...",
     "entry.state.saving": "Salvataggio in corso...",
     "entry.status.mark_as_read": "Segna come letto",
+    "entry.status.mark_as_unread": "Segna come non letto",
     "entry.status.title": "Cambia lo stato dell'articolo",
     "entry.status.toast.read": "Contrassegnato come letto",
     "entry.status.toast.unread": "Contrassegnato come non letto",
-    "entry.status.mark_as_unread": "Segna come non letto",
     "entry.tags.label": "Tag:",
     "entry.unshare.label": "Unshare",
     "error.api_key_already_exists": "Questa chiave API esiste già.",
@@ -114,9 +114,12 @@
     "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_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
     "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.invalid_categories_sorting_order": "L'ordinamento delle categorie non è valido.",
     "error.invalid_default_home_page": "Pagina iniziale predefinita non valida!",
     "error.invalid_display_mode": "Modalità di visualizzazione web app non valida.",
     "error.invalid_entry_direction": "Ordinamento non valido.",
+    "error.invalid_entry_order": "L'ordinamento delle voci non è valido.",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "URL del feed non valido.",
     "error.invalid_gesture_nav": "Navigazione gestuale non valida.",
     "error.invalid_language": "Lingua non valida.",
@@ -128,6 +131,7 @@
     "error.password_min_length": "La password deve contenere almeno 6 caratteri.",
     "error.pocket_access_token": "Non sono riuscito ad ottenere l'access token da Pocket!",
     "error.pocket_request_token": "Non sono riuscito ad ottenere il request token da Pocket!",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
     "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
     "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
@@ -174,7 +178,7 @@
     "form.feed.label.feed_password": "Password del feed",
     "form.feed.label.feed_url": "URL del feed",
     "form.feed.label.feed_username": "Nome utente del feed",
-    "form.feed.label.fetch_via_proxy": "Recuperare tramite proxy",
+    "form.feed.label.fetch_via_proxy": "Usa il proxy configurato a livello di applicazione",
     "form.feed.label.hide_globally": "Nascondere le voci nella lista globale dei non letti",
     "form.feed.label.ignore_http_cache": "Ignora cache HTTP",
     "form.feed.label.keeplist_rules": "Regole di autorizzazione",
@@ -187,6 +191,7 @@
     "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.label.ntfy_priority": "Ntfy priority",
     "form.feed.label.ntfy_topic": "Ntfy topic (optional)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to pushover.net",
     "form.feed.label.pushover_default_priority": "Pushover default priority",
     "form.feed.label.pushover_high_priority": "Pushover high priority",
@@ -290,6 +295,7 @@
     "form.integration.readwise_api_key": "Readwise Reader Access Token",
     "form.integration.readwise_api_key_link": "Get your Readwise Access Token",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
     "form.integration.shaarli_activate": "Save articles to Shaarli",
     "form.integration.shaarli_api_secret": "Shaarli API Secret",
@@ -342,6 +348,7 @@
     "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.media_playback_rate": "Velocità di riproduzione dell'audio/video",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Mostra il tempo di lettura stimato per gli articoli",
     "form.prefs.label.theme": "Tema",
     "form.prefs.label.timezone": "Fuso orario",
@@ -402,6 +409,7 @@
     "page.about.build_date": "Data della build:",
     "page.about.credits": "Crediti",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "Opzioni di configurazione globali",
     "page.about.go_version": "Go versione:",
     "page.about.license": "Licenza:",

internal/locale/translations/ja_JP.json

@@ -70,10 +70,10 @@
     "entry.state.loading": "読み込み中…",
     "entry.state.saving": "保存中…",
     "entry.status.mark_as_read": "既読にする",
+    "entry.status.mark_as_unread": "未読に戻す",
     "entry.status.title": "記事の状態を変更",
     "entry.status.toast.read": "既読にしました",
     "entry.status.toast.unread": "未読にしました",
-    "entry.status.mark_as_unread": "未読に戻す",
     "entry.tags.label": "タグ:",
     "entry.unshare.label": "共有を解除",
     "error.api_key_already_exists": "この API キーは既に存在します。",
@@ -112,9 +112,12 @@
     "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_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
     "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.invalid_categories_sorting_order": "カテゴリの表示順が無効です。",
     "error.invalid_default_home_page": "デフォルトのトップページが無効です",
     "error.invalid_display_mode": "Web アプリの表示モードが無効です。",
     "error.invalid_entry_direction": "記事の表示順が無効です。",
+    "error.invalid_entry_order": "記事の表示順が無効です。",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "フィード URL が無効です。",
     "error.invalid_gesture_nav": "ジェスチャー ナビゲーションが無効です。",
     "error.invalid_language": "言語が無効です。",
@@ -126,6 +129,7 @@
     "error.password_min_length": "パスワードは6文字以上である必要があります。",
     "error.pocket_access_token": "Pocket の access token が取得できません!",
     "error.pocket_request_token": "Pocket の request token が取得できません!",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
     "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
     "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
@@ -172,7 +176,7 @@
     "form.feed.label.feed_password": "フィードのパスワード",
     "form.feed.label.feed_url": "フィード URL",
     "form.feed.label.feed_username": "フィードのユーザー名",
-    "form.feed.label.fetch_via_proxy": "プロキシ経由で取得",
+    "form.feed.label.fetch_via_proxy": "アプリケーションレベルで設定されたプロキシを使用する",
     "form.feed.label.hide_globally": "未読一覧に記事を表示しない",
     "form.feed.label.ignore_http_cache": "HTTPキャッシュを無視",
     "form.feed.label.keeplist_rules": "Keep ルール",
@@ -185,6 +189,7 @@
     "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.label.ntfy_priority": "Ntfy priority",
     "form.feed.label.ntfy_topic": "Ntfy topic (optional)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to pushover.net",
     "form.feed.label.pushover_default_priority": "Pushover default priority",
     "form.feed.label.pushover_high_priority": "Pushover high priority",
@@ -288,6 +293,7 @@
     "form.integration.readwise_api_key": "Readwise Reader Access Token",
     "form.integration.readwise_api_key_link": "Get your Readwise Access Token",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
     "form.integration.shaarli_activate": "Save articles to Shaarli",
     "form.integration.shaarli_api_secret": "Shaarli API Secret",
@@ -340,6 +346,7 @@
     "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.media_playback_rate": "オーディオ/ビデオの再生速度",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "記事の推定読書時間を表示する",
     "form.prefs.label.theme": "テーマ",
     "form.prefs.label.timezone": "タイムゾーン",
@@ -400,6 +407,7 @@
     "page.about.build_date": "ビルド日時:",
     "page.about.credits": "著作権表示",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "グローバル構成オプション",
     "page.about.go_version": "Go バージョン:",
     "page.about.license": "ライセンス:",

internal/locale/translations/nan_Latn_pehoeji.json

@@ -70,10 +70,10 @@
     "entry.state.loading": "Tng leh chip-hêng…",
     "entry.state.saving": "Tng leh pó-chûn…",
     "entry.status.mark_as_read": "Chù chòe tha̍k kè",
+    "entry.status.mark_as_unread": "Chù chòe ah-bōe tha̍k",
     "entry.status.title": "Kái chōng-thài",
     "entry.status.toast.read": "Chù chòe tha̍k kè chòe soah",
     "entry.status.toast.unread": "Chù chòe ah-bōe tha̍k chòe soah",
-    "entry.status.mark_as_unread": "Chù chòe ah-bōe tha̍k",
     "entry.tags.label": "Khan-á：",
     "entry.unshare.label": "Chhú-siau hun-hióng",
     "error.api_key_already_exists": "Chit ê API só-sî í-keng chûn-chāi",
@@ -112,9 +112,12 @@
     "error.http_service_unavailable": "Chit ê bāng-chām in-ūi in ka-kī lāi-pō͘ ū būn-tôe，m̄ sī Miniflux chia ê būn-tôe, chhiáⁿ tán--chi̍t-ē chiah koh chhì-khòaⁿ-māi.",
     "error.http_too_many_requests": "Miniflux tùi chit ê bāng-chām ê chhéng-kiû siuⁿ kè chōe, chhiáⁿ têng chhì-khòaⁿ-māi ah-sī tiâu-chéng thêng-sek siat-tēng.",
     "error.http_unexpected_status_code": "Chit ê bāng-chām chòe liáu chi̍t ê liāu-bōe-tio̍h ê HTTP chōng-thài bé: %d, chhiáⁿ tán--chi̍t-ē chiah koh chhì-khòaⁿ-māi.",
+    "error.invalid_categories_sorting_order": "Lūi-pia̍t ê chōe pái bô-hāu, chhiáⁿ tán-hāu %d hun-cheng āu koh chhì-khòaⁿ-māi.",
     "error.invalid_default_home_page": "Ū-siat chú-ia̍h ū būn-tôe!",
     "error.invalid_display_mode": "Ū būn-tôe ê su-li̍p bô͘-sek.",
     "error.invalid_entry_direction": "Ū būn-tôe ê su-li̍p hong-hiòng.",
+    "error.invalid_entry_order": "Siau-sit ê chōe pái bô-hāu, chhiáⁿ tán-hāu %d hun-cheng āu koh chhì-khòaⁿ-māi.",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "Beh tēng ê siau-sit lâi-goân ê bāng-chí ū būn-tôe.",
     "error.invalid_gesture_nav": "Chhiú-sè tō-lám ū būn-tôe.",
     "error.invalid_language": "Ū būn-tôe ê gú-giân.",
@@ -126,6 +129,7 @@
     "error.password_min_length": "Chhiáⁿ chì-chió ài su-li̍p la̍k ê lī goân.",
     "error.pocket_access_token": "Bô-hoat-tō͘ ùi Pocket thê tio̍h access token",
     "error.pocket_request_token": "Bô-hoat-tō͘ ùi Pocket thê tio̍h request token",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Bô-hāu ê hong-só kui-chek: kui-chek #%d khiàm ū-hāu ê lân-ūi miâ (e-sai ê soán-hāng: %s)",
     "error.settings_block_rule_invalid_regex": "Bô-hāu ê hong-só kui-chek: kui-chek #%d ê bô͘-sek m̄ sī ha̍p-hoat ê chiàⁿ-kui piáu-ta̍t sek",
     "error.settings_block_rule_regex_required": "Bô-hāu ê hong-só kui-chek: kui-chek #%d bô thê-kiong chiàⁿ-kui piáu-ta̍t sek",
@@ -172,7 +176,7 @@
     "form.feed.label.feed_password": "Siau-sit lâi-goân bi̍t-bé",
     "form.feed.label.feed_url": "Siau-sit lâi-goân bāng-chí",
     "form.feed.label.feed_username": "Siau-sit lâi-goân kháu-chō miâ",
-    "form.feed.label.fetch_via_proxy": "Thàu-kè tāi-lí lia̍h",
+    "form.feed.label.fetch_via_proxy": "Iōng tī su-hāu-khì siat-tēng ê proxy",
     "form.feed.label.hide_globally": "Tī choân-he̍k ah-bōe tha̍k--ê lia̍t-pió am-khàm siau-sit",
     "form.feed.label.ignore_http_cache": "Pàng-ba̍k HTTP cache",
     "form.feed.label.keeplist_rules": "Pó-liû kui-chek",
@@ -185,6 +189,7 @@
     "form.feed.label.ntfy_min_priority": "Ntfy siōng kē iu-sian sūn-sū",
     "form.feed.label.ntfy_priority": "Ntfy iu-sian sūn-sū",
     "form.feed.label.ntfy_topic": "Ntfy topic (soán thiⁿ)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to Pushover",
     "form.feed.label.pushover_default_priority": "Default priority",
     "form.feed.label.pushover_high_priority": "High priority",
@@ -288,6 +293,7 @@
     "form.integration.readwise_api_key": "Readwise Reader Acess Token",
     "form.integration.readwise_api_key_link": "Chhú-tek lí ê Readwise Acess Token",
     "form.integration.rssbridge_activate": "Sin cheng-ka siau-sit lâi-goân ê sî tio̍h RSS-Bridge",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge su-hāu-khì的bāng-chí",
     "form.integration.shaarli_activate": "Pó-chûn siau-sit kàu Shaarli",
     "form.integration.shaarli_api_secret": "Shaarli API só-sî",
@@ -340,6 +346,7 @@
     "form.prefs.label.mark_read_on_view": "Phah khui ê sî-chūn sūn-sòa kā siau-sit chù chòe tha̍k kè",
     "form.prefs.label.mark_read_on_view_or_media_completion": "Phah khui ê sî-chūn sūn-sòa kā siau-sit chù chòe tha̍k kè, m̄-koh nā-sī im-sìn, sī-sìn tio̍h tī hòng-sàng kàu 90%% ê si-chun chiah lâi chù",
     "form.prefs.label.media_playback_rate": "Im-sìn, sī-sìn pàng ê sok-tō͘",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Hián-sī siau-sit àn-sǹg ài gōa-kú lâi tha̍k",
     "form.prefs.label.theme": "Chú-tôe",
     "form.prefs.label.timezone": "Sî-khu",
@@ -400,6 +407,7 @@
     "page.about.build_date": "Kiàn-tì li̍t-kî:",
     "page.about.credits": "Pán-koân",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "Choân-he̍k siat-tēng soán-hāng",
     "page.about.go_version": "Go pán-pún:",
     "page.about.license": "Pàng-koân:",

internal/locale/translations/nl_NL.json

@@ -72,10 +72,10 @@
     "entry.state.loading": "Laden...",
     "entry.state.saving": "Opslaan...",
     "entry.status.mark_as_read": "Markeren als gelezen",
+    "entry.status.mark_as_unread": "Markeren als ongelezen",
     "entry.status.title": "Verander artikelstatus",
     "entry.status.toast.read": "Gemarkeerd als gelezen",
     "entry.status.toast.unread": "Gemarkeerd als ongelezen",
-    "entry.status.mark_as_unread": "Markeren als ongelezen",
     "entry.tags.label": "Tags:",
     "entry.unshare.label": "Delen ongedaan maken",
     "error.api_key_already_exists": "Deze API-sleutel bestaat al.",
@@ -114,9 +114,12 @@
     "error.http_service_unavailable": "De website is momenteel niet beschikbaar vanwege een interne-server-fout. De oorzaak hiervan ligt niet bij Miniflux. Probeer het later nogmaals aub.",
     "error.http_too_many_requests": "Miniflux heeft te veel aanvragen gegenereerd voor deze website. Probeer het later nog eens of wijzig de applicatieconfiguratie.",
     "error.http_unexpected_status_code": "De website is momenteel niet beschikbaar vanwege een onverwachte HTTP-statuscode: %d. De oorzaak hiervan ligt niet bij Miniflux. Probeer het later nogmaals aub.",
+    "error.invalid_categories_sorting_order": "Ongeldige volgorde van categorieën.",
     "error.invalid_default_home_page": "Ongeldige startpagina!",
     "error.invalid_display_mode": "Ongeldige weergavemodus voor de webapp.",
     "error.invalid_entry_direction": "Ongeldige sorteervolgorde.",
+    "error.invalid_entry_order": "Ongeldige volgorde van artikelen.",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "Ongeldige feed URL.",
     "error.invalid_gesture_nav": "Ongeldige gebarennavigatie.",
     "error.invalid_language": "Ongeldige taal.",
@@ -128,6 +131,7 @@
     "error.password_min_length": "Minimaal 6 tekens gebruiken.",
     "error.pocket_access_token": "Kon geen toegangstoken ophalen van Pocket!",
     "error.pocket_request_token": "Kon geen aanvraagtoken ophalen van Pocket!",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Ongeldige blokkeerregel: regel #%d mist een geldige veldnaam (Opties: %s)",
     "error.settings_block_rule_invalid_regex": "Ongeldige blokkeerregel: het patroon van regel #%d is geen geldige regex",
     "error.settings_block_rule_regex_required": "Ongeldige blokkeerregel:  het patroon van regel #%d is niet opgegeven",
@@ -174,7 +178,7 @@
     "form.feed.label.feed_password": "Feed wachtwoord",
     "form.feed.label.feed_url": "Feed URL",
     "form.feed.label.feed_username": "Feed gebruikersnaam",
-    "form.feed.label.fetch_via_proxy": "Ophalen via proxy",
+    "form.feed.label.fetch_via_proxy": "Gebruik de proxy die op applicatieniveau is geconfigureerd",
     "form.feed.label.hide_globally": "Verberg artikelen in de globale ongelezen lijst",
     "form.feed.label.ignore_http_cache": "Negeer HTTP-cache",
     "form.feed.label.keeplist_rules": "Bewaarregels",
@@ -187,6 +191,7 @@
     "form.feed.label.ntfy_min_priority": "Ntfy minimale prioriteit",
     "form.feed.label.ntfy_priority": "Ntfy prioriteit",
     "form.feed.label.ntfy_topic": "Ntfy topic (optional)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to pushover.net",
     "form.feed.label.pushover_default_priority": "Pushover default priority",
     "form.feed.label.pushover_high_priority": "Pushover high priority",
@@ -290,6 +295,7 @@
     "form.integration.readwise_api_key": "Readwise Reader Access Token",
     "form.integration.readwise_api_key_link": "Readwise Access Token ophalen",
     "form.integration.rssbridge_activate": "Controleer RSS-Bridge bij het toevoegen van abonnementen",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
     "form.integration.shaarli_activate": "Artikelen opslaan in Shaarli",
     "form.integration.shaarli_api_secret": "Shaarli API Secret",
@@ -342,6 +348,7 @@
     "form.prefs.label.mark_read_on_view": "Markeer artikelen automatisch als gelezen wanneer ze worden bekeken",
     "form.prefs.label.mark_read_on_view_or_media_completion": "Markeer artikelen als gelezen wanneer ze worden bekeken. Voor audio/video, markeer als gelezen bij 90%% voltooiing",
     "form.prefs.label.media_playback_rate": "Afspeelsnelheid van de audio/video",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Toon geschatte leestijd van artikelen",
     "form.prefs.label.theme": "Thema",
     "form.prefs.label.timezone": "Tijdzone",
@@ -402,6 +409,7 @@
     "page.about.build_date": "Compilatiedatum:",
     "page.about.credits": "Credits",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "Globale Configuratie Opties",
     "page.about.go_version": "Go versie:",
     "page.about.license": "Licentie:",

internal/locale/translations/pl_PL.json

@@ -74,10 +74,10 @@
     "entry.state.loading": "Ładowanie…",
     "entry.state.saving": "Zapisywanie…",
     "entry.status.mark_as_read": "Oznacz jako przeczytany",
+    "entry.status.mark_as_unread": "Oznacz jako nieprzeczytany",
     "entry.status.title": "Zmień status wpisu",
     "entry.status.toast.read": "Oznaczono jako przeczytany",
     "entry.status.toast.unread": "Oznaczono jako nieprzeczytany",
-    "entry.status.mark_as_unread": "Oznacz jako nieprzeczytany",
     "entry.tags.label": "Znaczniki:",
     "entry.unshare.label": "Cofnij udostępnianie",
     "error.api_key_already_exists": "Ten klucz API już istnieje.",
@@ -116,9 +116,12 @@
     "error.http_service_unavailable": "Strona jest w tej chwili niedostępna z powodu wewnętrznego błędu serwera. Problem nie leży po stronie Miniflux. Spróbuj ponownie później.",
     "error.http_too_many_requests": "Miniflux wygenerował zbyt wiele żądań do tej witryny. Spróbuj ponownie później lub zmień konfigurację aplikacji.",
     "error.http_unexpected_status_code": "Strona jest w tej chwili niedostępna z powodu nieoczekiwanego kodu stanu HTTP: %d. Problem nie leży po stronie Miniflux. Spróbuj ponownie później.",
+    "error.invalid_categories_sorting_order": "Nieprawidłowa kolejność sortowania kategorii.",
     "error.invalid_default_home_page": "Nieprawidłowa domyślna strona główna!",
     "error.invalid_display_mode": "Nieprawidłowy tryb wyświetlania aplikacji sieciowej.",
     "error.invalid_entry_direction": "Nieprawidłowa kolejność sortowania.",
+    "error.invalid_entry_order": "Nieprawidłowa kolejność sortowania wpisów.",
+    "error.invalid_feed_proxy_url": "Nieprawidłowy adres URL serwera proxy.",
     "error.invalid_feed_url": "Nieprawidłowy adres URL kanału.",
     "error.invalid_gesture_nav": "Nieprawidłowa nawigacja gestami.",
     "error.invalid_language": "Nieprawidłowy język.",
@@ -130,6 +133,7 @@
     "error.password_min_length": "Musisz użyć co najmniej 6 znaków.",
     "error.pocket_access_token": "Nie można pobrać tokena dostępu z Pocket!",
     "error.pocket_request_token": "Nie można pobrać tokena żądania z Pocket!",
+    "error.proxy_url_not_empty": "Adres URL serwera proxy nie może być pusty.",
     "error.settings_block_rule_fieldname_invalid": "Nieprawidłowa reguła blokowania: w regule #%d brakuje prawidłowej nazwy pola (opcje: %s)",
     "error.settings_block_rule_invalid_regex": "Nieprawidłowa reguła blokowania: wzór reguły #%d nie jest prawidłowym wyrażeniem regularnym",
     "error.settings_block_rule_regex_required": "Nieprawidłowa reguła blokowania: nie podano wzorca reguły #%d",
@@ -176,7 +180,7 @@
     "form.feed.label.feed_password": "Hasło do subskrypcji",
     "form.feed.label.feed_url": "Adres URL kanału",
     "form.feed.label.feed_username": "Nazwa użytkownika subskrypcji",
-    "form.feed.label.fetch_via_proxy": "Pobierz przez proxy",
+    "form.feed.label.fetch_via_proxy": "Użyj serwera proxy skonfigurowanego na poziomie aplikacji",
     "form.feed.label.hide_globally": "Ukryj wpisy na globalnej liście nieprzeczytanych",
     "form.feed.label.ignore_http_cache": "Zignoruj pamięć podręczną HTTP",
     "form.feed.label.keeplist_rules": "Reguły utrzymywania",
@@ -189,6 +193,7 @@
     "form.feed.label.ntfy_min_priority": "Minimalny priorytet ntfy",
     "form.feed.label.ntfy_priority": "Priorytet ntfy",
     "form.feed.label.ntfy_topic": "Temat ntfy (opcjonalny)",
+    "form.feed.label.proxy_url": "Adres URL serwera proxy",
     "form.feed.label.pushover_activate": "Prześlij wpisy do pushover.net",
     "form.feed.label.pushover_default_priority": "Domyślny priorytet Pushover",
     "form.feed.label.pushover_high_priority": "Wysoki priorytet Pushover",
@@ -292,6 +297,7 @@
     "form.integration.readwise_api_key": "Token dostępu do czytnika Readwise",
     "form.integration.readwise_api_key_link": "Zdobądź token dostępu Readwise",
     "form.integration.rssbridge_activate": "Sprawdź RSS-Bridge podczas dodawania subskrypcji",
+    "form.integration.rssbridge_token": "Token uwierzytelniający RSS-Bridge",
     "form.integration.rssbridge_url": "Adres URL serwera RSS-Bridge",
     "form.integration.shaarli_activate": "Zapisuj artykuły w Shaarli",
     "form.integration.shaarli_api_secret": "Tajny klucz API do Shaarli",
@@ -344,6 +350,7 @@
     "form.prefs.label.mark_read_on_view": "Automatycznie oznacz wpisy jako przeczytane podczas przeglądania",
     "form.prefs.label.mark_read_on_view_or_media_completion": "Oznacz wpisy jako przeczytane po wyświetleniu. W przypadku audio i wideo oznacz jako przeczytane po ukończeniu 90%%",
     "form.prefs.label.media_playback_rate": "Szybkość odtwarzania audio i wideo",
+    "form.prefs.label.always_open_external_links": "Czytaj artykuły, otwierając łącza zewnętrzne",
     "form.prefs.label.show_reading_time": "Pokaż szacowany czas czytania wpisów",
     "form.prefs.label.theme": "Wygląd",
     "form.prefs.label.timezone": "Strefa czasowa",
@@ -404,6 +411,7 @@
     "page.about.build_date": "Data opracowania:",
     "page.about.credits": "Prawa autorskie",
     "page.about.db_usage": "Rozmiar bazy danych:",
+    "page.about.git_commit": "Zatwierdzenie Git:",
     "page.about.global_config_options": "Globalne opcje konfiguracji",
     "page.about.go_version": "Wersja Go:",
     "page.about.license": "Licencja:",

internal/locale/translations/pt_BR.json

@@ -72,10 +72,10 @@
     "entry.state.loading": "Carregando...",
     "entry.state.saving": "Salvando...",
     "entry.status.mark_as_read": "Marcar como lido",
+    "entry.status.mark_as_unread": "Marcar como não lido",
     "entry.status.title": "Modificar estado deste item",
     "entry.status.toast.read": "Marcado como lido",
     "entry.status.toast.unread": "Marcado como não lido",
-    "entry.status.mark_as_unread": "Marcar como não lido",
     "entry.tags.label": "Etiquetas:",
     "entry.unshare.label": "Descompartilhar",
     "error.api_key_already_exists": "Essa chave de API já existe.",
@@ -114,9 +114,12 @@
     "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_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
     "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.invalid_categories_sorting_order": "A ordem de classificação das categorias não é válida.",
     "error.invalid_default_home_page": "Página inicial por defeito inválida!",
     "error.invalid_display_mode": "Modo de exibição de aplicativo inválido da web.",
     "error.invalid_entry_direction": "Direção de entrada inválida.",
+    "error.invalid_entry_order": "A ordem de entrada é inválida.",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "URL de feed inválido.",
     "error.invalid_gesture_nav": "Navegação por gestos inválida.",
     "error.invalid_language": "Idioma inválido.",
@@ -128,6 +131,7 @@
     "error.password_min_length": "A senha deve ter no mínimo 6 caracteres.",
     "error.pocket_access_token": "Não foi possível obter um token de acesso no Pocket!",
     "error.pocket_request_token": "Não foi possível obter um pedido de token no Pocket!",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
     "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
     "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
@@ -174,7 +178,7 @@
     "form.feed.label.feed_password": "Senha da fonte",
     "form.feed.label.feed_url": "URL da fonte",
     "form.feed.label.feed_username": "Nome de usuário da fonte",
-    "form.feed.label.fetch_via_proxy": "Buscar via proxy",
+    "form.feed.label.fetch_via_proxy": "Usar o proxy configurado no nível da aplicação",
     "form.feed.label.hide_globally": "Ocultar entradas na lista global não lida",
     "form.feed.label.ignore_http_cache": "Ignorar cache HTTP",
     "form.feed.label.keeplist_rules": "Regras de permissão",
@@ -187,6 +191,7 @@
     "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.label.ntfy_priority": "Ntfy priority",
     "form.feed.label.ntfy_topic": "Ntfy topic (optional)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to pushover.net",
     "form.feed.label.pushover_default_priority": "Pushover default priority",
     "form.feed.label.pushover_high_priority": "Pushover high priority",
@@ -290,6 +295,7 @@
     "form.integration.readwise_api_key": "Readwise Reader Access Token",
     "form.integration.readwise_api_key_link": "Get your Readwise Access Token",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
     "form.integration.shaarli_activate": "Save articles to Shaarli",
     "form.integration.shaarli_api_secret": "Shaarli API Secret",
@@ -342,6 +348,7 @@
     "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.media_playback_rate": "Velocidade de reprodução do áudio/vídeo",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Mostrar tempo estimado de leitura de artigos",
     "form.prefs.label.theme": "Tema",
     "form.prefs.label.timezone": "Fuso horário",
@@ -402,6 +409,7 @@
     "page.about.build_date": "Compilado em:",
     "page.about.credits": "Créditos",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "opções de configuração global",
     "page.about.go_version": "Go versão:",
     "page.about.license": "Licença:",

internal/locale/translations/ro_RO.json

@@ -74,10 +74,10 @@
     "entry.state.loading": "Încarc…",
     "entry.state.saving": "Salvez…",
     "entry.status.mark_as_read": "Marcați ca citit",
+    "entry.status.mark_as_unread": "Marcați ca necitit",
     "entry.status.title": "Modifică starea intrării",
     "entry.status.toast.read": "Marcat ca citit",
     "entry.status.toast.unread": "Marcat ca necitit",
-    "entry.status.mark_as_unread": "Marcați ca necitit",
     "entry.tags.label": "Etichete:",
     "entry.unshare.label": "Elimină partajarea",
     "error.api_key_already_exists": "Această cheie API există deja.",
@@ -116,9 +116,12 @@
     "error.http_service_unavailable": "Acest site web nu este disponibil momentan din cauza unei erori generată de server. Problema nu este de la Miniflux. Vă rugăm să reîncercați mai târziu.",
     "error.http_too_many_requests": "Miniflux a generat prea multe solicitări pe acest site web. Vă rog, încercați mai tîrziu sau modificați configurațiile aplicației.",
     "error.http_unexpected_status_code": "Acest site web nu este disponibil momentan din cauza unei erori HTTP: %d. Problema nu este de la Miniflux. Vă rugăm să reîncercați mai târziu.",
+    "error.invalid_categories_sorting_order": "Ordinea de sortare a categoriilor nu este validă.",
     "error.invalid_default_home_page": "Pagină de start invalidă!",
     "error.invalid_display_mode": "Mod invalid de afișare în aplicația web.",
     "error.invalid_entry_direction": "Direcție invalidă ăn intrare.",
+    "error.invalid_entry_order": "Direcție de sortare invalidă.",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "Adresa URL a fluxului este invalidă.",
     "error.invalid_gesture_nav": "Gest de navigare invalid.",
     "error.invalid_language": "Limbă invalidă.",
@@ -130,6 +133,7 @@
     "error.password_min_length": "Parola trebuie să aibă cel puțin 6 caractere.",
     "error.pocket_access_token": "Nu poate obține token-ul de acces de la Pocket!",
     "error.pocket_request_token": "Nu poate obține token-ul solicitat de la Pocket!",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Regulă de bloc invalidă: regulii #%d îi lipsește un nume valid de câmp (Opțiuni: %s)",
     "error.settings_block_rule_invalid_regex": "Regulă de bloc invalidă: modelul regulii #%d's nu este regex valid",
     "error.settings_block_rule_regex_required": "Regulă de bloc invalidă: modelul regulii #%d's nu este furnizat",
@@ -176,7 +180,7 @@
     "form.feed.label.feed_password": "Parolă Flux",
     "form.feed.label.feed_url": "Flux URL",
     "form.feed.label.feed_username": "Nume user Flux",
-    "form.feed.label.fetch_via_proxy": "Actualizare prin proxy",
+    "form.feed.label.fetch_via_proxy": "Utilizați proxy-ul configurat la nivelul aplicației",
     "form.feed.label.hide_globally": "Ascunde intrările în lista globală de articole necitite",
     "form.feed.label.ignore_http_cache": "Ignoră cache HTTP",
     "form.feed.label.keeplist_rules": "Reguli de Păstrare",
@@ -189,6 +193,7 @@
     "form.feed.label.ntfy_min_priority": "Prioritate minimă Ntfy",
     "form.feed.label.ntfy_priority": "Prioritate Ntfy",
     "form.feed.label.ntfy_topic": "Subiect Ntfy (opțional)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Activează Pushover",
     "form.feed.label.pushover_default_priority": "Prioritate implicită Pushover",
     "form.feed.label.pushover_high_priority": "Prioritate ridicată Pushover",
@@ -292,6 +297,7 @@
     "form.integration.readwise_api_key": "Token Acces Readwise Reader",
     "form.integration.readwise_api_key_link": "Obțineți Token-ul de Acess pe Readwise",
     "form.integration.rssbridge_activate": "Verifică RSS-Bridge la adăugarea de abonamente",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "URL server RSS-Bridge",
     "form.integration.shaarli_activate": "Salvează articolele în Shaarli",
     "form.integration.shaarli_api_secret": "Secret API Shaarli",
@@ -344,6 +350,7 @@
     "form.prefs.label.mark_read_on_view": "Marchează intrările ca citite la vizualizare",
     "form.prefs.label.mark_read_on_view_or_media_completion": "Marchează intrările ca citite la vizualizare. Pentru audio/video, marchează ca citit la redarea a 90%% de conținut",
     "form.prefs.label.media_playback_rate": "Viteza de rulare audio/video",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Afișare timp estimat de citire pentru înregistrări",
     "form.prefs.label.theme": "Temă",
     "form.prefs.label.timezone": "Fus orar",
@@ -404,6 +411,7 @@
     "page.about.build_date": "Dată Build:",
     "page.about.credits": "Credit",
     "page.about.db_usage": "Utilizare Bază de Date",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "Opțiuni globale de configurare",
     "page.about.go_version": "Versiune Go:",
     "page.about.license": "Licență:",
@@ -423,11 +431,6 @@
     "page.api_keys.table.last_used_at": "Utilizat ultima dată",
     "page.api_keys.table.token": "Token",
     "page.api_keys.title": "Chei API",
-    "page.categories_count": [
-        "%d categorie",
-        "%d categorii",
-        "%d categorie găsită"
-    ],
     "page.categories.entries": "Intrări",
     "page.categories.feed_count": [
         "Este %d flux.",
@@ -437,6 +440,11 @@
     "page.categories.feeds": "Fluxuri",
     "page.categories.no_feed": "Nici un flux.",
     "page.categories.title": "Categorii",
+    "page.categories_count": [
+        "%d categorie",
+        "%d categorii",
+        "%d categorie găsită"
+    ],
     "page.category_label": "Categorie: %s",
     "page.edit_category.title": "Editare Categorie: %s",
     "page.edit_feed.etag_header": "Antet ETag:",
@@ -545,29 +553,29 @@
     "page.settings.webauthn.passkeys": "Chei Acces",
     "page.settings.webauthn.register": "Înregistrare cheie acces",
     "page.settings.webauthn.register.error": "Eroare la înregistrarea cheii de acces",
+    "page.shared_entries.title": "Înregistrări partajate",
     "page.shared_entries_count": [
         "%d înregistrare partajată",
         "%d înregistrări partajate",
         "%d înregistrări partajate"
     ],
-    "page.shared_entries.title": "Înregistrări partajate",
+    "page.starred.title": "Marcate",
     "page.starred_entry_count": [
         "%d înregistrare marcată",
         "%d Înregistrări marcate",
         "%d Înregistrări marcate"
     ],
-    "page.starred.title": "Marcate",
     "page.total_entry_count": [
         "%d intrare în total",
         "%d intrări în total",
         "%d intrări în total"
     ],
+    "page.unread.title": "Necitite",
     "page.unread_entry_count": [
         "%d înregistrare necitită",
         "%d înregistrări necitite",
         "%d înregistrări necitite"
     ],
-    "page.unread.title": "Necitite",
     "page.users.actions": "Acțiuni",
     "page.users.admin.no": "Nu",
     "page.users.admin.yes": "Da",
@@ -620,4 +628,4 @@
     "time_elapsed.yesterday": "ieri",
     "tooltip.keyboard_shortcuts": "Scurtături Tastatură: %s",
     "tooltip.logged_user": "Atentificat ca %s"
-}
+}

internal/locale/translations/ru_RU.json

@@ -13,7 +13,7 @@
     "action.update": "Обновить",
     "alert.account_linked": "Ваш внешний аккаунт теперь привязан!",
     "alert.account_unlinked": "Ваш внешний аккаунт теперь отвязан!",
-    "alert.background_feed_refresh": "All feeds are being refreshed in the background. You can continue to use Miniflux while this process is running.",
+    "alert.background_feed_refresh": "Все подписки обновляются в фоновом режиме. Вы можете продолжать использовать Miniflux пока идёт этот процесс.",
     "alert.feed_error": "С этой подпиской есть проблема",
     "alert.no_bookmark": "Избранное отсутствует.",
     "alert.no_category": "Категории отсутствуют.",
@@ -30,24 +30,24 @@
     "alert.pocket_linked": "Ваш Pocket аккаунт теперь привязан!",
     "alert.prefs_saved": "Предпочтения сохранены!",
     "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."
+        "Вы запустили слишком много обновлений подписок. Подождите %d минуту для нового запуска",
+        "Вы запустили слишком много обновлений подписок. Подождите %d минут для нового запуска",
+        "Вы запустили слишком много обновлений подписок. Подождите %d минут для нового запуска"
     ],
     "confirm.loading": "В процессе…",
     "confirm.no": "нет",
     "confirm.question": "Вы уверены?",
     "confirm.question.refresh": "Вы хотите выполнить принудительное обновление?",
     "confirm.yes": "да",
-    "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.reset": "Reset",
-    "enclosure_media_controls.speed.reset.title": "Reset speed to 1x",
-    "enclosure_media_controls.speed.slower": "Slower",
-    "enclosure_media_controls.speed.slower.title": "Slower by %sx",
+    "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": "Ускорить в %s раз",
+    "enclosure_media_controls.speed.reset": "Сбросить",
+    "enclosure_media_controls.speed.reset.title": "Сбросить скорость до 1x",
+    "enclosure_media_controls.speed.slower": "Медленнее",
+    "enclosure_media_controls.speed.slower.title": "Замедлить в %s раз",
     "entry.bookmark.toast.off": "Без пометок",
     "entry.bookmark.toast.on": "Помеченные",
     "entry.bookmark.toggle.off": "Удалить из Избранного",
@@ -74,83 +74,87 @@
     "entry.state.loading": "Загрузка…",
     "entry.state.saving": "Сохранение…",
     "entry.status.mark_as_read": "Отметить как прочитанное",
+    "entry.status.mark_as_unread": "Пометить как непрочитанное",
     "entry.status.title": "Изменить статус записи",
     "entry.status.toast.read": "Помечено как прочитанное",
     "entry.status.toast.unread": "Помечено как непрочитанное",
-    "entry.status.mark_as_unread": "Пометить как непрочитанное",
     "entry.tags.label": "Теги:",
     "entry.unshare.label": "Удалить из общедоступных",
     "error.api_key_already_exists": "Этот API-ключ уже существует.",
     "error.bad_credentials": "Неверное имя пользователя или пароль.",
     "error.category_already_exists": "Эта категория уже существует.",
-    "error.category_not_found": "This category does not exist or does not belong to this user.",
-    "error.database_error": "Database error: %v.",
+    "error.category_not_found": "Эта категория не существует или не принадлежит этому пользователю.",
+    "error.database_error": "Ошибка базы данных: %v.",
     "error.different_passwords": "Пароли не совпадают.",
     "error.duplicate_fever_username": "Уже есть кто-то с таким же именем пользователя Fever!",
     "error.duplicate_googlereader_username": "Уже есть кто-то с таким же именем пользователя Google Reader!",
     "error.duplicate_linked_account": "Уже есть кто-то, кто ассоциирован с этим аккаунтом!",
-    "error.duplicated_feed": "This feed already exists.",
+    "error.duplicated_feed": "Эта подписка уже существует.",
     "error.empty_file": "Этот файл пуст.",
     "error.entries_per_page_invalid": "Недопустимое значение количества записей на странице.",
     "error.feed_already_exists": "Эта подписка уже существует.",
     "error.feed_category_not_found": "Эта категория не существует или не принадлежит этому пользователю.",
-    "error.feed_format_not_detected": "Unable to detect feed format: %v.",
+    "error.feed_format_not_detected": "Не удалось определить формат подписки: %v.",
     "error.feed_invalid_blocklist_rule": "Правило черного списка некорректно.",
     "error.feed_invalid_keeplist_rule": "Правило белого списка некорректно.",
     "error.feed_mandatory_fields": "Ссылка и категория обязательны.",
-    "error.feed_not_found": "This feed does not exist or does not belong to this user.",
+    "error.feed_not_found": "Эта подписка не существует или не принадлежит этому пользователю.",
     "error.feed_title_not_empty": "Заголовок подписки не может быть пустым.",
     "error.feed_url_not_empty": "URL-адрес подписки не может быть пустым.",
     "error.fields_mandatory": "Все поля обязательны.",
-    "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_body_read": "Unable to read the HTTP body: %v.",
-    "error.http_client_error": "HTTP client error: %v.",
-    "error.http_empty_response": "The HTTP response is empty. Perhaps, this website is using a bot protection mechanism?",
-    "error.http_empty_response_body": "The HTTP response body is empty.",
-    "error.http_forbidden": "Access to this website is forbidden. Perhaps, this website has a bot protection mechanism?",
-    "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_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_not_authorized": "Access to this website is not authorized. It could be a bad username or password.",
-    "error.http_resource_not_found": "The requested resource is not found. Please, verify the URL.",
-    "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_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_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
-    "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.http_bad_gateway": "В данный момент сайт недоступен из-за ошибки шлюза. Проблема не связана с Miniflux. Пожалуйста, попробуйте позже.",
+    "error.http_body_read": "Невозможно прочитать тело HTTP-сообщения: %v.",
+    "error.http_client_error": "Ошибка HTTP-клиента: %v.",
+    "error.http_empty_response": "Пустой ответ HTTP. Возможно этот сайт использует защиту от ботов?",
+    "error.http_empty_response_body": "Пустое тело HTTP-ответа.",
+    "error.http_forbidden": "Доступ к сайту запрещён. Возможно этот сайт использует защиту от ботов?",
+    "error.http_gateway_timeout": "В данный момент сайт недоступен из-за превышения времени ожидания ответа от шлюза. Проблема не связана с Miniflux. Пожалуйста, попробуйте позже.",
+    "error.http_internal_server_error": "В данный момент сайт недоступен из-за ошибки сервера. Проблема не связана с Miniflux. Пожалуйста, попробуйте позже.",
+    "error.http_not_authorized": "Доступ к сайту запрещён. Возможно используется неправильное имя пользователя или пароль.",
+    "error.http_resource_not_found": "Запрашиваемый ресурс не найден. Пожалуйста, проверьте URL.",
+    "error.http_response_too_large": "Превышен размер HTTP-ответа. Вы можете увеличить лимит размера HTTP-ответа в настройках (для применения новых настроек потребуется перезагрузка приложения).",
+    "error.http_service_unavailable": "В данный момент сайт недоступен из-за ошибки сервера. Проблема не связана с Miniflux. Пожалуйста, попробуйте позже.",
+    "error.http_too_many_requests": "Miniflux отправил слишком много запросов к этому сайту. Пожалуйста, попробуйте позже или измените настройки приложения.",
+    "error.http_unexpected_status_code": "В данный момент сайт недоступен из-за непредвиденного кода HTTP-ответа: %d. Проблема не связана с Miniflux. Пожалуйста, попробуйте позже.",
+    "error.invalid_categories_sorting_order": "Недопустимый порядок сортировки категорий.",
     "error.invalid_default_home_page": "Недопустимая домашняя страница по умолчанию!",
     "error.invalid_display_mode": "Недопустимый режим отображения веб-приложения.",
     "error.invalid_entry_direction": "Недопустимая сортировка записей.",
+    "error.invalid_entry_order": "Недопустимый порядок статей.",
+    "error.invalid_feed_proxy_url": "Недействительный URL прокси.",
     "error.invalid_feed_url": "Недействительная ссылка подписки.",
     "error.invalid_gesture_nav": "Недопустимая навигация жестами.",
     "error.invalid_language": "Недопустимый язык.",
     "error.invalid_site_url": "Недействительный ссылка сайта.",
     "error.invalid_theme": "Недопустимая тема.",
-    "error.invalid_timezone": "Недопустымый часовой пояс.",
-    "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.invalid_timezone": "Недопустимый часовой пояс.",
+    "error.network_operation": "Miniflux не может открыть сайт из-за ошибки сети: %v.",
+    "error.network_timeout": "Этот сайт слишком медленный и время ожидания запроса истекло: %v",
     "error.password_min_length": "Вы должны использовать минимум 6 символов.",
     "error.pocket_access_token": "Не удалось получить ключ доступа от Pocket!",
     "error.pocket_request_token": "Не удалось получить request token от Pocket!",
-    "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
-    "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
-    "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
-    "error.settings_block_rule_separator_required": "Invalid Block rule: rule #%d's pattern is required to be seperated by a '='",
-    "error.settings_invalid_domain_list": "Invalid domain list. Please provide a space separated list of domains.",
-    "error.settings_keep_rule_fieldname_invalid": "Invalid Keep rule: rule #%d is missing a valid field name (Options: %s)",
-    "error.settings_keep_rule_invalid_regex": "Invalid Keep rule: rule #%d's pattern is not a valid regex",
-    "error.settings_keep_rule_regex_required": "Invalid Keep rule: rule #%d pattern is not provided",
-    "error.settings_keep_rule_separator_required": "Invalid Keep rule: rule #%d's pattern is required to be seperated by a '='",
+    "error.proxy_url_not_empty": "URL прокси не может быть пустым.",
+    "error.settings_block_rule_fieldname_invalid": "Недопустимое правило блокировки: у правила #%d отсутствует корректное имя поля (Возможные варианты: %s)",
+    "error.settings_block_rule_invalid_regex": "Недопустимое правило блокировки: шаблон правила #%d не является корректным регулярным выражением",
+    "error.settings_block_rule_regex_required": "Недопустимое правило блокировки: не указан шаблон для правила #%d",
+    "error.settings_block_rule_separator_required": "Недопустимое правило блокировки: шаблон правила #%d должен быть отделен символом '='",
+    "error.settings_invalid_domain_list": "Недопустимый список доменов. Пожалуйста, укажите список доменов, разделенных пробелами.",
+    "error.settings_keep_rule_fieldname_invalid": "Недопустимое правило сохранения: у правила #%d отсутствует корректное имя поля (Возможные варианты: %s)",
+    "error.settings_keep_rule_invalid_regex": "Недопустимое правило сохранения: шаблон правила #%d не является корректным регулярным выражением",
+    "error.settings_keep_rule_regex_required": "Недопустимое правило сохранения: не указан шаблон для правила #%d",
+    "error.settings_keep_rule_separator_required": "Недопустимое правило сохранения: шаблон правила #%d должен быть отделен символом '='",
     "error.settings_mandatory_fields": "Имя пользователя, тема, язык и часовой пояс обязательны.",
     "error.settings_media_playback_rate_range": "Скорость воспроизведения выходит за пределы диапазона",
     "error.settings_reading_speed_is_positive": "Скорость чтения должна быть целым положительным числом.",
     "error.site_url_not_empty": "Ссылка на сайт не может быть пустой.",
     "error.subscription_not_found": "Не удалось найти подписки.",
     "error.title_required": "Название обязательно.",
-    "error.tls_error": "TLS error: %q. You could disable TLS verification in the feed settings if you would like.",
+    "error.tls_error": "Ошибка TLS: %q. Вы можете отключить проверку TLS в настройках подписки.",
     "error.unable_to_create_api_key": "Невозможно создать этот API-ключ.",
     "error.unable_to_create_category": "Не удалось создать эту категорию.",
     "error.unable_to_create_user": "Не удалось создать этого пользователя.",
-    "error.unable_to_detect_rssbridge": "Unable to detect feed using RSS-Bridge: %v.",
-    "error.unable_to_parse_feed": "Unable to parse this feed: %v.",
+    "error.unable_to_detect_rssbridge": "Не удалось обнаружить подписку с помощью RSS-Bridge: %v.",
+    "error.unable_to_parse_feed": "Не удалось обработать эту подписку: %v.",
     "error.unable_to_update_category": "Не удалось обновить эту категорию.",
     "error.unable_to_update_feed": "Не удалось обновить эту подписку.",
     "error.unable_to_update_user": "Не удалось обновить этого пользователя.",
@@ -160,10 +164,10 @@
     "form.api_key.label.description": "Описание API-ключа",
     "form.category.hide_globally": "Скрыть записи в глобальном списке непрочитанных",
     "form.category.label.title": "Название",
-    "form.feed.fieldset.general": "General",
-    "form.feed.fieldset.integration": "Third-Party Services",
-    "form.feed.fieldset.network_settings": "Network Settings",
-    "form.feed.fieldset.rules": "Rules",
+    "form.feed.fieldset.general": "Общие",
+    "form.feed.fieldset.integration": "Сторонние сервисы",
+    "form.feed.fieldset.network_settings": "Настройки сети",
+    "form.feed.fieldset.rules": "Правила",
     "form.feed.label.allow_self_signed_certificates": "Разрешить самоподписанные или недействительные сертификаты",
     "form.feed.label.apprise_service_urls": "Список ссылок сервисов Apprise, разделенный запятой",
     "form.feed.label.blocklist_rules": "Правила черного списка",
@@ -171,48 +175,49 @@
     "form.feed.label.cookie": "Установить куки",
     "form.feed.label.crawler": "Извлечь оригинальное содержимое",
     "form.feed.label.description": "Описание",
-    "form.feed.label.disable_http2": "Disable HTTP/2 to avoid fingerprinting",
+    "form.feed.label.disable_http2": "Отключить HTTP/2 для предотвращения фингерпринтинга",
     "form.feed.label.disabled": "Не обновлять эту подписку",
     "form.feed.label.feed_password": "Пароль подписки",
     "form.feed.label.feed_url": "Адрес подписки",
     "form.feed.label.feed_username": "Имя пользователя подписки",
-    "form.feed.label.fetch_via_proxy": "Использовать прокси",
+    "form.feed.label.fetch_via_proxy": "Использовать прокси, настроенный на уровне приложения",
     "form.feed.label.hide_globally": "Скрыть записи в глобальном списке непрочитанных",
     "form.feed.label.ignore_http_cache": "Игнорировать HTTP кеш",
     "form.feed.label.keeplist_rules": "Правила белого списка",
     "form.feed.label.no_media_player": "Отключить медиаплеер (аудио и видео)",
-    "form.feed.label.ntfy_activate": "Push entries to ntfy",
-    "form.feed.label.ntfy_default_priority": "Ntfy default priority",
-    "form.feed.label.ntfy_high_priority": "Ntfy high priority",
-    "form.feed.label.ntfy_low_priority": "Ntfy low priority",
-    "form.feed.label.ntfy_max_priority": "Ntfy max priority",
-    "form.feed.label.ntfy_min_priority": "Ntfy min priority",
-    "form.feed.label.ntfy_priority": "Ntfy priority",
-    "form.feed.label.ntfy_topic": "Ntfy topic (optional)",
-    "form.feed.label.pushover_activate": "Push entries to pushover.net",
-    "form.feed.label.pushover_default_priority": "Pushover default priority",
-    "form.feed.label.pushover_high_priority": "Pushover high priority",
-    "form.feed.label.pushover_low_priority": "Pushover low priority",
-    "form.feed.label.pushover_max_priority": "Pushover max priority",
-    "form.feed.label.pushover_min_priority": "Pushover min priority",
-    "form.feed.label.pushover_priority": "Pushover message priority",
+    "form.feed.label.ntfy_activate": "Отправлять статьи в ntfy",
+    "form.feed.label.ntfy_default_priority": "По умолчанию",
+    "form.feed.label.ntfy_high_priority": "Высший",
+    "form.feed.label.ntfy_low_priority": "Низкий",
+    "form.feed.label.ntfy_max_priority": "Высокий",
+    "form.feed.label.ntfy_min_priority": "Минимальный",
+    "form.feed.label.ntfy_priority": "Приоритет ntfy",
+    "form.feed.label.ntfy_topic": "Топик ntfy (опционально)",
+    "form.feed.label.proxy_url": "URL прокси",
+    "form.feed.label.pushover_activate": "Отправлять статьи в pushover.net",
+    "form.feed.label.pushover_default_priority": "По умолчанию",
+    "form.feed.label.pushover_high_priority": "Высокий",
+    "form.feed.label.pushover_low_priority": "Низкий",
+    "form.feed.label.pushover_max_priority": "Высший",
+    "form.feed.label.pushover_min_priority": "Минимальный",
+    "form.feed.label.pushover_priority": "Приоритет сообщений Pushover",
     "form.feed.label.rewrite_rules": "Правила перезаписи",
     "form.feed.label.scraper_rules": "Правила сборщика",
     "form.feed.label.site_url": "Адрес сайта",
     "form.feed.label.title": "Название",
     "form.feed.label.urlrewrite_rules": "Правила перезаписи URL",
     "form.feed.label.user_agent": "Переопределить User-Agent по умолчанию",
-    "form.feed.label.webhook_url": "Override webhook url",
+    "form.feed.label.webhook_url": "Переопределить URL вебхука",
     "form.import.label.file": "OPML файл",
     "form.import.label.url": "Ссылка",
     "form.integration.apprise_activate": "Отправить статьи в Apprise",
     "form.integration.apprise_services_url": "Список ссылок сервисов Apprise, разделенный запятой",
     "form.integration.apprise_url": "Ссылка на Apprise API",
-    "form.integration.betula_activate": "Сохранять статьи в Бетулу",
-    "form.integration.betula_token": "Токен Бетулы",
-    "form.integration.betula_url": "Адрес сервера Бетулы",
-    "form.integration.cubox_activate": "Save entries to Cubox",
-    "form.integration.cubox_api_link": "Cubox API link",
+    "form.integration.betula_activate": "Сохранять статьи в Betula",
+    "form.integration.betula_token": "Токен Betula",
+    "form.integration.betula_url": "Адрес сервера Betula",
+    "form.integration.cubox_activate": "Сохранять статьи в Cubox",
+    "form.integration.cubox_api_link": "Ссылка на Cubox API",
     "form.integration.discord_activate": "Отправить статьи в Discord",
     "form.integration.discord_webhook_link": "Ссылка на Discord Webhook",
     "form.integration.espial_activate": "Сохранять статьи в Espial",
@@ -230,12 +235,12 @@
     "form.integration.instapaper_activate": "Сохранять статьи в Instapaper",
     "form.integration.instapaper_password": "Пароль Instapaper",
     "form.integration.instapaper_username": "Имя пользователя Instapaper",
-    "form.integration.linkace_activate": "Save entries to LinkAce",
-    "form.integration.linkace_api_key": "LinkAce API key",
-    "form.integration.linkace_check_disabled": "Disable link check",
-    "form.integration.linkace_endpoint": "LinkAce API Endpoint",
-    "form.integration.linkace_is_private": "Mark link as private",
-    "form.integration.linkace_tags": "LinkAce Tags",
+    "form.integration.linkace_activate": "Сохранять статьи в LinkAce",
+    "form.integration.linkace_api_key": "API-ключ LinkAce",
+    "form.integration.linkace_check_disabled": "Отключить проверку ссылок",
+    "form.integration.linkace_endpoint": "Конечная точка LinkAce API",
+    "form.integration.linkace_is_private": "Отмечать ссылки как приватные",
+    "form.integration.linkace_tags": "Теги LinkAce",
     "form.integration.linkding_activate": "Сохранять статьи в Linkding",
     "form.integration.linkding_api_key": "API-ключ Linkding",
     "form.integration.linkding_bookmark": "Помечать закладки как непрочитанное",
@@ -244,7 +249,7 @@
     "form.integration.linkwarden_activate": "Сохранять статьи в Linkwarden",
     "form.integration.linkwarden_api_key": "API-ключ Linkwarden",
     "form.integration.linkwarden_endpoint": "Конечная точка Linkwarden API",
-    "form.integration.matrix_bot_activate": "Репостить новые статьи в Matrix",
+    "form.integration.matrix_bot_activate": "Отправлять статьи в Matrix",
     "form.integration.matrix_bot_chat_id": "ID комнаты Matrix",
     "form.integration.matrix_bot_password": "Пароль пользователя Matrix",
     "form.integration.matrix_bot_url": "Ссылка на сервер Matrix",
@@ -252,14 +257,14 @@
     "form.integration.notion_activate": "Сохранить статьи в Notion",
     "form.integration.notion_page_id": "Идентификатор страницы Notion",
     "form.integration.notion_token": "Секретный токен Notion",
-    "form.integration.ntfy_activate": "Push entries to ntfy",
-    "form.integration.ntfy_api_token": "Ntfy API Token (optional)",
-    "form.integration.ntfy_icon_url": "Ntfy Icon URL (optional)",
-    "form.integration.ntfy_internal_links": "Use internal links on click (optional)",
-    "form.integration.ntfy_password": "Ntfy Password (optional)",
-    "form.integration.ntfy_topic": "Ntfy topic (default if not set in feed)",
-    "form.integration.ntfy_url": "Ntfy URL (optional, default is ntfy.sh)",
-    "form.integration.ntfy_username": "Ntfy Username (optional)",
+    "form.integration.ntfy_activate": "Отправлять статьи в ntfy",
+    "form.integration.ntfy_api_token": "API-токен ntfy (опционально)",
+    "form.integration.ntfy_icon_url": "URL иконки ntfy (опционально)",
+    "form.integration.ntfy_internal_links": "Использовать внутренние ссылки по клику (опционально)",
+    "form.integration.ntfy_password": "Пароль ntfy (опционально)",
+    "form.integration.ntfy_topic": "Тема ntfy (по умолчанию, если не задана в подписке)",
+    "form.integration.ntfy_url": "URL ntfy (опционально, по умолчанию ntfy.sh)",
+    "form.integration.ntfy_username": "Имя пользователя ntfy (опционально)",
     "form.integration.nunux_keeper_activate": "Сохранять статьи в Nunux Keeper",
     "form.integration.nunux_keeper_api_key": "API-ключ Nunux Keeper",
     "form.integration.nunux_keeper_endpoint": "Конечная точка Nunux Keeper API",
@@ -274,15 +279,15 @@
     "form.integration.pocket_activate": "Сохранять статьи в Pocket",
     "form.integration.pocket_connect_link": "Подключить аккаунт Pocket",
     "form.integration.pocket_consumer_key": "Ключ пользователя Pocket",
-    "form.integration.pushover_activate": "Push entries to Pushover",
-    "form.integration.pushover_device": "Pushover device (optional)",
-    "form.integration.pushover_prefix": "Pushover URL prefix (optional)",
-    "form.integration.pushover_token": "Pushover application API token",
-    "form.integration.pushover_user": "Pushover user key",
-    "form.integration.raindrop_activate": "Save entries to Raindrop",
-    "form.integration.raindrop_collection_id": "Collection ID",
-    "form.integration.raindrop_tags": "Tags (comma-separated)",
-    "form.integration.raindrop_token": "(Test) Token",
+    "form.integration.pushover_activate": "Отправлять статьи Pushover",
+    "form.integration.pushover_device": "Устройство Pushover (опционально)",
+    "form.integration.pushover_prefix": "URL-префикс Pushover (опционально)",
+    "form.integration.pushover_token": "API-токен приложения Pushover",
+    "form.integration.pushover_user": "Пользовательский ключ Pushover",
+    "form.integration.raindrop_activate": "Сохранять статьи в Raindrop",
+    "form.integration.raindrop_collection_id": "ID коллекции",
+    "form.integration.raindrop_tags": "Теги (через запятую)",
+    "form.integration.raindrop_token": "Токен (тестовый)",
     "form.integration.readeck_activate": "Сохранять статьи в Readeck",
     "form.integration.readeck_api_key": "API-ключ Readeck",
     "form.integration.readeck_endpoint": "Конечная точка Readeck API",
@@ -291,8 +296,9 @@
     "form.integration.readwise_activate": "Сохранить статьи в Readwise",
     "form.integration.readwise_api_key": "Токен доступа в Readwise",
     "form.integration.readwise_api_key_link": "Получить токен доступа Readwise",
-    "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
-    "form.integration.rssbridge_url": "RSS-Bridge server URL",
+    "form.integration.rssbridge_activate": "Проверять RSS-Bridge при добавлении подписок",
+    "form.integration.rssbridge_token": "Токен аутентификации RSS-Bridge",
+    "form.integration.rssbridge_url": "URL сервера RSS-Bridge",
     "form.integration.shaarli_activate": "Сохранить статьи в Shaarli",
     "form.integration.shaarli_api_secret": "Секретный ключ Shaarli API",
     "form.integration.shaarli_endpoint": "Ссылка Shaarli",
@@ -302,13 +308,13 @@
     "form.integration.shiori_username": "Имя пользователя Shiori",
     "form.integration.slack_activate": "Отправить статьи в Slack",
     "form.integration.slack_webhook_link": "Ссылка на Slack Webhook",
-    "form.integration.telegram_bot_activate": "Репостить новые статьи в Telegram-чат",
-    "form.integration.telegram_bot_disable_buttons": "Disable buttons",
-    "form.integration.telegram_bot_disable_notification": "Disable notification",
-    "form.integration.telegram_bot_disable_web_page_preview": "Disable web page preview",
+    "form.integration.telegram_bot_activate": "Отправлять статьи в Telegram-чат",
+    "form.integration.telegram_bot_disable_buttons": "Отключить кнопки",
+    "form.integration.telegram_bot_disable_notification": "Отключить уведомления",
+    "form.integration.telegram_bot_disable_web_page_preview": "Отключить предпросмотр веб-страниц",
     "form.integration.telegram_bot_token": "Токен бота",
     "form.integration.telegram_chat_id": "ID чата",
-    "form.integration.telegram_topic_id": "Topic ID",
+    "form.integration.telegram_topic_id": "ID топика",
     "form.integration.wallabag_activate": "Сохранять статьи в Wallabag",
     "form.integration.wallabag_client_id": "Номер клиента Wallabag",
     "form.integration.wallabag_client_secret": "Секретный код клиента Wallabag",
@@ -319,11 +325,11 @@
     "form.integration.webhook_activate": "Включить вебхуки",
     "form.integration.webhook_secret": "Секретный ключ для вебхуков",
     "form.integration.webhook_url": "Адрес вебхуков",
-    "form.prefs.fieldset.application_settings": "Application Settings",
-    "form.prefs.fieldset.authentication_settings": "Authentication Settings",
-    "form.prefs.fieldset.global_feed_settings": "Global Feed Settings",
-    "form.prefs.fieldset.reader_settings": "Reader Settings",
-    "form.prefs.help.external_font_hosts": "Space separated list of external font hosts to allow. For example: \"fonts.gstatic.com fonts.googleapis.com\".",
+    "form.prefs.fieldset.application_settings": "Настройки приложения",
+    "form.prefs.fieldset.authentication_settings": "Настройки аутентификации",
+    "form.prefs.fieldset.global_feed_settings": "Глобальные настройки подписок",
+    "form.prefs.fieldset.reader_settings": "Настройки чтения",
+    "form.prefs.help.external_font_hosts": "Список разрешённых внешних хостов для шрифтов, разделенных пробелами. Например: \"fonts.gstatic.com fonts.googleapis.com\".",
     "form.prefs.label.categories_sorting_order": "Сортировка категорий",
     "form.prefs.label.cjk_reading_speed": "Скорость чтения на китайском, корейском и японском языках (знаков в минуту)",
     "form.prefs.label.custom_css": "Пользовательский CSS",
@@ -335,15 +341,16 @@
     "form.prefs.label.entry_order": "Столбец сортировки статей",
     "form.prefs.label.entry_sorting": "Сортировка статей",
     "form.prefs.label.entry_swipe": "Включить пролистывание свайпом на сенсорных экранах",
-    "form.prefs.label.external_font_hosts": "External font hosts",
+    "form.prefs.label.external_font_hosts": "Внешние хосты шрифтов",
     "form.prefs.label.gesture_nav": "Жест для перехода между статьями",
     "form.prefs.label.keyboard_shortcuts": "Включить горячие клавиши",
     "form.prefs.label.language": "Язык",
-    "form.prefs.label.mark_read_manually": "Mark entries as read manually",
-    "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": "Отмечать статьи как прочитанные вручную",
+    "form.prefs.label.mark_read_on_media_completion": "Отмечать как прочитанное только когда воспроизведение аудио/видео достигает 90%% завершения",
     "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_view_or_media_completion": "Отмечать статьи как прочитанные при просмотре. Для аудио/видео - при 90%% завершения воспроизведения",
     "form.prefs.label.media_playback_rate": "Скорость воспроизведения аудио/видео",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Показать примерное время чтения статей",
     "form.prefs.label.theme": "Тема",
     "form.prefs.label.timezone": "Часовой пояс",
@@ -380,7 +387,7 @@
     "menu.feeds": "Подписки",
     "menu.flush_history": "Очистить историю",
     "menu.history": "История",
-    "menu.home_page": "Home page",
+    "menu.home_page": "Главная",
     "menu.import": "Импорт",
     "menu.integrations": "Интеграции",
     "menu.logout": "Выйти",
@@ -397,17 +404,18 @@
     "menu.show_only_starred_entries": "Показывать только избранные статьи",
     "menu.show_only_unread_entries": "Показывать только непрочитанные статьи",
     "menu.starred": "Избранное",
-    "menu.title": "Menu",
+    "menu.title": "Меню",
     "menu.unread": "Непрочитанное",
     "menu.users": "Пользователи",
     "page.about.author": "Автор:",
     "page.about.build_date": "Дата сборки:",
     "page.about.credits": "Авторы",
-    "page.about.db_usage": "Database size:",
+    "page.about.db_usage": "Размер базы данных:",
+    "page.about.git_commit": "Git-коммит:",
     "page.about.global_config_options": "Глобальные параметры конфигурации",
     "page.about.go_version": "Версия Go:",
     "page.about.license": "Лицензия:",
-    "page.about.postgres_version": "Версия Postgres:",
+    "page.about.postgres_version": "Версия PostgreSQL:",
     "page.about.title": "О приложении",
     "page.about.version": "Версия:",
     "page.add_feed.choose_feed": "Выберите подписку",
@@ -423,7 +431,7 @@
     "page.api_keys.table.last_used_at": "Последнее использование",
     "page.api_keys.table.token": "Токен",
     "page.api_keys.title": "API-ключи",
-    "page.categories.entries": "Cтатьи",
+    "page.categories.entries": "Статьи",
     "page.categories.feed_count": [
         "Есть %d подписка.",
         "Есть %d подписки.",
@@ -433,11 +441,11 @@
     "page.categories.no_feed": "Нет подписок.",
     "page.categories.title": "Категории",
     "page.categories_count": [
-        "%d category",
-        "%d categories",
-        "%d categories"
+        "%d категория",
+        "%d категории",
+        "%d категорий"
     ],
-    "page.category_label": "Category: %s",
+    "page.category_label": "Категории: %s",
     "page.edit_category.title": "Изменить категорию: %s",
     "page.edit_feed.etag_header": "Заголовок ETag:",
     "page.edit_feed.last_check": "Последняя проверка:",
@@ -452,8 +460,8 @@
         "%d ошибки",
         "%d ошибок"
     ],
-    "page.feeds.last_check": "Последняя проверка:",
-    "page.feeds.next_check": "Next check:",
+    "page.feeds.last_check": "Последнее обновление:",
+    "page.feeds.next_check": "Следующее обновление:",
     "page.feeds.read_counter": "Количество прочитанных статей",
     "page.feeds.title": "Подписки",
     "page.history.title": "История",
@@ -509,7 +517,7 @@
     "page.login.title": "Войти",
     "page.login.webauthn_login": "Войти с паролем",
     "page.login.webauthn_login.error": "Невозможно войти с паролем",
-    "page.login.webauthn_login.help": "Please enter your username if you're using a security key. This is not required if you are using a Passkey (discoverable credentials).",
+    "page.login.webauthn_login.help": "Пожалуйста, введите имя пользователя, если вы используете ключ безопасности. Это не требуется при использовании Passkey (обнаруживаемые учетные данные).",
     "page.new_api_key.title": "Новый API-ключ",
     "page.new_category.title": "Новая категория",
     "page.new_user.title": "Новый пользователь",
@@ -517,9 +525,9 @@
     "page.offline.refresh_page": "Попробуйте обновить страницу",
     "page.offline.title": "Автономный режим",
     "page.read_entry_count": [
-        "%d read entry",
-        "%d read entries",
-        "%d read entries"
+        "%d прочитанная статья",
+        "%d прочитанных статьи",
+        "%d прочитанных статей"
     ],
     "page.search.title": "Результаты поиска",
     "page.sessions.table.actions": "Действия",
@@ -533,40 +541,40 @@
     "page.settings.title": "Настройки",
     "page.settings.unlink_google_account": "Отвязать мой Google аккаунт",
     "page.settings.unlink_oidc_account": "Отвязать мой %s аккаунт",
-    "page.settings.webauthn.actions": "Actions",
-    "page.settings.webauthn.added_on": "Added On",
+    "page.settings.webauthn.actions": "Действия",
+    "page.settings.webauthn.added_on": "Добавлен",
     "page.settings.webauthn.delete": [
         "Удалить %d пароль",
         "Удалить %d пароля",
         "Удалить %d пароля"
     ],
-    "page.settings.webauthn.last_seen_on": "Last Used",
-    "page.settings.webauthn.passkey_name": "Passkey Name",
-    "page.settings.webauthn.passkeys": "Passkeys",
+    "page.settings.webauthn.last_seen_on": "Последнее использование",
+    "page.settings.webauthn.passkey_name": "Название ключа доступа",
+    "page.settings.webauthn.passkeys": "Ключи доступа",
     "page.settings.webauthn.register": "Зарегистрировать пароль",
     "page.settings.webauthn.register.error": "Не удается зарегистрировать пароль",
     "page.shared_entries.title": "Общедоступные статьи",
     "page.shared_entries_count": [
-        "%d shared entry",
-        "%d shared entries",
-        "%d shared entries"
+        "%d общедоступная статья",
+        "%d общедоступных статьи",
+        "%d общедоступных статей"
     ],
     "page.starred.title": "Избранное",
     "page.starred_entry_count": [
-        "%d starred entry",
-        "%d starred entries",
-        "%d starred entries"
+        "%d избранная статья",
+        "%d избранные статьи",
+        "%d избранных статей"
     ],
     "page.total_entry_count": [
-        "%d entry in total",
-        "%d entries in total",
-        "%d entries in total"
+        "%d статья всего",
+        "%d статьи всего",
+        "%d статей всего"
     ],
     "page.unread.title": "Непрочитанное",
     "page.unread_entry_count": [
-        "%d unread entry",
-        "%d unread entries",
-        "%d unread entries"
+        "%d непрочитанная статья",
+        "%d непрочитанных статьи",
+        "%d непрочитанных статей"
     ],
     "page.users.actions": "Действия",
     "page.users.admin.no": "Нет",
@@ -576,15 +584,15 @@
     "page.users.never_logged": "Никогда",
     "page.users.title": "Пользователи",
     "page.users.username": "Имя пользователя",
-    "page.webauthn_rename.title": "Rename Passkey",
-    "pagination.first": "First",
-    "pagination.last": "Last",
+    "page.webauthn_rename.title": "Переименовать ключ доступа",
+    "pagination.first": "Первая",
+    "pagination.last": "Последняя",
     "pagination.next": "Следующая",
     "pagination.previous": "Предыдущая",
     "search.label": "Поиск",
     "search.placeholder": "Поиск…",
-    "search.submit": "Search",
-    "skip_to_content": "Skip to content",
+    "search.submit": "Искать",
+    "skip_to_content": "Перейти к содержимому",
     "time_elapsed.days": [
         "%d день назад",
         "%d дня назад",

internal/locale/translations/tr_TR.json

@@ -72,10 +72,10 @@
     "entry.state.loading": "Yükleniyor...",
     "entry.state.saving": "Kaydediliyor...",
     "entry.status.mark_as_read": "Okundu olarak işaretle",
+    "entry.status.mark_as_unread": "Okunmadı olarak işaretle",
     "entry.status.title": "Makele okundu durumunu değiştir",
     "entry.status.toast.read": "Okundu olarak işaretlendi",
     "entry.status.toast.unread": "Okunmamış olarak işaretlendi",
-    "entry.status.mark_as_unread": "Okunmadı olarak işaretle",
     "entry.tags.label": "Etiketler:",
     "entry.unshare.label": "Paylaşma",
     "error.api_key_already_exists": "Bu API anahtarı zaten mevcut.",
@@ -114,9 +114,12 @@
     "error.http_service_unavailable": "Dahili sunucu hatası nedeniyle web sitesi şu anda kullanılamıyor. Sorun Miniflux tarafında değil. Lütfen daha sonra tekrar deneyiniz.",
     "error.http_too_many_requests": "Miniflux bu web sitesine çok fazla istek oluşturdu. Lütfen daha sonra tekrar deneyin veya uygulama yapılandırmasını değiştirin.",
     "error.http_unexpected_status_code": "Beklenmeyen bir HTTP durum kodu nedeniyle bu websitesi şu anda kullanılamıyor: %d. Sorun Miniflux tarafında değil. Lütfen daha sonra tekrar deneyiniz.",
+    "error.invalid_categories_sorting_order": "Geçersiz kategori sıralama düzeni.",
     "error.invalid_default_home_page": "Geçersiz varsayılan ana sayfa!",
     "error.invalid_display_mode": "Geçersiz web uygulaması görüntüleme modu.",
     "error.invalid_entry_direction": "Geçersiz makele sıralaması.",
+    "error.invalid_entry_order": "Geçersiz makele sıralaması.",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "Geçersiz besleme URL'si.",
     "error.invalid_gesture_nav": "Hareketle gezinme geçersiz.",
     "error.invalid_language": "Geçersiz dil.",
@@ -128,6 +131,7 @@
     "error.password_min_length": "Parola en az 6 karakter içermeli.",
     "error.pocket_access_token": "Pocket'tan access tokeni alınamıyor!",
     "error.pocket_request_token": "Pocket'tan request tokeni alınamıyor!",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Geçersiz Engelleme kuralı: #%d kuralında geçerli bir alan adı eksik (Seçenekler: %s)",
     "error.settings_block_rule_invalid_regex": "Geçersiz Engelleme kuralı: #%d kuralı modeli geçerli bir düzenli ifade değil",
     "error.settings_block_rule_regex_required": "Geçersiz Engelleme kuralı: #%d kuralı modeli sağlanmadı",
@@ -174,7 +178,7 @@
     "form.feed.label.feed_password": "Besleme Parolası",
     "form.feed.label.feed_url": "Besleme URL'si",
     "form.feed.label.feed_username": "Besleme Kullanıcı Adı",
-    "form.feed.label.fetch_via_proxy": "Proxy ile çek",
+    "form.feed.label.fetch_via_proxy": "Uygulama düzeyinde yapılandırılmış proxy'yi kullan",
     "form.feed.label.hide_globally": "Genel okunmamış listesindeki girişleri gizle",
     "form.feed.label.ignore_http_cache": "HTTP önbelleğini yoksay",
     "form.feed.label.keeplist_rules": "Saklama Kuralları",
@@ -187,6 +191,7 @@
     "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.label.ntfy_priority": "Ntfy priority",
     "form.feed.label.ntfy_topic": "Ntfy topic (optional)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to pushover.net",
     "form.feed.label.pushover_default_priority": "Pushover default priority",
     "form.feed.label.pushover_high_priority": "Pushover high priority",
@@ -290,6 +295,7 @@
     "form.integration.readwise_api_key": "Readwise Reader Access Token",
     "form.integration.readwise_api_key_link": "Readwise Access Token'ınızı alın",
     "form.integration.rssbridge_activate": "Abonelik eklerken RSS-Bridge'i kontrol edin",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
     "form.integration.shaarli_activate": "Makaleleri Shaarli'ye kaydet",
     "form.integration.shaarli_api_secret": "Shaarli API Secret",
@@ -342,6 +348,7 @@
     "form.prefs.label.mark_read_on_view": "Makaleler görüntülendiğinde otomatik olarak okundu olarak işaretle",
     "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.media_playback_rate": "Ses/video oynatma hızı",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Makaleler için tahmini okuma süresini göster",
     "form.prefs.label.theme": "Tema",
     "form.prefs.label.timezone": "Saat Dilimi",
@@ -402,6 +409,7 @@
     "page.about.build_date": "Oluşturulma Tarihi:",
     "page.about.credits": "Katkıda Bulunanlar",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "Global yapılandırma seçenekleri",
     "page.about.go_version": "Go sürümü:",
     "page.about.license": "Lisans:",

internal/locale/translations/uk_UA.json

@@ -74,10 +74,10 @@
     "entry.state.loading": "Завантаження...",
     "entry.state.saving": "Зберігаю...",
     "entry.status.mark_as_read": "Позначити як прочитане",
+    "entry.status.mark_as_unread": "Позначити як непрочитане",
     "entry.status.title": "Змінити стан запису",
     "entry.status.toast.read": "Відмічено прочитаним",
     "entry.status.toast.unread": "Відмічено непрочитаним",
-    "entry.status.mark_as_unread": "Позначити як непрочитане",
     "entry.tags.label": "Теги:",
     "entry.unshare.label": "Не ділитися",
     "error.api_key_already_exists": "Такий ключ API вже існує.",
@@ -116,9 +116,12 @@
     "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_too_many_requests": "Miniflux generated too many requests to this website. Please, try again later or change the application configuration.",
     "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.invalid_categories_sorting_order": "Недійсний порядок сортування категорій.",
     "error.invalid_default_home_page": "Недійсна домашня сторінка за замовчуванням!",
     "error.invalid_display_mode": "Недійсний режим відображення.",
     "error.invalid_entry_direction": "Недійсний напрямок запису.",
+    "error.invalid_entry_order": "Недійсний порядок запису.",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "Недійсна URL-адреса стрічки.",
     "error.invalid_gesture_nav": "Недійсна навігація жестами.",
     "error.invalid_language": "Недійсна мова.",
@@ -130,6 +133,7 @@
     "error.password_min_length": "Пароль має складати щонайменше 6 символів.",
     "error.pocket_access_token": "Не вдалося отримати токен доступу з Pocket!",
     "error.pocket_request_token": "Не вдалося отримати токен доступу з Pocket!",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "Invalid Block rule: rule #%d is missing a valid field name (Options: %s)",
     "error.settings_block_rule_invalid_regex": "Invalid Block rule: rule #%d's pattern is not a valid regex",
     "error.settings_block_rule_regex_required": "Invalid Block rule: rule #%d's pattern is not provided",
@@ -176,7 +180,7 @@
     "form.feed.label.feed_password": "Пароль для завантаження",
     "form.feed.label.feed_url": "URL-адреса стрічки",
     "form.feed.label.feed_username": "Ім’я користувача для завантаження",
-    "form.feed.label.fetch_via_proxy": "Використати проксі-сервер",
+    "form.feed.label.fetch_via_proxy": "Використовувати проксі, налаштований на рівні програми",
     "form.feed.label.hide_globally": "Приховати записи в глобальному списку непрочитаного",
     "form.feed.label.ignore_http_cache": "Ігнорувати кеш HTTP",
     "form.feed.label.keeplist_rules": "Правила дозволення",
@@ -189,6 +193,7 @@
     "form.feed.label.ntfy_min_priority": "Ntfy min priority",
     "form.feed.label.ntfy_priority": "Ntfy priority",
     "form.feed.label.ntfy_topic": "Ntfy topic (optional)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to pushover.net",
     "form.feed.label.pushover_default_priority": "Pushover default priority",
     "form.feed.label.pushover_high_priority": "Pushover high priority",
@@ -292,6 +297,7 @@
     "form.integration.readwise_api_key": "Readwise Reader Access Token",
     "form.integration.readwise_api_key_link": "Get your Readwise Access Token",
     "form.integration.rssbridge_activate": "Check RSS-Bridge when adding subscriptions",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge server URL",
     "form.integration.shaarli_activate": "Save articles to Shaarli",
     "form.integration.shaarli_api_secret": "Shaarli API Secret",
@@ -344,6 +350,7 @@
     "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.media_playback_rate": "Швидкість відтворення аудіо/відео",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "Показувати приблизний час читання для записів",
     "form.prefs.label.theme": "Тема",
     "form.prefs.label.timezone": "Часовий пояс",
@@ -404,6 +411,7 @@
     "page.about.build_date": "Дата побудови:",
     "page.about.credits": "Титри",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "Параметри глобальної конфігурації",
     "page.about.go_version": "Версія Go:",
     "page.about.license": "Ліцензія:",

internal/locale/translations/zh_CN.json

@@ -13,7 +13,7 @@
     "action.update": "更新",
     "alert.account_linked": "您的外部账号已关联！",
     "alert.account_unlinked": "您的外部帐户现已解除关联！",
-    "alert.background_feed_refresh": "所有的订阅源都在后台刷新中。您可以继续使用Miniflux，同时此过程正在运行。",
+    "alert.background_feed_refresh": "所有订阅源正在后台更新。此过程中您仍可继续使用 Miniflux。",
     "alert.feed_error": "该源存在问题",
     "alert.no_bookmark": "目前没有收藏",
     "alert.no_category": "目前没有分类",
@@ -70,10 +70,10 @@
     "entry.state.loading": "载入中…",
     "entry.state.saving": "保存中…",
     "entry.status.mark_as_read": "标为已读",
+    "entry.status.mark_as_unread": "标为未读",
     "entry.status.title": "更改状态",
     "entry.status.toast.read": "已标为已读",
     "entry.status.toast.unread": "已标为未读",
-    "entry.status.mark_as_unread": "标为未读",
     "entry.tags.label": "标签：",
     "entry.unshare.label": "取消分享",
     "error.api_key_already_exists": "此 API 密钥已存在。",
@@ -98,34 +98,38 @@
     "error.feed_title_not_empty": "订阅源的标题不能为空。",
     "error.feed_url_not_empty": "订阅源的网址不能为空。",
     "error.fields_mandatory": "必须填写全部信息",
-    "error.http_bad_gateway": "当前由于错误的网关导致该网站无法访问，问题不在Miniflux，请稍后重试。",
+    "error.http_bad_gateway": "当前由于错误的网关导致该网站无法访问，问题不在 Miniflux，请稍后重试。",
     "error.http_body_read": "无法读取HTTP主体: %v。",
     "error.http_client_error": "HTTP 客户端错误r: %v。",
-    "error.http_empty_response": "HTTP响应内容为空，该网站可能正在使用机器人保护机制。",
-    "error.http_empty_response_body": "HTTP响应主体为空。",
+    "error.http_empty_response": "HTTP 响应内容为空，该网站可能正在使用机器人保护机制。",
+    "error.http_empty_response_body": "HTTP 响应主体为空。",
     "error.http_forbidden": "该网站被禁止访问，网站可能有机器人保护机制？",
-    "error.http_gateway_timeout": "当前由于网关超时导致该网站无法访问，问题不在Miniflux，请稍后重试。",
-    "error.http_internal_server_error": "当前由于服务器错误导致该网站无法访问，问题不在Miniflux，请稍后重试。",
+    "error.http_gateway_timeout": "当前由于网关超时导致该网站无法访问，问题不在 Miniflux，请稍后重试。",
+    "error.http_internal_server_error": "当前由于服务器错误导致该网站无法访问，问题不在 Miniflux，请稍后重试。",
     "error.http_not_authorized": "该网站访问未授权，可能用户名和密码错误。",
-    "error.http_resource_not_found": "请求资源无法找到，请检查URL。",
-    "error.http_response_too_large": "HTTP响应内容过大，您可以在全局设置中增加HTTP响应大小限制（需要服务器重新启动）。",
-    "error.http_service_unavailable": "当前由于服务器内部错误导致该网站无法访问，问题不在Miniflux，请稍后重试。",
+    "error.http_resource_not_found": "请求资源无法找到，请检查 URL。",
+    "error.http_response_too_large": "HTTP 响应内容过大，您可以在全局设置中增加 HTTP 响应大小限制（需要服务器重新启动）。",
+    "error.http_service_unavailable": "当前由于服务器内部错误导致该网站无法访问，问题不在 Miniflux，请稍后重试。",
     "error.http_too_many_requests": "Miniflux 对该网站请求过多次数，请稍后重试或修改应用配置项。",
-    "error.http_unexpected_status_code": "当前由于意外的HTTP状态码：%d 导致该网站无法访问，问题不在Miniflux，请稍后重试。",
+    "error.http_unexpected_status_code": "当前由于意外的 HTTP 状态码：%d 导致该网站无法访问，问题不在 Miniflux，请稍后重试。",
+    "error.invalid_categories_sorting_order": "无效的分类排序",
     "error.invalid_default_home_page": "无效的默认主页!",
     "error.invalid_display_mode": "无效的网页应用显示模式。",
     "error.invalid_entry_direction": "无效的输入方向。",
+    "error.invalid_entry_order": "无效的条目排序",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "订阅源的网址无效。",
     "error.invalid_gesture_nav": "手势导航无效。",
     "error.invalid_language": "无效的语言。",
     "error.invalid_site_url": "源网站的网址无效。",
     "error.invalid_theme": "无效的主题。",
     "error.invalid_timezone": "无效的时区。",
-    "error.network_operation": "Miniflux无法访问该网站由于网络错误: %v。",
+    "error.network_operation": "Miniflux 无法访问该网站由于网络错误: %v。",
     "error.network_timeout": "该网站响应过慢，请求超时: %v",
     "error.password_min_length": "请至少输入 6 个字符",
     "error.pocket_access_token": "无法从 Pocket 获取访问令牌！",
     "error.pocket_request_token": "无法从 Pocket 获取请求令牌！",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "无效的阻止规则: 规则 #%d 缺少合法的字段名 (可选: %s)",
     "error.settings_block_rule_invalid_regex": "无效的阻止规则: 规则 #%d 的模式字符不是合法的正则表达式。",
     "error.settings_block_rule_regex_required": "无效的阻止规则: 规则 #%d 的模式字符没有提供。",
@@ -141,11 +145,11 @@
     "error.site_url_not_empty": "源网站的网址不能为空。",
     "error.subscription_not_found": "找不到任何源",
     "error.title_required": "必须填写标题",
-    "error.tls_error": "TLS 错误: %q。如果您愿意的话可以在订阅源设置里关闭TLS验证。",
+    "error.tls_error": "TLS 错误: %q。如果您愿意的话可以在订阅源设置里关闭 TLS 验证。",
     "error.unable_to_create_api_key": "无法创建此 API 密钥。",
     "error.unable_to_create_category": "无法建立这个分类",
     "error.unable_to_create_user": "无法创建此用户",
-    "error.unable_to_detect_rssbridge": "无法使用RSS-Bridge去检测订阅源: %v。",
+    "error.unable_to_detect_rssbridge": "无法使用 RSS-Bridge 去检测订阅源: %v。",
     "error.unable_to_parse_feed": "无法解析该订阅源: %v。",
     "error.unable_to_update_category": "无法更新该分类",
     "error.unable_to_update_feed": "无法更新此源",
@@ -153,7 +157,7 @@
     "error.unlink_account_without_password": "您必须设置密码，否则您将无法再次登录。",
     "error.user_already_exists": "用户已存在",
     "error.user_mandatory_fields": "必须填写用户名",
-    "form.api_key.label.description": "API密钥标签",
+    "form.api_key.label.description": "API 密钥标签",
     "form.category.hide_globally": "隐藏全局未读列表中的文章",
     "form.category.label.title": "标题",
     "form.feed.fieldset.general": "通用",
@@ -172,40 +176,41 @@
     "form.feed.label.feed_password": "源密码",
     "form.feed.label.feed_url": "订阅源 URL",
     "form.feed.label.feed_username": "源用户名",
-    "form.feed.label.fetch_via_proxy": "通过代理获取",
+    "form.feed.label.fetch_via_proxy": "使用在应用程序级别配置的代理",
     "form.feed.label.hide_globally": "隐藏全局未读列表中的文章",
     "form.feed.label.ignore_http_cache": "忽略 HTTP 缓存",
     "form.feed.label.keeplist_rules": "保留规则",
     "form.feed.label.no_media_player": "没有媒体播放器(音频/视频)",
     "form.feed.label.ntfy_activate": "推送条目到ntfy",
-    "form.feed.label.ntfy_default_priority": "Ntfy默认优先级",
-    "form.feed.label.ntfy_high_priority": "Ntfy高优先级",
-    "form.feed.label.ntfy_low_priority": "Ntfy低优先级",
-    "form.feed.label.ntfy_max_priority": "Ntfy最高优先级",
-    "form.feed.label.ntfy_min_priority": "Ntfy最低优先级",
-    "form.feed.label.ntfy_priority": "Ntfy优先级",
-    "form.feed.label.ntfy_topic": "Ntfy主题（可选）",
-    "form.feed.label.pushover_activate": "Push entries to pushover.net",
-    "form.feed.label.pushover_default_priority": "Pushover default priority",
-    "form.feed.label.pushover_high_priority": "Pushover high priority",
-    "form.feed.label.pushover_low_priority": "Pushover low priority",
-    "form.feed.label.pushover_max_priority": "Pushover max priority",
-    "form.feed.label.pushover_min_priority": "Pushover min priority",
-    "form.feed.label.pushover_priority": "Pushover message priority",
+    "form.feed.label.ntfy_default_priority": "Ntfy 默认优先级",
+    "form.feed.label.ntfy_high_priority": "Ntfy 高优先级",
+    "form.feed.label.ntfy_low_priority": "Ntfy 低优先级",
+    "form.feed.label.ntfy_max_priority": "Ntfy 最高优先级",
+    "form.feed.label.ntfy_min_priority": "Ntfy 最低优先级",
+    "form.feed.label.ntfy_priority": "Ntfy 优先级",
+    "form.feed.label.ntfy_topic": "Ntfy 主题（可选）",
+    "form.feed.label.proxy_url": "Proxy URL",
+    "form.feed.label.pushover_activate": "将条目推送至 pushover.net",
+    "form.feed.label.pushover_default_priority": "Pushover 默认优先级",
+    "form.feed.label.pushover_high_priority": "Pushover 高优先级",
+    "form.feed.label.pushover_low_priority": "Pushover 低优先级",
+    "form.feed.label.pushover_max_priority": "Pushover 最高优先级",
+    "form.feed.label.pushover_min_priority": "Pushover 最低优先级",
+    "form.feed.label.pushover_priority": "Pushover 消息优先级",
     "form.feed.label.rewrite_rules": "重写规则",
     "form.feed.label.scraper_rules": "抓取规则",
     "form.feed.label.site_url": "源网站 URL",
     "form.feed.label.title": "标题",
     "form.feed.label.urlrewrite_rules": "URL 重写规则",
     "form.feed.label.user_agent": "覆盖默认的用户代理",
-    "form.feed.label.webhook_url": "Override webhook url",
+    "form.feed.label.webhook_url": "覆盖 webhook url",
     "form.import.label.file": "OPML 文件",
     "form.import.label.url": "URL",
     "form.integration.apprise_activate": "将新文章推送到 Apprise",
     "form.integration.apprise_services_url": "使用逗号分隔的 Apprise 服务 URL 列表",
     "form.integration.apprise_url": "Apprise API URL",
     "form.integration.betula_activate": "保存文章到 Betula",
-    "form.integration.betula_token": "Betula 密钥",
+    "form.integration.betula_token": "Betula 令牌",
     "form.integration.betula_url": "Betula 服务地址",
     "form.integration.cubox_activate": "保存文章到 Cubox",
     "form.integration.cubox_api_link": "Cubox API 链接",
@@ -247,15 +252,15 @@
     "form.integration.matrix_bot_user": "Matrix Bot 用户名",
     "form.integration.notion_activate": "保存文章到 Notion",
     "form.integration.notion_page_id": "Notion 页面ID",
-    "form.integration.notion_token": "Notion 密钥",
-    "form.integration.ntfy_activate": "推送条目到ntfy",
+    "form.integration.notion_token": "Notion 令牌",
+    "form.integration.ntfy_activate": "推送条目到 ntfy",
     "form.integration.ntfy_api_token": "Ntfy API令牌（可选）",
-    "form.integration.ntfy_icon_url": "Ntfy图标URL（可选）",
-    "form.integration.ntfy_internal_links": "Use internal links on click (optional)",
-    "form.integration.ntfy_password": "Ntfy密码（可选）",
-    "form.integration.ntfy_topic": "Ntfy主题（預設，如果未在此源中定義）",
-    "form.integration.ntfy_url": "Ntfy URL（可选，默认为ntfy.sh）",
-    "form.integration.ntfy_username": "Ntfy用户名（可选）",
+    "form.integration.ntfy_icon_url": "Ntfy 图标 URL （可选）",
+    "form.integration.ntfy_internal_links": "点击时使用内部链接（可选）",
+    "form.integration.ntfy_password": "Ntfy 密码（可选）",
+    "form.integration.ntfy_topic": "Ntfy 主题（預設，如果未在此源中定義）",
+    "form.integration.ntfy_url": "Ntfy URL（可选，默认为 ntfy.sh）",
+    "form.integration.ntfy_username": "Ntfy 用户名（可选）",
     "form.integration.nunux_keeper_activate": "保存文章到 Nunux Keeper",
     "form.integration.nunux_keeper_api_key": "Nunux Keeper API 密钥",
     "form.integration.nunux_keeper_endpoint": "Nunux Keeper API 端点",
@@ -265,29 +270,30 @@
     "form.integration.pinboard_activate": "保存文章到 Pinboard",
     "form.integration.pinboard_bookmark": "标记为未读",
     "form.integration.pinboard_tags": "Pinboard 标签",
-    "form.integration.pinboard_token": "Pinboard API 密钥",
-    "form.integration.pocket_access_token": "Pocket 访问密钥",
+    "form.integration.pinboard_token": "Pinboard API 令牌",
+    "form.integration.pocket_access_token": "Pocket 访问令牌",
     "form.integration.pocket_activate": "将文章保存到 Pocket",
     "form.integration.pocket_connect_link": "连接您的 Pocket 帐户",
     "form.integration.pocket_consumer_key": "Pocket 用户密钥",
-    "form.integration.pushover_activate": "Push entries to Pushover",
-    "form.integration.pushover_device": "Pushover device (optional)",
-    "form.integration.pushover_prefix": "Pushover URL prefix (optional)",
-    "form.integration.pushover_token": "Pushover application API token",
-    "form.integration.pushover_user": "Pushover user key",
+    "form.integration.pushover_activate": "将条目推送至 Pushover",
+    "form.integration.pushover_device": "Pushover 装置（可选）",
+    "form.integration.pushover_prefix": "Pushover URL 前缀（可选）",
+    "form.integration.pushover_token": "Pushover 应用程序 API 令牌",
+    "form.integration.pushover_user": "Pushover 用户密钥",
     "form.integration.raindrop_activate": "保存文章到 Raindrop",
-    "form.integration.raindrop_collection_id": "Collection ID",
-    "form.integration.raindrop_tags": "Tags (comma-separated)",
-    "form.integration.raindrop_token": "(Test) 密钥",
+    "form.integration.raindrop_collection_id": "集合 ID",
+    "form.integration.raindrop_tags": "Tags （逗号分隔）",
+    "form.integration.raindrop_token": "(Test) 令牌",
     "form.integration.readeck_activate": "保存文章到 Readeck",
     "form.integration.readeck_api_key": "Readeck API 密钥",
     "form.integration.readeck_endpoint": "Readeck API 端点",
     "form.integration.readeck_labels": "Readeck 默认标签",
     "form.integration.readeck_only_url": "仅发送 URL（而不是完整内容）",
     "form.integration.readwise_activate": "保存文章到 Readwise Reader",
-    "form.integration.readwise_api_key": "Readwise Reader 密钥",
-    "form.integration.readwise_api_key_link": "获取你的 Readwise 密钥",
+    "form.integration.readwise_api_key": "Readwise Reader 访问令牌",
+    "form.integration.readwise_api_key_link": "获取你的 Readwise 访问令牌",
     "form.integration.rssbridge_activate": "添加订阅时检查 RSS-Bridge",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge 服务器 URL",
     "form.integration.shaarli_activate": "保存文章到 Shaarli",
     "form.integration.shaarli_api_secret": "Shaarli API 密钥",
@@ -303,7 +309,7 @@
     "form.integration.telegram_bot_disable_notification": "禁用通知",
     "form.integration.telegram_bot_disable_web_page_preview": "禁用网页预览",
     "form.integration.telegram_bot_token": "机器人令牌",
-    "form.integration.telegram_chat_id": "聊天ID",
+    "form.integration.telegram_chat_id": "聊天 ID",
     "form.integration.telegram_topic_id": "Topic ID",
     "form.integration.wallabag_activate": "保存文章到 Wallabag",
     "form.integration.wallabag_client_id": "Wallabag 客户端 ID",
@@ -340,6 +346,7 @@
     "form.prefs.label.mark_read_on_view": "查看时自动将条目标记为已读",
     "form.prefs.label.mark_read_on_view_or_media_completion": "当浏览时标记条目为已读。对于音频/视频，当播放完成90%%时标记为已读",
     "form.prefs.label.media_playback_rate": "音频/视频的播放速度",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "显示文章的预计阅读时间",
     "form.prefs.label.theme": "主题",
     "form.prefs.label.timezone": "时区",
@@ -400,6 +407,7 @@
     "page.about.build_date": "构建日期：",
     "page.about.credits": "版权",
     "page.about.db_usage": "数据库容量",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "全局配置选项",
     "page.about.go_version": "Go 版本号：",
     "page.about.license": "协议：",
@@ -417,11 +425,8 @@
     "page.api_keys.table.created_at": "创建日期",
     "page.api_keys.table.description": "描述",
     "page.api_keys.table.last_used_at": "最后使用",
-    "page.api_keys.table.token": "密钥",
+    "page.api_keys.table.token": "令牌",
     "page.api_keys.title": "API 密钥",
-    "page.categories_count": [
-        "%d 分类"
-    ],
     "page.categories.entries": "查看内容",
     "page.categories.feed_count": [
         "有 %d 个源"
@@ -429,6 +434,9 @@
     "page.categories.feeds": "查看源",
     "page.categories.no_feed": "没有源",
     "page.categories.title": "分类",
+    "page.categories_count": [
+        "%d 分类"
+    ],
     "page.category_label": "分类: %s",
     "page.edit_category.title": "编辑分类 : %s",
     "page.edit_feed.etag_header": "ETag 标题：",
@@ -531,21 +539,21 @@
     "page.settings.webauthn.passkeys": "Passkeys",
     "page.settings.webauthn.register": "注册 Passkey",
     "page.settings.webauthn.register.error": "无法注册 Passkey",
+    "page.shared_entries.title": "已分享的文章",
     "page.shared_entries_count": [
         "%d 已分享的文章"
     ],
-    "page.shared_entries.title": "已分享的文章",
+    "page.starred.title": "收藏",
     "page.starred_entry_count": [
         "%d 收藏的文章"
     ],
-    "page.starred.title": "收藏",
     "page.total_entry_count": [
         "%d 文章总数"
     ],
+    "page.unread.title": "未读",
     "page.unread_entry_count": [
         "%d 未读的文章"
     ],
-    "page.unread.title": "未读",
     "page.users.actions": "操作",
     "page.users.admin.no": "否",
     "page.users.admin.yes": "是",
@@ -586,4 +594,4 @@
     "time_elapsed.yesterday": "昨天",
     "tooltip.keyboard_shortcuts": "快捷键: %s",
     "tooltip.logged_user": "当前登录 %s"
-}
+}

internal/locale/translations/zh_TW.json

@@ -70,10 +70,10 @@
     "entry.state.loading": "載入中…",
     "entry.state.saving": "儲存中…",
     "entry.status.mark_as_read": "標記為已讀",
+    "entry.status.mark_as_unread": "標記為未讀",
     "entry.status.title": "更改狀態",
     "entry.status.toast.read": "已標記為已讀",
     "entry.status.toast.unread": "已標記為未讀",
-    "entry.status.mark_as_unread": "標記為未讀",
     "entry.tags.label": "標籤：",
     "entry.unshare.label": "取消分享",
     "error.api_key_already_exists": "此 API 金鑰已存在。",
@@ -112,9 +112,12 @@
     "error.http_service_unavailable": "此網站目前因內部問題無法使用，問題不在 Miniflux，請稍後重試。",
     "error.http_too_many_requests": "Miniflux 對此網站的請求過多，請稍後重試或調整程式設定。",
     "error.http_unexpected_status_code": "此網站回應了意外的 HTTP 狀態碼：%d，請稍後重試。",
+    "error.invalid_categories_sorting_order": "無效的分類排序",
     "error.invalid_default_home_page": "預設主頁無效！",
     "error.invalid_display_mode": "無效的顯示模式。",
     "error.invalid_entry_direction": "無效的輸入方向。",
+    "error.invalid_entry_order": "無效的文章排序依據。",
+    "error.invalid_feed_proxy_url": "Invalid proxy URL.",
     "error.invalid_feed_url": "訂閱網址無效。",
     "error.invalid_gesture_nav": "手勢導覽無效。",
     "error.invalid_language": "無效的語言。",
@@ -126,6 +129,7 @@
     "error.password_min_length": "請至少輸入 6 個字元",
     "error.pocket_access_token": "無法從 Pocket 取得存取金鑰！",
     "error.pocket_request_token": "無法從 Pocket 取得請求金鑰！",
+    "error.proxy_url_not_empty": "The proxy URL cannot be empty.",
     "error.settings_block_rule_fieldname_invalid": "無效的封鎖規則：規則 #%d 缺少有效的欄位名稱 (可用選項：%s)",
     "error.settings_block_rule_invalid_regex": "無效的封鎖規則：規則 #%d 的模式不是合法的正規表示式",
     "error.settings_block_rule_regex_required": "無效的封鎖規則：規則 #%d 沒有提供正規表示式",
@@ -172,7 +176,7 @@
     "form.feed.label.feed_password": "Feed 密碼",
     "form.feed.label.feed_url": "Feed 網址",
     "form.feed.label.feed_username": "Feed 使用者名稱",
-    "form.feed.label.fetch_via_proxy": "透過代理取得",
+    "form.feed.label.fetch_via_proxy": "使用應用程式層級設定的代理",
     "form.feed.label.hide_globally": "在全域未讀列表中隱藏文章",
     "form.feed.label.ignore_http_cache": "忽略 HTTP 快取",
     "form.feed.label.keeplist_rules": "保留規則",
@@ -185,6 +189,7 @@
     "form.feed.label.ntfy_min_priority": "Ntfy 最低優先順序",
     "form.feed.label.ntfy_priority": "Ntfy 優先順序",
     "form.feed.label.ntfy_topic": "Ntfy topic (選填)",
+    "form.feed.label.proxy_url": "Proxy URL",
     "form.feed.label.pushover_activate": "Push entries to pushover.net",
     "form.feed.label.pushover_default_priority": "Pushover default priority",
     "form.feed.label.pushover_high_priority": "Pushover high priority",
@@ -288,6 +293,7 @@
     "form.integration.readwise_api_key": "Readwise Reader 存取金鑰",
     "form.integration.readwise_api_key_link": "取得您的 Readwise 存取金鑰",
     "form.integration.rssbridge_activate": "新增訂閱時檢查 RSS-Bridge",
+    "form.integration.rssbridge_token": "RSS-Bridge authentication token",
     "form.integration.rssbridge_url": "RSS-Bridge 伺服器的網址",
     "form.integration.shaarli_activate": "儲存文章到 Shaarli",
     "form.integration.shaarli_api_secret": "Shaarli API 金鑰",
@@ -340,6 +346,7 @@
     "form.prefs.label.mark_read_on_view": "檢視時自動將文章標記為已讀",
     "form.prefs.label.mark_read_on_view_or_media_completion": "檢視文章即標記為已讀；若是音訊/視訊則在 90% 播放完成時標記",
     "form.prefs.label.media_playback_rate": "音訊/視訊播放速度",
+    "form.prefs.label.always_open_external_links": "Read articles by opening external links",
     "form.prefs.label.show_reading_time": "顯示文章的預計閱讀時間",
     "form.prefs.label.theme": "主題",
     "form.prefs.label.timezone": "時區",
@@ -400,6 +407,7 @@
     "page.about.build_date": "建構日期：",
     "page.about.credits": "版權",
     "page.about.db_usage": "Database size:",
+    "page.about.git_commit": "Git Commit:",
     "page.about.global_config_options": "全域設定選項",
     "page.about.go_version": "Go 版本：",
     "page.about.license": "授權：",

internal/model/api_key.go

@@ -5,28 +5,22 @@ package model // import "miniflux.app/v2/internal/model"
 
 import (
 	"time"
-
-	"miniflux.app/v2/internal/crypto"
 )
 
 // APIKey represents an application API key.
 type APIKey struct {
-	ID          int64
-	UserID      int64
-	Token       string
-	Description string
-	LastUsedAt  *time.Time
-	CreatedAt   time.Time
-}
-
-// NewAPIKey initializes a new APIKey.
-func NewAPIKey(userID int64, description string) *APIKey {
-	return &APIKey{
-		UserID:      userID,
-		Token:       crypto.GenerateRandomString(32),
-		Description: description,
-	}
+	ID          int64      `json:"id"`
+	UserID      int64      `json:"user_id"`
+	Token       string     `json:"token"`
+	Description string     `json:"description"`
+	LastUsedAt  *time.Time `json:"last_used_at"`
+	CreatedAt   time.Time  `json:"created_at"`
 }
 
 // APIKeys represents a collection of API Key.
 type APIKeys []*APIKey
+
+// APIKeyCreationRequest represents the request to create a new API Key.
+type APIKeyCreationRequest struct {
+	Description string `json:"description"`
+}

internal/model/category.go

@@ -19,16 +19,24 @@ func (c *Category) String() string {
 	return fmt.Sprintf("ID=%d, UserID=%d, Title=%s", c.ID, c.UserID, c.Title)
 }
 
-// CategoryRequest represents the request to create or update a category.
-type CategoryRequest struct {
+type CategoryCreationRequest struct {
 	Title        string `json:"title"`
-	HideGlobally string `json:"hide_globally"`
+	HideGlobally bool   `json:"hide_globally"`
 }
 
-// Patch updates category fields.
-func (cr *CategoryRequest) Patch(category *Category) {
-	category.Title = cr.Title
-	category.HideGlobally = cr.HideGlobally != ""
+type CategoryModificationRequest struct {
+	Title        *string `json:"title"`
+	HideGlobally *bool   `json:"hide_globally"`
+}
+
+func (c *CategoryModificationRequest) Patch(category *Category) {
+	if c.Title != nil {
+		category.Title = *c.Title
+	}
+
+	if c.HideGlobally != nil {
+		category.HideGlobally = *c.HideGlobally
+	}
 }
 
 // Categories represents a list of categories.

internal/model/feed.go

@@ -57,8 +57,9 @@ type Feed struct {
 	NtfyEnabled                 bool      `json:"ntfy_enabled"`
 	NtfyPriority                int       `json:"ntfy_priority"`
 	NtfyTopic                   string    `json:"ntfy_topic"`
-	PushoverEnabled             bool      `json:"pushover_enabled,omitempty"`
-	PushoverPriority            int       `json:"pushover_priority,omitempty"`
+	PushoverEnabled             bool      `json:"pushover_enabled"`
+	PushoverPriority            int       `json:"pushover_priority"`
+	ProxyURL                    string    `json:"proxy_url"`
 
 	// Non-persisted attributes
 	Category *Category `json:"category,omitempty"`
@@ -116,9 +117,7 @@ func (f *Feed) CheckedNow() {
 }
 
 // ScheduleNextCheck set "next_check_at" of a feed based on the scheduler selected from the configuration.
-func (f *Feed) ScheduleNextCheck(weeklyCount int, refreshDelayInMinutes int) {
-	f.TTL = refreshDelayInMinutes
-
+func (f *Feed) ScheduleNextCheck(weeklyCount int, refreshDelayInMinutes int) int {
 	// Default to the global config Polling Frequency.
 	intervalMinutes := config.Opts.SchedulerRoundRobinMinInterval()
 
@@ -132,12 +131,21 @@ func (f *Feed) ScheduleNextCheck(weeklyCount int, refreshDelayInMinutes int) {
 		}
 	}
 
-	// If the feed has a TTL or a Retry-After defined, we use it to make sure we don't check it too often.
+	// Use the RSS TTL field, Retry-After, Cache-Control or Expires HTTP headers if defined.
 	if refreshDelayInMinutes > 0 && refreshDelayInMinutes > intervalMinutes {
 		intervalMinutes = refreshDelayInMinutes
 	}
 
+	// Limit the max interval value for misconfigured feeds.
+	switch config.Opts.PollingScheduler() {
+	case SchedulerRoundRobin:
+		intervalMinutes = min(intervalMinutes, config.Opts.SchedulerRoundRobinMaxInterval())
+	case SchedulerEntryFrequency:
+		intervalMinutes = min(intervalMinutes, config.Opts.SchedulerEntryFrequencyMaxInterval())
+	}
+
 	f.NextCheckAt = time.Now().Add(time.Minute * time.Duration(intervalMinutes))
+	return intervalMinutes
 }
 
 // FeedCreationRequest represents the request to create a feed.
@@ -161,6 +169,7 @@ type FeedCreationRequest struct {
 	HideGlobally                bool   `json:"hide_globally"`
 	UrlRewriteRules             string `json:"urlrewrite_rules"`
 	DisableHTTP2                bool   `json:"disable_http2"`
+	ProxyURL                    string `json:"proxy_url"`
 }
 
 type FeedCreationRequestFromSubscriptionDiscovery struct {
@@ -195,6 +204,7 @@ type FeedModificationRequest struct {
 	FetchViaProxy               *bool   `json:"fetch_via_proxy"`
 	HideGlobally                *bool   `json:"hide_globally"`
 	DisableHTTP2                *bool   `json:"disable_http2"`
+	ProxyURL                    *string `json:"proxy_url"`
 }
 
 // Patch updates a feed with modified values.
@@ -286,6 +296,10 @@ func (f *FeedModificationRequest) Patch(feed *Feed) {
 	if f.DisableHTTP2 != nil {
 		feed.DisableHTTP2 = *f.DisableHTTP2
 	}
+
+	if f.ProxyURL != nil {
+		feed.ProxyURL = *f.ProxyURL
+	}
 }
 
 // Feeds is a list of feed

internal/model/feed_test.go

@@ -144,6 +144,29 @@ func TestFeedScheduleNextCheckRoundRobinWithRefreshDelayBelowMinInterval(t *test
 	checkTargetInterval(t, feed, expectedInterval, timeBefore, "TestFeedScheduleNextCheckRoundRobinWithRefreshDelayBelowMinInterval")
 }
 
+func TestFeedScheduleNextCheckRoundRobinWithRefreshDelayAboveMaxInterval(t *testing.T) {
+	os.Clearenv()
+
+	var err error
+	parser := config.NewParser()
+	config.Opts, err = parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	timeBefore := time.Now()
+	feed := &Feed{}
+
+	feed.ScheduleNextCheck(0, config.Opts.SchedulerRoundRobinMaxInterval()+30)
+
+	if feed.NextCheckAt.IsZero() {
+		t.Error(`The next_check_at must be set`)
+	}
+
+	expectedInterval := config.Opts.SchedulerRoundRobinMaxInterval()
+	checkTargetInterval(t, feed, expectedInterval, timeBefore, "TestFeedScheduleNextCheckRoundRobinWithRefreshDelayAboveMaxInterval")
+}
+
 func TestFeedScheduleNextCheckRoundRobinMinInterval(t *testing.T) {
 	minInterval := 1
 	os.Clearenv()

internal/model/integration.go

@@ -90,6 +90,7 @@ type Integration struct {
 	WebhookSecret                    string
 	RSSBridgeEnabled                 bool
 	RSSBridgeURL                     string
+	RSSBridgeToken                   string
 	OmnivoreEnabled                  bool
 	OmnivoreAPIKey                   string
 	OmnivoreURL                      string

internal/model/model.go

@@ -20,3 +20,7 @@ func OptionalString(value string) *string {
 	}
 	return nil
 }
+
+func SetOptionalField[T any](value T) *T {
+	return &value
+}

internal/model/subscription.go

@@ -10,6 +10,7 @@ type SubscriptionDiscoveryRequest struct {
 	Cookie                      string `json:"cookie"`
 	Username                    string `json:"username"`
 	Password                    string `json:"password"`
+	ProxyURL                    string `json:"proxy_url"`
 	FetchViaProxy               bool   `json:"fetch_via_proxy"`
 	AllowSelfSignedCertificates bool   `json:"allow_self_signed_certificates"`
 	DisableHTTP2                bool   `json:"disable_http2"`

internal/model/user.go

@@ -41,6 +41,7 @@ type User struct {
 	MediaPlaybackRate               float64    `json:"media_playback_rate"`
 	BlockFilterEntryRules           string     `json:"block_filter_entry_rules"`
 	KeepFilterEntryRules            string     `json:"keep_filter_entry_rules"`
+	AlwaysOpenExternalLinks         bool       `json:"always_open_external_links"`
 }
 
 // UserCreationRequest represents the request to create a user.
@@ -82,6 +83,7 @@ type UserModificationRequest struct {
 	MediaPlaybackRate               *float64 `json:"media_playback_rate"`
 	BlockFilterEntryRules           *string  `json:"block_filter_entry_rules"`
 	KeepFilterEntryRules            *string  `json:"keep_filter_entry_rules"`
+	AlwaysOpenExternalLinks         *bool    `json:"always_open_external_links"`
 }
 
 // Patch updates the User object with the modification request.
@@ -197,6 +199,10 @@ func (u *UserModificationRequest) Patch(user *User) {
 	if u.KeepFilterEntryRules != nil {
 		user.KeepFilterEntryRules = *u.KeepFilterEntryRules
 	}
+
+	if u.AlwaysOpenExternalLinks != nil {
+		user.AlwaysOpenExternalLinks = *u.AlwaysOpenExternalLinks
+	}
 }
 
 // UseTimezone converts last login date to the given timezone.

internal/proxyrotator/proxyrotator.go

@@ -0,0 +1,60 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package proxyrotator // import "miniflux.app/v2/internal/proxyrotator"
+
+import (
+	"net/url"
+	"sync"
+)
+
+var ProxyRotatorInstance *ProxyRotator
+
+// ProxyRotator manages a list of proxies and rotates through them.
+type ProxyRotator struct {
+	proxies      []*url.URL
+	currentIndex int
+	mutex        sync.Mutex
+}
+
+// NewProxyRotator creates a new ProxyRotator with the given proxy URLs.
+func NewProxyRotator(proxyURLs []string) (*ProxyRotator, error) {
+	parsedProxies := make([]*url.URL, 0, len(proxyURLs))
+
+	for _, p := range proxyURLs {
+		proxyURL, err := url.Parse(p)
+		if err != nil {
+			return nil, err
+		}
+		parsedProxies = append(parsedProxies, proxyURL)
+	}
+
+	return &ProxyRotator{
+		proxies:      parsedProxies,
+		currentIndex: 0,
+		mutex:        sync.Mutex{},
+	}, nil
+}
+
+// GetNextProxy returns the next proxy in the rotation.
+func (pr *ProxyRotator) GetNextProxy() *url.URL {
+	pr.mutex.Lock()
+	defer pr.mutex.Unlock()
+
+	if len(pr.proxies) == 0 {
+		return nil
+	}
+
+	proxy := pr.proxies[pr.currentIndex]
+	pr.currentIndex = (pr.currentIndex + 1) % len(pr.proxies)
+
+	return proxy
+}
+
+// HasProxies checks if there are any proxies available in the rotator.
+func (pr *ProxyRotator) HasProxies() bool {
+	pr.mutex.Lock()
+	defer pr.mutex.Unlock()
+
+	return len(pr.proxies) > 0
+}

internal/proxyrotator/proxyrotator_test.go

@@ -0,0 +1,71 @@
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package proxyrotator // import "miniflux.app/v2/internal/proxyrotator"
+
+import (
+	"testing"
+)
+
+func TestProxyRotator(t *testing.T) {
+	proxyURLs := []string{
+		"http://proxy1.example.com",
+		"http://proxy2.example.com",
+		"http://proxy3.example.com",
+	}
+
+	rotator, err := NewProxyRotator(proxyURLs)
+	if err != nil {
+		t.Fatalf("Failed to create ProxyRotator: %v", err)
+	}
+
+	if !rotator.HasProxies() {
+		t.Fatalf("Expected rotator to have proxies")
+	}
+
+	seenProxies := make(map[string]bool)
+	for range len(proxyURLs) * 2 {
+		proxy := rotator.GetNextProxy()
+		if proxy == nil {
+			t.Fatalf("Expected a proxy, got nil")
+		}
+
+		seenProxies[proxy.String()] = true
+	}
+
+	if len(seenProxies) != len(proxyURLs) {
+		t.Fatalf("Expected to see all proxies, but saw: %v", seenProxies)
+	}
+}
+
+func TestProxyRotatorEmpty(t *testing.T) {
+	rotator, err := NewProxyRotator([]string{})
+	if err != nil {
+		t.Fatalf("Failed to create ProxyRotator: %v", err)
+	}
+
+	if rotator.HasProxies() {
+		t.Fatalf("Expected rotator to have no proxies")
+	}
+
+	proxy := rotator.GetNextProxy()
+	if proxy != nil {
+		t.Fatalf("Expected no proxy, got: %v", proxy)
+	}
+}
+
+func TestProxyRotatorInvalidURL(t *testing.T) {
+	invalidProxyURLs := []string{
+		"http://validproxy.example.com",
+		"test|test://invalidproxy.example.com",
+	}
+
+	rotator, err := NewProxyRotator(invalidProxyURLs)
+	if err == nil {
+		t.Fatalf("Expected an error when creating ProxyRotator with invalid URLs, but got none")
+	}
+
+	if rotator != nil {
+		t.Fatalf("Expected rotator to be nil when initialization fails, but got: %v", rotator)
+	}
+}

internal/reader/atom/atom_10.go

@@ -39,6 +39,10 @@ type Atom10Feed struct {
 	// atom:feed elements MUST contain exactly one atom:title element.
 	Title Atom10Text `xml:"http://www.w3.org/2005/Atom title"`
 
+	// The "atom:subtitle" element is a Text construct that
+	// contains a human-readable description or subtitle for the feed.
+	Subtitle Atom10Text `xml:"http://www.w3.org/2005/Atom subtitle"`
+
 	// The "atom:author" element is a Person construct that indicates the
 	// author of the entry or feed.
 	//

internal/reader/atom/atom_10_adapter.go

@@ -55,6 +55,9 @@ func (a *Atom10Adapter) BuildFeed(baseURL string) *model.Feed {
 		feed.Title = feed.SiteURL
 	}
 
+	// Populate the feed description.
+	feed.Description = a.atomFeed.Subtitle.Body()
+
 	// Populate the feed icon.
 	if a.atomFeed.Icon != "" {
 		if absoluteIconURL, err := urllib.AbsoluteURL(feed.SiteURL, a.atomFeed.Icon); err == nil {

internal/reader/atom/atom_10_test.go

@@ -82,6 +82,29 @@ func TestParseAtomSample(t *testing.T) {
 	}
 }
 
+func TestParseFeedWithSubtitle(t *testing.T) {
+	data := `<?xml version="1.0" encoding="utf-8"?>
+	<feed xmlns="http://www.w3.org/2005/Atom">
+	  <title>Example Feed</title>
+	  <subtitle>This is a subtitle</subtitle>
+	  <link href="http://example.org/"/>
+	  <updated>2003-12-13T18:30:02Z</updated>
+	  <author>
+		<name>John Doe</name>
+	  </author>
+	  <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
+	</feed>`
+
+	feed, err := Parse("http://example.org/feed.xml", bytes.NewReader([]byte(data)), "10")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if feed.Description != "This is a subtitle" {
+		t.Errorf("Incorrect description, got: %s", feed.Description)
+	}
+}
+
 func TestParseFeedWithoutTitle(t *testing.T) {
 	data := `<?xml version="1.0" encoding="utf-8"?>
 		<feed xmlns="http://www.w3.org/2005/Atom">

internal/reader/fetcher/request_builder.go

@@ -6,11 +6,14 @@ package fetcher // import "miniflux.app/v2/internal/reader/fetcher"
 import (
 	"crypto/tls"
 	"encoding/base64"
+	"fmt"
 	"log/slog"
 	"net"
 	"net/http"
 	"net/url"
 	"time"
+
+	"miniflux.app/v2/internal/proxyrotator"
 )
 
 const (
@@ -21,12 +24,14 @@ const (
 
 type RequestBuilder struct {
 	headers          http.Header
-	clientProxyURL   string
+	clientProxyURL   *url.URL
 	useClientProxy   bool
 	clientTimeout    int
 	withoutRedirects bool
 	ignoreTLSErrors  bool
 	disableHTTP2     bool
+	proxyRotator     *proxyrotator.ProxyRotator
+	feedProxyURL     string
 }
 
 func NewRequestBuilder() *RequestBuilder {
@@ -78,16 +83,26 @@ func (r *RequestBuilder) WithUsernameAndPassword(username, password string) *Req
 	return r
 }
 
-func (r *RequestBuilder) WithProxy(proxyURL string) *RequestBuilder {
+func (r *RequestBuilder) WithProxyRotator(proxyRotator *proxyrotator.ProxyRotator) *RequestBuilder {
+	r.proxyRotator = proxyRotator
+	return r
+}
+
+func (r *RequestBuilder) WithCustomApplicationProxyURL(proxyURL *url.URL) *RequestBuilder {
 	r.clientProxyURL = proxyURL
 	return r
 }
 
-func (r *RequestBuilder) UseProxy(value bool) *RequestBuilder {
+func (r *RequestBuilder) UseCustomApplicationProxyURL(value bool) *RequestBuilder {
 	r.useClientProxy = value
 	return r
 }
 
+func (r *RequestBuilder) WithCustomFeedProxyURL(proxyURL string) *RequestBuilder {
+	r.feedProxyURL = proxyURL
+	return r
+}
+
 func (r *RequestBuilder) WithTimeout(timeout int) *RequestBuilder {
 	r.clientTimeout = timeout
 	return r
@@ -151,15 +166,25 @@ func (r *RequestBuilder) ExecuteRequest(requestURL string) (*http.Response, erro
 		transport.TLSNextProto = map[string]func(string, *tls.Conn) http.RoundTripper{}
 	}
 
-	if r.useClientProxy && r.clientProxyURL != "" {
-		if proxyURL, err := url.Parse(r.clientProxyURL); err != nil {
-			slog.Warn("Unable to parse proxy URL",
-				slog.String("proxy_url", r.clientProxyURL),
-				slog.Any("error", err),
-			)
-		} else {
-			transport.Proxy = http.ProxyURL(proxyURL)
+	var clientProxyURL *url.URL
+
+	switch {
+	case r.feedProxyURL != "":
+		var err error
+		clientProxyURL, err = url.Parse(r.feedProxyURL)
+		if err != nil {
+			return nil, fmt.Errorf(`fetcher: invalid feed proxy URL %q: %w`, r.feedProxyURL, err)
 		}
+	case r.useClientProxy && r.clientProxyURL != nil:
+		clientProxyURL = r.clientProxyURL
+	case r.proxyRotator != nil && r.proxyRotator.HasProxies():
+		clientProxyURL = r.proxyRotator.GetNextProxy()
+	}
+
+	var clientProxyURLRedacted string
+	if clientProxyURL != nil {
+		transport.Proxy = http.ProxyURL(clientProxyURL)
+		clientProxyURLRedacted = clientProxyURL.Redacted()
 	}
 
 	client := &http.Client{
@@ -189,8 +214,8 @@ func (r *RequestBuilder) ExecuteRequest(requestURL string) (*http.Response, erro
 		slog.String("url", req.URL.String()),
 		slog.Any("headers", req.Header),
 		slog.Bool("without_redirects", r.withoutRedirects),
-		slog.Bool("with_proxy", r.useClientProxy),
-		slog.String("proxy_url", r.clientProxyURL),
+		slog.Bool("use_app_client_proxy", r.useClientProxy),
+		slog.String("client_proxy_url", clientProxyURLRedacted),
 		slog.Bool("ignore_tls_errors", r.ignoreTLSErrors),
 		slog.Bool("disable_http2", r.disableHTTP2),
 	))

internal/reader/fetcher/response_handler.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"io"
 	"log/slog"
+	"math"
 	"net"
 	"net/http"
 	"net/url"
@@ -53,6 +54,33 @@ func (r *ResponseHandler) ETag() string {
 	return r.httpResponse.Header.Get("ETag")
 }
 
+func (r *ResponseHandler) ExpiresInMinutes() int {
+	expiresHeaderValue := r.httpResponse.Header.Get("Expires")
+	if expiresHeaderValue != "" {
+		t, err := time.Parse(time.RFC1123, expiresHeaderValue)
+		if err == nil {
+			return int(math.Ceil(time.Until(t).Minutes()))
+		}
+	}
+	return 0
+}
+
+func (r *ResponseHandler) CacheControlMaxAgeInMinutes() int {
+	cacheControlHeaderValue := r.httpResponse.Header.Get("Cache-Control")
+	if cacheControlHeaderValue != "" {
+		for _, directive := range strings.Split(cacheControlHeaderValue, ",") {
+			directive = strings.TrimSpace(directive)
+			if strings.HasPrefix(directive, "max-age=") {
+				maxAge, err := strconv.Atoi(strings.TrimPrefix(directive, "max-age="))
+				if err == nil {
+					return int(math.Ceil(float64(maxAge) / 60))
+				}
+			}
+		}
+	}
+	return 0
+}
+
 func (r *ResponseHandler) ParseRetryDelay() int {
 	retryAfterHeaderValue := r.httpResponse.Header.Get("Retry-After")
 	if retryAfterHeaderValue != "" {

internal/reader/fetcher/response_handler_test.go

@@ -102,3 +102,75 @@ func TestRetryDelay(t *testing.T) {
 		})
 	}
 }
+
+func TestExpiresInMinutes(t *testing.T) {
+	var testCases = map[string]struct {
+		ExpiresHeader   string
+		ExpectedMinutes int
+	}{
+		"Empty header": {
+			ExpiresHeader:   "",
+			ExpectedMinutes: 0,
+		},
+		"Valid Expires header": {
+			ExpiresHeader:   time.Now().Add(10 * time.Minute).Format(time.RFC1123),
+			ExpectedMinutes: 10,
+		},
+		"Invalid Expires header": {
+			ExpiresHeader:   "invalid-date",
+			ExpectedMinutes: 0,
+		},
+	}
+	for name, tc := range testCases {
+		t.Run(name, func(tt *testing.T) {
+			header := http.Header{}
+			header.Add("Expires", tc.ExpiresHeader)
+			rh := ResponseHandler{
+				httpResponse: &http.Response{
+					Header: header,
+				},
+			}
+			if tc.ExpectedMinutes != rh.ExpiresInMinutes() {
+				t.Errorf("Expected %d, got %d for scenario %q", tc.ExpectedMinutes, rh.ExpiresInMinutes(), name)
+			}
+		})
+	}
+}
+
+func TestCacheControlMaxAgeInMinutes(t *testing.T) {
+	var testCases = map[string]struct {
+		CacheControlHeader string
+		ExpectedMinutes    int
+	}{
+		"Empty header": {
+			CacheControlHeader: "",
+			ExpectedMinutes:    0,
+		},
+		"Valid max-age": {
+			CacheControlHeader: "max-age=600",
+			ExpectedMinutes:    10,
+		},
+		"Invalid max-age": {
+			CacheControlHeader: "max-age=invalid",
+			ExpectedMinutes:    0,
+		},
+		"Multiple directives": {
+			CacheControlHeader: "no-cache, max-age=300",
+			ExpectedMinutes:    5,
+		},
+	}
+	for name, tc := range testCases {
+		t.Run(name, func(tt *testing.T) {
+			header := http.Header{}
+			header.Add("Cache-Control", tc.CacheControlHeader)
+			rh := ResponseHandler{
+				httpResponse: &http.Response{
+					Header: header,
+				},
+			}
+			if tc.ExpectedMinutes != rh.CacheControlMaxAgeInMinutes() {
+				t.Errorf("Expected %d, got %d for scenario %q", tc.ExpectedMinutes, rh.CacheControlMaxAgeInMinutes(), name)
+			}
+		})
+	}
+}

internal/reader/handler/handler.go

@@ -12,6 +12,7 @@ import (
 	"miniflux.app/v2/internal/integration"
 	"miniflux.app/v2/internal/locale"
 	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/proxyrotator"
 	"miniflux.app/v2/internal/reader/fetcher"
 	"miniflux.app/v2/internal/reader/icon"
 	"miniflux.app/v2/internal/reader/parser"
@@ -29,6 +30,7 @@ func CreateFeedFromSubscriptionDiscovery(store *storage.Storage, userID int64, f
 	slog.Debug("Begin feed creation process from subscription discovery",
 		slog.Int64("user_id", userID),
 		slog.String("feed_url", feedCreationRequest.FeedURL),
+		slog.String("proxy_url", feedCreationRequest.ProxyURL),
 	)
 
 	if !store.CategoryIDExists(userID, feedCreationRequest.CategoryID) {
@@ -64,6 +66,7 @@ func CreateFeedFromSubscriptionDiscovery(store *storage.Storage, userID int64, f
 	subscription.FeedURL = feedCreationRequest.FeedURL
 	subscription.DisableHTTP2 = feedCreationRequest.DisableHTTP2
 	subscription.WithCategoryID(feedCreationRequest.CategoryID)
+	subscription.ProxyURL = feedCreationRequest.ProxyURL
 	subscription.CheckedNow()
 
 	processor.ProcessFeedEntries(store, subscription, userID, true)
@@ -83,8 +86,10 @@ func CreateFeedFromSubscriptionDiscovery(store *storage.Storage, userID int64, f
 	requestBuilder.WithUserAgent(feedCreationRequest.UserAgent, config.Opts.HTTPClientUserAgent())
 	requestBuilder.WithCookie(feedCreationRequest.Cookie)
 	requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
-	requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
-	requestBuilder.UseProxy(feedCreationRequest.FetchViaProxy)
+	requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
+	requestBuilder.WithCustomFeedProxyURL(feedCreationRequest.ProxyURL)
+	requestBuilder.WithCustomApplicationProxyURL(config.Opts.HTTPClientProxyURL())
+	requestBuilder.UseCustomApplicationProxyURL(feedCreationRequest.FetchViaProxy)
 	requestBuilder.IgnoreTLSErrors(feedCreationRequest.AllowSelfSignedCertificates)
 	requestBuilder.DisableHTTP2(feedCreationRequest.DisableHTTP2)
 
@@ -98,6 +103,7 @@ func CreateFeed(store *storage.Storage, userID int64, feedCreationRequest *model
 	slog.Debug("Begin feed creation process",
 		slog.Int64("user_id", userID),
 		slog.String("feed_url", feedCreationRequest.FeedURL),
+		slog.String("proxy_url", feedCreationRequest.ProxyURL),
 	)
 
 	if !store.CategoryIDExists(userID, feedCreationRequest.CategoryID) {
@@ -109,8 +115,10 @@ func CreateFeed(store *storage.Storage, userID int64, feedCreationRequest *model
 	requestBuilder.WithUserAgent(feedCreationRequest.UserAgent, config.Opts.HTTPClientUserAgent())
 	requestBuilder.WithCookie(feedCreationRequest.Cookie)
 	requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
-	requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
-	requestBuilder.UseProxy(feedCreationRequest.FetchViaProxy)
+	requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
+	requestBuilder.WithCustomFeedProxyURL(feedCreationRequest.ProxyURL)
+	requestBuilder.WithCustomApplicationProxyURL(config.Opts.HTTPClientProxyURL())
+	requestBuilder.UseCustomApplicationProxyURL(feedCreationRequest.FetchViaProxy)
 	requestBuilder.IgnoreTLSErrors(feedCreationRequest.AllowSelfSignedCertificates)
 	requestBuilder.DisableHTTP2(feedCreationRequest.DisableHTTP2)
 
@@ -157,6 +165,7 @@ func CreateFeed(store *storage.Storage, userID int64, feedCreationRequest *model
 	subscription.EtagHeader = responseHandler.ETag()
 	subscription.LastModifiedHeader = responseHandler.LastModified()
 	subscription.FeedURL = responseHandler.EffectiveURL()
+	subscription.ProxyURL = feedCreationRequest.ProxyURL
 	subscription.WithCategoryID(feedCreationRequest.CategoryID)
 	subscription.CheckedNow()
 
@@ -212,8 +221,10 @@ func RefreshFeed(store *storage.Storage, userID, feedID int64, forceRefresh bool
 	requestBuilder.WithUserAgent(originalFeed.UserAgent, config.Opts.HTTPClientUserAgent())
 	requestBuilder.WithCookie(originalFeed.Cookie)
 	requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
-	requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
-	requestBuilder.UseProxy(originalFeed.FetchViaProxy)
+	requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
+	requestBuilder.WithCustomFeedProxyURL(originalFeed.ProxyURL)
+	requestBuilder.WithCustomApplicationProxyURL(config.Opts.HTTPClientProxyURL())
+	requestBuilder.UseCustomApplicationProxyURL(originalFeed.FetchViaProxy)
 	requestBuilder.IgnoreTLSErrors(originalFeed.AllowSelfSignedCertificates)
 	requestBuilder.DisableHTTP2(originalFeed.DisableHTTP2)
 
@@ -229,18 +240,24 @@ func RefreshFeed(store *storage.Storage, userID, feedID int64, forceRefresh bool
 	if responseHandler.IsRateLimited() {
 		retryDelayInSeconds := responseHandler.ParseRetryDelay()
 		refreshDelayInMinutes = retryDelayInSeconds / 60
-		originalFeed.ScheduleNextCheck(weeklyEntryCount, refreshDelayInMinutes)
+		calculatedNextCheckIntervalInMinutes := originalFeed.ScheduleNextCheck(weeklyEntryCount, refreshDelayInMinutes)
 
 		slog.Warn("Feed is rate limited",
 			slog.String("feed_url", originalFeed.FeedURL),
 			slog.Int("retry_delay_in_seconds", retryDelayInSeconds),
 			slog.Int("refresh_delay_in_minutes", refreshDelayInMinutes),
+			slog.Int("calculated_next_check_interval_in_minutes", calculatedNextCheckIntervalInMinutes),
 			slog.Time("new_next_check_at", originalFeed.NextCheckAt),
 		)
 	}
 
 	if localizedError := responseHandler.LocalizedError(); localizedError != nil {
-		slog.Warn("Unable to fetch feed", slog.String("feed_url", originalFeed.FeedURL), slog.Any("error", localizedError.Error()))
+		slog.Warn("Unable to fetch feed",
+			slog.Int64("user_id", userID),
+			slog.Int64("feed_id", feedID),
+			slog.String("feed_url", originalFeed.FeedURL),
+			slog.Any("error", localizedError.Error()),
+		)
 		user, storeErr := store.UserByID(userID)
 		if storeErr != nil {
 			return locale.NewLocalizedErrorWrapper(storeErr, "error.database_error", storeErr)
@@ -292,16 +309,25 @@ func RefreshFeed(store *storage.Storage, userID, feedID int64, forceRefresh bool
 			return localizedError
 		}
 
-		// If the feed has a TTL defined, we use it to make sure we don't check it too often.
-		refreshDelayInMinutes = updatedFeed.TTL
+		// Use the RSS TTL value, or the Cache-Control or Expires HTTP headers if available.
+		// Otherwise, we use the default value from the configuration (min interval parameter).
+		feedTTLValue := updatedFeed.TTL
+		cacheControlMaxAgeValue := responseHandler.CacheControlMaxAgeInMinutes()
+		expiresValue := responseHandler.ExpiresInMinutes()
+		refreshDelayInMinutes = max(feedTTLValue, cacheControlMaxAgeValue, expiresValue)
 
 		// Set the next check at with updated arguments.
-		originalFeed.ScheduleNextCheck(weeklyEntryCount, refreshDelayInMinutes)
+		calculatedNextCheckIntervalInMinutes := originalFeed.ScheduleNextCheck(weeklyEntryCount, refreshDelayInMinutes)
 
 		slog.Debug("Updated next check date",
 			slog.Int64("user_id", userID),
 			slog.Int64("feed_id", feedID),
+			slog.String("feed_url", originalFeed.FeedURL),
+			slog.Int("feed_ttl_minutes", feedTTLValue),
+			slog.Int("cache_control_max_age_in_minutes", cacheControlMaxAgeValue),
+			slog.Int("expires_in_minutes", expiresValue),
 			slog.Int("refresh_delay_in_minutes", refreshDelayInMinutes),
+			slog.Int("calculated_next_check_interval_in_minutes", calculatedNextCheckIntervalInMinutes),
 			slog.Time("new_next_check_at", originalFeed.NextCheckAt),
 		)
 

internal/reader/icon/checker.go

@@ -8,6 +8,7 @@ import (
 
 	"miniflux.app/v2/internal/config"
 	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/proxyrotator"
 	"miniflux.app/v2/internal/reader/fetcher"
 	"miniflux.app/v2/internal/storage"
 )
@@ -29,8 +30,10 @@ func (c *IconChecker) fetchAndStoreIcon() {
 	requestBuilder.WithUserAgent(c.feed.UserAgent, config.Opts.HTTPClientUserAgent())
 	requestBuilder.WithCookie(c.feed.Cookie)
 	requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
-	requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
-	requestBuilder.UseProxy(c.feed.FetchViaProxy)
+	requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
+	requestBuilder.WithCustomFeedProxyURL(c.feed.ProxyURL)
+	requestBuilder.WithCustomApplicationProxyURL(config.Opts.HTTPClientProxyURL())
+	requestBuilder.UseCustomApplicationProxyURL(c.feed.FetchViaProxy)
 	requestBuilder.IgnoreTLSErrors(c.feed.AllowSelfSignedCertificates)
 	requestBuilder.DisableHTTP2(c.feed.DisableHTTP2)
 

internal/reader/json/adapter.go

@@ -26,9 +26,10 @@ func NewJSONAdapter(jsonFeed *JSONFeed) *JSONAdapter {
 
 func (j *JSONAdapter) BuildFeed(baseURL string) *model.Feed {
 	feed := &model.Feed{
-		Title:   strings.TrimSpace(j.jsonFeed.Title),
-		FeedURL: strings.TrimSpace(j.jsonFeed.FeedURL),
-		SiteURL: strings.TrimSpace(j.jsonFeed.HomePageURL),
+		Title:       strings.TrimSpace(j.jsonFeed.Title),
+		FeedURL:     strings.TrimSpace(j.jsonFeed.FeedURL),
+		SiteURL:     strings.TrimSpace(j.jsonFeed.HomePageURL),
+		Description: strings.TrimSpace(j.jsonFeed.Description),
 	}
 
 	if feed.FeedURL == "" {

internal/reader/json/parser_test.go

@@ -41,6 +41,10 @@ func TestParseJsonFeedVersion1(t *testing.T) {
 		t.Errorf("Incorrect title, got: %s", feed.Title)
 	}
 
+	if feed.Description != "" {
+		t.Errorf("Incorrect description, got: %s", feed.Description)
+	}
+
 	if feed.FeedURL != "https://example.org/feed.json" {
 		t.Errorf("Incorrect feed URL, got: %s", feed.FeedURL)
 	}
@@ -90,6 +94,26 @@ func TestParseJsonFeedVersion1(t *testing.T) {
 	}
 }
 
+func TestParseFeedWithDescription(t *testing.T) {
+	data := `{
+		"version": "https://jsonfeed.org/version/1",
+		"title": "My Example Feed",
+		"description": "This is a sample feed description.",
+		"home_page_url": "https://example.org/",
+		"feed_url": "https://example.org/feed.json",
+		"items": []
+	}`
+
+	feed, err := Parse("https://example.org/feed.json", bytes.NewBufferString(data))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if feed.Description != "This is a sample feed description." {
+		t.Errorf("Incorrect description, got: %s", feed.Description)
+	}
+}
+
 func TestParsePodcast(t *testing.T) {
 	data := `{
 		"version": "https://jsonfeed.org/version/1",

internal/reader/opml/handler.go

@@ -61,7 +61,7 @@ func (h *Handler) Import(userID int64, data io.Reader) error {
 				}
 
 				if category == nil {
-					category, err = h.store.CreateCategory(userID, &model.CategoryRequest{Title: subscription.CategoryName})
+					category, err = h.store.CreateCategory(userID, &model.CategoryCreationRequest{Title: subscription.CategoryName})
 					if err != nil {
 						return fmt.Errorf(`opml: unable to create this category: %q`, subscription.CategoryName)
 					}

internal/reader/processor/bilibili.go

@@ -11,6 +11,7 @@ import (
 
 	"miniflux.app/v2/internal/config"
 	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/proxyrotator"
 	"miniflux.app/v2/internal/reader/fetcher"
 )
 
@@ -45,7 +46,7 @@ func extractBilibiliVideoID(websiteURL string) (string, string, error) {
 func fetchBilibiliWatchTime(websiteURL string) (int, error) {
 	requestBuilder := fetcher.NewRequestBuilder()
 	requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
-	requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
+	requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
 
 	idType, videoID, extractErr := extractBilibiliVideoID(websiteURL)
 	if extractErr != nil {

internal/reader/processor/nebula.go

@@ -14,6 +14,7 @@ import (
 
 	"miniflux.app/v2/internal/config"
 	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/proxyrotator"
 	"miniflux.app/v2/internal/reader/fetcher"
 )
 
@@ -33,7 +34,7 @@ func shouldFetchNebulaWatchTime(entry *model.Entry) bool {
 func fetchNebulaWatchTime(websiteURL string) (int, error) {
 	requestBuilder := fetcher.NewRequestBuilder()
 	requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
-	requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
+	requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
 
 	responseHandler := fetcher.NewResponseHandler(requestBuilder.ExecuteRequest(websiteURL))
 	defer responseHandler.Close()

internal/reader/processor/odysee.go

@@ -14,6 +14,7 @@ import (
 
 	"miniflux.app/v2/internal/config"
 	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/proxyrotator"
 	"miniflux.app/v2/internal/reader/fetcher"
 )
 
@@ -33,7 +34,7 @@ func shouldFetchOdyseeWatchTime(entry *model.Entry) bool {
 func fetchOdyseeWatchTime(websiteURL string) (int, error) {
 	requestBuilder := fetcher.NewRequestBuilder()
 	requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
-	requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
+	requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
 
 	responseHandler := fetcher.NewResponseHandler(requestBuilder.ExecuteRequest(websiteURL))
 	defer responseHandler.Close()

internal/reader/processor/processor.go

@@ -14,6 +14,7 @@ import (
 	"miniflux.app/v2/internal/config"
 	"miniflux.app/v2/internal/metric"
 	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/proxyrotator"
 	"miniflux.app/v2/internal/reader/fetcher"
 	"miniflux.app/v2/internal/reader/readingtime"
 	"miniflux.app/v2/internal/reader/rewrite"
@@ -51,7 +52,7 @@ func ProcessFeedEntries(store *storage.Storage, feed *model.Feed, userID int64,
 			continue
 		}
 
-		if cleanedURL, err := urlcleaner.RemoveTrackingParameters(entry.URL); err == nil {
+		if cleanedURL, err := urlcleaner.RemoveTrackingParameters(feed.FeedURL, feed.SiteURL, entry.URL); err == nil {
 			entry.URL = cleanedURL
 		}
 
@@ -78,8 +79,10 @@ func ProcessFeedEntries(store *storage.Storage, feed *model.Feed, userID int64,
 			requestBuilder.WithUserAgent(feed.UserAgent, config.Opts.HTTPClientUserAgent())
 			requestBuilder.WithCookie(feed.Cookie)
 			requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
-			requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
-			requestBuilder.UseProxy(feed.FetchViaProxy)
+			requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
+			requestBuilder.WithCustomFeedProxyURL(feed.ProxyURL)
+			requestBuilder.WithCustomApplicationProxyURL(config.Opts.HTTPClientProxyURL())
+			requestBuilder.UseCustomApplicationProxyURL(feed.FetchViaProxy)
 			requestBuilder.IgnoreTLSErrors(feed.AllowSelfSignedCertificates)
 			requestBuilder.DisableHTTP2(feed.DisableHTTP2)
 
@@ -145,8 +148,10 @@ func ProcessEntryWebPage(feed *model.Feed, entry *model.Entry, user *model.User)
 	requestBuilder.WithUserAgent(feed.UserAgent, config.Opts.HTTPClientUserAgent())
 	requestBuilder.WithCookie(feed.Cookie)
 	requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
-	requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
-	requestBuilder.UseProxy(feed.FetchViaProxy)
+	requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
+	requestBuilder.WithCustomFeedProxyURL(feed.ProxyURL)
+	requestBuilder.WithCustomApplicationProxyURL(config.Opts.HTTPClientProxyURL())
+	requestBuilder.UseCustomApplicationProxyURL(feed.FetchViaProxy)
 	requestBuilder.IgnoreTLSErrors(feed.AllowSelfSignedCertificates)
 	requestBuilder.DisableHTTP2(feed.DisableHTTP2)
 

internal/reader/processor/youtube.go

@@ -18,6 +18,7 @@ import (
 
 	"miniflux.app/v2/internal/config"
 	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/proxyrotator"
 	"miniflux.app/v2/internal/reader/fetcher"
 )
 
@@ -52,7 +53,7 @@ func fetchYouTubeWatchTimeForSingleEntry(websiteURL string) (int, error) {
 
 	requestBuilder := fetcher.NewRequestBuilder()
 	requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
-	requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
+	requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
 
 	responseHandler := fetcher.NewResponseHandler(requestBuilder.ExecuteRequest(websiteURL))
 	defer responseHandler.Close()
@@ -132,7 +133,7 @@ func fetchYouTubeWatchTimeFromApiInBulk(videoIDs []string) (map[string]time.Dura
 
 	requestBuilder := fetcher.NewRequestBuilder()
 	requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
-	requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
+	requestBuilder.WithProxyRotator(proxyrotator.ProxyRotatorInstance)
 
 	responseHandler := fetcher.NewResponseHandler(requestBuilder.ExecuteRequest(apiURL.String()))
 	defer responseHandler.Close()

internal/reader/rdf/adapter.go

@@ -26,9 +26,10 @@ func NewRDFAdapter(rdf *RDF) *RDFAdapter {
 
 func (r *RDFAdapter) BuildFeed(baseURL string) *model.Feed {
 	feed := &model.Feed{
-		Title:   stripTags(r.rdf.Channel.Title),
-		FeedURL: strings.TrimSpace(baseURL),
-		SiteURL: strings.TrimSpace(r.rdf.Channel.Link),
+		Title:       stripTags(r.rdf.Channel.Title),
+		FeedURL:     strings.TrimSpace(baseURL),
+		SiteURL:     strings.TrimSpace(r.rdf.Channel.Link),
+		Description: strings.TrimSpace(r.rdf.Channel.Description),
 	}
 
 	if feed.Title == "" {

internal/reader/rdf/parser_test.go

@@ -23,8 +23,7 @@ func TestParseRDFSample(t *testing.T) {
 		<title>XML.com</title>
 		<link>http://xml.com/pub</link>
 		<description>
-		  XML.com features a rich mix of information and services
-		  for the XML community.
+		  XML.com features a rich mix of information and services for the XML community.
 		</description>
 
 		<image rdf:resource="http://xml.com/universal/images/xml_tiny.gif" />
@@ -84,6 +83,10 @@ func TestParseRDFSample(t *testing.T) {
 		t.Errorf("Incorrect title, got: %s", feed.Title)
 	}
 
+	if feed.Description != "XML.com features a rich mix of information and services for the XML community." {
+		t.Errorf("Incorrect description, got: %s", feed.Description)
+	}
+
 	if feed.FeedURL != "http://xml.com/pub/rdf.xml" {
 		t.Errorf("Incorrect feed URL, got: %s", feed.FeedURL)
 	}

internal/reader/rss/adapter.go

@@ -28,9 +28,10 @@ func NewRSSAdapter(rss *RSS) *RSSAdapter {
 
 func (r *RSSAdapter) BuildFeed(baseURL string) *model.Feed {
 	feed := &model.Feed{
-		Title:   html.UnescapeString(strings.TrimSpace(r.rss.Channel.Title)),
-		FeedURL: strings.TrimSpace(baseURL),
-		SiteURL: strings.TrimSpace(r.rss.Channel.Link),
+		Title:       html.UnescapeString(strings.TrimSpace(r.rss.Channel.Title)),
+		FeedURL:     strings.TrimSpace(baseURL),
+		SiteURL:     strings.TrimSpace(r.rss.Channel.Link),
+		Description: strings.TrimSpace(r.rss.Channel.Description),
 	}
 
 	// Ensure the Site URL is absolute.

internal/reader/rss/parser_test.go

@@ -67,6 +67,10 @@ func TestParseRss2Sample(t *testing.T) {
 		t.Errorf("Incorrect title, got: %s", feed.Title)
 	}
 
+	if feed.Description != "Liftoff to Space Exploration." {
+		t.Errorf("Incorrect description, got: %s", feed.Description)
+	}
+
 	if feed.FeedURL != "http://liftoff.msfc.nasa.gov/rss.xml" {
 		t.Errorf("Incorrect feed URL, got: %s", feed.FeedURL)
 	}
@@ -237,6 +241,14 @@ func TestParseEntryWithoutTitleAndDescription(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	if feed.Description != "" {
+		t.Errorf("Expected empty feed description, got: %s", feed.Description)
+	}
+
+	if len(feed.Entries) != 1 {
+		t.Errorf("Expected 1 entry, got: %d", len(feed.Entries))
+	}
+
 	if feed.Entries[0].Title != "https://example.org/item" {
 		t.Errorf("Incorrect entry title, got: %s", feed.Entries[0].Title)
 	}

internal/reader/sanitizer/sanitizer.go

@@ -77,6 +77,38 @@ var (
 		"var":        {},
 		"video":      {"poster", "height", "width", "src"},
 		"wbr":        {},
+
+		// MathML: https://w3c.github.io/mathml-core/ and https://developer.mozilla.org/en-US/docs/Web/MathML/Reference/Element
+		"annotation":     {},
+		"annotation-xml": {},
+		"maction":        {},
+		"math":           {"xmlns"},
+		"merror":         {},
+		"mfrac":          {},
+		"mi":             {},
+		"mmultiscripts":  {},
+		"mn":             {},
+		"mo":             {},
+		"mover":          {},
+		"mpadded":        {},
+		"mphantom":       {},
+		"mprescripts":    {},
+		"mroot":          {},
+		"mrow":           {},
+		"ms":             {},
+		"mspace":         {},
+		"msqrt":          {},
+		"mstyle":         {},
+		"msub":           {},
+		"msubsup":        {},
+		"msup":           {},
+		"mtable":         {},
+		"mtd":            {},
+		"mtext":          {},
+		"mtr":            {},
+		"munder":         {},
+		"munderover":     {},
+		"semantics":      {},
 	}
 )
 
@@ -99,7 +131,15 @@ func Sanitize(baseURL, input string) string {
 		}
 
 		token := tokenizer.Token()
-		tagName := token.DataAtom.String()
+
+		// Note: MathML elements are not fully supported by golang.org/x/net/html.
+		// See https://github.com/golang/net/blob/master/html/atom/gen.go
+		// and https://github.com/golang/net/blob/master/html/atom/table.go
+		tagName := token.Data
+		if tagName == "" {
+			continue
+		}
+
 		switch token.Type {
 		case html.TextToken:
 			if len(blockedStack) > 0 {
@@ -217,7 +257,8 @@ func sanitizeAttributes(baseURL, tagName string, attributes []html.Attribute) ([
 					continue
 				}
 
-				if cleanedURL, err := urlcleaner.RemoveTrackingParameters(value); err == nil {
+				// TODO use feedURL instead of baseURL twice.
+				if cleanedURL, err := urlcleaner.RemoveTrackingParameters(baseURL, baseURL, value); err == nil {
 					value = cleanedURL
 				}
 			}
@@ -385,6 +426,7 @@ func isValidIframeSource(baseURL, src string) bool {
 		"dailymotion.com",
 		"youtube-nocookie.com",
 		"youtube.com",
+		"open.spotify.com",
 	}
 	domain := urllib.Domain(src)
 

internal/reader/sanitizer/sanitizer_test.go

@@ -705,3 +705,13 @@ func TestAttributesAreStripped(t *testing.T) {
 		t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
 	}
 }
+
+func TestMathML(t *testing.T) {
+	input := `<math xmlns="http://www.w3.org/1998/Math/MathML"><msup><mi>x</mi><mn>2</mn></msup></math>`
+	expected := `<math xmlns="http://www.w3.org/1998/Math/MathML"><msup><mi>x</mi><mn>2</mn></msup></math>`
+	output := Sanitize("http://example.org/", input)
+
+	if expected != output {
+		t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
+	}
+}

internal/reader/subscription/finder.go

@@ -48,7 +48,7 @@ func (f *SubscriptionFinder) FeedResponseInfo() *model.FeedCreationRequestFromSu
 	return f.feedResponseInfo
 }
 
-func (f *SubscriptionFinder) FindSubscriptions(websiteURL, rssBridgeURL string) (Subscriptions, *locale.LocalizedErrorWrapper) {
+func (f *SubscriptionFinder) FindSubscriptions(websiteURL, rssBridgeURL string, rssBridgeToken string) (Subscriptions, *locale.LocalizedErrorWrapper) {
 	responseHandler := fetcher.NewResponseHandler(f.requestBuilder.ExecuteRequest(websiteURL))
 	defer responseHandler.Close()
 
@@ -108,7 +108,7 @@ func (f *SubscriptionFinder) FindSubscriptions(websiteURL, rssBridgeURL string)
 	// Step 5) Check if the website URL can use RSS-Bridge.
 	if rssBridgeURL != "" {
 		slog.Debug("Try to detect feeds with RSS-Bridge", slog.String("website_url", websiteURL))
-		if subscriptions, localizedError := f.FindSubscriptionsFromRSSBridge(websiteURL, rssBridgeURL); localizedError != nil {
+		if subscriptions, localizedError := f.FindSubscriptionsFromRSSBridge(websiteURL, rssBridgeURL, rssBridgeToken); localizedError != nil {
 			return nil, localizedError
 		} else if len(subscriptions) > 0 {
 			slog.Debug("Subscriptions found from RSS-Bridge", slog.String("website_url", websiteURL), slog.Any("subscriptions", subscriptions))
@@ -254,13 +254,14 @@ func (f *SubscriptionFinder) FindSubscriptionsFromWellKnownURLs(websiteURL strin
 	return subscriptions, nil
 }
 
-func (f *SubscriptionFinder) FindSubscriptionsFromRSSBridge(websiteURL, rssBridgeURL string) (Subscriptions, *locale.LocalizedErrorWrapper) {
+func (f *SubscriptionFinder) FindSubscriptionsFromRSSBridge(websiteURL, rssBridgeURL string, rssBridgeToken string) (Subscriptions, *locale.LocalizedErrorWrapper) {
 	slog.Debug("Trying to detect feeds using RSS-Bridge",
 		slog.String("website_url", websiteURL),
 		slog.String("rssbridge_url", rssBridgeURL),
+		slog.String("rssbridge_token", rssBridgeToken),
 	)
 
-	bridges, err := rssbridge.DetectBridges(rssBridgeURL, websiteURL)
+	bridges, err := rssbridge.DetectBridges(rssBridgeURL, rssBridgeToken, websiteURL)
 	if err != nil {
 		return nil, locale.NewLocalizedErrorWrapper(err, "error.unable_to_detect_rssbridge", err)
 	}
@@ -268,6 +269,7 @@ func (f *SubscriptionFinder) FindSubscriptionsFromRSSBridge(websiteURL, rssBridg
 	slog.Debug("RSS-Bridge results",
 		slog.String("website_url", websiteURL),
 		slog.String("rssbridge_url", rssBridgeURL),
+		slog.String("rssbridge_token", rssBridgeToken),
 		slog.Int("nb_bridges", len(bridges)),
 	)
 

internal/reader/urlcleaner/urlcleaner.go

@@ -89,7 +89,13 @@ var trackingParams = map[string]bool{
 	"_branch_referrer": true,
 }
 
-func RemoveTrackingParameters(inputURL string) (string, error) {
+// Outbound tracking parameters are appending the website's url to outbound links.
+var trackingParamsOutbound = map[string]bool{
+	// Ghost
+	"ref": true,
+}
+
+func RemoveTrackingParameters(baseUrl, feedUrl, inputURL string) (string, error) {
 	parsedURL, err := url.Parse(inputURL)
 	if err != nil {
 		return "", fmt.Errorf("urlcleaner: error parsing URL: %v", err)
@@ -99,6 +105,15 @@ func RemoveTrackingParameters(inputURL string) (string, error) {
 		return inputURL, nil
 	}
 
+	parsedBaseUrl, err := url.Parse(baseUrl)
+	if err != nil {
+		return "", fmt.Errorf("urlcleaner: error parsing base URL: %v", err)
+	}
+	parsedFeedUrl, err := url.Parse(feedUrl)
+	if err != nil {
+		return "", fmt.Errorf("urlcleaner: error parsing feed URL: %v", err)
+	}
+
 	queryParams := parsedURL.Query()
 	hasTrackers := false
 
@@ -109,6 +124,16 @@ func RemoveTrackingParameters(inputURL string) (string, error) {
 			queryParams.Del(param)
 			hasTrackers = true
 		}
+		if trackingParamsOutbound[lowerParam] {
+			// handle duplicate parameters like ?a=b&a=c&a=d…
+			for _, value := range queryParams[param] {
+				if value == parsedBaseUrl.Hostname() || value == parsedFeedUrl.Hostname() {
+					queryParams.Del(param)
+					hasTrackers = true
+					break
+				}
+			}
+		}
 	}
 
 	// Do not modify the URL if there are no tracking parameters

internal/reader/urlcleaner/urlcleaner_test.go

@@ -14,6 +14,8 @@ func TestRemoveTrackingParams(t *testing.T) {
 		name             string
 		input            string
 		expected         string
+		baseUrl          string
+		feedUrl          string
 		strictComparison bool
 	}{
 		{
@@ -62,28 +64,64 @@ func TestRemoveTrackingParams(t *testing.T) {
 			input:    "https://example.com/page?name=John%20Doe&utm_source=newsletter",
 			expected: "https://example.com/page?name=John+Doe",
 		},
+		{
+			name:     "ref parameter for another url",
+			input:    "https://example.com/page?ref=test.com",
+			baseUrl:  "https://example.com/page",
+			expected: "https://example.com/page?ref=test.com",
+		},
+		{
+			name:     "ref parameter for feed url",
+			input:    "https://example.com/page?ref=feed.com",
+			baseUrl:  "https://example.com/page",
+			expected: "https://example.com/page",
+			feedUrl:  "http://feed.com",
+		},
+		{
+			name:     "ref parameter for site url",
+			input:    "https://example.com/page?ref=example.com",
+			baseUrl:  "https://example.com/page",
+			expected: "https://example.com/page",
+		},
+		{
+			name:     "ref parameter for base url",
+			input:    "https://example.com/page?ref=example.com",
+			expected: "https://example.com/page",
+			baseUrl:  "https://example.com",
+			feedUrl:  "https://feedburned.com/example",
+		},
+		{
+			name:     "ref parameter for base url on subdomain",
+			input:    "https://blog.exploits.club/some-path?ref=blog.exploits.club",
+			expected: "https://blog.exploits.club/some-path",
+			baseUrl:  "https://blog.exploits.club/some-path",
+			feedUrl:  "https://feedburned.com/exploit.club",
+		},
 		{
 			name:             "Non-standard URL parameter with no tracker",
 			input:            "https://example.com/foo.jpg?crop/1420x708/format/webp",
 			expected:         "https://example.com/foo.jpg?crop/1420x708/format/webp",
+			baseUrl:          "https://example.com/page",
 			strictComparison: true,
 		},
 		{
 			name:     "Invalid URL",
 			input:    "https://example|org/",
+			baseUrl:  "https://example.com/page",
 			expected: "",
 		},
 		{
 			name:             "Non-HTTP URL",
 			input:            "mailto:user@example.org",
 			expected:         "mailto:user@example.org",
+			baseUrl:          "https://example.com/page",
 			strictComparison: true,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			result, err := RemoveTrackingParameters(tt.input)
+			result, err := RemoveTrackingParameters(tt.baseUrl, tt.feedUrl, tt.input)
 			if tt.expected == "" {
 				if err == nil {
 					t.Errorf("Expected an error for invalid URL, but got none")

internal/storage/api_key.go

@@ -6,9 +6,12 @@ package storage // import "miniflux.app/v2/internal/storage"
 import (
 	"fmt"
 
+	"miniflux.app/v2/internal/crypto"
 	"miniflux.app/v2/internal/model"
 )
 
+var ErrAPIKeyNotFound = fmt.Errorf("store: API Key not found")
+
 // APIKeyExists checks if an API Key with the same description exists.
 func (s *Storage) APIKeyExists(userID int64, description string) bool {
 	var result bool
@@ -66,37 +69,50 @@ func (s *Storage) APIKeys(userID int64) (model.APIKeys, error) {
 }
 
 // CreateAPIKey inserts a new API key.
-func (s *Storage) CreateAPIKey(apiKey *model.APIKey) error {
+func (s *Storage) CreateAPIKey(userID int64, description string) (*model.APIKey, error) {
 	query := `
 		INSERT INTO api_keys
 			(user_id, token, description)
 		VALUES
 			($1, $2, $3)
 		RETURNING
-			id, created_at
+			id, user_id, token, description, last_used_at, created_at
 	`
+	var apiKey model.APIKey
 	err := s.db.QueryRow(
 		query,
-		apiKey.UserID,
-		apiKey.Token,
-		apiKey.Description,
+		userID,
+		crypto.GenerateRandomStringHex(32),
+		description,
 	).Scan(
 		&apiKey.ID,
+		&apiKey.UserID,
+		&apiKey.Token,
+		&apiKey.Description,
+		&apiKey.LastUsedAt,
 		&apiKey.CreatedAt,
 	)
 	if err != nil {
-		return fmt.Errorf(`store: unable to create category: %v`, err)
+		return nil, fmt.Errorf(`store: unable to create API Key: %v`, err)
 	}
 
-	return nil
+	return &apiKey, nil
 }
 
-// RemoveAPIKey deletes an API Key.
-func (s *Storage) RemoveAPIKey(userID, keyID int64) error {
-	query := `DELETE FROM api_keys WHERE id = $1 AND user_id = $2`
-	_, err := s.db.Exec(query, keyID, userID)
+// DeleteAPIKey deletes an API Key.
+func (s *Storage) DeleteAPIKey(userID, keyID int64) error {
+	result, err := s.db.Exec(`DELETE FROM api_keys WHERE id = $1 AND user_id = $2`, keyID, userID)
 	if err != nil {
-		return fmt.Errorf(`store: unable to remove this API Key: %v`, err)
+		return fmt.Errorf(`store: unable to delete this API Key: %v`, err)
+	}
+
+	count, err := result.RowsAffected()
+	if err != nil {
+		return fmt.Errorf(`store: unable to delete this API Key: %v`, err)
+	}
+
+	if count == 0 {
+		return ErrAPIKeyNotFound
 	}
 
 	return nil

internal/storage/category.go

@@ -165,31 +165,34 @@ func (s *Storage) CategoriesWithFeedCount(userID int64) (model.Categories, error
 }
 
 // CreateCategory creates a new category.
-func (s *Storage) CreateCategory(userID int64, request *model.CategoryRequest) (*model.Category, error) {
+func (s *Storage) CreateCategory(userID int64, request *model.CategoryCreationRequest) (*model.Category, error) {
 	var category model.Category
 
 	query := `
 		INSERT INTO categories
-			(user_id, title)
+			(user_id, title, hide_globally)
 		VALUES
-			($1, $2)
+			($1, $2, $3)
 		RETURNING
 			id,
 			user_id,
-			title
+			title,
+			hide_globally
 	`
 	err := s.db.QueryRow(
 		query,
 		userID,
 		request.Title,
+		request.HideGlobally,
 	).Scan(
 		&category.ID,
 		&category.UserID,
 		&category.Title,
+		&category.HideGlobally,
 	)
 
 	if err != nil {
-		return nil, fmt.Errorf(`store: unable to create category %q: %v`, request.Title, err)
+		return nil, fmt.Errorf(`store: unable to create category %q for user ID %d: %v`, request.Title, userID, err)
 	}
 
 	return &category, nil
@@ -197,7 +200,7 @@ func (s *Storage) CreateCategory(userID int64, request *model.CategoryRequest) (
 
 // UpdateCategory updates an existing category.
 func (s *Storage) UpdateCategory(category *model.Category) error {
-	query := `UPDATE categories SET title=$1, hide_globally = $2 WHERE id=$3 AND user_id=$4`
+	query := `UPDATE categories SET title=$1, hide_globally=$2 WHERE id=$3 AND user_id=$4`
 	_, err := s.db.Exec(
 		query,
 		category.Title,

internal/storage/entry.go

@@ -476,6 +476,30 @@ func (s *Storage) MarkAllAsRead(userID int64) error {
 	return nil
 }
 
+// MarkAllAsReadBeforeDate updates all user entries to the read status before the given date.
+func (s *Storage) MarkAllAsReadBeforeDate(userID int64, before time.Time) error {
+	query := `
+		UPDATE
+			entries
+		SET
+			status=$1,
+			changed_at=now()
+		WHERE
+			user_id=$2 AND status=$3 AND published_at < $4
+	`
+	result, err := s.db.Exec(query, model.EntryStatusRead, userID, model.EntryStatusUnread, before)
+	if err != nil {
+		return fmt.Errorf(`store: unable to mark all entries as read before %s: %v`, before.Format(time.RFC3339), err)
+	}
+	count, _ := result.RowsAffected()
+	slog.Debug("Marked all entries as read before date",
+		slog.Int64("user_id", userID),
+		slog.Int64("nb_entries", count),
+		slog.String("before", before.Format(time.RFC3339)),
+	)
+	return nil
+}
+
 // MarkGloballyVisibleFeedsAsRead updates all user entries to the read status.
 func (s *Storage) MarkGloballyVisibleFeedsAsRead(userID int64) error {
 	query := `
@@ -527,6 +551,7 @@ func (s *Storage) MarkFeedAsRead(userID, feedID int64, before time.Time) error {
 		slog.Int64("user_id", userID),
 		slog.Int64("feed_id", feedID),
 		slog.Int64("nb_entries", count),
+		slog.String("before", before.Format(time.RFC3339)),
 	)
 
 	return nil
@@ -563,6 +588,7 @@ func (s *Storage) MarkCategoryAsRead(userID, categoryID int64, before time.Time)
 		slog.Int64("user_id", userID),
 		slog.Int64("category_id", categoryID),
 		slog.Int64("nb_entries", count),
+		slog.String("before", before.Format(time.RFC3339)),
 	)
 
 	return nil

internal/storage/feed.go

@@ -248,10 +248,11 @@ func (s *Storage) CreateFeed(feed *model.Feed) error {
 			apprise_service_urls,
 			webhook_url,
 			disable_http2,
-			description
+			description,
+			proxy_url
 		)
 		VALUES
-			($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27)
+			($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28)
 		RETURNING
 			id
 	`
@@ -284,6 +285,7 @@ func (s *Storage) CreateFeed(feed *model.Feed) error {
 		feed.WebhookURL,
 		feed.DisableHTTP2,
 		feed.Description,
+		feed.ProxyURL,
 	).Scan(&feed.ID)
 	if err != nil {
 		return fmt.Errorf(`store: unable to create feed %q: %v`, feed.FeedURL, err)
@@ -363,9 +365,10 @@ func (s *Storage) UpdateFeed(feed *model.Feed) (err error) {
 			ntfy_priority=$32,
 			ntfy_topic=$33,
 			pushover_enabled=$34,
-			pushover_priority=$35
+			pushover_priority=$35,
+			proxy_url=$36
 		WHERE
-			id=$36 AND user_id=$37
+			id=$37 AND user_id=$38
 	`
 	_, err = s.db.Exec(query,
 		feed.FeedURL,
@@ -403,6 +406,7 @@ func (s *Storage) UpdateFeed(feed *model.Feed) (err error) {
 		feed.NtfyTopic,
 		feed.PushoverEnabled,
 		feed.PushoverPriority,
+		feed.ProxyURL,
 		feed.ID,
 		feed.UserID,
 	)
@@ -481,3 +485,8 @@ func (s *Storage) ResetFeedErrors() error {
 	_, err := s.db.Exec(`UPDATE feeds SET parsing_error_count=0, parsing_error_msg=''`)
 	return err
 }
+
+func (s *Storage) ResetNextCheckAt() error {
+	_, err := s.db.Exec(`UPDATE feeds SET next_check_at=now()`)
+	return err
+}

internal/storage/feed_query_builder.go

@@ -172,7 +172,8 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) {
 			f.ntfy_priority,
 			f.ntfy_topic,
 			f.pushover_enabled,
-			f.pushover_priority
+			f.pushover_priority,
+			f.proxy_url
 		FROM
 			feeds f
 		LEFT JOIN
@@ -251,6 +252,7 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) {
 			&feed.NtfyTopic,
 			&feed.PushoverEnabled,
 			&feed.PushoverPriority,
+			&feed.ProxyURL,
 		)
 
 		if err != nil {

internal/storage/integration.go

@@ -219,7 +219,8 @@ func (s *Storage) Integration(userID int64) (*model.Integration, error) {
 			pushover_user,
 			pushover_token,
 			pushover_device,
-			pushover_prefix
+			pushover_prefix,
+			rssbridge_token
 		FROM
 			integrations
 		WHERE
@@ -338,6 +339,7 @@ func (s *Storage) Integration(userID int64) (*model.Integration, error) {
 		&integration.PushoverToken,
 		&integration.PushoverDevice,
 		&integration.PushoverPrefix,
+		&integration.RSSBridgeToken,
 	)
 	switch {
 	case err == sql.ErrNoRows:
@@ -464,9 +466,10 @@ func (s *Storage) UpdateIntegration(integration *model.Integration) error {
 			pushover_user=$107,
 			pushover_token=$108,
 			pushover_device=$109,
-			pushover_prefix=$110
+			pushover_prefix=$110,
+			rssbridge_token=$111
 		WHERE
-			user_id=$111
+			user_id=$112
 	`
 	_, err := s.db.Exec(
 		query,
@@ -580,6 +583,7 @@ func (s *Storage) UpdateIntegration(integration *model.Integration) error {
 		integration.PushoverToken,
 		integration.PushoverDevice,
 		integration.PushoverPrefix,
+		integration.RSSBridgeToken,
 		integration.UserID,
 	)
 

internal/storage/user.go

@@ -96,7 +96,8 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m
 			mark_read_on_view,
 			media_playback_rate,
 			block_filter_entry_rules,
-			keep_filter_entry_rules
+			keep_filter_entry_rules,
+			always_open_external_links
 	`
 
 	tx, err := s.db.Begin()
@@ -140,6 +141,7 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m
 		&user.MediaPlaybackRate,
 		&user.BlockFilterEntryRules,
 		&user.KeepFilterEntryRules,
+		&user.AlwaysOpenExternalLinks,
 	)
 	if err != nil {
 		tx.Rollback()
@@ -204,9 +206,10 @@ func (s *Storage) UpdateUser(user *model.User) error {
 				mark_read_on_media_player_completion=$25,
 				media_playback_rate=$26,
 				block_filter_entry_rules=$27,
-				keep_filter_entry_rules=$28
+				keep_filter_entry_rules=$28,
+				always_open_external_links=$29
 			WHERE
-				id=$29
+				id=$30
 		`
 
 		_, err = s.db.Exec(
@@ -239,6 +242,7 @@ func (s *Storage) UpdateUser(user *model.User) error {
 			user.MediaPlaybackRate,
 			user.BlockFilterEntryRules,
 			user.KeepFilterEntryRules,
+			user.AlwaysOpenExternalLinks,
 			user.ID,
 		)
 		if err != nil {
@@ -273,9 +277,10 @@ func (s *Storage) UpdateUser(user *model.User) error {
 				mark_read_on_media_player_completion=$24,
 				media_playback_rate=$25,
 				block_filter_entry_rules=$26,
-				keep_filter_entry_rules=$27
+				keep_filter_entry_rules=$27,
+				always_open_external_links=$28
 			WHERE
-				id=$28
+				id=$29
 		`
 
 		_, err := s.db.Exec(
@@ -307,6 +312,7 @@ func (s *Storage) UpdateUser(user *model.User) error {
 			user.MediaPlaybackRate,
 			user.BlockFilterEntryRules,
 			user.KeepFilterEntryRules,
+			user.AlwaysOpenExternalLinks,
 			user.ID,
 		)
 
@@ -360,7 +366,8 @@ func (s *Storage) UserByID(userID int64) (*model.User, error) {
 			mark_read_on_media_player_completion,
 			media_playback_rate,
 			block_filter_entry_rules,
-			keep_filter_entry_rules
+			keep_filter_entry_rules,
+			always_open_external_links
 		FROM
 			users
 		WHERE
@@ -401,7 +408,8 @@ func (s *Storage) UserByUsername(username string) (*model.User, error) {
 			mark_read_on_media_player_completion,
 			media_playback_rate,
 			block_filter_entry_rules,
-			keep_filter_entry_rules
+			keep_filter_entry_rules,
+			always_open_external_links
 		FROM
 			users
 		WHERE
@@ -442,7 +450,8 @@ func (s *Storage) UserByField(field, value string) (*model.User, error) {
 			mark_read_on_media_player_completion,
 			media_playback_rate,
 			block_filter_entry_rules,
-			keep_filter_entry_rules
+			keep_filter_entry_rules,
+			always_open_external_links
 		FROM
 			users
 		WHERE
@@ -490,7 +499,8 @@ func (s *Storage) UserByAPIKey(token string) (*model.User, error) {
 			u.mark_read_on_media_player_completion,
 			media_playback_rate,
 			u.block_filter_entry_rules,
-			u.keep_filter_entry_rules
+			u.keep_filter_entry_rules,
+			u.always_open_external_links
 		FROM
 			users u
 		LEFT JOIN
@@ -533,6 +543,7 @@ func (s *Storage) fetchUser(query string, args ...interface{}) (*model.User, err
 		&user.MediaPlaybackRate,
 		&user.BlockFilterEntryRules,
 		&user.KeepFilterEntryRules,
+		&user.AlwaysOpenExternalLinks,
 	)
 
 	if err == sql.ErrNoRows {
@@ -646,7 +657,8 @@ func (s *Storage) Users() (model.Users, error) {
 			mark_read_on_media_player_completion,
 			media_playback_rate,
 			block_filter_entry_rules,
-			keep_filter_entry_rules
+			keep_filter_entry_rules,
+			always_open_external_links
 		FROM
 			users
 		ORDER BY username ASC
@@ -690,6 +702,7 @@ func (s *Storage) Users() (model.Users, error) {
 			&user.MediaPlaybackRate,
 			&user.BlockFilterEntryRules,
 			&user.KeepFilterEntryRules,
+			&user.AlwaysOpenExternalLinks,
 		)
 
 		if err != nil {

internal/template/templates/views/about.html

@@ -13,7 +13,7 @@
     <ul>
         <li><strong>{{ t "page.about.version" }}</strong> <a href="https://github.com/miniflux/v2/releases/tag/{{ .version }}">{{ .version }}</a></li>
 	{{ if .commit }}
-        <li><strong>Git Commit</strong> <a href="https://github.com/miniflux/v2/commit/{{ .commit }}">{{ .commit }}</a></li>
+        <li><strong>{{ t "page.about.git_commit" }}</strong> <a href="https://github.com/miniflux/v2/commit/{{ .commit }}">{{ .commit }}</a></li>
 	{{ end }}
         <li><strong>{{ t "page.about.build_date" }}</strong> {{ .build_date }}</li>
         {{ if .user.IsAdmin }}<li><strong>{{ t "page.about.postgres_version" }}</strong> {{ .postgres_version }}</li>{{ end }}