refactor(app): remove RequestError class

Prevents the primary administrator from unlinking their media server account (which would break
sync). Additionally, prevents users without a configured local email and password from unlinking
their accounts, which would render them unable to log in.

.all-contributorsrc

@@ -556,51 +556,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "GkhnGRBZ",
-      "name": "GkhnGRBZ",
-      "avatar_url": "https://avatars.githubusercontent.com/u/127258824?v=4",
-      "profile": "https://github.com/GkhnGRBZ",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "benhaney",
-      "name": "Ben Haney",
-      "avatar_url": "https://avatars.githubusercontent.com/u/31331498?v=4",
-      "profile": "http://benhaney.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Wunderharke",
-      "name": "Wunderharke",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5105672?v=4",
-      "profile": "https://github.com/Wunderharke",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "methbkts",
-      "name": "Metin Bektas",
-      "avatar_url": "https://avatars.githubusercontent.com/u/30674934?v=4",
-      "profile": "https://github.com/methbkts",
-      "contributions": [
-        "infra"
-      ]
-    },
-    {
-      "login": "andrewkolda",
-      "name": "andrewkolda",
-      "avatar_url": "https://avatars.githubusercontent.com/u/158614532?v=4",
-      "profile": "https://github.com/andrewkolda",
-      "contributions": [
-        "design"
-      ]
     }
   ]
 }

.github/ISSUE_TEMPLATE/bug.yml

@@ -63,8 +63,6 @@ body:
         - PostgreSQL
       label: Database
       description: Which database backend are you using?
-    validations:
-      required: true
   - type: input
     id: device
     attributes:

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
   test:
     name: Lint & Test Build
     if: github.event_name == 'pull_request'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     container: node:22-alpine
     steps:
       - name: Checkout
@@ -43,23 +43,15 @@ jobs:
       - name: Build
         run: pnpm build
 
-  build:
+  build_and_push:
     name: Build & Publish Docker Images
     if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]')
-    strategy:
-      matrix:
-        include:
-          - runner: ubuntu-24.04
-            platform: linux/amd64
-          - runner: ubuntu-24.04-arm
-            platform: linux/arm64
-    runs-on: ${{ matrix.runner }}
-    outputs:
-      digest-amd64: ${{ steps.set_outputs.outputs.digest-amd64 }}
-      digest-arm64: ${{ steps.set_outputs.outputs.digest-arm64 }}
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Log in to Docker Hub
@@ -78,77 +70,24 @@ jobs:
           echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
         env:
           OWNER: ${{ github.repository_owner }}
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            fallenbagel/jellyseerr
-            ghcr.io/${{ env.OWNER_LC }}/jellyseerr
-          tags: |
-            type=ref,event=branch
-            type=sha,prefix=,suffix=,format=short
-      - name: Build and push by digest
-        id: build
+      - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile
-          platforms: ${{ matrix.platform }}
+          platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
             COMMIT_TAG=${{ github.sha }}
-          outputs: |
-            type=image,push-by-digest=true,name=fallenbagel/jellyseerr,push=true
-            type=image,push-by-digest=true,name=ghcr.io/${{ env.OWNER_LC }}/jellyseerr,push=true
-          cache-from: type=gha,scope=${{ matrix.platform }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.platform }}
-          provenance: false
-      - name: Set outputs
-        id: set_outputs
-        run: |
-          platform="${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}"
-          echo "digest-${platform}=${{ steps.build.outputs.digest }}" >> $GITHUB_OUTPUT
-
-  merge_and_push:
-    name: Create and Push Multi-arch Manifest
-    needs: build
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set lower case owner name
-        run: |
-          echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
-        env:
-          OWNER: ${{ github.repository_owner }}
-      - name: Create and push manifest
-        run: |
-          docker manifest create fallenbagel/jellyseerr:develop \
-            --amend fallenbagel/jellyseerr@${{ needs.build.outputs.digest-amd64 }} \
-            --amend fallenbagel/jellyseerr@${{ needs.build.outputs.digest-arm64 }}
-          docker manifest push fallenbagel/jellyseerr:develop
-
-          # GHCR manifest
-          docker manifest create ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop \
-            --amend ghcr.io/${{ env.OWNER_LC }}/jellyseerr@${{ needs.build.outputs.digest-amd64 }} \
-            --amend ghcr.io/${{ env.OWNER_LC }}/jellyseerr@${{ needs.build.outputs.digest-arm64 }}
-          docker manifest push ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop
+          tags: |
+            fallenbagel/jellyseerr:develop
+            ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop
 
   discord:
     name: Send Discord Notification
-    needs: merge_and_push
+    needs: build_and_push
     if: always() && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Get Build Job Status
         uses: technote-space/workflow-conclusion-action@v3

.github/workflows/helm.yml

@@ -1,135 +0,0 @@
-name: Release Charts
-
-on:
-  push:
-    branches:
-      - develop
-
-jobs:
-  package-helm-chart:
-    name: Package helm chart
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: read
-    outputs:
-      has_artifacts: ${{ steps.check-artifacts.outputs.has_artifacts }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install helm
-        uses: azure/setup-helm@v4
-
-      - name: Install Oras
-        uses: oras-project/setup-oras@v1
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Package helm charts
-        run: |
-          mkdir -p ./.cr-release-packages
-          for chart_path in ./charts/*; do
-            if [ -d "$chart_path" ] && [ -f "$chart_path/Chart.yaml" ]; then
-              chart_name=$(grep '^name:' "$chart_path/Chart.yaml" | awk '{print $2}')
-              # get current version
-              current_version=$(grep '^version:' "$chart_path/Chart.yaml" | awk '{print $2}')
-              # try to get current release version
-              set +e
-              oras discover ghcr.io/${GITHUB_REPOSITORY@L}/${chart_name}:${current_version}
-              oras_exit_code=$?
-              set -e
-
-              if [ $oras_exit_code -ne 0 ]; then
-                helm dependency build "$chart_path"
-                helm package "$chart_path" --destination ./.cr-release-packages
-              else
-                echo "No version change for $chart_name. Skipping."
-              fi
-            else
-              echo "Skipping $chart_name: Not a valid Helm chart"
-            fi
-          done
-
-      - name: Check if artifacts exist
-        id: check-artifacts
-        run: |
-          if ls .cr-release-packages/* >/dev/null 2>&1; then
-            echo "has_artifacts=true" >> $GITHUB_OUTPUT
-          else
-            echo "has_artifacts=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        if: steps.check-artifacts.outputs.has_artifacts == 'true'
-        with:
-          name: artifacts
-          include-hidden-files: true
-          path: .cr-release-packages/
-
-  publish:
-    name: Publish to ghcr.io
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write # needed for pushing to github registry
-      id-token: write # needed for signing the images with GitHub OIDC Token
-    needs: [package-helm-chart]
-    if: needs.package-helm-chart.outputs.has_artifacts == 'true'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install helm
-        uses: azure/setup-helm@v4
-
-      - name: Install Oras
-        uses: oras-project/setup-oras@v1
-
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@v3
-
-      - name: Downloads artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: artifacts
-          path: .cr-release-packages/
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Push charts to GHCR
-        env:
-          COSIGN_YES: true
-        run: |
-          for chart_path in `find .cr-release-packages -name '*.tgz' -print`; do
-            # push chart to OCI
-            chart_release_file=$(basename "$chart_path")
-            chart_name=${chart_release_file%-*}
-            helm push ${chart_path} oci://ghcr.io/${GITHUB_REPOSITORY@L} |& tee helm-push-output.log
-            chart_digest=$(awk -F "[, ]+" '/Digest/{print $NF}' < helm-push-output.log)
-            # sign chart
-            cosign sign "ghcr.io/${GITHUB_REPOSITORY@L}/${chart_name}@${chart_digest}"
-            # push artifacthub-repo.yml to OCI
-            oras push \
-              ghcr.io/${GITHUB_REPOSITORY@L}/${chart_name}:artifacthub.io \
-              --config /dev/null:application/vnd.cncf.artifacthub.config.v1+yaml \
-              charts/$chart_name/artifacthub-repo.yml:application/vnd.cncf.artifacthub.repository-metadata.layer.v1.yaml \
-              |& tee oras-push-output.log
-            artifacthub_digest=$(grep "Digest:" oras-push-output.log | awk '{print $2}')
-            # sign artifacthub-repo.yml
-            cosign sign "ghcr.io/${GITHUB_REPOSITORY@L}/${chart_name}:artifacthub.io@${artifacthub_digest}"
-          done

.github/workflows/release.yml

@@ -26,12 +26,6 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GH_TOKEN }}
       - name: Pnpm Setup
         uses: pnpm/action-setup@v4
         with:

Dockerfile

@@ -14,7 +14,7 @@ RUN \
   ;; \
   esac
 
-RUN npm install --global pnpm@9
+RUN npm install --global pnpm
 
 COPY package.json pnpm-lock.yaml postinstall-win.js ./
 RUN CYPRESS_INSTALL_BINARY=0 pnpm install --frozen-lockfile
@@ -29,7 +29,7 @@ RUN pnpm build
 # remove development dependencies
 RUN pnpm prune --prod --ignore-scripts
 
-RUN rm -rf src server .next/cache charts gen-docs docs
+RUN rm -rf src server .next/cache
 
 RUN touch config/DOCKER
 
@@ -45,7 +45,7 @@ WORKDIR /app
 
 RUN apk add --no-cache tzdata tini && rm -rf /tmp/*
 
-RUN npm install -g pnpm@9
+RUN npm install -g pnpm
 
 # copy from build image
 COPY --from=BUILD_IMAGE /app ./

Dockerfile.local

@@ -3,7 +3,7 @@ FROM node:22-alpine
 COPY . /app
 WORKDIR /app
 
-RUN npm install --global pnpm@9
+Run npm install --global pnpm
 
 RUN pnpm install
 

README.md

@@ -11,17 +11,17 @@
 <a href="http://translate.jellyseerr.dev/engage/jellyseerr/"><img src="http://translate.jellyseerr.dev/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
 <a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-65-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-60-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
-**Jellyseerr** is a free and open source software application for managing requests for your media library. It integrates with the media server of your choice: [Jellyfin](https://jellyfin.org), [Plex](https://plex.tv), and [Emby](https://emby.media/). In addition, it integrates with your existing services, such as **[Sonarr](https://sonarr.tv/)**, **[Radarr](https://radarr.video/)**.
+**Jellyseerr** is a free and open source software application for managing requests for your media library.
+It is a fork of [Overseerr](https://github.com/sct/overseerr) built to bring additional support for [Jellyfin](https://github.com/jellyfin/jellyfin) & [Emby](https://github.com/MediaBrowser/Emby) media servers!
 
 ## Current Features
 
-- Full Jellyfin/Emby/Plex integration including authentication with user import & management.
-- Support for **PostgreSQL** and **SQLite** databases.
-- Supports Movies, Shows and Mixed Libraries.
-- Ability to change email addresses for SMTP purposes.
+- Full Jellyfin/Emby/Plex integration including authentication with user import & management
+- Supports Movies, Shows and Mixed Libraries
+- Ability to change email addresses for smtp purposes
 - Easy integration with your existing services. Currently, Jellyseerr supports Sonarr and Radarr. More to come!
 - Jellyfin/Emby/Plex library scan, to keep track of the titles which are already available.
 - Customizable request system, which allows users to request individual seasons or movies in a friendly, easy-to-use interface.
@@ -29,7 +29,8 @@
 - Granular permission system.
 - Support for various notification agents.
 - Mobile-friendly design, for when you need to approve requests on the go!
-- Support for watchlisting & blacklisting media.
+
+  (Upcoming Features include: Multiple Server Instances, and much more!)
 
 With more features on the way! Check out our [issue tracker](https://github.com/fallenbagel/jellyseerr/issues) to see the features which have already been requested.
 
@@ -162,13 +163,6 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
       <td align="center" valign="top" width="14.28%"><a href="https://me.garnx.fr"><img src="https://avatars.githubusercontent.com/u/37373941?v=4?s=100" width="100px;" alt="Guillaume ARNOUX"/><br /><sub><b>Guillaume ARNOUX</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=guillaumearnx" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/dr-carrot"><img src="https://avatars.githubusercontent.com/u/17272571?v=4?s=100" width="100px;" alt="dr-carrot"/><br /><sub><b>dr-carrot</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=dr-carrot" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/gageorsburn"><img src="https://avatars.githubusercontent.com/u/4692734?v=4?s=100" width="100px;" alt="Gage Orsburn"/><br /><sub><b>Gage Orsburn</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=gageorsburn" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/GkhnGRBZ"><img src="https://avatars.githubusercontent.com/u/127258824?v=4?s=100" width="100px;" alt="GkhnGRBZ"/><br /><sub><b>GkhnGRBZ</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=GkhnGRBZ" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://benhaney.com"><img src="https://avatars.githubusercontent.com/u/31331498?v=4?s=100" width="100px;" alt="Ben Haney"/><br /><sub><b>Ben Haney</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=benhaney" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Wunderharke"><img src="https://avatars.githubusercontent.com/u/5105672?v=4?s=100" width="100px;" alt="Wunderharke"/><br /><sub><b>Wunderharke</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=Wunderharke" title="Documentation">📖</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/methbkts"><img src="https://avatars.githubusercontent.com/u/30674934?v=4?s=100" width="100px;" alt="Metin Bektas"/><br /><sub><b>Metin Bektas</b></sub></a><br /><a href="#infra-methbkts" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andrewkolda"><img src="https://avatars.githubusercontent.com/u/158614532?v=4?s=100" width="100px;" alt="andrewkolda"/><br /><sub><b>andrewkolda</b></sub></a><br /><a href="#design-andrewkolda" title="Design">🎨</a></td>
     </tr>
   </tbody>
 </table>

charts/jellyseerr-chart/artifacthub-repo.yml

@@ -1 +0,0 @@
-repositoryID: c6b3f2dc-444c-4e37-b397-6a5ff563ee8b

charts/jellyseerr/.helmignore

@@ -21,5 +21,3 @@
 .idea/
 *.tmproj
 .vscode/
-# go template
-*.gotmpl

charts/jellyseerr/Chart.yaml

@@ -1,10 +1,10 @@
 apiVersion: v2
 kubeVersion: ">=1.23.0-0"
-name: jellyseerr-chart
+name: Jellyseerr
 description: Jellyseerr helm chart for Kubernetes
 type: application
-version: 2.1.1
-appVersion: "2.3.0"
+version: 1.1.0
+appVersion: "2.1.0"
 maintainers:
   - name: Jellyseerr
     url: https://github.com/Fallenbagel/jellyseerr

charts/jellyseerr/README.md

@@ -1,6 +1,6 @@
-# jellyseerr-chart
+# Jellyseerr
 
-![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square)
+![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square)
 
 Jellyseerr helm chart for Kubernetes
 
@@ -25,6 +25,10 @@ Kubernetes: `>=1.23.0-0`
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
+| autoscaling.enabled | bool | `false` |  |
+| autoscaling.maxReplicas | int | `100` |  |
+| autoscaling.minReplicas | int | `1` |  |
+| autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | config | object | `{"persistence":{"accessModes":["ReadWriteOnce"],"annotations":{},"name":"","size":"5Gi","volumeName":""}}` | Creating PVC to store configuration |
 | config.persistence.accessModes | list | `["ReadWriteOnce"]` | Access modes of persistent disk |
 | config.persistence.annotations | object | `{}` | Annotations for PVCs |
@@ -35,7 +39,7 @@ Kubernetes: `>=1.23.0-0`
 | extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the jellyseerr pods |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.registry | string | `"ghcr.io"` |  |
+| image.registry | string | `"docker.io"` |  |
 | image.repository | string | `"fallenbagel/jellyseerr"` |  |
 | image.sha | string | `""` |  |
 | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
@@ -63,5 +67,3 @@ Kubernetes: `>=1.23.0-0`
 | serviceAccount.name | string | `""` | If not set and create is true, a name is generated using the fullname template |
 | strategy | object | `{"type":"Recreate"}` | Deployment strategy |
 | tolerations | list | `[]` |  |
-| volumeMounts | list | `[]` | Additional volumeMounts on the output Deployment definition. |
-| volumes | list | `[]` | Additional volumes on the output Deployment definition. |

charts/jellyseerr/templates/deployment.yaml

@@ -5,7 +5,9 @@ metadata:
   labels:
     {{- include "jellyseerr.labels" . | nindent 4 }}
 spec:
+  {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
+  {{- end }}
   strategy:
     type: {{ .Values.strategy.type }}
   selector:
@@ -65,16 +67,10 @@ spec:
           volumeMounts:
             - name: config
               mountPath: /app/config
-          {{- with .Values.volumeMounts }}
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
       volumes:
         - name: config
           persistentVolumeClaim:
             claimName: {{ include "jellyseerr.configPersistenceName" . }}
-      {{- with .Values.volumes }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/jellyseerr/templates/hpa.yaml

@@ -0,0 +1,32 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "jellyseerr.fullname" . }}
+  labels:
+    {{- include "jellyseerr.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "jellyseerr.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}

charts/jellyseerr/values.yaml

@@ -1,7 +1,7 @@
 replicaCount: 1
 
 image:
-  registry: ghcr.io
+  registry: docker.io
   repository: fallenbagel/jellyseerr
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion.
@@ -94,18 +94,12 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
-# -- Additional volumes on the output Deployment definition.
-volumes: []
-# - name: foo
-#   secret:
-#     secretName: mysecret
-#     optional: false
-
-# -- Additional volumeMounts on the output Deployment definition.
-volumeMounts: []
-# - name: foo
-#   mountPath: "/etc/foo"
-#   readOnly: true
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
 
 nodeSelector: {}
 

cypress/config/settings.cypress.json

@@ -23,8 +23,6 @@
     "mediaServerType": 1,
     "partialRequestsEnabled": true,
     "enableSpecialEpisodes": false,
-    "forceIpv4First": false,
-    "dnsServers": "",
     "locale": "en"
   },
   "plex": {

cypress/support/commands.ts

@@ -6,6 +6,7 @@ Cypress.Commands.add('login', (email, password) => {
     [email, password],
     () => {
       cy.visit('/login');
+      cy.contains('Use your Overseerr account').click();
 
       cy.get('[data-testid=email]').type(email);
       cy.get('[data-testid=password]').type(password);

docs/README.md

@@ -7,34 +7,31 @@ sidebar_position: 1
 
 Welcome to the Jellyseerr Documentation.
 
-**Jellyseerr** is a free and open source software application for managing requests for your media library. It integrates with the media server of your choice: [Jellyfin](https://jellyfin.org), [Plex](https://plex.tv), and [Emby](https://emby.media/). In addition, it integrates with your existing services, such as **[Sonarr](https://sonarr.tv/)**, **[Radarr](https://radarr.video/)**.
-
 ## Features
 
 - **Full Jellyfin/Emby/Plex integration**. Login and manage user access with Jellyfin/Emby/Plex.
 - **Syncs to your Jellyfin/Emby/Plex library** to show what titles you already have.
-- Supports Movies, Shows and Mixed Libraries.
 - **Integrates with Sonarr and Radarr**. With more services to come in the future.
-- Optionally set **Override rules** for requests to match with your defined conditions.
 - **Easy to use request system** allowing users to request individual seasons or movies in a friendly, clean UI.
 - **Simple request management UI**. Don't dig through the app to approve recent requests.
 - **Mobile-friendly design**, for when you need to approve requests on the go.
 - Granular permission system.
 - Localization into other languages.
-- Support for **PostgreSQL** and **SQLite** databases.
-- Support for various notification agents.
-- Easily **Watchlist** or **Blacklist** media.
+- Support for PostgreSQL and SQLite databases.
 - More features to come!
 
 ## Motivation
 
-The primary motivation for starting Jellyseerr was to bring Jellyfin and Emby support to Overseerr. However, over time, **Jellyseerr** has evolved into its own distinct application with unique features. Designed as a one-stop shop for media requests, it offers a simple, easy-to-use experience for managing requests on Jellyfin, Emby, and Plex servers.
+The primary motivation for starting this project was to add support for Jellyfin and Emby to Overseerr. As Overseerr is an incredibly performant and easy-to-use application, we wanted to bring that same experience to Jellyfin and Emby users. Thus, **Jellyseerr** was born.
+
+This application is designed to be a **one-stop-shop** for all your media requests. It is designed to be a **simple, easy-to-use** application that allows users to request media to be added to your Jellyfin/Emby/Plex server.
 
 ## We need your help!
 
-[Jellyseerr](https://github.com/Fallenbagel/jellyseerr) is an ambitious project where developers/contributors poured a lot of work into, and that builds on top of [Overseerr](https://github.com/sct/overseerr). And we have a lot more to do as well.
+[Jellyseerr](https://github.com/Fallenbagel/jellyseerr) is a fork of Overseerr, with a heavy focus on Jellyfin and Emby integration.
+[Overseerr](https://github.com/sct/overseerr) is an ambitious project where the original developers/contributors have already poured a lot of work into, and we wanted to build on top of that.
 
-We value your feedback and support in identifying and fixing bugs to make Jellyseerr even better. As an open-source project, we welcome contributions from everyone. While Jellyseerr has diverged from Overseerr and evolved into its own unique application, we still encourage contributions to Overseerr, as it played a crucial role in inspiring what Jellyseerr has become today.
+We also have poured a lot of work into this project, and we have a lot more to do as well. We need your valuable feedback and help to find and fix bugs. Also, with Jellyseerr being an open-source project, anyone is welcome to contribute. We also encourage you to contribute to Overseerr as well.
 
 Contribution includes building new features, patching bugs, translating the application, or even just writing documentation.
 

docs/extending-jellyseerr/database-config.mdx

@@ -9,8 +9,6 @@ Jellyseerr supports SQLite and PostgreSQL. The database connection can be config
 
 ## SQLite Options
 
-If you want to use SQLite, you can simply set the `DB_TYPE` environment variable to `sqlite`. This is the default configuration so even if you don't set any other options, SQLite will be used.
-
 ```dotenv
 DB_TYPE="sqlite" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite".
 CONFIG_DIRECTORY="config" # (optional) The path to the config directory where the db file is stored. The default is "config".
@@ -19,35 +17,17 @@ DB_LOG_QUERIES="false" # (optional) Whether to log the DB queries for debugging.
 
 ## PostgreSQL Options
 
-### TCP Connection
-
-If your PostgreSQL server is configured to accept TCP connections, you can specify the host and port using the `DB_HOST` and `DB_PORT` environment variables. This is useful for remote connections where the server uses a network host and port.
-
 ```dotenv
-DB_TYPE="postgres" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite".
-DB_HOST="localhost" # (optional) The host (URL) of the database. The default is "localhost".
+DB_TYPE="postgres" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite". To use postgres, this needs to be set to "postgres"
+DB_HOST="localhost" # (optional) The host (url) of the database. The default is "localhost".
 DB_PORT="5432" # (optional) The port to connect to. The default is "5432".
-DB_USER= # (required) Username used to connect to the database.
-DB_PASS= # (required) Password of the user used to connect to the database.
-DB_NAME="jellyseerr" # (optional) The name of the database to connect to. The default is "jellyseerr".
-DB_LOG_QUERIES="false" # (optional) Whether to log the DB queries for debugging. The default is "false".
-```
-
-### Unix Socket Connection
-
-If your PostgreSQL server is configured to accept Unix socket connections, you can specify the path to the socket directory using the `DB_SOCKET_PATH` environment variable. This is useful for local connections where the server uses a Unix socket.
-
-```dotenv
-DB_TYPE="postgres" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite".
-DB_SOCKET_PATH="/var/run/postgresql" # (required) The path to the PostgreSQL Unix socket directory.
-DB_USER= # (required) Username used to connect to the database.
-DB_PASS= # (optional) Password of the user used to connect to the database, depending on the server's authentication configuration.
+DB_USER= # (required) Username used to connect to the database
+DB_PASS= # (required) Password of the user used to connect to the database
 DB_NAME="jellyseerr" # (optional) The name of the database to connect to. The default is "jellyseerr".
 DB_LOG_QUERIES="false" # (optional) Whether to log the DB queries for debugging. The default is "false".
 ```
 
 ### SSL configuration
-
 The following options can be used to further configure ssl. Certificates can be provided as a string or a file path, with the string version taking precedence.
 
 ```dotenv
@@ -60,7 +40,6 @@ DB_SSL_KEY_FILE= # (optinal) Path to the private key for the connection in PEM f
 DB_SSL_CERT= # (optional) Certificate chain in pem format for the private key, provided as a string. The default is "".
 DB_SSL_CERT_FILE= # (optional) Path to certificate chain in pem format for the private key. The default is "".
 ```
----
 
 ### Migrating from SQLite to PostgreSQL
 
@@ -69,7 +48,7 @@ DB_SSL_CERT_FILE= # (optional) Path to certificate chain in pem format for the p
 3. Stop Jellyseerr
 4. Run the following command to export the data from the SQLite database and import it into the PostgreSQL database:
 :::info
-Edit the postgres connection string to match your setup.
+Edit the postgres connection string to match your setup
 
 If you don't have or don't want to use docker, you can build the working pgloader version [in this PR](https://github.com/dimitri/pgloader/pull/1531) from source and use the same options as below.
 :::

docs/getting-started/buildfromsource.mdx

@@ -6,8 +6,6 @@ sidebar_position: 2
 # Build from Source (Advanced)
 :::warning
 This method is not recommended for most users. It is intended for advanced users who are familiar with managing their own server infrastructure.
-
-Refer to [Configuring Databases](/extending-jellyseerr/database-config#postgresql-options) for details on how to configure your database.
 :::
 
 import Tabs from '@theme/Tabs';

docs/getting-started/docker.mdx

@@ -7,8 +7,6 @@ sidebar_position: 1
 :::info
 This is the recommended method for most users.
 Details on how to install Docker can be found on the [official Docker website](https://docs.docker.com/get-docker/).
-
-Refer to [Configuring Databases](/extending-jellyseerr/database-config#postgresql-options) for details on how to configure your database.
 :::
 
 ## Unix (Linux, macOS)

docs/getting-started/kubernetes.mdx

@@ -1,21 +0,0 @@
----
-title: Kubernetes
-description: Install Jellyseerr in Kubernetes
-sidebar_position: 5
----
-# Kubernetes
-:::info
-This method is not recommended for most users. It is intended for advanced users who are using Kubernetes.
-:::
-
-## Installation
-```console
-helm install jellyseerr oci://ghcr.io/fallenbagel/jellyseerr/jellyseerr-chart
-```
-Helm values can be found in the Jellyseerr repository under [charts/jellyseerr-chart/README.md](https://github.com/Fallenbagel/jellyseerr/tree/develop/charts/jellyseerr-chart).
-
-Verify the signature with [cosign](https://docs.sigstore.dev/cosign/system_config/installation/) (replace [tag], with the TAG you want to verify) :
-```console
-cosign verify ghcr.io/fallenbagel/jellyseerr/jellyseerr-chart:[tag] --certificate-identity=https://github.com/Fallenbagel/jellyseerr/.github/workflows/helm.yml@refs/heads/main --certificate-oidc-issuer=https://token.ac
-tions.githubusercontent.com
-```

docs/getting-started/nixpkg.mdx

@@ -6,8 +6,6 @@ sidebar_position: 3
 
 import { JellyseerrVersion, NixpkgVersion } from '@site/src/components/JellyseerrVersion';
 import Admonition from '@theme/Admonition';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
 
 # Nix Package Manager (Advanced)
 :::info
@@ -15,55 +13,22 @@ This method is not recommended for most users. It is intended for advanced users
 :::
 
 export const VersionMismatchWarning = () => {
-  let jellyseerrVersion = null;
-  let nixpkgVersions = null;
-  try {
-    jellyseerrVersion = JellyseerrVersion();
-    nixpkgVersions = NixpkgVersion();
-  } catch (err) {
-    return (
-      <Admonition type="error">
-        Failed to load version information. Error: {err.message || JSON.stringify(err)}
-      </Admonition>
-    );
-  }
+  const jellyseerrVersion = JellyseerrVersion();
+  const nixpkgVersion = NixpkgVersion();
 
-    if (!nixpkgVersions || nixpkgVersions.error) {
-    return (
-      <Admonition type="error">
-        Failed to fetch Nixpkg versions: {nixpkgVersions?.error || 'Unknown error'}
-      </Admonition>
-    );
-  }
-
-  const isUnstableUpToDate = jellyseerrVersion === nixpkgVersions.unstable;
-  const isStableUpToDate = jellyseerrVersion === nixpkgVersions.stable;
+  const isUpToDate = jellyseerrVersion === nixpkgVersion;
 
   return (
-     <>
-      {!isStableUpToDate ? (
-  <Admonition type="warning">
-    The{' '}
-    <a href="https://github.com/NixOS/nixpkgs/blob/nixos-24.11/pkgs/servers/jellyseerr/default.nix#L14">
-      upstream Jellyseerr Nix Package (v{nixpkgVersions.stable})
-    </a>{' '}
-    is not <b>up-to-date</b>. If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>,{' '}
-    {isUnstableUpToDate ? (
-      <>
-        consider using the{' '}
-        <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/by-name/je/jellyseerr/package.nix">
-          unstable package
-        </a>{' '}
-        instead.
-      </>
-    ) : (
-      <>
-        you will need to{' '}
-        <a href="#overriding-the-package-derivation">override the package derivation</a>.
-      </>
-    )}
-  </Admonition>
-) : null} 
+    <>
+      {!isUpToDate ? (
+        <Admonition type="warning">
+          The <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/servers/jellyseerr/default.nix#L14">upstream Jellyseerr Nix Package (v{nixpkgVersion})</a> is not <b>up-to-date</b>. If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>, you will need to <a href="#overriding-the-package-derivation">override the package derivation</a>.
+        </Admonition>
+      ) : (
+        <Admonition type="success">
+          The <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/servers/jellyseerr/default.nix#L14">upstream Jellyseerr Nix Package (v{nixpkgVersion})</a> is <b>up-to-date</b> with <b>Jellyseerr v{jellyseerrVersion}</b>.
+        </Admonition>
+      )}
     </>
   );
 };
@@ -83,8 +48,6 @@ To get up and running with jellyseerr using Nix, you can add the following to yo
 
 If you want more advanced configuration options, you can use the following:
 
-<Tabs groupId="nixpkg-methods" queryString>
-  <TabItem value="default" label="Default Configurations">
 ```nix
 { config, pkgs, ... }:
 
@@ -93,20 +56,53 @@ If you want more advanced configuration options, you can use the following:
     enable = true;
     port = 5055;
     openFirewall = true;
-    package = pkgs.jellyseerr; # Use the unstable package if stable is not up-to-date
   };
 }
 ```
-  </TabItem>
-  <TabItem value="custom" label="Database Configurations">
-In order to use postgres, you will need to add override the default module of jellyseerr with the following as the current default module is not compatible with postgres:
-```nix
+
+After adding the configuration to your `configuration.nix`, you can run the following command to install jellyseerr:
+
+```bash
+nixos-rebuild switch
+```
+After rebuild is complete jellyseerr should be running, verify that it is with the following command.
+```bash
+systemctl status jellyseerr
+```
+
+:::info
+You can now access Jellyseerr by visiting `http://localhost:5055` in your web browser.
+:::
+
+
+
+import CodeBlock from '@theme/CodeBlock';
+
+## Overriding the package derivation
+export const VersionMatch = () => {
+  const jellyseerrVersion = JellyseerrVersion();
+  const nixpkgVersion = NixpkgVersion();
+
+  const code = `{ config, pkgs, ... }:
 {
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+  nixpkgs.config.packageOverrides = pkgs: {
+    jellyseerr = pkgs.jellyseerr.overrideAttrs (oldAttrs: rec {
+      version = "${jellyseerrVersion}";
+
+      src = pkgs.fetchFromGitHub {
+        rev = "v\${version}";
+        sha256 = pkgs.lib.fakeSha256;
+      };
+
+      offlineCache = pkgs.fetchYarnDeps {
+        sha256 = pkgs.lib.fakeSha256;
+      };
+    });
+  };
+}`;
+
+  const module = `{ config, pkgs, lib, ... }:
+
 with lib;
 let
   cfg = config.services.jellyseerr;
@@ -117,65 +113,28 @@ in
   disabledModules = [ "services/misc/jellyseerr.nix" ];
 
   options.services.jellyseerr = {
-    enable = mkEnableOption ''Jellyseerr, a requests manager for Jellyfin'';
+    enable = mkEnableOption (mdDoc ''Jellyseerr, a requests manager for Jellyfin'');
 
     openFirewall = mkOption {
       type = types.bool;
       default = false;
-      description = ''Open port in the firewall for the Jellyseerr web interface.'';
+      description = mdDoc ''Open port in the firewall for the Jellyseerr web interface.'';
     };
 
     port = mkOption {
       type = types.port;
       default = 5055;
-      description = ''The port which the Jellyseerr web UI should listen to.'';
+      description = mdDoc ''The port which the Jellyseerr web UI should listen to.'';
     };
 
     package = mkOption {
-      type = types.package;
-      default = pkgs.jellyseerr;
-      defaultText = literalExpression "pkgs.jellyseerr";
-      description = ''
-        Jellyseerr package to use.
-      '';
-    };
-
-    databaseConfig = mkOption {
-      type = types.attrsOf types.str;
-      default = {
-        type = "sqlite";
-        configDirectory = "config";
-        logQueries = "false";
+        type = types.package;
+        default = pkgs.jellyseerr;
+        defaultText = literalExpression "pkgs.jellyseerr";
+        description = lib.mdDoc ''
+          Jellyseerr package to use.
+        '';
       };
-      description = ''
-        Database configuration. For "sqlite", only "type", "configDirectory", and "logQueries" are relevant.
-        For "postgres", include host, port, user, pass, name, and optionally socket.
-        Example:
-        {
-          type = "postgres";
-          socket = "/run/postgresql";
-          user = "jellyseerr";
-          name = "jellyseerr";
-          logQueries = "false";
-        }
-        or
-        {
-          type = "postgres";
-          host = "localhost";
-          port = "5432";
-          user = "dbuser";
-          pass = "password";
-          name = "jellyseerr";
-          logQueries = "false";
-        }
-        or
-        {
-          type = "sqlite";
-          configDirectory = "config";
-          logQueries = "false";
-        }
-      '';
-    };
   };
 
   config = mkIf cfg.enable {
@@ -183,29 +142,14 @@ in
       description = "Jellyseerr, a requests manager for Jellyfin";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      environment =
-        let
-          dbConfig = cfg.databaseConfig;
-        in
-        {
-          PORT = toString cfg.port;
-          DB_TYPE = toString dbConfig.type;
-          CONFIG_DIRECTORY = toString dbConfig.configDirectory or "";
-          DB_LOG_QUERIES = toString dbConfig.logQueries;
-          DB_HOST = if dbConfig.type == "postgres" && !(hasAttr "socket" dbConfig) then toString dbConfig.host or "" else "";
-          DB_PORT = if dbConfig.type == "postgres" && !(hasAttr "socket" dbConfig) then toString dbConfig.port or "" else "";
-          DB_SOCKET_PATH = if dbConfig.type == "postgres" && hasAttr "socket" dbConfig then toString dbConfig.socket or "" else "";
-          DB_USER = if dbConfig.type == "postgres" then toString dbConfig.user or "" else "";
-          DB_PASS = if dbConfig.type == "postgres" then toString dbConfig.pass or "" else "";
-          DB_NAME = if dbConfig.type == "postgres" then toString dbConfig.name or "" else "";
-        };
+      environment.PORT = toString cfg.port;
       serviceConfig = {
         Type = "exec";
         StateDirectory = "jellyseerr";
-        WorkingDirectory = "${cfg.package}/libexec/jellyseerr";
+        WorkingDirectory = "\${cfg.package}/libexec/jellyseerr/deps/jellyseerr";
         DynamicUser = true;
-        ExecStart = "${cfg.package}/bin/jellyseerr";
-        BindPaths = [ "/var/lib/jellyseerr/:${cfg.package}/libexec/jellyseerr/config/" ];
+        ExecStart = "\${cfg.package}/bin/jellyseerr";
+        BindPaths = [ "/var/lib/jellyseerr/:\${cfg.package}/libexec/jellyseerr/deps/jellyseerr/config/" ];
         Restart = "on-failure";
         ProtectHome = true;
         ProtectSystem = "strict";
@@ -225,47 +169,57 @@ in
       };
     };
 
-    networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
-  };
-}
-```
-Then, import the module into your `configuration.nix`:
-```nix
-{ config, pkgs, ... }:
-{
-  imports = [ ./modules/jellyseerr.nix ];
-
-  services.jellyseerr = {
-    enable = true;
-    port = 5055;
-    openFirewall = true;
-    package = pkgs.unstable.jellyseerr; # use the unstable package if stable is not up-to-date
-    databaseConfig = {
-      type = "postgres";
-      host = "localhost"; # or socket: "/run/postgresql"
-      port = "5432"; # if using socket, this is not needed
-      user = "jellyseerr";
-      pass = "jellyseerr";
-      name = "jellyseerr";
-      logQueries = "false";
+    networking.firewall = mkIf cfg.openFirewall {
+      allowedTCPPorts = [ cfg.port ];
     };
-  }
-}
-```
-  </TabItem>
-</Tabs>
+  };
+}`;
 
-After adding the configuration to your `configuration.nix`, you can run the following command to install jellyseerr:
+  const configuration = `{ config, pkgs, ... }:
+{
+    imports = [ ./jellyseerr-module.nix ]
 
-```bash
-nixos-rebuild switch
-```
-After rebuild is complete jellyseerr should be running, verify that it is with the following command.
-```bash
-systemctl status jellyseerr
-```
+    services.jellyseerr = {
+        enable = true;
+        port = 5055;
+        openFirewall = true;
+        package = (pkgs.callPackage (import ../../../pkgs/jellyseerr) { });
+    };
+}`;
 
-:::info
-You can now access Jellyseerr by visiting `http://localhost:5055` in your web browser.
-:::
+  const isUpToDate = jellyseerrVersion === nixpkgVersion;
+
+  return (
+    <>
+      {isUpToDate ? (
+        <>
+          <p>The latest version of Jellyseerr <strong>({jellyseerrVersion})</strong> and the Jellyseerr nixpkg package version <strong>({nixpkgVersion})</strong> is <strong>up-to-date</strong>.</p>
+          <p>There is no need to override the package derivation.</p>
+        </>
+      ) : (
+        <>
+          <p>The latest version of Jellyseerr <strong>({jellyseerrVersion})</strong> and the Jellyseerr nixpkg version <strong>(v{nixpkgVersion})</strong> is <strong>out-of-date</strong>.
+          If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>, you will need to override the package derivation.</p>
+          <p>In order to override the package derivation:</p>
+          <ol>
+            <li style={{ marginBottom: '1rem' }}>Grab the <a href="https://raw.githubusercontent.com/NixOS/nixpkgs/nixos-unstable/pkgs/servers/jellyseerr/default.nix">latest nixpkg derivation for Jellyseerr</a></li>
+            <li style={{ marginBottom: '1rem' }}>Grab the latest <a href="https://raw.githubusercontent.com/Fallenbagel/jellyseerr/main/package.json">package.json</a> for Jellyseerr</li>
+            <li style={{ marginBottom: '1rem' }}>Add it to the same directory as the nixpkg derivation</li>
+            <li style={{ marginBottom: '1rem' }}>Update the `src` and `offlineCache` attributes in the nixpkg derivation:</li>
+            <CodeBlock className="language-nix" style={{ marginBottom: '1rem' }}>{code}</CodeBlock>
+            <Admonition type="tip" style={{ marginBottom: '1rem' }}>You can replace the <b>sha256</b> with the actual hash that <b>nixos-rebuild</b> outputs when you run the command.</Admonition>
+            <li style={{ marginBottom: '1rem' }}>Grab this module and import it in your `configuration.nix`</li>
+            <CodeBlock className="language-nix" style={{ marginBottom: '1rem' }}>{module}</CodeBlock>
+            <Admonition type="tip" style={{ marginBottom: '1rem' }}>We are using a custom module because the upstream module does not have a package option.</Admonition>
+            <li style={{ marginBottom: '1rem' }}>Call the new package in your `configuration.nix`</li>
+            <CodeBlock className="language-nix" style={{ marginBottom: '1rem' }}>{configuration}</CodeBlock>
+          </ol>
+        </>
+      )}
+    </>
+  );
+
+};
+
+<VersionMatch />
 

docs/using-jellyseerr/backups.md

@@ -1,93 +0,0 @@
----
-title: Backups
-description: Understand which data you should back up.
-sidebar_position: 4
----
-
-# Which data does Jellyseerr save and where?
-
-## Settings  
-
-All configurations from the **Settings** panel in the Jellyseerr web UI are saved, including integrations with Radarr, Sonarr, Jellyfin, Plex, and notification settings.  
-These settings are stored in the `settings.json` file located in the Jellyseerr data folder.
-
-## User Data  
-
-Apart from the settings, all other data—including user accounts, media requests, blacklist etc. are stored in the database (either SQLite or PostgreSQL).
-
-# Backup
-
-### SQLite
-
-If your backup system uses filesystem snapshots (such as Kubernetes with Volsync), you can directly back up the Jellyseerr data folder.  
-Otherwise, you need to stop the Jellyseerr application and back up the `config` folder.
-
-For advanced users, it's possible to back up the database without stopping the application by using the [SQLite CLI](https://www.sqlite.org/download.html). Run the following command to create a backup:  
-
-```bash
-sqlite3 db/db.sqlite3 ".backup '/tmp/jellyseerr_db.sqlite3.bak'"
-```  
-
-Then, copy the `/tmp/jellyseerr_dump.sqlite3.bak` file to your desired backup location.
-
-### PostgreSQL
-
-You can back up the `config` folder and dump the PostgreSQL database without stopping the Jellyseerr application.
-
-Install [postgresql-client](https://www.postgresql.org/download/) and run the following command to create a backup (just replace the placeholders):
-
-:::info
-Depending on how your PostgreSQL instance is configured, you may need to add these options to the command below.
-
-  -h, --host=HOSTNAME      database server host or socket directory
-
-  -p, --port=PORT          database server port number
-:::
-
-```bash
-pg_dump -U <database_user> -d <database_name> -f /tmp/jellyseerr_db.sql
-```
-
-# Restore
-
-### SQLite
-
-After restoring your `db/db.sqlite3` file and, optionally, the `settings.json` file, the `config` folder structure should look like this:
-
-```
-.
-├── cache            <-- Optional
-├── db
-│   └── db.sqlite3
-├── logs             <-- Optional
-└── settings.json    <-- Optional (required if you want to avoid reconfiguring Jellyseerr)
-```
-
-Once the files are restored, start the Jellyseerr application.
-
-### PostgreSQL
-
-Install the [PostgreSQL client](https://www.postgresql.org/download/) and restore the PostgreSQL database using the following command (replace the placeholders accordingly):
-
-:::info
-Depending on how your PostgreSQL instance is configured, you may need to add these options to the command below.
-
-  -h, --host=HOSTNAME      database server host or socket directory
-
-  -p, --port=PORT          database server port number
-:::
-
-```bash
-pg_restore -U <database_user> -d <database_name> /tmp/jellyseerr_db.sql
-```
-
-Optionally, restore the `settings.json` file. The `config` folder structure should look like this:
-
-```
-.
-├── cache            <-- Optional
-├── logs             <-- Optional
-└── settings.json    <-- Optional (required if you want to avoid reconfiguring Jellyseerr)
-```
-
-Once the database and files are restored, start the Jellyseerr application.

docs/using-jellyseerr/settings/users.md

@@ -14,14 +14,6 @@ When disabled, your mediaserver OAuth becomes the only sign-in option, and any "
 
 This setting is **enabled** by default.
 
-## Enable Jellyfin/Emby/Plex Sign-In
-
-When enabled, users will be able to sign in to Jellyseerr using their Jellyfin/Emby/Plex credentials, provided they have linked their media server accounts.
-
-When disabled, users will only be able to sign in using their email address. Users without a password set will not be able to sign in to Jellyseerr.
-
-This setting is **enabled** by default.
-
 ## Enable New Jellyfin/Emby/Plex Sign-In
 
 When enabled, users with access to your media server will be able to sign in to Jellyseerr even if they have not yet been imported. Users will be automatically assigned the permissions configured in the [Default Permissions](#default-permissions) setting upon first sign-in.

gen-docs/docusaurus.config.ts

@@ -11,7 +11,7 @@ const config: Config = {
   baseUrl: '/',
   trailingSlash: false,
 
-  organizationName: 'fallenbagel',
+  organizationName: 'Fallenbagel',
   projectName: 'Jellyseerr',
   deploymentBranch: 'gh-pages',
 
@@ -32,7 +32,7 @@ const config: Config = {
           routeBasePath: '/',
           path: '../docs',
           editUrl:
-            'https://github.com/fallenbagel/jellyseerr/edit/develop/docs/',
+            'https://github.com/Fallenbagel/jellyseerr/edit/develop/docs/',
         },
         blog: false,
         pages: false,
@@ -70,7 +70,7 @@ const config: Config = {
       },
       items: [
         {
-          href: 'https://github.com/fallenbagel/jellyseerr',
+          href: 'https://github.com/Fallenbagel/jellyseerr',
           label: 'GitHub',
           position: 'right',
         },

gen-docs/src/components/JellyseerrVersion/index.tsx

@@ -26,37 +26,25 @@ export const JellyseerrVersion = () => {
 };
 
 export const NixpkgVersion = () => {
-  const [versions, setVersions] = useState(null);
+  const [version, setVersion] = useState(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
 
   useEffect(() => {
     const fetchVersion = async () => {
       try {
-        const unstableUrl =
-          'https://raw.githubusercontent.com/NixOS/nixpkgs/refs/heads/nixos-unstable/pkgs/by-name/je/jellyseerr/package.nix';
-        const stableUrl =
-          'https://raw.githubusercontent.com/NixOS/nixpkgs/refs/heads/nixos-24.11/pkgs/servers/jellyseerr/default.nix';
-
-        const [unstableResponse, stableResponse] = await Promise.all([
-          fetch(unstableUrl),
-          fetch(stableUrl),
-        ]);
-
-        const unstableData = await unstableResponse.text();
-        const stableData = await stableResponse.text();
+        const url =
+          'https://raw.githubusercontent.com/NixOS/nixpkgs/nixos-unstable/pkgs/servers/jellyseerr/default.nix';
+        const response = await fetch(url);
+        const data = await response.text();
 
         const versionRegex = /version\s*=\s*"([^"]+)"/;
-
-        const unstableMatch = unstableData.match(versionRegex);
-        const stableMatch = stableData.match(versionRegex);
-
-        const unstableVersion =
-          unstableMatch && unstableMatch[1] ? unstableMatch[1] : '0.0.0';
-        const stableVersion =
-          stableMatch && stableMatch[1] ? stableMatch[1] : '0.0.0';
-
-        setVersions({ unstable: unstableVersion, stable: stableVersion });
+        const match = data.match(versionRegex);
+        if (match && match[1]) {
+          setVersion(match[1]);
+        } else {
+          setError('0.0.0');
+        }
         setLoading(false);
       } catch (err) {
         setError(err.message);
@@ -75,5 +63,5 @@ export const NixpkgVersion = () => {
     return { error };
   }
 
-  return versions;
+  return version;
 };

next.config.js

@@ -11,7 +11,6 @@ module.exports = {
       { hostname: 'gravatar.com' },
       { hostname: 'image.tmdb.org' },
       { hostname: 'artworks.thetvdb.com' },
-      { hostname: 'plex.tv' },
     ],
   },
   webpack(config) {

overseerr-api.yml

@@ -191,12 +191,6 @@ components:
         enableSpecialEpisodes:
           type: boolean
           example: false
-        forceIpv4First:
-          type: boolean
-          example: false
-        dnsServers:
-          type: string
-          example: '1.1.1.1'
     PlexLibrary:
       type: object
       properties:
@@ -4389,6 +4383,104 @@ paths:
       responses:
         '204':
           description: User password updated
+  /user/{userId}/settings/linked-accounts/plex:
+    post:
+      summary: Link the provided Plex account to the current user
+      description: Logs in to Plex with the provided auth token, then links the associated Plex account with the user's account. Users can only link external accounts to their own account.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                authToken:
+                  type: string
+              required:
+                - authToken
+      responses:
+        '204':
+          description: Linking account succeeded
+        '403':
+          description: Invalid credentials
+        '422':
+          description: Account already linked to a user
+    delete:
+      summary: Remove the linked Plex account for a user
+      description: Removes the linked Plex account for a specific user. Requires `MANAGE_USERS` permission if editing other users.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+      responses:
+        '204':
+          description: Unlinking account succeeded
+        '400':
+          description: Unlink request invalid
+        '404':
+          description: User does not exist
+  /user/{userId}/settings/linked-accounts/jellyfin:
+    post:
+      summary: Link the provided Jellyfin account to the current user
+      description: Logs in to Jellyfin with the provided credentials, then links the associated Jellyfin account with the user's account. Users can only link external accounts to their own account.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                username:
+                  type: string
+                  example: 'Mr User'
+                password:
+                  type: string
+                  example: 'supersecret'
+      responses:
+        '204':
+          description: Linking account succeeded
+        '403':
+          description: Invalid credentials
+        '422':
+          description: Account already linked to a user
+    delete:
+      summary: Remove the linked Jellyfin account for a user
+      description: Removes the linked Jellyfin account for a specific user. Requires `MANAGE_USERS` permission if editing other users.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+      responses:
+        '204':
+          description: Unlinking account succeeded
+        '400':
+          description: Unlink request invalid
+        '404':
+          description: User does not exist
   /user/{userId}/settings/notifications:
     get:
       summary: Get notification settings for a user
@@ -7024,12 +7116,6 @@ paths:
       description: Updates an Override Rule from the request body.
       tags:
         - overriderule
-      parameters:
-        - in: path
-          name: ruleId
-          required: true
-          schema:
-            type: number
       responses:
         '200':
           description: 'Values were successfully updated'

package.json

@@ -42,7 +42,6 @@
     "@supercharge/request-ip": "1.2.0",
     "@svgr/webpack": "6.5.1",
     "@tanem/react-nprogress": "5.0.30",
-    "@types/wink-jaro-distance": "^2.0.2",
     "ace-builds": "1.15.2",
     "bcrypt": "5.1.0",
     "bowser": "2.11.0",
@@ -86,7 +85,6 @@
     "react-spring": "9.7.1",
     "react-tailwindcss-datepicker-sct": "1.3.4",
     "react-toast-notifications": "2.5.1",
-    "react-transition-group": "^4.4.5",
     "react-truncate-markup": "5.1.2",
     "react-use-clipboard": "1.0.9",
     "reflect-metadata": "0.1.13",
@@ -96,11 +94,9 @@
     "sqlite3": "5.1.4",
     "swagger-ui-express": "4.6.2",
     "swr": "2.2.5",
-    "tailwind-merge": "^2.6.0",
     "typeorm": "0.3.11",
     "undici": "^6.20.1",
     "web-push": "3.5.0",
-    "wink-jaro-distance": "^2.0.0",
     "winston": "3.8.2",
     "winston-daily-rotate-file": "4.7.1",
     "xml2js": "0.4.23",
@@ -239,8 +235,7 @@
           "COMMIT_TAG": "$GIT_SHA"
         },
         "imageNames": [
-          "fallenbagel/jellyseerr",
-          "ghcr.io/fallenbagel/jellyseerr"
+          "fallenbagel/jellyseerr"
         ],
         "platforms": [
           "linux/amd64",

pnpm-lock.yaml

@@ -38,9 +38,6 @@ importers:
       '@tanem/react-nprogress':
         specifier: 5.0.30
         version: 5.0.30(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@types/wink-jaro-distance':
-        specifier: ^2.0.2
-        version: 2.0.2
       ace-builds:
         specifier: 1.15.2
         version: 1.15.2
@@ -170,9 +167,6 @@ importers:
       react-toast-notifications:
         specifier: 2.5.1
         version: 2.5.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react-transition-group:
-        specifier: ^4.4.5
-        version: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react-truncate-markup:
         specifier: 5.1.2
         version: 5.1.2(react@18.3.1)
@@ -200,9 +194,6 @@ importers:
       swr:
         specifier: 2.2.5
         version: 2.2.5(react@18.3.1)
-      tailwind-merge:
-        specifier: ^2.6.0
-        version: 2.6.0
       typeorm:
         specifier: 0.3.11
         version: 0.3.11(pg@8.11.0)(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@22.10.5)(typescript@4.9.5))
@@ -212,9 +203,6 @@ importers:
       web-push:
         specifier: 3.5.0
         version: 3.5.0
-      wink-jaro-distance:
-        specifier: ^2.0.0
-        version: 2.0.0
       winston:
         specifier: 3.8.2
         version: 3.8.2
@@ -3262,9 +3250,6 @@ packages:
   '@types/webxr@0.5.20':
     resolution: {integrity: sha512-JGpU6qiIJQKUuVSKx1GtQnHJGxRjtfGIhzO2ilq43VZZS//f1h1Sgexbdk+Lq+7569a6EYhOWrUpIruR/1Enmg==}
 
-  '@types/wink-jaro-distance@2.0.2':
-    resolution: {integrity: sha512-Q79orp7qA/g/uLdFmqd5MtEa0ZfJW5X1WXikAu8IVHt24IrHWrcTNYNdPpLK5mwVg34C6FQnrv/DMtcUhjE/zA==}
-
   '@types/xml2js@0.4.11':
     resolution: {integrity: sha512-JdigeAKmCyoJUiQljjr7tQG3if9NkqGUgwEUqBvV0N7LM4HyQk7UXCnusRa1lnvXAEYJ8mw8GtZWioagNztOwA==}
 
@@ -8850,9 +8835,6 @@ packages:
     peerDependencies:
       react: ^16.11.0 || ^17.0.0 || ^18.0.0
 
-  tailwind-merge@2.6.0:
-    resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
-
   tailwindcss@3.2.7:
     resolution: {integrity: sha512-B6DLqJzc21x7wntlH/GsZwEXTBttVSl1FtCzC8WP4oBc/NKef7kaax5jeihkkCEWc831/5NDJ9gRNDK6NEioQQ==}
     engines: {node: '>=12.13.0'}
@@ -9485,9 +9467,6 @@ packages:
   wide-align@1.1.5:
     resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}
 
-  wink-jaro-distance@2.0.0:
-    resolution: {integrity: sha512-9bcUaXCi9N8iYpGWbFkf83OsBkg17r4hEyxusEzl+nnReLRPqxhB9YNeRn3g54SYnVRNXP029lY3HDsbdxTAuA==}
-
   winston-daily-rotate-file@4.7.1:
     resolution: {integrity: sha512-7LGPiYGBPNyGHLn9z33i96zx/bd71pjBn9tqQzO3I4Tayv94WPmBNwKC7CO1wPHdP9uvu+Md/1nr6VSH9h0iaA==}
     engines: {node: '>=8'}
@@ -11302,7 +11281,7 @@ snapshots:
   '@emotion/babel-plugin@11.11.0':
     dependencies:
       '@babel/helper-module-imports': 7.24.7
-      '@babel/runtime': 7.26.0
+      '@babel/runtime': 7.24.7
       '@emotion/hash': 0.9.1
       '@emotion/memoize': 0.8.1
       '@emotion/serialize': 1.1.4
@@ -11332,7 +11311,7 @@ snapshots:
 
   '@emotion/core@10.3.1(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.0
+      '@babel/runtime': 7.24.7
       '@emotion/cache': 10.0.29
       '@emotion/css': 10.0.27
       '@emotion/serialize': 0.11.16
@@ -11360,7 +11339,7 @@ snapshots:
 
   '@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.0
+      '@babel/runtime': 7.24.7
       '@emotion/babel-plugin': 11.11.0
       '@emotion/cache': 11.11.0
       '@emotion/serialize': 1.1.4
@@ -13758,8 +13737,6 @@ snapshots:
 
   '@types/webxr@0.5.20': {}
 
-  '@types/wink-jaro-distance@2.0.2': {}
-
   '@types/xml2js@0.4.11':
     dependencies:
       '@types/node': 22.10.5
@@ -14263,13 +14240,13 @@ snapshots:
 
   babel-plugin-macros@2.8.0:
     dependencies:
-      '@babel/runtime': 7.26.0
+      '@babel/runtime': 7.24.7
       cosmiconfig: 6.0.0
       resolve: 1.22.8
 
   babel-plugin-macros@3.1.0:
     dependencies:
-      '@babel/runtime': 7.26.0
+      '@babel/runtime': 7.24.7
       cosmiconfig: 7.1.0
       resolve: 1.22.8
 
@@ -15359,7 +15336,7 @@ snapshots:
 
   dom-helpers@5.2.1:
     dependencies:
-      '@babel/runtime': 7.26.0
+      '@babel/runtime': 7.24.7
       csstype: 3.1.3
 
   dom-serializer@1.4.1:
@@ -19375,7 +19352,7 @@ snapshots:
 
   react-transition-group@4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
-      '@babel/runtime': 7.26.0
+      '@babel/runtime': 7.24.7
       dom-helpers: 5.2.1
       loose-envify: 1.4.0
       prop-types: 15.8.1
@@ -19502,7 +19479,7 @@ snapshots:
 
   regenerator-transform@0.15.2:
     dependencies:
-      '@babel/runtime': 7.26.0
+      '@babel/runtime': 7.24.7
 
   regexp.prototype.flags@1.5.2:
     dependencies:
@@ -20283,8 +20260,6 @@ snapshots:
       react: 18.3.1
       use-sync-external-store: 1.2.2(react@18.3.1)
 
-  tailwind-merge@2.6.0: {}
-
   tailwindcss@3.2.7(postcss@8.4.21)(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@22.10.5)(typescript@4.9.5)):
     dependencies:
       arg: 5.0.2
@@ -20930,8 +20905,6 @@ snapshots:
     dependencies:
       string-width: 4.2.3
 
-  wink-jaro-distance@2.0.0: {}
-
   winston-daily-rotate-file@4.7.1(winston@3.8.2):
     dependencies:
       file-stream-rotator: 0.6.1

public/robots.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /

server/api/externalapi.ts

@@ -69,13 +69,10 @@ class ExternalAPI {
     ttl?: number,
     config?: RequestInit
   ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
     const cacheKey = this.serializeCacheKey(endpoint, {
       ...this.params,
       ...params,
-      headers,
     });
-
     const cachedItem = this.cache?.get<T>(cacheKey);
     if (cachedItem) {
       return cachedItem;
@@ -84,7 +81,10 @@ class ExternalAPI {
     const url = this.formatUrl(endpoint, params);
     const response = await this.fetch(url, {
       ...config,
-      headers,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
     });
     if (!response.ok) {
       const text = await response.text();
@@ -111,13 +111,10 @@ class ExternalAPI {
     ttl?: number,
     config?: RequestInit
   ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
     const cacheKey = this.serializeCacheKey(endpoint, {
       config: { ...this.params, ...params },
-      headers,
       data,
     });
-
     const cachedItem = this.cache?.get<T>(cacheKey);
     if (cachedItem) {
       return cachedItem;
@@ -127,7 +124,10 @@ class ExternalAPI {
     const response = await this.fetch(url, {
       method: 'POST',
       ...config,
-      headers,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
       body: data ? JSON.stringify(data) : undefined,
     });
     if (!response.ok) {
@@ -155,13 +155,10 @@ class ExternalAPI {
     ttl?: number,
     config?: RequestInit
   ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
     const cacheKey = this.serializeCacheKey(endpoint, {
       config: { ...this.params, ...params },
       data,
-      headers,
     });
-
     const cachedItem = this.cache?.get<T>(cacheKey);
     if (cachedItem) {
       return cachedItem;
@@ -171,7 +168,10 @@ class ExternalAPI {
     const response = await this.fetch(url, {
       method: 'PUT',
       ...config,
-      headers,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
       body: JSON.stringify(data),
     });
     if (!response.ok) {
@@ -227,11 +227,9 @@ class ExternalAPI {
     config?: RequestInit,
     overwriteBaseUrl?: string
   ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
     const cacheKey = this.serializeCacheKey(endpoint, {
       ...this.params,
       ...params,
-      headers,
     });
     const cachedItem = this.cache?.get<T>(cacheKey);
 
@@ -246,7 +244,10 @@ class ExternalAPI {
         const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
         this.fetch(url, {
           ...config,
-          headers,
+          headers: {
+            ...this.defaultHeaders,
+            ...config?.headers,
+          },
         }).then(async (response) => {
           if (!response.ok) {
             const text = await response.text();
@@ -269,7 +270,10 @@ class ExternalAPI {
     const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
     const response = await this.fetch(url, {
       ...config,
-      headers,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
     });
     if (!response.ok) {
       const text = await response.text();
@@ -289,10 +293,10 @@ class ExternalAPI {
     return data;
   }
 
-  protected removeCache(endpoint: string, options?: Record<string, string>) {
+  protected removeCache(endpoint: string, params?: Record<string, string>) {
     const cacheKey = this.serializeCacheKey(endpoint, {
       ...this.params,
-      ...options,
+      ...params,
     });
     this.cache?.del(cacheKey);
   }
@@ -321,13 +325,13 @@ class ExternalAPI {
 
   private serializeCacheKey(
     endpoint: string,
-    options?: Record<string, unknown>
+    params?: Record<string, unknown>
   ) {
-    if (!options) {
+    if (!params) {
       return `${this.baseUrl}${endpoint}`;
     }
 
-    return `${this.baseUrl}${endpoint}${JSON.stringify(options)}`;
+    return `${this.baseUrl}${endpoint}${JSON.stringify(params)}`;
   }
 
   private async getDataFromResponse(response: Response) {

server/api/jellyfin.ts

@@ -95,7 +95,11 @@ export interface JellyfinLibraryItemExtended extends JellyfinLibraryItem {
 class JellyfinAPI extends ExternalAPI {
   private userId?: string;
 
-  constructor(jellyfinHost: string, authToken?: string, deviceId?: string) {
+  constructor(
+    jellyfinHost: string,
+    authToken?: string | null,
+    deviceId?: string | null
+  ) {
     let authHeaderVal: string;
     if (authToken) {
       authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}", Token="${authToken}"`;

server/api/plexapi.ts

@@ -92,7 +92,7 @@ class PlexAPI {
     plexSettings,
     timeout,
   }: {
-    plexToken?: string;
+    plexToken?: string | null;
     plexSettings?: PlexSettings;
     timeout?: number;
   }) {
@@ -107,7 +107,7 @@ class PlexAPI {
       port: settingsPlex.port,
       https: settingsPlex.useSsl,
       timeout: timeout,
-      token: plexToken,
+      token: plexToken ?? undefined,
       authenticator: {
         authenticate: (
           _plexApi,

server/api/rating/rottentomatoes.ts

@@ -1,7 +1,6 @@
 import ExternalAPI from '@server/api/externalapi';
 import cacheManager from '@server/lib/cache';
 import { getSettings } from '@server/lib/settings';
-import jaro from 'wink-jaro-distance';
 
 interface RTAlgoliaSearchResponse {
   results: {
@@ -16,7 +15,7 @@ interface RTAlgoliaHit {
   tmsId: string;
   type: string;
   title: string;
-  titles?: string[];
+  titles: string[];
   description: string;
   releaseYear: number;
   rating: string;
@@ -25,9 +24,9 @@ interface RTAlgoliaHit {
   isEmsSearchable: boolean;
   rtId: number;
   vanity: string;
-  aka?: string[];
+  aka: string[];
   posterImageUrl: string;
-  rottenTomatoes?: {
+  rottenTomatoes: {
     audienceScore: number;
     criticsIconUrl: string;
     wantToSeeCount: number;
@@ -48,47 +47,6 @@ export interface RTRating {
   url: string;
 }
 
-// Tunables
-const INEXACT_TITLE_FACTOR = 0.25;
-const ALTERNATE_TITLE_FACTOR = 0.8;
-const PER_YEAR_PENALTY = 0.4;
-const MINIMUM_SCORE = 0.175;
-
-// Normalization for title comparisons.
-// Lowercase and strip non-alphanumeric (unicode-aware).
-const norm = (s: string): string =>
-  s.toLowerCase().replace(/[^\p{L}\p{N} ]/gu, '');
-
-// Title similarity. 1 if exact, quarter-jaro otherwise.
-const similarity = (a: string, b: string): number =>
-  a === b ? 1 : jaro(a, b).similarity * INEXACT_TITLE_FACTOR;
-
-// Gets the best similarity score between the searched title and all alternate
-// titles of the search result. Non-main titles are penalized.
-const t_score = ({ title, titles, aka }: RTAlgoliaHit, s: string): number => {
-  const f = (t: string, i: number) =>
-    similarity(norm(t), norm(s)) * (i ? ALTERNATE_TITLE_FACTOR : 1);
-  return Math.max(...[title].concat(aka || [], titles || []).map(f));
-};
-
-// Year difference to score: 0 -> 1.0, 1 -> 0.6, 2 -> 0.2, 3+ -> 0.0
-const y_score = (r: RTAlgoliaHit, y?: number): number =>
-  y ? Math.max(0, 1 - Math.abs(r.releaseYear - y) * PER_YEAR_PENALTY) : 1;
-
-// Cut score in half if result has no ratings.
-const extra_score = (r: RTAlgoliaHit): number => (r.rottenTomatoes ? 1 : 0.5);
-
-// Score search result as product of all subscores
-const score = (r: RTAlgoliaHit, name: string, year?: number): number =>
-  t_score(r, name) * y_score(r, year) * extra_score(r);
-
-// Score each search result and return the highest scoring result, if any
-const best = (rs: RTAlgoliaHit[], name: string, year?: number): RTAlgoliaHit =>
-  rs
-    .map((r) => ({ score: score(r, name, year), result: r }))
-    .filter(({ score }) => score > MINIMUM_SCORE)
-    .sort(({ score: a }, { score: b }) => b - a)[0]?.result;
-
 /**
  * This is a best-effort API. The Rotten Tomatoes API is technically
  * private and getting access costs money/requires approval.
@@ -132,21 +90,47 @@ class RottenTomatoes extends ExternalAPI {
     year: number
   ): Promise<RTRating | null> {
     try {
-      const filters = encodeURIComponent('isEmsSearchable=1 AND type:"movie"');
       const data = await this.post<RTAlgoliaSearchResponse>('/queries', {
         requests: [
           {
             indexName: 'content_rt',
-            query: name.replace(/\bthe\b ?/gi, ''),
-            params: `filters=${filters}&hitsPerPage=20`,
+            query: name,
+            params: 'filters=isEmsSearchable%20%3D%201&hitsPerPage=20',
           },
         ],
       });
 
       const contentResults = data.results.find((r) => r.index === 'content_rt');
-      const movie = best(contentResults?.hits || [], name, year);
 
-      if (!movie?.rottenTomatoes) return null;
+      if (!contentResults) {
+        return null;
+      }
+
+      // First, attempt to match exact name and year
+      let movie = contentResults.hits.find(
+        (movie) => movie.releaseYear === year && movie.title === name
+      );
+
+      // If we don't find a movie, try to match partial name and year
+      if (!movie) {
+        movie = contentResults.hits.find(
+          (movie) => movie.releaseYear === year && movie.title.includes(name)
+        );
+      }
+
+      // If we still dont find a movie, try to match just on year
+      if (!movie) {
+        movie = contentResults.hits.find((movie) => movie.releaseYear === year);
+      }
+
+      // One last try, try exact name match only
+      if (!movie) {
+        movie = contentResults.hits.find((movie) => movie.title === name);
+      }
+
+      if (!movie?.rottenTomatoes) {
+        return null;
+      }
 
       return {
         title: movie.title,
@@ -174,21 +158,33 @@ class RottenTomatoes extends ExternalAPI {
     year?: number
   ): Promise<RTRating | null> {
     try {
-      const filters = encodeURIComponent('isEmsSearchable=1 AND type:"tv"');
       const data = await this.post<RTAlgoliaSearchResponse>('/queries', {
         requests: [
           {
             indexName: 'content_rt',
             query: name,
-            params: `filters=${filters}&hitsPerPage=20`,
+            params: 'filters=isEmsSearchable%20%3D%201&hitsPerPage=20',
           },
         ],
       });
 
       const contentResults = data.results.find((r) => r.index === 'content_rt');
-      const tvshow = best(contentResults?.hits || [], name, year);
 
-      if (!tvshow?.rottenTomatoes) return null;
+      if (!contentResults) {
+        return null;
+      }
+
+      let tvshow: RTAlgoliaHit | undefined = contentResults.hits[0];
+
+      if (year) {
+        tvshow = contentResults.hits.find(
+          (series) => series.releaseYear === year
+        );
+      }
+
+      if (!tvshow || !tvshow.rottenTomatoes) {
+        return null;
+      }
 
       return {
         title: tvshow.title,

server/api/themoviedb/index.ts

@@ -108,7 +108,7 @@ class TheMovieDb extends ExternalAPI {
     super(
       'https://api.themoviedb.org/3',
       {
-        api_key: '431a8708161bcd1f1fbe7536137e61ed',
+        api_key: 'db55323b8d3e4154498498a75642b381',
       },
       {
         nodeCache: cacheManager.getCache('tmdb').data,

server/constants/error.ts

@@ -7,5 +7,6 @@ export enum ApiErrorCode {
   NoAdminUser = 'NO_ADMIN_USER',
   SyncErrorGroupedFolders = 'SYNC_ERROR_GROUPED_FOLDERS',
   SyncErrorNoLibraries = 'SYNC_ERROR_NO_LIBRARIES',
+  Unauthorized = 'UNAUTHORIZED',
   Unknown = 'UNKNOWN',
 }

server/datasource.ts

@@ -68,10 +68,8 @@ const prodConfig: DataSourceOptions = {
 
 const postgresDevConfig: DataSourceOptions = {
   type: 'postgres',
-  host: process.env.DB_SOCKET_PATH || process.env.DB_HOST,
-  port: process.env.DB_SOCKET_PATH
-    ? undefined
-    : parseInt(process.env.DB_PORT ?? '5432'),
+  host: process.env.DB_HOST,
+  port: parseInt(process.env.DB_PORT ?? '5432'),
   username: process.env.DB_USER,
   password: process.env.DB_PASS,
   database: process.env.DB_NAME ?? 'jellyseerr',
@@ -86,10 +84,8 @@ const postgresDevConfig: DataSourceOptions = {
 
 const postgresProdConfig: DataSourceOptions = {
   type: 'postgres',
-  host: process.env.DB_SOCKET_PATH || process.env.DB_HOST,
-  port: process.env.DB_SOCKET_PATH
-    ? undefined
-    : parseInt(process.env.DB_PORT ?? '5432'),
+  host: process.env.DB_HOST,
+  port: parseInt(process.env.DB_PORT ?? '5432'),
   username: process.env.DB_USER,
   password: process.env.DB_PASS,
   database: process.env.DB_NAME ?? 'jellyseerr',

server/entity/User.ts

@@ -56,11 +56,11 @@ export class User {
   })
   public email: string;
 
-  @Column({ nullable: true })
-  public plexUsername?: string;
+  @Column({ type: 'varchar', nullable: true })
+  public plexUsername?: string | null;
 
-  @Column({ nullable: true })
-  public jellyfinUsername?: string;
+  @Column({ type: 'varchar', nullable: true })
+  public jellyfinUsername?: string | null;
 
   @Column({ nullable: true })
   public username?: string;
@@ -77,20 +77,20 @@ export class User {
   @Column({ type: 'integer', default: UserType.PLEX })
   public userType: UserType;
 
-  @Column({ nullable: true, select: true })
-  public plexId?: number;
+  @Column({ type: 'integer', nullable: true, select: true })
+  public plexId?: number | null;
 
-  @Column({ nullable: true })
-  public jellyfinUserId?: string;
+  @Column({ type: 'varchar', nullable: true })
+  public jellyfinUserId?: string | null;
 
-  @Column({ nullable: true, select: false })
-  public jellyfinDeviceId?: string;
+  @Column({ type: 'varchar', nullable: true })
+  public jellyfinDeviceId?: string | null;
 
-  @Column({ nullable: true, select: false })
-  public jellyfinAuthToken?: string;
+  @Column({ type: 'varchar', nullable: true })
+  public jellyfinAuthToken?: string | null;
 
-  @Column({ nullable: true, select: false })
-  public plexToken?: string;
+  @Column({ type: 'varchar', nullable: true })
+  public plexToken?: string | null;
 
   @Column({ type: 'integer', default: 0 })
   public permissions = 0;

server/index.ts

@@ -41,6 +41,11 @@ import path from 'path';
 import swaggerUi from 'swagger-ui-express';
 import YAML from 'yamljs';
 
+if (process.env.forceIpv4First === 'true') {
+  dns.setDefaultResultOrder('ipv4first');
+  net.setDefaultAutoSelectFamily(false);
+}
+
 const API_SPEC_PATH = path.join(__dirname, '../overseerr-api.yml');
 
 logger.info(`Starting Overseerr version ${getAppVersion()}`);
@@ -74,18 +79,6 @@ app
     const settings = await getSettings().load();
     restartFlag.initializeSettings(settings.main);
 
-    // Check if we force IPv4 first
-    if (process.env.forceIpv4First === 'true' || settings.main.forceIpv4First) {
-      dns.setDefaultResultOrder('ipv4first');
-      net.setDefaultAutoSelectFamily(false);
-    }
-
-    if (settings.main.dnsServers.trim() !== '') {
-      dns.setServers(
-        settings.main.dnsServers.split(',').map((server) => server.trim())
-      );
-    }
-
     // Register HTTP proxy
     if (settings.main.proxy.enabled) {
       await createCustomProxyAgent(settings.main.proxy);

server/interfaces/api/settingsInterfaces.ts

@@ -30,7 +30,6 @@ export interface PublicSettingsResponse {
   applicationUrl: string;
   hideAvailable: boolean;
   localLogin: boolean;
-  mediaServerLogin: boolean;
   movie4kEnabled: boolean;
   series4kEnabled: boolean;
   discoverRegion: string;

server/job/schedule.ts

@@ -70,35 +70,6 @@ export const startJobs = (): void => {
       running: () => plexFullScanner.status().running,
       cancelFn: () => plexFullScanner.cancel(),
     });
-
-    scheduledJobs.push({
-      id: 'plex-refresh-token',
-      name: 'Plex Refresh Token',
-      type: 'process',
-      interval: 'fixed',
-      cronSchedule: jobs['plex-refresh-token'].schedule,
-      job: schedule.scheduleJob(jobs['plex-refresh-token'].schedule, () => {
-        logger.info('Starting scheduled job: Plex Refresh Token', {
-          label: 'Jobs',
-        });
-        refreshToken.run();
-      }),
-    });
-
-    // Watchlist Sync
-    scheduledJobs.push({
-      id: 'plex-watchlist-sync',
-      name: 'Plex Watchlist Sync',
-      type: 'process',
-      interval: 'seconds',
-      cronSchedule: jobs['plex-watchlist-sync'].schedule,
-      job: schedule.scheduleJob(jobs['plex-watchlist-sync'].schedule, () => {
-        logger.info('Starting scheduled job: Plex Watchlist Sync', {
-          label: 'Jobs',
-        });
-        watchlistSync.syncWatchlist();
-      }),
-    });
   } else if (
     mediaServerType === MediaServerType.JELLYFIN ||
     mediaServerType === MediaServerType.EMBY
@@ -141,6 +112,21 @@ export const startJobs = (): void => {
     });
   }
 
+  // Watchlist Sync
+  scheduledJobs.push({
+    id: 'plex-watchlist-sync',
+    name: 'Plex Watchlist Sync',
+    type: 'process',
+    interval: 'seconds',
+    cronSchedule: jobs['plex-watchlist-sync'].schedule,
+    job: schedule.scheduleJob(jobs['plex-watchlist-sync'].schedule, () => {
+      logger.info('Starting scheduled job: Plex Watchlist Sync', {
+        label: 'Jobs',
+      });
+      watchlistSync.syncWatchlist();
+    }),
+  });
+
   // Run full radarr scan every 24 hours
   scheduledJobs.push({
     id: 'radarr-scan',
@@ -237,5 +223,19 @@ export const startJobs = (): void => {
     }),
   });
 
+  scheduledJobs.push({
+    id: 'plex-refresh-token',
+    name: 'Plex Refresh Token',
+    type: 'process',
+    interval: 'fixed',
+    cronSchedule: jobs['plex-refresh-token'].schedule,
+    job: schedule.scheduleJob(jobs['plex-refresh-token'].schedule, () => {
+      logger.info('Starting scheduled job: Plex Refresh Token', {
+        label: 'Jobs',
+      });
+      refreshToken.run();
+    }),
+  });
+
   logger.info('Scheduled jobs loaded', { label: 'Jobs' });
 };

server/lib/settings/index.ts

@@ -124,7 +124,6 @@ export interface MainSettings {
   };
   hideAvailable: boolean;
   localLogin: boolean;
-  mediaServerLogin: boolean;
   newPlexLogin: boolean;
   discoverRegion: string;
   streamingRegion: string;
@@ -133,8 +132,6 @@ export interface MainSettings {
   mediaServerType: number;
   partialRequestsEnabled: boolean;
   enableSpecialEpisodes: boolean;
-  forceIpv4First: boolean;
-  dnsServers: string;
   locale: string;
   proxy: ProxySettings;
 }
@@ -148,7 +145,6 @@ interface FullPublicSettings extends PublicSettings {
   applicationUrl: string;
   hideAvailable: boolean;
   localLogin: boolean;
-  mediaServerLogin: boolean;
   movie4kEnabled: boolean;
   series4kEnabled: boolean;
   discoverRegion: string;
@@ -342,7 +338,6 @@ class Settings {
         },
         hideAvailable: false,
         localLogin: true,
-        mediaServerLogin: true,
         newPlexLogin: true,
         discoverRegion: '',
         streamingRegion: '',
@@ -351,8 +346,6 @@ class Settings {
         mediaServerType: MediaServerType.NOT_CONFIGURED,
         partialRequestsEnabled: true,
         enableSpecialEpisodes: false,
-        forceIpv4First: false,
-        dnsServers: '',
         locale: 'en',
         proxy: {
           enabled: false,
@@ -585,8 +578,6 @@ class Settings {
       applicationUrl: this.data.main.applicationUrl,
       hideAvailable: this.data.main.hideAvailable,
       localLogin: this.data.main.localLogin,
-      mediaServerLogin: this.data.main.mediaServerLogin,
-      jellyfinExternalHost: this.data.jellyfin.externalHostname,
       jellyfinForgotPasswordUrl: this.data.jellyfin.jellyfinForgotPasswordUrl,
       movie4kEnabled: this.data.radarr.some(
         (radarr) => radarr.is4k && radarr.isDefault

server/lib/settings/migrations/0004_migrate_region_setting.ts

@@ -1,13 +1,6 @@
 import type { AllSettings } from '@server/lib/settings';
 
 const migrateRegionSetting = (settings: any): AllSettings => {
-  if (
-    settings.main.discoverRegion !== undefined &&
-    settings.main.streamingRegion !== undefined
-  ) {
-    return settings;
-  }
-
   const oldRegion = settings.main.region;
   if (oldRegion) {
     settings.main.discoverRegion = oldRegion;

server/routes/auth.ts

@@ -56,9 +56,8 @@ authRoutes.post('/plex', async (req, res, next) => {
   }
 
   if (
-    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED &&
-    (settings.main.mediaServerLogin === false ||
-      settings.main.mediaServerType != MediaServerType.PLEX)
+    settings.main.mediaServerType != MediaServerType.PLEX &&
+    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED
   ) {
     return res.status(500).json({ error: 'Plex login is disabled' });
   }
@@ -232,13 +231,10 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
 
   //Make sure jellyfin login is enabled, but only if jellyfin && Emby is not already configured
   if (
-    // media server not configured, allow login for setup
+    settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
+    settings.main.mediaServerType !== MediaServerType.EMBY &&
     settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED &&
-    (settings.main.mediaServerLogin === false ||
-      // media server is neither jellyfin or emby
-      (settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
-        settings.main.mediaServerType !== MediaServerType.EMBY &&
-        settings.jellyfin.ip !== ''))
+    settings.jellyfin.ip !== ''
   ) {
     return res.status(500).json({ error: 'Jellyfin login is disabled' });
   }
@@ -267,7 +263,6 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
     // Try to find deviceId that corresponds to jellyfin user, else generate a new one
     let user = await userRepository.findOne({
       where: { jellyfinUsername: body.username },
-      select: { id: true, jellyfinDeviceId: true },
     });
 
     let deviceId = '';

server/routes/user/usersettings.ts

@@ -1,4 +1,7 @@
+import JellyfinAPI from '@server/api/jellyfin';
+import PlexTvAPI from '@server/api/plextv';
 import { ApiErrorCode } from '@server/constants/error';
+import { MediaServerType } from '@server/constants/server';
 import { UserType } from '@server/constants/user';
 import { getRepository } from '@server/datasource';
 import { User } from '@server/entity/User';
@@ -12,9 +15,23 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
 import { ApiError } from '@server/types/error';
+import { getHostname } from '@server/utils/getHostname';
 import { Router } from 'express';
+import net from 'net';
 import { canMakePermissionsChange } from '.';
 
+const isOwnProfile = (): Middleware => {
+  return (req, res, next) => {
+    if (req.user?.id !== Number(req.params.id)) {
+      return next({
+        status: 403,
+        message: "You do not have permission to view this user's settings.",
+      });
+    }
+    next();
+  };
+};
+
 const isOwnProfileOrAdmin = (): Middleware => {
   const authMiddleware: Middleware = (req, res, next) => {
     if (
@@ -183,9 +200,8 @@ userSettingsRoutes.post<
         status: e.statusCode,
         message: e.errorCode,
       });
-    } else {
-      return next({ status: 500, message: e.message });
     }
+    return next({ status: 500, message: e.message });
   }
 });
 
@@ -290,6 +306,260 @@ userSettingsRoutes.post<
   }
 });
 
+userSettingsRoutes.post<{ authToken: string }>(
+  '/linked-accounts/plex',
+  isOwnProfile(),
+  async (req, res) => {
+    const settings = getSettings();
+    const userRepository = getRepository(User);
+
+    if (!req.user) {
+      return res.status(404).json({ code: ApiErrorCode.Unauthorized });
+    }
+    // Make sure Plex login is enabled
+    if (settings.main.mediaServerType !== MediaServerType.PLEX) {
+      return res.status(500).json({ message: 'Plex login is disabled' });
+    }
+
+    // First we need to use this auth token to get the user's email from plex.tv
+    const plextv = new PlexTvAPI(req.body.authToken);
+    const account = await plextv.getUser();
+
+    // Do not allow linking of an already linked account
+    if (await userRepository.exist({ where: { plexId: account.id } })) {
+      return res.status(422).json({
+        message: 'This Plex account is already linked to a Jellyseerr user',
+      });
+    }
+
+    const user = req.user;
+
+    // Emails do not match
+    if (user.email !== account.email) {
+      return res.status(422).json({
+        message:
+          'This Plex account is registered under a different email address.',
+      });
+    }
+
+    // valid plex user found, link to current user
+    user.userType = UserType.PLEX;
+    user.plexId = account.id;
+    user.plexUsername = account.username;
+    user.plexToken = account.authToken;
+    await userRepository.save(user);
+
+    return res.status(204).send();
+  }
+);
+
+userSettingsRoutes.delete<{ id: string }>(
+  '/linked-accounts/plex',
+  isOwnProfileOrAdmin(),
+  async (req, res) => {
+    const settings = getSettings();
+    const userRepository = getRepository(User);
+
+    // Make sure Plex login is enabled
+    if (settings.main.mediaServerType !== MediaServerType.PLEX) {
+      return res.status(500).json({ message: 'Plex login is disabled' });
+    }
+
+    try {
+      const user = await userRepository
+        .createQueryBuilder('user')
+        .addSelect('user.password')
+        .where({
+          id: Number(req.params.id),
+        })
+        .getOne();
+
+      if (!user) {
+        return res.status(404).json({ message: 'User not found.' });
+      }
+
+      if (user.id === 1) {
+        return res.status(400).json({
+          message:
+            'Cannot unlink media server accounts for the primary administrator.',
+        });
+      }
+
+      if (!user.email || !user.password) {
+        return res.status(400).json({
+          message: 'User does not have a local email or password set.',
+        });
+      }
+
+      user.userType = UserType.LOCAL;
+      user.plexId = null;
+      user.plexUsername = null;
+      user.plexToken = null;
+      await userRepository.save(user);
+
+      return res.status(204).send();
+    } catch (e) {
+      return res.status(500).json({ message: e.message });
+    }
+  }
+);
+
+userSettingsRoutes.post<{ username: string; password: string }>(
+  '/linked-accounts/jellyfin',
+  isOwnProfile(),
+  async (req, res) => {
+    const settings = getSettings();
+    const userRepository = getRepository(User);
+
+    if (!req.user) {
+      return res.status(401).json({ code: ApiErrorCode.Unauthorized });
+    }
+    // Make sure jellyfin login is enabled
+    if (
+      settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
+      settings.main.mediaServerType !== MediaServerType.EMBY
+    ) {
+      return res
+        .status(500)
+        .json({ message: 'Jellyfin/Emby login is disabled' });
+    }
+
+    // Do not allow linking of an already linked account
+    if (
+      await userRepository.exist({
+        where: { jellyfinUsername: req.body.username },
+      })
+    ) {
+      return res.status(422).json({
+        message: 'The specified account is already linked to a Jellyseerr user',
+      });
+    }
+
+    const hostname = getHostname();
+    const deviceId = Buffer.from(
+      `BOT_overseerr_${req.user.username ?? ''}`
+    ).toString('base64');
+
+    const jellyfinserver = new JellyfinAPI(hostname, undefined, deviceId);
+
+    const ip = req.ip;
+    let clientIp: string | undefined;
+    if (ip) {
+      if (net.isIPv4(ip)) {
+        clientIp = ip;
+      } else if (net.isIPv6(ip)) {
+        clientIp = ip.startsWith('::ffff:') ? ip.substring(7) : ip;
+      }
+    }
+
+    try {
+      const account = await jellyfinserver.login(
+        req.body.username,
+        req.body.password,
+        clientIp
+      );
+
+      // Do not allow linking of an already linked account
+      if (
+        await userRepository.exist({
+          where: { jellyfinUserId: account.User.Id },
+        })
+      ) {
+        return res.status(422).json({
+          message:
+            'The specified account is already linked to a Jellyseerr user',
+        });
+      }
+
+      const user = req.user;
+
+      // valid jellyfin user found, link to current user
+      user.userType =
+        settings.main.mediaServerType === MediaServerType.EMBY
+          ? UserType.EMBY
+          : UserType.JELLYFIN;
+      user.jellyfinUserId = account.User.Id;
+      user.jellyfinUsername = account.User.Name;
+      user.jellyfinAuthToken = account.AccessToken;
+      user.jellyfinDeviceId = deviceId;
+      await userRepository.save(user);
+
+      return res.status(204).send();
+    } catch (e) {
+      logger.error('Failed to link account to user.', {
+        label: 'API',
+        ip: req.ip,
+        error: e,
+      });
+      if (
+        e instanceof ApiError &&
+        e.errorCode === ApiErrorCode.InvalidCredentials
+      ) {
+        return res.status(401).json({ code: e.errorCode });
+      }
+
+      return res.status(500).send();
+    }
+  }
+);
+
+userSettingsRoutes.delete<{ id: string }>(
+  '/linked-accounts/jellyfin',
+  isOwnProfileOrAdmin(),
+  async (req, res) => {
+    const settings = getSettings();
+    const userRepository = getRepository(User);
+
+    // Make sure jellyfin login is enabled
+    if (
+      settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
+      settings.main.mediaServerType !== MediaServerType.EMBY
+    ) {
+      return res
+        .status(500)
+        .json({ message: 'Jellyfin/Emby login is disabled' });
+    }
+
+    try {
+      const user = await userRepository
+        .createQueryBuilder('user')
+        .addSelect('user.password')
+        .where({
+          id: Number(req.params.id),
+        })
+        .getOne();
+
+      if (!user) {
+        return res.status(404).json({ message: 'User not found.' });
+      }
+
+      if (user.id === 1) {
+        return res.status(400).json({
+          message:
+            'Cannot unlink media server accounts for the primary administrator.',
+        });
+      }
+
+      if (!user.email || !user.password) {
+        return res.status(400).json({
+          message: 'User does not have a local email or password set.',
+        });
+      }
+
+      user.userType = UserType.LOCAL;
+      user.jellyfinUserId = null;
+      user.jellyfinUsername = null;
+      user.jellyfinAuthToken = null;
+      user.jellyfinDeviceId = null;
+      await userRepository.save(user);
+
+      return res.status(204).send();
+    } catch (e) {
+      return res.status(500).json({ message: e.message });
+    }
+  }
+);
+
 userSettingsRoutes.get<{ id: string }, UserSettingsNotificationsResponse>(
   '/notifications',
   isOwnProfileOrAdmin(),

server/utils/restartFlag.ts

@@ -14,9 +14,7 @@ class RestartFlag {
     return (
       this.settings.csrfProtection !== settings.csrfProtection ||
       this.settings.trustProxy !== settings.trustProxy ||
-      this.settings.proxy.enabled !== settings.proxy.enabled ||
-      this.settings.forceIpv4First !== settings.forceIpv4First ||
-      this.settings.dnsServers !== settings.dnsServers
+      this.settings.proxy.enabled !== settings.proxy.enabled
     );
   }
 }

src/components/Common/Button/index.tsx

@@ -1,6 +1,5 @@
 import type { ForwardedRef } from 'react';
 import React from 'react';
-import { twMerge } from 'tailwind-merge';
 
 export type ButtonType =
   | 'default'
@@ -98,7 +97,7 @@ function Button<P extends ElementTypes = 'button'>(
   if (as === 'a') {
     return (
       <a
-        className={twMerge(buttonStyle)}
+        className={buttonStyle.join(' ')}
         {...(props as React.ComponentProps<'a'>)}
         ref={ref as ForwardedRef<HTMLAnchorElement>}
       >
@@ -108,7 +107,7 @@ function Button<P extends ElementTypes = 'button'>(
   } else {
     return (
       <button
-        className={twMerge(buttonStyle)}
+        className={buttonStyle.join(' ')}
         {...(props as React.ComponentProps<'button'>)}
         ref={ref as ForwardedRef<HTMLButtonElement>}
       >

src/components/Common/ButtonWithDropdown/index.tsx

@@ -1,77 +1,29 @@
-import useClickOutside from '@app/hooks/useClickOutside';
+import Dropdown from '@app/components/Common/Dropdown';
 import { withProperties } from '@app/utils/typeHelpers';
-import { Transition } from '@headlessui/react';
+import { Menu } from '@headlessui/react';
 import { ChevronDownIcon } from '@heroicons/react/24/solid';
-import type {
-  AnchorHTMLAttributes,
-  ButtonHTMLAttributes,
-  RefObject,
-} from 'react';
-import { Fragment, useRef, useState } from 'react';
+import type { AnchorHTMLAttributes, ButtonHTMLAttributes } from 'react';
 
-interface DropdownItemProps extends AnchorHTMLAttributes<HTMLAnchorElement> {
-  buttonType?: 'primary' | 'ghost';
-}
-
-const DropdownItem = ({
-  children,
-  buttonType = 'primary',
-  ...props
-}: DropdownItemProps) => {
-  let styleClass = 'button-md text-white';
-
-  switch (buttonType) {
-    case 'ghost':
-      styleClass +=
-        ' bg-transparent rounded hover:bg-gradient-to-br from-indigo-600 to-purple-600 text-white focus:border-gray-500 focus:text-white';
-      break;
-    default:
-      styleClass +=
-        ' bg-indigo-600 rounded hover:bg-indigo-500 focus:border-indigo-700 focus:text-white';
-  }
-  return (
-    <a
-      className={`flex cursor-pointer items-center px-4 py-2 text-sm leading-5 focus:outline-none ${styleClass}`}
-      {...props}
-    >
-      {children}
-    </a>
-  );
-};
-
-interface ButtonWithDropdownProps {
+type ButtonWithDropdownProps = {
   text: React.ReactNode;
   dropdownIcon?: React.ReactNode;
   buttonType?: 'primary' | 'ghost';
-}
-interface ButtonProps
-  extends ButtonHTMLAttributes<HTMLButtonElement>,
-    ButtonWithDropdownProps {
-  as?: 'button';
-}
-interface AnchorProps
-  extends AnchorHTMLAttributes<HTMLAnchorElement>,
-    ButtonWithDropdownProps {
-  as: 'a';
-}
+} & (
+  | ({ as?: 'button' } & ButtonHTMLAttributes<HTMLButtonElement>)
+  | ({ as: 'a' } & AnchorHTMLAttributes<HTMLAnchorElement>)
+);
 
 const ButtonWithDropdown = ({
-  as,
   text,
   children,
   dropdownIcon,
   className,
   buttonType = 'primary',
   ...props
-}: ButtonProps | AnchorProps) => {
-  const [isOpen, setIsOpen] = useState(false);
-  const buttonRef = useRef<HTMLButtonElement | HTMLAnchorElement>(null);
-  useClickOutside(buttonRef, () => setIsOpen(false));
-
+}: ButtonWithDropdownProps) => {
   const styleClasses = {
     mainButtonClasses: 'button-md text-white border',
     dropdownSideButtonClasses: 'button-md border',
-    dropdownClasses: 'button-md',
   };
 
   switch (buttonType) {
@@ -79,72 +31,40 @@ const ButtonWithDropdown = ({
       styleClasses.mainButtonClasses +=
         ' bg-transparent border-gray-600 hover:border-gray-200 focus:border-gray-100 active:border-gray-100';
       styleClasses.dropdownSideButtonClasses = styleClasses.mainButtonClasses;
-      styleClasses.dropdownClasses +=
-        ' bg-gray-800 border border-gray-700 bg-opacity-80 p-1 backdrop-blur';
       break;
     default:
       styleClasses.mainButtonClasses +=
         ' bg-indigo-600 border-indigo-500 bg-opacity-80 hover:bg-opacity-100 hover:border-indigo-500 active:bg-indigo-700 active:border-indigo-700 focus:ring-blue';
       styleClasses.dropdownSideButtonClasses +=
         ' bg-indigo-600 bg-opacity-80 border-indigo-500 hover:bg-opacity-100 active:bg-opacity-100 focus:ring-blue';
-      styleClasses.dropdownClasses += ' bg-indigo-600 p-1';
   }
 
+  const TriggerElement = props.as ?? 'button';
+
   return (
-    <span className="relative inline-flex h-full rounded-md shadow-sm">
-      {as === 'a' ? (
-        <a
-          className={`relative z-10 inline-flex h-full items-center px-4 py-2 text-sm font-medium leading-5 transition duration-150 ease-in-out hover:z-20 focus:z-20 focus:outline-none ${
-            styleClasses.mainButtonClasses
-          } ${children ? 'rounded-l-md' : 'rounded-md'} ${className}`}
-          ref={buttonRef as RefObject<HTMLAnchorElement>}
-          {...(props as AnchorHTMLAttributes<HTMLAnchorElement>)}
-        >
-          {text}
-        </a>
-      ) : (
-        <button
-          type="button"
-          className={`relative z-10 inline-flex h-full items-center px-4 py-2 text-sm font-medium leading-5 transition duration-150 ease-in-out hover:z-20 focus:z-20 focus:outline-none ${
-            styleClasses.mainButtonClasses
-          } ${children ? 'rounded-l-md' : 'rounded-md'} ${className}`}
-          ref={buttonRef as RefObject<HTMLButtonElement>}
-          {...(props as ButtonHTMLAttributes<HTMLButtonElement>)}
-        >
-          {text}
-        </button>
-      )}
+    <Menu as="div" className="relative z-10 inline-flex">
+      <TriggerElement
+        type="button"
+        className={`relative z-10 inline-flex h-full items-center px-4 py-2 text-sm font-medium leading-5 transition duration-150 ease-in-out hover:z-20 focus:z-20 focus:outline-none ${
+          styleClasses.mainButtonClasses
+        } ${children ? 'rounded-l-md' : 'rounded-md'} ${className}`}
+        {...(props as Record<string, string>)}
+      >
+        {text}
+      </TriggerElement>
       {children && (
         <span className="relative -ml-px block">
-          <button
+          <Menu.Button
             type="button"
             className={`relative z-10 inline-flex h-full items-center rounded-r-md px-2 py-2 text-sm font-medium leading-5 text-white transition duration-150 ease-in-out hover:z-20 focus:z-20 ${styleClasses.dropdownSideButtonClasses}`}
             aria-label="Expand"
-            onClick={() => setIsOpen((state) => !state)}
           >
             {dropdownIcon ? dropdownIcon : <ChevronDownIcon />}
-          </button>
-          <Transition
-            as={Fragment}
-            show={isOpen}
-            enter="transition ease-out duration-100"
-            enterFrom="opacity-0 scale-95"
-            enterTo="opacity-100 scale-100"
-            leave="transition ease-in duration-75"
-            leaveFrom="opacity-100 scale-100"
-            leaveTo="opacity-0 scale-95"
-          >
-            <div className="absolute right-0 z-40 mt-2 -mr-1 w-56 origin-top-right rounded-md shadow-lg">
-              <div
-                className={`rounded-md ring-1 ring-black ring-opacity-5 ${styleClasses.dropdownClasses}`}
-              >
-                <div className="py-1">{children}</div>
-              </div>
-            </div>
-          </Transition>
+          </Menu.Button>
+          <Dropdown.Items dropdownType={buttonType}>{children}</Dropdown.Items>
         </span>
       )}
-    </span>
+    </Menu>
   );
 };
-export default withProperties(ButtonWithDropdown, { Item: DropdownItem });
+export default withProperties(ButtonWithDropdown, { Item: Dropdown.Item });

src/components/Common/Dropdown/index.tsx

@@ -0,0 +1,117 @@
+import { withProperties } from '@app/utils/typeHelpers';
+import { Menu, Transition } from '@headlessui/react';
+import { ChevronDownIcon } from '@heroicons/react/24/solid';
+import {
+  Fragment,
+  useRef,
+  type AnchorHTMLAttributes,
+  type ButtonHTMLAttributes,
+  type HTMLAttributes,
+} from 'react';
+
+interface DropdownItemProps extends AnchorHTMLAttributes<HTMLAnchorElement> {
+  buttonType?: 'primary' | 'ghost';
+}
+
+const DropdownItem = ({
+  children,
+  buttonType = 'primary',
+  ...props
+}: DropdownItemProps) => {
+  return (
+    <Menu.Item>
+      <a
+        className={[
+          'button-md flex cursor-pointer items-center rounded px-4 py-2 text-sm leading-5 text-white focus:text-white focus:outline-none',
+          buttonType === 'ghost'
+            ? 'bg-transparent from-indigo-600 to-purple-600 hover:bg-gradient-to-br focus:border-gray-500'
+            : 'bg-indigo-600 hover:bg-indigo-500 focus:border-indigo-700',
+        ].join(' ')}
+        {...props}
+      >
+        {children}
+      </a>
+    </Menu.Item>
+  );
+};
+
+type DropdownItemsProps = HTMLAttributes<HTMLDivElement> & {
+  dropdownType: 'primary' | 'ghost';
+};
+
+const DropdownItems = ({
+  children,
+  className,
+  dropdownType,
+  ...props
+}: DropdownItemsProps) => {
+  return (
+    <Transition
+      as={Fragment}
+      enter="transition ease-out duration-100"
+      enterFrom="opacity-0 scale-95"
+      enterTo="opacity-100 scale-100"
+      leave="transition ease-in duration-75"
+      leaveFrom="opacity-100 scale-100"
+      leaveTo="opacity-0 scale-95"
+    >
+      <Menu.Items
+        className={[
+          'absolute right-0 z-40 mt-2 -mr-1 w-56 origin-top-right rounded-md p-1 shadow-lg',
+          dropdownType === 'ghost'
+            ? 'border border-gray-700 bg-gray-800 bg-opacity-80 backdrop-blur'
+            : 'bg-indigo-600',
+          className,
+        ].join(' ')}
+        {...props}
+      >
+        <div className="py-1">{children}</div>
+      </Menu.Items>
+    </Transition>
+  );
+};
+
+interface DropdownProps extends ButtonHTMLAttributes<HTMLButtonElement> {
+  text: React.ReactNode;
+  dropdownIcon?: React.ReactNode;
+  buttonType?: 'primary' | 'ghost';
+}
+
+const Dropdown = ({
+  text,
+  children,
+  dropdownIcon,
+  className,
+  buttonType = 'primary',
+  ...props
+}: DropdownProps) => {
+  const buttonRef = useRef<HTMLButtonElement>(null);
+
+  return (
+    <Menu as="div" className="relative z-10">
+      <Menu.Button
+        type="button"
+        className={[
+          'button-md inline-flex h-full items-center space-x-2 rounded-md border px-4 py-2 text-sm font-medium leading-5 text-white transition duration-150 ease-in-out hover:z-20 focus:z-20 focus:outline-none',
+          buttonType === 'ghost'
+            ? 'border-gray-600 bg-transparent hover:border-gray-200 focus:border-gray-100 active:border-gray-100'
+            : 'focus:ring-blue border-indigo-500 bg-indigo-600 bg-opacity-80 hover:border-indigo-500 hover:bg-opacity-100 active:border-indigo-700 active:bg-indigo-700',
+          className,
+        ].join(' ')}
+        ref={buttonRef}
+        disabled={!children}
+        {...props}
+      >
+        <span>{text}</span>
+        {children && (dropdownIcon ? dropdownIcon : <ChevronDownIcon />)}
+      </Menu.Button>
+      {children && (
+        <DropdownItems dropdownType={buttonType}>{children}</DropdownItems>
+      )}
+    </Menu>
+  );
+};
+export default withProperties(Dropdown, {
+  Item: DropdownItem,
+  Items: DropdownItems,
+});

src/components/Common/LabeledCheckbox/index.tsx

@@ -1,44 +0,0 @@
-import { Field } from 'formik';
-import { twMerge } from 'tailwind-merge';
-
-interface LabeledCheckboxProps {
-  id: string;
-  className?: string;
-  label: string;
-  description: string;
-  onChange: () => void;
-  children?: React.ReactNode;
-}
-
-const LabeledCheckbox: React.FC<LabeledCheckboxProps> = ({
-  id,
-  className,
-  label,
-  description,
-  onChange,
-  children,
-}) => {
-  return (
-    <>
-      <div className={twMerge('relative flex items-start', className)}>
-        <div className="flex h-6 items-center">
-          <Field type="checkbox" id={id} name={id} onChange={onChange} />
-        </div>
-        <div className="ml-3 text-sm leading-6">
-          <label htmlFor="localLogin" className="block">
-            <div className="flex flex-col">
-              <span className="font-medium text-white">{label}</span>
-              <span className="font-normal text-gray-400">{description}</span>
-            </div>
-          </label>
-        </div>
-      </div>
-      {
-        /* can hold child checkboxes */
-        children && <div className="mt-4 pl-10">{children}</div>
-      }
-    </>
-  );
-};
-
-export default LabeledCheckbox;

src/components/Common/Modal/index.tsx

@@ -29,11 +29,16 @@ interface ModalProps {
   secondaryDisabled?: boolean;
   tertiaryDisabled?: boolean;
   tertiaryButtonType?: ButtonType;
+  okButtonProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
+  cancelButtonProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
+  secondaryButtonProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
+  tertiaryButtonProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
   disableScrollLock?: boolean;
   backgroundClickable?: boolean;
   loading?: boolean;
   backdrop?: string;
   children?: React.ReactNode;
+  dialogClass?: string;
 }
 
 const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
@@ -61,6 +66,11 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
       loading = false,
       onTertiary,
       backdrop,
+      dialogClass,
+      okButtonProps,
+      cancelButtonProps,
+      secondaryButtonProps,
+      tertiaryButtonProps,
     },
     parentRef
   ) => {
@@ -106,7 +116,7 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
           </div>
         </Transition>
         <Transition
-          className="hide-scrollbar relative inline-block w-full overflow-auto bg-gray-800 px-4 pt-4 pb-4 text-left align-bottom shadow-xl ring-1 ring-gray-700 transition-all sm:my-8 sm:max-w-3xl sm:rounded-lg sm:align-middle"
+          className={`hide-scrollbar relative inline-block w-full overflow-auto bg-gray-800 px-4 pt-4 pb-4 text-left align-bottom shadow-xl ring-1 ring-gray-700 transition-all sm:my-8 sm:max-w-3xl sm:rounded-lg sm:align-middle ${dialogClass}`}
           role="dialog"
           aria-modal="true"
           aria-labelledby="modal-headline"
@@ -189,6 +199,7 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
                   className="ml-3"
                   disabled={okDisabled}
                   data-testid="modal-ok-button"
+                  {...okButtonProps}
                 >
                   {okText ? okText : 'Ok'}
                 </Button>
@@ -200,6 +211,7 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
                   className="ml-3"
                   disabled={secondaryDisabled}
                   data-testid="modal-secondary-button"
+                  {...secondaryButtonProps}
                 >
                   {secondaryText}
                 </Button>
@@ -210,6 +222,7 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
                   onClick={onTertiary}
                   className="ml-3"
                   disabled={tertiaryDisabled}
+                  {...tertiaryButtonProps}
                 >
                   {tertiaryText}
                 </Button>
@@ -220,6 +233,7 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
                   onClick={onCancel}
                   className="ml-3 sm:ml-0"
                   data-testid="modal-cancel-button"
+                  {...cancelButtonProps}
                 >
                   {cancelText
                     ? cancelText

src/components/Login/JellyfinLogin.tsx

@@ -1,39 +1,63 @@
 import Button from '@app/components/Common/Button';
-import SensitiveInput from '@app/components/Common/SensitiveInput';
+import Tooltip from '@app/components/Common/Tooltip';
 import useSettings from '@app/hooks/useSettings';
 import defineMessages from '@app/utils/defineMessages';
-import { ArrowLeftOnRectangleIcon } from '@heroicons/react/24/outline';
+import { InformationCircleIcon } from '@heroicons/react/24/solid';
 import { ApiErrorCode } from '@server/constants/error';
 import { MediaServerType, ServerType } from '@server/constants/server';
 import { Field, Form, Formik } from 'formik';
-import { useIntl } from 'react-intl';
+import { FormattedMessage, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import * as Yup from 'yup';
 
 const messages = defineMessages('components.Login', {
-  loginwithapp: 'Login with {appName}',
   username: 'Username',
   password: 'Password',
+  hostname: '{mediaServerName} URL',
+  port: 'Port',
+  enablessl: 'Use SSL',
+  urlBase: 'URL Base',
+  email: 'Email',
+  emailtooltip:
+    'Address does not need to be associated with your {mediaServerName} instance.',
+  validationhostrequired: '{mediaServerName} URL required',
+  validationhostformat: 'Valid URL required',
+  validationemailrequired: 'Email required',
+  validationemailformat: 'Valid email required',
   validationusernamerequired: 'Username required',
   validationpasswordrequired: 'Password required',
+  validationservertyperequired: 'Please select a server type',
+  validationHostnameRequired: 'You must provide a valid hostname or IP address',
+  validationPortRequired: 'You must provide a valid port number',
+  validationUrlTrailingSlash: 'URL must not end in a trailing slash',
+  validationUrlBaseLeadingSlash: 'URL base must have a leading slash',
+  validationUrlBaseTrailingSlash: 'URL base must not end in a trailing slash',
   loginerror: 'Something went wrong while trying to sign in.',
   adminerror: 'You must use an admin account to sign in.',
   noadminerror: 'No admin user found on the server.',
   credentialerror: 'The username or password is incorrect.',
   invalidurlerror: 'Unable to connect to {mediaServerName} server.',
-  signingin: 'Signing In…',
+  signingin: 'Signing in…',
   signin: 'Sign In',
+  initialsigningin: 'Connecting…',
+  initialsignin: 'Connect',
   forgotpassword: 'Forgot Password?',
+  servertype: 'Server Type',
+  back: 'Go back',
 });
 
 interface JellyfinLoginProps {
   revalidate: () => void;
+  initial?: boolean;
   serverType?: MediaServerType;
+  onCancel?: () => void;
 }
 
 const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
   revalidate,
+  initial,
   serverType,
+  onCancel,
 }) => {
   const toasts = useToasts();
   const intl = useIntl();
@@ -48,29 +72,56 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
         : 'Media Server',
   };
 
-  const LoginSchema = Yup.object().shape({
-    username: Yup.string().required(
-      intl.formatMessage(messages.validationusernamerequired)
-    ),
-    password: Yup.string(),
-  });
-  const baseUrl = settings.currentSettings.jellyfinExternalHost
-    ? settings.currentSettings.jellyfinExternalHost
-    : settings.currentSettings.jellyfinHost;
-  const jellyfinForgotPasswordUrl =
-    settings.currentSettings.jellyfinForgotPasswordUrl;
+  if (initial) {
+    const LoginSchema = Yup.object().shape({
+      hostname: Yup.string().required(
+        intl.formatMessage(
+          messages.validationhostrequired,
+          mediaServerFormatValues
+        )
+      ),
+      port: Yup.number().required(
+        intl.formatMessage(messages.validationPortRequired)
+      ),
+      urlBase: Yup.string()
+        .test(
+          'leading-slash',
+          intl.formatMessage(messages.validationUrlBaseLeadingSlash),
+          (value) => !value || value.startsWith('/')
+        )
+        .test(
+          'trailing-slash',
+          intl.formatMessage(messages.validationUrlBaseTrailingSlash),
+          (value) => !value || !value.endsWith('/')
+        ),
+      email: Yup.string()
+        .email(intl.formatMessage(messages.validationemailformat))
+        .required(intl.formatMessage(messages.validationemailrequired)),
+      username: Yup.string().required(
+        intl.formatMessage(messages.validationusernamerequired)
+      ),
+      password: Yup.string(),
+    });
 
-  return (
-    <div>
+    return (
       <Formik
         initialValues={{
           username: '',
           password: '',
+          hostname: '',
+          port: 8096,
+          useSsl: false,
+          urlBase: '',
+          email: '',
         }}
         validationSchema={LoginSchema}
-        validateOnBlur={false}
         onSubmit={async (values) => {
           try {
+            // Check if serverType is either 'Jellyfin' or 'Emby'
+            // if (serverType !== 'Jellyfin' && serverType !== 'Emby') {
+            //   throw new Error('Invalid serverType'); // You can customize the error message
+            // }
+
             const res = await fetch('/api/v1/auth/jellyfin', {
               method: 'POST',
               headers: {
@@ -79,7 +130,12 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
               body: JSON.stringify({
                 username: values.username,
                 password: values.password,
-                email: values.username,
+                hostname: values.hostname,
+                port: values.port,
+                useSsl: values.useSsl,
+                urlBase: values.urlBase,
+                email: values.email,
+                serverType: serverType,
               }),
             });
             if (!res.ok) throw new Error(res.statusText, { cause: res });
@@ -109,6 +165,7 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
                 errorMessage = messages.loginerror;
                 break;
             }
+
             toasts.addToast(
               intl.formatMessage(errorMessage, mediaServerFormatValues),
               {
@@ -121,51 +178,303 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
           }
         }}
       >
-        {({ errors, touched, isSubmitting, isValid }) => {
-          return (
-            <>
-              <Form>
-                <div>
-                  <h2 className="mb-6 -mt-1 text-center text-lg font-bold text-neutral-200">
-                    {intl.formatMessage(messages.loginwithapp, {
-                      appName: mediaServerFormatValues.mediaServerName,
-                    })}
-                  </h2>
-
-                  <div className="mt-1 mb-4">
-                    <div className="form-input-field">
+        {({
+          errors,
+          touched,
+          values,
+          setFieldValue,
+          isSubmitting,
+          isValid,
+        }) => (
+          <Form>
+            <div className="sm:border-t sm:border-gray-800">
+              <div className="flex flex-col sm:flex-row sm:gap-4">
+                <div className="w-full">
+                  <label htmlFor="hostname" className="text-label">
+                    {intl.formatMessage(
+                      messages.hostname,
+                      mediaServerFormatValues
+                    )}
+                  </label>
+                  <div className="mt-1 mb-2 sm:col-span-2 sm:mb-0 sm:mt-0">
+                    <div className="flex rounded-md shadow-sm">
+                      <span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-gray-100 sm:text-sm">
+                        {values.useSsl ? 'https://' : 'http://'}
+                      </span>
                       <Field
-                        id="username"
-                        name="username"
+                        id="hostname"
+                        name="hostname"
                         type="text"
-                        placeholder={intl.formatMessage(messages.username)}
-                        className="!bg-gray-700/80 placeholder:text-gray-400"
+                        className="rounded-r-only flex-1"
+                        placeholder={intl.formatMessage(
+                          messages.hostname,
+                          mediaServerFormatValues
+                        )}
                       />
                     </div>
-                    {errors.username && touched.username && (
-                      <div className="error">{errors.username}</div>
+                    {errors.hostname && touched.hostname && (
+                      <div className="error">{errors.hostname}</div>
                     )}
                   </div>
-
-                  <div className="mt-1 mb-2">
-                    <div className="form-input-field">
-                      <SensitiveInput
-                        as="field"
-                        id="password"
-                        name="password"
-                        type="password"
-                        autoComplete="current-password"
-                        placeholder={intl.formatMessage(messages.password)}
-                        className="!bg-gray-700/80 placeholder:text-gray-400"
-                      />
+                </div>
+                <div className="flex-1">
+                  <label htmlFor="port" className="text-label">
+                    {intl.formatMessage(messages.port)}
+                  </label>
+                  <div className="mt-1 sm:mt-0">
+                    <Field
+                      id="port"
+                      name="port"
+                      inputMode="numeric"
+                      type="text"
+                      className="short flex-1"
+                      placeholder={intl.formatMessage(messages.port)}
+                    />
+                    {errors.port && touched.port && (
+                      <div className="error">{errors.port}</div>
+                    )}
+                  </div>
+                </div>
+              </div>
+              <label htmlFor="useSsl" className="text-label mt-2">
+                {intl.formatMessage(messages.enablessl)}
+              </label>
+              <div className="mt-1 mb-2 sm:col-span-2">
+                <div className="flex rounded-md shadow-sm">
+                  <Field
+                    id="useSsl"
+                    name="useSsl"
+                    type="checkbox"
+                    onChange={() => {
+                      setFieldValue('useSsl', !values.useSsl);
+                      setFieldValue('port', values.useSsl ? 8096 : 443);
+                    }}
+                  />
+                </div>
+              </div>
+              <label htmlFor="urlBase" className="text-label mt-1">
+                {intl.formatMessage(messages.urlBase)}
+              </label>
+              <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
+                <div className="flex rounded-md shadow-sm">
+                  <Field
+                    type="text"
+                    inputMode="url"
+                    id="urlBase"
+                    name="urlBase"
+                    placeholder={intl.formatMessage(messages.urlBase)}
+                  />
+                </div>
+                {errors.urlBase && touched.urlBase && (
+                  <div className="error">{errors.urlBase}</div>
+                )}
+              </div>
+              <label
+                htmlFor="email"
+                className="text-label inline-flex gap-1 align-middle"
+              >
+                {intl.formatMessage(messages.email)}
+                <span className="label-tip">
+                  <Tooltip
+                    content={intl.formatMessage(
+                      messages.emailtooltip,
+                      mediaServerFormatValues
+                    )}
+                  >
+                    <span className="tooltip-trigger">
+                      <InformationCircleIcon className="h-4 w-4" />
+                    </span>
+                  </Tooltip>
+                </span>
+              </label>
+              <div className="mt-1 sm:col-span-2 sm:mb-2 sm:mt-0">
+                <div className="flex rounded-md shadow-sm">
+                  <Field
+                    id="email"
+                    name="email"
+                    type="text"
+                    placeholder={intl.formatMessage(messages.email)}
+                  />
+                </div>
+                {errors.email && touched.email && (
+                  <div className="error">{errors.email}</div>
+                )}
+              </div>
+              <label htmlFor="username" className="text-label">
+                {intl.formatMessage(messages.username)}
+              </label>
+              <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
+                <div className="flex rounded-md shadow-sm">
+                  <Field
+                    id="username"
+                    name="username"
+                    type="text"
+                    placeholder={intl.formatMessage(messages.username)}
+                  />
+                </div>
+                {errors.username && touched.username && (
+                  <div className="error">{errors.username}</div>
+                )}
+              </div>
+              <label htmlFor="password" className="text-label">
+                {intl.formatMessage(messages.password)}
+              </label>
+              <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
+                <div className="flexrounded-md shadow-sm">
+                  <Field
+                    id="password"
+                    name="password"
+                    type="password"
+                    placeholder={intl.formatMessage(messages.password)}
+                  />
+                </div>
+                {errors.password && touched.password && (
+                  <div className="error">{errors.password}</div>
+                )}
+              </div>
+            </div>
+            <div className="mt-8 border-t border-gray-700 pt-5">
+              <div className="flex flex-row-reverse justify-between">
+                <span className="inline-flex rounded-md shadow-sm">
+                  <Button
+                    buttonType="primary"
+                    type="submit"
+                    disabled={isSubmitting || !isValid}
+                  >
+                    {isSubmitting
+                      ? intl.formatMessage(messages.signingin)
+                      : intl.formatMessage(messages.signin)}
+                  </Button>
+                </span>
+                {onCancel && (
+                  <span className="inline-flex rounded-md shadow-sm">
+                    <Button buttonType="default" onClick={() => onCancel()}>
+                      <FormattedMessage {...messages.back} />
+                    </Button>
+                  </span>
+                )}
+              </div>
+            </div>
+          </Form>
+        )}
+      </Formik>
+    );
+  } else {
+    const LoginSchema = Yup.object().shape({
+      username: Yup.string().required(
+        intl.formatMessage(messages.validationusernamerequired)
+      ),
+      password: Yup.string(),
+    });
+    const baseUrl = settings.currentSettings.jellyfinExternalHost
+      ? settings.currentSettings.jellyfinExternalHost
+      : settings.currentSettings.jellyfinHost;
+    const jellyfinForgotPasswordUrl =
+      settings.currentSettings.jellyfinForgotPasswordUrl;
+    return (
+      <div>
+        <Formik
+          initialValues={{
+            username: '',
+            password: '',
+          }}
+          validationSchema={LoginSchema}
+          onSubmit={async (values) => {
+            try {
+              const res = await fetch('/api/v1/auth/jellyfin', {
+                method: 'POST',
+                headers: {
+                  'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                  username: values.username,
+                  password: values.password,
+                  email: values.username,
+                }),
+              });
+              if (!res.ok) throw new Error(res.statusText, { cause: res });
+            } catch (e) {
+              let errorData;
+              try {
+                errorData = await e.cause?.text();
+                errorData = JSON.parse(errorData);
+              } catch {
+                /* empty */
+              }
+              let errorMessage = null;
+              switch (errorData?.message) {
+                case ApiErrorCode.InvalidUrl:
+                  errorMessage = messages.invalidurlerror;
+                  break;
+                case ApiErrorCode.InvalidCredentials:
+                  errorMessage = messages.credentialerror;
+                  break;
+                case ApiErrorCode.NotAdmin:
+                  errorMessage = messages.adminerror;
+                  break;
+                case ApiErrorCode.NoAdminUser:
+                  errorMessage = messages.noadminerror;
+                  break;
+                default:
+                  errorMessage = messages.loginerror;
+                  break;
+              }
+              toasts.addToast(
+                intl.formatMessage(errorMessage, mediaServerFormatValues),
+                {
+                  autoDismiss: true,
+                  appearance: 'error',
+                }
+              );
+            } finally {
+              revalidate();
+            }
+          }}
+        >
+          {({ errors, touched, isSubmitting, isValid }) => {
+            return (
+              <>
+                <Form>
+                  <div className="sm:border-t sm:border-gray-800">
+                    <label htmlFor="username" className="text-label">
+                      {intl.formatMessage(messages.username)}
+                    </label>
+                    <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
+                      <div className="flex max-w-lg rounded-md shadow-sm">
+                        <Field
+                          id="username"
+                          name="username"
+                          type="text"
+                          placeholder={intl.formatMessage(messages.username)}
+                        />
+                      </div>
+                      {errors.username && touched.username && (
+                        <div className="error">{errors.username}</div>
+                      )}
                     </div>
-                    <div className="flex">
+                    <label htmlFor="password" className="text-label">
+                      {intl.formatMessage(messages.password)}
+                    </label>
+                    <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
+                      <div className="flex max-w-lg rounded-md shadow-sm">
+                        <Field
+                          id="password"
+                          name="password"
+                          type="password"
+                          placeholder={intl.formatMessage(messages.password)}
+                        />
+                      </div>
                       {errors.password && touched.password && (
                         <div className="error">{errors.password}</div>
                       )}
-                      <div className="flex-grow"></div>
-                      {baseUrl && (
-                        <a
+                    </div>
+                  </div>
+                  <div className="mt-8 border-t border-gray-700 pt-5">
+                    <div className="flex justify-between">
+                      <span className="inline-flex rounded-md shadow-sm">
+                        <Button
+                          as="a"
+                          buttonType="ghost"
                           href={
                             jellyfinForgotPasswordUrl
                               ? `${jellyfinForgotPasswordUrl}`
@@ -176,35 +485,31 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
                                     : ''
                                 }forgotpassword.html`
                           }
-                          className="pt-2 text-sm text-indigo-500 hover:text-indigo-400"
                         >
                           {intl.formatMessage(messages.forgotpassword)}
-                        </a>
-                      )}
+                        </Button>
+                      </span>
+                      <span className="inline-flex rounded-md shadow-sm">
+                        <Button
+                          buttonType="primary"
+                          type="submit"
+                          disabled={isSubmitting || !isValid}
+                        >
+                          {isSubmitting
+                            ? intl.formatMessage(messages.signingin)
+                            : intl.formatMessage(messages.signin)}
+                        </Button>
+                      </span>
                     </div>
                   </div>
-                </div>
-
-                <Button
-                  buttonType="primary"
-                  type="submit"
-                  disabled={isSubmitting || !isValid}
-                  className="mt-2 w-full shadow-sm"
-                >
-                  <ArrowLeftOnRectangleIcon />
-                  <span>
-                    {isSubmitting
-                      ? intl.formatMessage(messages.signingin)
-                      : intl.formatMessage(messages.signin)}
-                  </span>
-                </Button>
-              </Form>
-            </>
-          );
-        }}
-      </Formik>
-    </div>
-  );
+                </Form>
+              </>
+            );
+          }}
+        </Formik>
+      </div>
+    );
+  }
 };
 
 export default JellyfinLogin;

src/components/Login/LocalLogin.tsx

@@ -2,7 +2,10 @@ import Button from '@app/components/Common/Button';
 import SensitiveInput from '@app/components/Common/SensitiveInput';
 import useSettings from '@app/hooks/useSettings';
 import defineMessages from '@app/utils/defineMessages';
-import { ArrowLeftOnRectangleIcon } from '@heroicons/react/24/outline';
+import {
+  ArrowLeftOnRectangleIcon,
+  LifebuoyIcon,
+} from '@heroicons/react/24/outline';
 import { Field, Form, Formik } from 'formik';
 import Link from 'next/link';
 import { useState } from 'react';
@@ -10,7 +13,6 @@ import { useIntl } from 'react-intl';
 import * as Yup from 'yup';
 
 const messages = defineMessages('components.Login', {
-  loginwithapp: 'Login with {appName}',
   username: 'Username',
   email: 'Email Address',
   password: 'Password',
@@ -51,7 +53,6 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
         password: '',
       }}
       validationSchema={LoginSchema}
-      validateOnBlur={false}
       onSubmit={async (values) => {
         try {
           const res = await fetch('/api/v1/auth/local', {
@@ -77,24 +78,19 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
           <>
             <Form>
               <div>
-                <h2 className="mb-6 -mt-1 text-center text-lg font-bold text-neutral-200">
-                  {intl.formatMessage(messages.loginwithapp, {
-                    appName: settings.currentSettings.applicationTitle,
-                  })}
-                </h2>
-
-                <div className="mt-1 mb-4">
+                <label htmlFor="email" className="text-label">
+                  {intl.formatMessage(messages.email) +
+                    ' / ' +
+                    intl.formatMessage(messages.username)}
+                </label>
+                <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
                   <div className="form-input-field">
                     <Field
                       id="email"
                       name="email"
-                      placeholder={`${intl.formatMessage(
-                        messages.email
-                      )} / ${intl.formatMessage(messages.username)}`}
                       type="text"
                       inputMode="email"
                       data-testid="email"
-                      className="!bg-gray-700/80 placeholder:text-gray-400"
                     />
                   </div>
                   {errors.email &&
@@ -103,35 +99,25 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
                       <div className="error">{errors.email}</div>
                     )}
                 </div>
-                <div className="mt-1 mb-2">
+                <label htmlFor="password" className="text-label">
+                  {intl.formatMessage(messages.password)}
+                </label>
+                <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
                   <div className="form-input-field">
                     <SensitiveInput
                       as="field"
                       id="password"
                       name="password"
                       type="password"
-                      placeholder={intl.formatMessage(messages.password)}
                       autoComplete="current-password"
                       data-testid="password"
-                      className="!bg-gray-700/80 placeholder:text-gray-400"
                     />
                   </div>
-                  <div className="flex">
-                    {errors.password &&
-                      touched.password &&
-                      typeof errors.password === 'string' && (
-                        <div className="error">{errors.password}</div>
-                      )}
-                    <div className="flex-grow"></div>
-                    {passwordResetEnabled && (
-                      <Link
-                        href="/resetpassword"
-                        className="pt-2 text-sm text-indigo-500 hover:text-indigo-400"
-                      >
-                        {intl.formatMessage(messages.forgotpassword)}
-                      </Link>
+                  {errors.password &&
+                    touched.password &&
+                    typeof errors.password === 'string' && (
+                      <div className="error">{errors.password}</div>
                     )}
-                  </div>
                 </div>
                 {loginError && (
                   <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
@@ -139,21 +125,37 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
                   </div>
                 )}
               </div>
-
-              <Button
-                buttonType="primary"
-                type="submit"
-                disabled={isSubmitting || !isValid}
-                data-testid="local-signin-button"
-                className="mt-2 w-full shadow-sm"
-              >
-                <ArrowLeftOnRectangleIcon />
-                <span>
-                  {isSubmitting
-                    ? intl.formatMessage(messages.signingin)
-                    : intl.formatMessage(messages.signin)}
-                </span>
-              </Button>
+              <div className="mt-8 border-t border-gray-700 pt-5">
+                <div className="flex flex-row-reverse justify-between">
+                  <span className="inline-flex rounded-md shadow-sm">
+                    <Button
+                      buttonType="primary"
+                      type="submit"
+                      disabled={isSubmitting || !isValid}
+                      data-testid="local-signin-button"
+                    >
+                      <ArrowLeftOnRectangleIcon />
+                      <span>
+                        {isSubmitting
+                          ? intl.formatMessage(messages.signingin)
+                          : intl.formatMessage(messages.signin)}
+                      </span>
+                    </Button>
+                  </span>
+                  {passwordResetEnabled && (
+                    <span className="inline-flex rounded-md shadow-sm">
+                      <Link href="/resetpassword" passHref legacyBehavior>
+                        <Button as="a" buttonType="ghost">
+                          <LifebuoyIcon />
+                          <span>
+                            {intl.formatMessage(messages.forgotpassword)}
+                          </span>
+                        </Button>
+                      </Link>
+                    </span>
+                  )}
+                </div>
+              </div>
             </Form>
           </>
         );

src/components/Login/PlexLoginButton.tsx

@@ -1,62 +0,0 @@
-import PlexIcon from '@app/assets/services/plex.svg';
-import Button from '@app/components/Common/Button';
-import { SmallLoadingSpinner } from '@app/components/Common/LoadingSpinner';
-import usePlexLogin from '@app/hooks/usePlexLogin';
-import defineMessages from '@app/utils/defineMessages';
-import { FormattedMessage } from 'react-intl';
-
-const messages = defineMessages('components.Login', {
-  loginwithapp: 'Login with {appName}',
-});
-
-interface PlexLoginButtonProps {
-  onAuthToken: (authToken: string) => void;
-  isProcessing?: boolean;
-  onError?: (message: string) => void;
-  large?: boolean;
-}
-
-const PlexLoginButton = ({
-  onAuthToken,
-  onError,
-  isProcessing,
-  large,
-}: PlexLoginButtonProps) => {
-  const { loading, login } = usePlexLogin({ onAuthToken, onError });
-
-  return (
-    <Button
-      className="relative flex-1 border-[#cc7b19] bg-[rgba(204,123,25,0.3)] hover:border-[#cc7b19] hover:bg-[rgba(204,123,25,0.7)] disabled:opacity-50"
-      onClick={login}
-      disabled={loading || isProcessing}
-      data-testid="plex-login-button"
-    >
-      {loading && (
-        <div className="absolute right-0 mr-4 h-4 w-4">
-          <SmallLoadingSpinner />
-        </div>
-      )}
-
-      {large ? (
-        <FormattedMessage
-          {...messages.loginwithapp}
-          values={{
-            appName: <PlexIcon className="mt-[2px] ml-[0.35em] w-8" />,
-          }}
-        >
-          {(chunks) => (
-            <>
-              {chunks.map((c) =>
-                typeof c === 'string' ? <span>{c}</span> : c
-              )}
-            </>
-          )}
-        </FormattedMessage>
-      ) : (
-        <PlexIcon className="w-8" />
-      )}
-    </Button>
-  );
-};
-
-export default PlexLoginButton;

src/components/Login/index.tsx

@@ -1,13 +1,9 @@
-import EmbyLogo from '@app/assets/services/emby-icon-only.svg';
-import JellyfinLogo from '@app/assets/services/jellyfin-icon.svg';
-import PlexLogo from '@app/assets/services/plex.svg';
-import Button from '@app/components/Common/Button';
+import Accordion from '@app/components/Common/Accordion';
 import ImageFader from '@app/components/Common/ImageFader';
 import PageTitle from '@app/components/Common/PageTitle';
 import LanguagePicker from '@app/components/Layout/LanguagePicker';
-import JellyfinLogin from '@app/components/Login/JellyfinLogin';
 import LocalLogin from '@app/components/Login/LocalLogin';
-import PlexLoginButton from '@app/components/Login/PlexLoginButton';
+import PlexLoginButton from '@app/components/PlexLoginButton';
 import useSettings from '@app/hooks/useSettings';
 import { useUser } from '@app/hooks/useUser';
 import defineMessages from '@app/utils/defineMessages';
@@ -16,10 +12,10 @@ import { XCircleIcon } from '@heroicons/react/24/solid';
 import { MediaServerType } from '@server/constants/server';
 import { useRouter } from 'next/dist/client/router';
 import Image from 'next/image';
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { CSSTransition, SwitchTransition } from 'react-transition-group';
 import useSWR from 'swr';
+import JellyfinLogin from './JellyfinLogin';
 
 const messages = defineMessages('components.Login', {
   signin: 'Sign In',
@@ -27,21 +23,16 @@ const messages = defineMessages('components.Login', {
   signinwithplex: 'Use your Plex account',
   signinwithjellyfin: 'Use your {mediaServerName} account',
   signinwithoverseerr: 'Use your {applicationTitle} account',
-  orsigninwith: 'Or sign in with',
 });
 
 const Login = () => {
   const intl = useIntl();
-  const router = useRouter();
-  const settings = useSettings();
-  const { user, revalidate } = useUser();
-
   const [error, setError] = useState('');
   const [isProcessing, setProcessing] = useState(false);
   const [authToken, setAuthToken] = useState<string | undefined>(undefined);
-  const [mediaServerLogin, setMediaServerLogin] = useState(
-    settings.currentSettings.mediaServerLogin
-  );
+  const { user, revalidate } = useUser();
+  const router = useRouter();
+  const settings = useSettings();
 
   // Effect that is triggered when the `authToken` comes back from the Plex OAuth
   // We take the token and attempt to sign in. If we get a success message, we will
@@ -95,73 +86,14 @@ const Login = () => {
     revalidateOnFocus: false,
   });
 
-  const mediaServerName =
-    settings.currentSettings.mediaServerType === MediaServerType.PLEX
-      ? 'Plex'
-      : settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN
-      ? 'Jellyfin'
-      : settings.currentSettings.mediaServerType === MediaServerType.EMBY
-      ? 'Emby'
-      : undefined;
-
-  const MediaServerLogo =
-    settings.currentSettings.mediaServerType === MediaServerType.PLEX
-      ? PlexLogo
-      : settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN
-      ? JellyfinLogo
-      : settings.currentSettings.mediaServerType === MediaServerType.EMBY
-      ? EmbyLogo
-      : undefined;
-
-  const isJellyfin =
-    settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN ||
-    settings.currentSettings.mediaServerType === MediaServerType.EMBY;
-  const mediaServerLoginRef = useRef<HTMLDivElement>(null);
-  const localLoginRef = useRef<HTMLDivElement>(null);
-  const loginRef = mediaServerLogin ? mediaServerLoginRef : localLoginRef;
-
-  const loginFormVisible =
-    (isJellyfin && settings.currentSettings.mediaServerLogin) ||
-    settings.currentSettings.localLogin;
-  const additionalLoginOptions = [
-    settings.currentSettings.mediaServerLogin &&
-      (settings.currentSettings.mediaServerType === MediaServerType.PLEX ? (
-        <PlexLoginButton
-          key="plex"
-          isProcessing={isProcessing}
-          onAuthToken={(authToken) => setAuthToken(authToken)}
-          large={!isJellyfin && !settings.currentSettings.localLogin}
-        />
-      ) : (
-        settings.currentSettings.localLogin &&
-        (mediaServerLogin ? (
-          <Button
-            key="jellyseerr"
-            data-testid="jellyseerr-login-button"
-            className="flex-1 bg-transparent"
-            onClick={() => setMediaServerLogin(false)}
-          >
-            {/* eslint-disable-next-line @next/next/no-img-element */}
-            <img
-              src="/os_icon.svg"
-              alt={settings.currentSettings.applicationTitle}
-              className="mr-2 h-5"
-            />
-            <span>{settings.currentSettings.applicationTitle}</span>
-          </Button>
-        ) : (
-          <Button
-            key="mediaserver"
-            data-testid="mediaserver-login-button"
-            className="flex-1 bg-transparent"
-            onClick={() => setMediaServerLogin(true)}
-          >
-            <MediaServerLogo />
-            <span>{mediaServerName}</span>
-          </Button>
-        ))
-      )),
-  ].filter((o): o is JSX.Element => !!o);
+  const mediaServerFormatValues = {
+    mediaServerName:
+      settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN
+        ? 'Jellyfin'
+        : settings.currentSettings.mediaServerType === MediaServerType.EMBY
+        ? 'Emby'
+        : undefined,
+  };
 
   return (
     <div className="relative flex min-h-screen flex-col bg-gray-900 py-14">
@@ -180,6 +112,9 @@ const Login = () => {
         <div className="relative h-48 w-full max-w-full">
           <Image src="/logo_stacked.svg" alt="Logo" fill />
         </div>
+        <h2 className="mt-12 text-center text-3xl font-extrabold leading-9 text-gray-100">
+          {intl.formatMessage(messages.signinheader)}
+        </h2>
       </div>
       <div className="relative z-50 mt-8 sm:mx-auto sm:w-full sm:max-w-md">
         <div
@@ -210,71 +145,65 @@ const Login = () => {
                 </div>
               </div>
             </Transition>
-            <div className="px-10 py-8">
-              <SwitchTransition mode="out-in">
-                <CSSTransition
-                  key={mediaServerLogin ? 'ms' : 'local'}
-                  nodeRef={loginRef}
-                  addEndListener={(done) => {
-                    loginRef.current?.addEventListener(
-                      'transitionend',
-                      done,
-                      false
-                    );
-                  }}
-                  onEntered={() => {
-                    document
-                      .querySelector<HTMLInputElement>('#email, #username')
-                      ?.focus();
-                  }}
-                  classNames={{
-                    appear: 'opacity-0',
-                    appearActive: 'transition-opacity duration-500 opacity-100',
-                    enter: 'opacity-0',
-                    enterActive: 'transition-opacity duration-500 opacity-100',
-                    exitActive: 'transition-opacity duration-0 opacity-0',
-                  }}
-                >
-                  <div ref={loginRef} className="button-container">
-                    {isJellyfin &&
-                    (mediaServerLogin ||
-                      !settings.currentSettings.localLogin) ? (
-                      <JellyfinLogin
-                        serverType={settings.currentSettings.mediaServerType}
-                        revalidate={revalidate}
-                      />
-                    ) : (
-                      settings.currentSettings.localLogin && (
-                        <LocalLogin revalidate={revalidate} />
-                      )
-                    )}
-                  </div>
-                </CSSTransition>
-              </SwitchTransition>
-
-              {additionalLoginOptions.length > 0 &&
-                (loginFormVisible ? (
-                  <div className="flex items-center py-5">
-                    <div className="flex-grow border-t border-gray-600"></div>
-                    <span className="mx-2 flex-shrink text-sm text-gray-400">
-                      {intl.formatMessage(messages.orsigninwith)}
-                    </span>
-                    <div className="flex-grow border-t border-gray-600"></div>
-                  </div>
-                ) : (
-                  <h2 className="mb-6 text-center text-lg font-bold text-neutral-200">
-                    {intl.formatMessage(messages.signinheader)}
-                  </h2>
-                ))}
-
-              <div
-                className={`flex w-full flex-wrap gap-2 ${
-                  !loginFormVisible ? 'flex-col' : ''
-                }`}
-              >
-                {additionalLoginOptions}
-              </div>
-            </div>
+            <Accordion single atLeastOne>
+              {({ openIndexes, handleClick, AccordionContent }) => (
+                <>
+                  <button
+                    className={`w-full cursor-default bg-gray-800 bg-opacity-70 py-2 text-center text-sm font-bold text-gray-400 transition-colors duration-200 focus:outline-none sm:rounded-t-lg ${
+                      openIndexes.includes(0) && 'text-indigo-500'
+                    } ${
+                      settings.currentSettings.localLogin &&
+                      'hover:cursor-pointer hover:bg-gray-700'
+                    }`}
+                    onClick={() => handleClick(0)}
+                    disabled={!settings.currentSettings.localLogin}
+                  >
+                    {settings.currentSettings.mediaServerType ==
+                    MediaServerType.PLEX
+                      ? intl.formatMessage(messages.signinwithplex)
+                      : intl.formatMessage(
+                          messages.signinwithjellyfin,
+                          mediaServerFormatValues
+                        )}
+                  </button>
+                  <AccordionContent isOpen={openIndexes.includes(0)}>
+                    <div className="px-10 py-8">
+                      {settings.currentSettings.mediaServerType ==
+                      MediaServerType.PLEX ? (
+                        <PlexLoginButton
+                          isProcessing={isProcessing}
+                          onAuthToken={(authToken) => setAuthToken(authToken)}
+                        />
+                      ) : (
+                        <JellyfinLogin revalidate={revalidate} />
+                      )}
+                    </div>
+                  </AccordionContent>
+                  {settings.currentSettings.localLogin && (
+                    <div>
+                      <button
+                        className={`w-full cursor-default bg-gray-800 bg-opacity-70 py-2 text-center text-sm font-bold text-gray-400 transition-colors duration-200 hover:cursor-pointer hover:bg-gray-700 focus:outline-none ${
+                          openIndexes.includes(1)
+                            ? 'text-indigo-500'
+                            : 'sm:rounded-b-lg'
+                        }`}
+                        onClick={() => handleClick(1)}
+                      >
+                        {intl.formatMessage(messages.signinwithoverseerr, {
+                          applicationTitle:
+                            settings.currentSettings.applicationTitle,
+                        })}
+                      </button>
+                      <AccordionContent isOpen={openIndexes.includes(1)}>
+                        <div className="px-10 py-8">
+                          <LocalLogin revalidate={revalidate} />
+                        </div>
+                      </AccordionContent>
+                    </div>
+                  )}
+                </>
+              )}
+            </Accordion>
           </>
         </div>
       </div>

src/components/MovieDetails/index.tsx

@@ -38,14 +38,14 @@ import {
   ExclamationTriangleIcon,
   EyeSlashIcon,
   FilmIcon,
-  MinusCircleIcon,
   PlayIcon,
-  StarIcon,
   TicketIcon,
 } from '@heroicons/react/24/outline';
 import {
   ChevronDoubleDownIcon,
   ChevronDoubleUpIcon,
+  MinusCircleIcon,
+  StarIcon,
 } from '@heroicons/react/24/solid';
 import { type RatingResponse } from '@server/api/ratings';
 import { IssueStatus } from '@server/constants/issue';
@@ -102,7 +102,7 @@ const messages = defineMessages('components.MovieDetails', {
   watchlistSuccess: '<strong>{title}</strong> added to watchlist successfully!',
   watchlistDeleted:
     '<strong>{title}</strong> Removed from watchlist successfully!',
-  watchlistError: 'Something went wrong. Please try again.',
+  watchlistError: 'Something went wrong try again.',
   removefromwatchlist: 'Remove From Watchlist',
   addtowatchlist: 'Add To Watchlist',
 });

src/components/PlexLoginButton/index.tsx

@@ -0,0 +1,66 @@
+import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
+import PlexOAuth from '@app/utils/plex';
+import { ArrowLeftOnRectangleIcon } from '@heroicons/react/24/outline';
+import { useState } from 'react';
+import { useIntl } from 'react-intl';
+
+const messages = defineMessages('components.PlexLoginButton', {
+  signinwithplex: 'Sign In',
+  signingin: 'Signing In…',
+});
+
+const plexOAuth = new PlexOAuth();
+
+interface PlexLoginButtonProps {
+  onAuthToken: (authToken: string) => void;
+  isProcessing?: boolean;
+  onError?: (message: string) => void;
+}
+
+const PlexLoginButton = ({
+  onAuthToken,
+  onError,
+  isProcessing,
+}: PlexLoginButtonProps) => {
+  const intl = useIntl();
+  const [loading, setLoading] = useState(false);
+
+  const getPlexLogin = async () => {
+    setLoading(true);
+    try {
+      const authToken = await plexOAuth.login();
+      setLoading(false);
+      onAuthToken(authToken);
+    } catch (e) {
+      if (onError) {
+        onError(e.message);
+      }
+      setLoading(false);
+    }
+  };
+  return (
+    <span className="block w-full rounded-md shadow-sm">
+      <button
+        type="button"
+        onClick={() => {
+          plexOAuth.preparePopup();
+          setTimeout(() => getPlexLogin(), 1500);
+        }}
+        disabled={loading || isProcessing}
+        className="plex-button"
+      >
+        <ArrowLeftOnRectangleIcon />
+        <span>
+          {loading
+            ? intl.formatMessage(globalMessages.loading)
+            : isProcessing
+            ? intl.formatMessage(messages.signingin)
+            : intl.formatMessage(messages.signinwithplex)}
+        </span>
+      </button>
+    </span>
+  );
+};
+
+export default PlexLoginButton;

src/components/Settings/RadarrModal/index.tsx

@@ -773,42 +773,38 @@ const RadarrModal = ({
                   </div>
                 </div>
               </div>
-              {radarr && (
-                <>
-                  <h3 className="mb-4 text-xl font-bold leading-8 text-gray-100">
-                    {intl.formatMessage(messages.overrideRules)}
-                  </h3>
-                  <ul className="grid gap-x-4 gap-y-8 sm:grid-cols-3 sm:gap-x-6 sm:gap-y-6 lg:grid-cols-2">
-                    {rules && (
-                      <OverrideRuleTile
-                        rules={rules}
-                        setOverrideRuleModal={setOverrideRuleModal}
-                        testResponse={testResponse}
-                        radarr={radarr}
-                        revalidate={revalidate}
-                      />
-                    )}
-                    <li className="min-h-[8rem] rounded-lg border-2 border-dashed border-gray-400 shadow sm:min-h-[11rem]">
-                      <div className="flex h-full w-full items-center justify-center">
-                        <Button
-                          buttonType="ghost"
-                          onClick={() =>
-                            setOverrideRuleModal({
-                              open: true,
-                              rule: null,
-                              testResponse,
-                            })
-                          }
-                          disabled={!isValidated}
-                        >
-                          <PlusIcon />
-                          <span>{intl.formatMessage(messages.addrule)}</span>
-                        </Button>
-                      </div>
-                    </li>
-                  </ul>
-                </>
-              )}
+              <h3 className="mb-4 text-xl font-bold leading-8 text-gray-100">
+                {intl.formatMessage(messages.overrideRules)}
+              </h3>
+              <ul className="grid grid-cols-2 gap-6">
+                {rules && (
+                  <OverrideRuleTile
+                    rules={rules}
+                    setOverrideRuleModal={setOverrideRuleModal}
+                    testResponse={testResponse}
+                    radarr={radarr}
+                    revalidate={revalidate}
+                  />
+                )}
+                <li className="min-h-[8rem] rounded-lg border-2 border-dashed border-gray-400 shadow sm:min-h-[11rem]">
+                  <div className="flex h-full w-full items-center justify-center">
+                    <Button
+                      buttonType="ghost"
+                      onClick={() =>
+                        setOverrideRuleModal({
+                          open: true,
+                          rule: null,
+                          testResponse,
+                        })
+                      }
+                      disabled={!isValidated}
+                    >
+                      <PlusIcon />
+                      <span>{intl.formatMessage(messages.addrule)}</span>
+                    </Button>
+                  </div>
+                </li>
+              </ul>
             </Modal>
           );
         }}

src/components/Settings/SettingsLogs/index.tsx

@@ -245,9 +245,7 @@ const SettingsLogs = () => {
         <p className="description">
           {intl.formatMessage(messages.logsDescription, {
             code: (msg: React.ReactNode) => (
-              <code className="whitespace-normal break-words bg-opacity-50">
-                {msg}
-              </code>
+              <code className="bg-opacity-50">{msg}</code>
             ),
             appDataPath: appData ? appData.appDataPath : '/app/config',
           })}

src/components/Settings/SettingsMain/index.tsx

@@ -57,12 +57,6 @@ const messages = defineMessages('components.Settings.SettingsMain', {
   validationApplicationUrlTrailingSlash: 'URL must not end in a trailing slash',
   partialRequestsEnabled: 'Allow Partial Series Requests',
   enableSpecialEpisodes: 'Allow Special Episodes Requests',
-  forceIpv4First: 'IPv4 Resolution First',
-  forceIpv4FirstTip:
-    'Force Jellyseerr to resolve IPv4 addresses first instead of IPv6',
-  dnsServers: 'Custom DNS Servers',
-  dnsServersTip:
-    'Comma-separated list of custom DNS servers, e.g. "1.1.1.1,[2606:4700:4700::1111]"',
   locale: 'Display Language',
   proxyEnabled: 'HTTP(S) Proxy',
   proxyHostname: 'Proxy Hostname',
@@ -166,8 +160,6 @@ const SettingsMain = () => {
             streamingRegion: data?.streamingRegion || 'US',
             partialRequestsEnabled: data?.partialRequestsEnabled,
             enableSpecialEpisodes: data?.enableSpecialEpisodes,
-            forceIpv4First: data?.forceIpv4First,
-            dnsServers: data?.dnsServers,
             trustProxy: data?.trustProxy,
             cacheImages: data?.cacheImages,
             proxyEnabled: data?.proxy?.enabled,
@@ -199,8 +191,6 @@ const SettingsMain = () => {
                   originalLanguage: values.originalLanguage,
                   partialRequestsEnabled: values.partialRequestsEnabled,
                   enableSpecialEpisodes: values.enableSpecialEpisodes,
-                  forceIpv4First: values.forceIpv4First,
-                  dnsServers: values.dnsServers,
                   trustProxy: values.trustProxy,
                   cacheImages: values.cacheImages,
                   proxy: {
@@ -534,55 +524,6 @@ const SettingsMain = () => {
                     />
                   </div>
                 </div>
-                <div className="form-row">
-                  <label htmlFor="forceIpv4First" className="checkbox-label">
-                    <span className="mr-2">
-                      {intl.formatMessage(messages.forceIpv4First)}
-                    </span>
-                    <SettingsBadge badgeType="advanced" className="mr-2" />
-                    <SettingsBadge badgeType="restartRequired" />
-                    <span className="label-tip">
-                      {intl.formatMessage(messages.forceIpv4FirstTip)}
-                    </span>
-                  </label>
-                  <div className="form-input-area">
-                    <Field
-                      type="checkbox"
-                      id="forceIpv4First"
-                      name="forceIpv4First"
-                      onChange={() => {
-                        setFieldValue('forceIpv4First', !values.forceIpv4First);
-                      }}
-                    />
-                  </div>
-                </div>
-                <div className="form-row">
-                  <label htmlFor="dnsServers" className="checkbox-label">
-                    <span className="mr-2">
-                      {intl.formatMessage(messages.dnsServers)}
-                    </span>
-                    <SettingsBadge badgeType="advanced" className="mr-2" />
-                    <SettingsBadge badgeType="restartRequired" />
-                    <span className="label-tip">
-                      {intl.formatMessage(messages.dnsServersTip)}
-                    </span>
-                  </label>
-                  <div className="form-input-area">
-                    <div className="form-input-field">
-                      <Field
-                        id="dnsServers"
-                        name="dnsServers"
-                        type="text"
-                        inputMode="url"
-                      />
-                    </div>
-                    {errors.dnsServers &&
-                      touched.dnsServers &&
-                      typeof errors.dnsServers === 'string' && (
-                        <div className="error">{errors.dnsServers}</div>
-                      )}
-                  </div>
-                </div>
                 <div className="form-row">
                   <label htmlFor="proxyEnabled" className="checkbox-label">
                     <span className="mr-2">

src/components/Settings/SettingsUsers/index.tsx

@@ -1,5 +1,4 @@
 import Button from '@app/components/Common/Button';
-import LabeledCheckbox from '@app/components/Common/LabeledCheckbox';
 import LoadingSpinner from '@app/components/Common/LoadingSpinner';
 import PageTitle from '@app/components/Common/PageTitle';
 import PermissionEdit from '@app/components/PermissionEdit';
@@ -14,7 +13,6 @@ import { Field, Form, Formik } from 'formik';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR, { mutate } from 'swr';
-import * as yup from 'yup';
 
 const messages = defineMessages('components.Settings.SettingsUsers', {
   users: 'Users',
@@ -22,15 +20,9 @@ const messages = defineMessages('components.Settings.SettingsUsers', {
   userSettingsDescription: 'Configure global and default user settings.',
   toastSettingsSuccess: 'User settings saved successfully!',
   toastSettingsFailure: 'Something went wrong while saving settings.',
-  loginMethods: 'Login Methods',
-  loginMethodsTip: 'Configure login methods for users.',
   localLogin: 'Enable Local Sign-In',
   localLoginTip:
-    'Allow users to sign in using their email address and password',
-  mediaServerLogin: 'Enable {mediaServerName} Sign-In',
-  mediaServerLoginTip:
-    'Allow users to sign in using their {mediaServerName} account',
-  atLeastOneAuth: 'At least one authentication method must be selected.',
+    'Allow users to sign in using their email address and password, instead of {mediaServerName} OAuth',
   newPlexLogin: 'Enable New {mediaServerName} Sign-In',
   newPlexLoginTip:
     'Allow {mediaServerName} users to sign in without first being imported',
@@ -50,27 +42,6 @@ const SettingsUsers = () => {
   } = useSWR<MainSettings>('/api/v1/settings/main');
   const settings = useSettings();
 
-  const schema = yup
-    .object()
-    .shape({
-      localLogin: yup.boolean(),
-      mediaServerLogin: yup.boolean(),
-    })
-    .test({
-      name: 'atLeastOneAuth',
-      test: function (values) {
-        const isValid = ['localLogin', 'mediaServerLogin'].some(
-          (field) => !!values[field]
-        );
-
-        if (isValid) return true;
-        return this.createError({
-          path: 'localLogin | mediaServerLogin',
-          message: intl.formatMessage(messages.atLeastOneAuth),
-        });
-      },
-    });
-
   if (!data && !error) {
     return <LoadingSpinner />;
   }
@@ -81,8 +52,6 @@ const SettingsUsers = () => {
         ? 'Jellyfin'
         : settings.currentSettings.mediaServerType === MediaServerType.EMBY
         ? 'Emby'
-        : settings.currentSettings.mediaServerType === MediaServerType.PLEX
-        ? 'Plex'
         : undefined,
   };
 
@@ -104,7 +73,6 @@ const SettingsUsers = () => {
         <Formik
           initialValues={{
             localLogin: data?.localLogin,
-            mediaServerLogin: data?.mediaServerLogin,
             newPlexLogin: data?.newPlexLogin,
             movieQuotaLimit: data?.defaultQuotas.movie.quotaLimit ?? 0,
             movieQuotaDays: data?.defaultQuotas.movie.quotaDays ?? 7,
@@ -112,7 +80,6 @@ const SettingsUsers = () => {
             tvQuotaDays: data?.defaultQuotas.tv.quotaDays ?? 7,
             defaultPermissions: data?.defaultPermissions ?? 0,
           }}
-          validationSchema={schema}
           enableReinitialize
           onSubmit={async (values) => {
             try {
@@ -123,7 +90,6 @@ const SettingsUsers = () => {
                 },
                 body: JSON.stringify({
                   localLogin: values.localLogin,
-                  mediaServerLogin: values.mediaServerLogin,
                   newPlexLogin: values.newPlexLogin,
                   defaultQuotas: {
                     movie: {
@@ -155,61 +121,30 @@ const SettingsUsers = () => {
             }
           }}
         >
-          {({ isSubmitting, isValid, values, errors, setFieldValue }) => {
+          {({ isSubmitting, values, setFieldValue }) => {
             return (
               <Form className="section">
-                <div
-                  role="group"
-                  aria-labelledby="group-label"
-                  className="form-group"
-                >
-                  <div className="form-row">
-                    <span id="group-label" className="group-label">
-                      {intl.formatMessage(messages.loginMethods)}
-                      <span className="label-tip">
-                        {intl.formatMessage(messages.loginMethodsTip)}
-                      </span>
-                      {'localLogin | mediaServerLogin' in errors && (
-                        <span className="error">
-                          {errors['localLogin | mediaServerLogin'] as string}
-                        </span>
+                <div className="form-row">
+                  <label htmlFor="localLogin" className="checkbox-label">
+                    {intl.formatMessage(messages.localLogin)}
+                    <span className="label-tip">
+                      {intl.formatMessage(
+                        messages.localLoginTip,
+                        mediaServerFormatValues
                       )}
                     </span>
-
-                    <div className="form-input-area max-w-lg">
-                      <LabeledCheckbox
-                        id="localLogin"
-                        label={intl.formatMessage(messages.localLogin)}
-                        description={intl.formatMessage(
-                          messages.localLoginTip,
-                          mediaServerFormatValues
-                        )}
-                        onChange={() =>
-                          setFieldValue('localLogin', !values.localLogin)
-                        }
-                      />
-                      <LabeledCheckbox
-                        id="mediaServerLogin"
-                        className="mt-4"
-                        label={intl.formatMessage(
-                          messages.mediaServerLogin,
-                          mediaServerFormatValues
-                        )}
-                        description={intl.formatMessage(
-                          messages.mediaServerLoginTip,
-                          mediaServerFormatValues
-                        )}
-                        onChange={() =>
-                          setFieldValue(
-                            'mediaServerLogin',
-                            !values.mediaServerLogin
-                          )
-                        }
-                      />
-                    </div>
+                  </label>
+                  <div className="form-input-area">
+                    <Field
+                      type="checkbox"
+                      id="localLogin"
+                      name="localLogin"
+                      onChange={() => {
+                        setFieldValue('localLogin', !values.localLogin);
+                      }}
+                    />
                   </div>
                 </div>
-
                 <div className="form-row">
                   <label htmlFor="newPlexLogin" className="checkbox-label">
                     {intl.formatMessage(
@@ -294,7 +229,7 @@ const SettingsUsers = () => {
                       <Button
                         buttonType="primary"
                         type="submit"
-                        disabled={isSubmitting || !isValid}
+                        disabled={isSubmitting}
                       >
                         <ArrowDownOnSquareIcon />
                         <span>

src/components/Settings/SonarrModal/index.tsx

@@ -1070,42 +1070,38 @@ const SonarrModal = ({
                   </div>
                 </div>
               </div>
-              {sonarr && (
-                <>
-                  <h3 className="mb-4 text-xl font-bold leading-8 text-gray-100">
-                    {intl.formatMessage(messages.overrideRules)}
-                  </h3>
-                  <ul className="grid gap-x-4 gap-y-8 sm:grid-cols-3 sm:gap-x-6 sm:gap-y-6 lg:grid-cols-2">
-                    {rules && (
-                      <OverrideRuleTile
-                        rules={rules}
-                        setOverrideRuleModal={setOverrideRuleModal}
-                        testResponse={testResponse}
-                        sonarr={sonarr}
-                        revalidate={revalidate}
-                      />
-                    )}
-                    <li className="min-h-[8rem] rounded-lg border-2 border-dashed border-gray-400 shadow sm:min-h-[11rem]">
-                      <div className="flex h-full w-full items-center justify-center">
-                        <Button
-                          buttonType="ghost"
-                          onClick={() =>
-                            setOverrideRuleModal({
-                              open: true,
-                              rule: null,
-                              testResponse,
-                            })
-                          }
-                          disabled={!isValidated}
-                        >
-                          <PlusIcon />
-                          <span>{intl.formatMessage(messages.addrule)}</span>
-                        </Button>
-                      </div>
-                    </li>
-                  </ul>
-                </>
-              )}
+              <h3 className="mb-4 text-xl font-bold leading-8 text-gray-100">
+                {intl.formatMessage(messages.overrideRules)}
+              </h3>
+              <ul className="grid grid-cols-2 gap-6">
+                {rules && (
+                  <OverrideRuleTile
+                    rules={rules}
+                    setOverrideRuleModal={setOverrideRuleModal}
+                    testResponse={testResponse}
+                    sonarr={sonarr}
+                    revalidate={revalidate}
+                  />
+                )}
+                <li className="min-h-[8rem] rounded-lg border-2 border-dashed border-gray-400 shadow sm:min-h-[11rem]">
+                  <div className="flex h-full w-full items-center justify-center">
+                    <Button
+                      buttonType="ghost"
+                      onClick={() =>
+                        setOverrideRuleModal({
+                          open: true,
+                          rule: null,
+                          testResponse,
+                        })
+                      }
+                      disabled={!isValidated}
+                    >
+                      <PlusIcon />
+                      <span>{intl.formatMessage(messages.addrule)}</span>
+                    </Button>
+                  </div>
+                </li>
+              </ul>
             </Modal>
           );
         }}

src/components/Setup/JellyfinSetup.tsx

@@ -1,352 +0,0 @@
-import Button from '@app/components/Common/Button';
-import Tooltip from '@app/components/Common/Tooltip';
-import defineMessages from '@app/utils/defineMessages';
-import { InformationCircleIcon } from '@heroicons/react/24/solid';
-import { ApiErrorCode } from '@server/constants/error';
-import { MediaServerType, ServerType } from '@server/constants/server';
-import { Field, Form, Formik } from 'formik';
-import { FormattedMessage, useIntl } from 'react-intl';
-import { useToasts } from 'react-toast-notifications';
-import * as Yup from 'yup';
-
-const messages = defineMessages('components.Login', {
-  username: 'Username',
-  password: 'Password',
-  hostname: '{mediaServerName} URL',
-  port: 'Port',
-  enablessl: 'Use SSL',
-  urlBase: 'URL Base',
-  email: 'Email Address',
-  emailtooltip:
-    'Address does not need to be associated with your {mediaServerName} instance.',
-  validationhostrequired: '{mediaServerName} URL required',
-  validationhostformat: 'Valid URL required',
-  validationemailrequired: 'You must provide a valid email address',
-  validationemailformat: 'Valid email required',
-  validationusernamerequired: 'Username required',
-  validationpasswordrequired: 'You must provide a password',
-  validationservertyperequired: 'Please select a server type',
-  validationHostnameRequired: 'You must provide a valid hostname or IP address',
-  validationPortRequired: 'You must provide a valid port number',
-  validationUrlTrailingSlash: 'URL must not end in a trailing slash',
-  validationUrlBaseLeadingSlash: 'URL base must have a leading slash',
-  validationUrlBaseTrailingSlash: 'URL base must not end in a trailing slash',
-  loginerror: 'Something went wrong while trying to sign in.',
-  adminerror: 'You must use an admin account to sign in.',
-  noadminerror: 'No admin user found on the server.',
-  credentialerror: 'The username or password is incorrect.',
-  invalidurlerror: 'Unable to connect to {mediaServerName} server.',
-  signingin: 'Signing In…',
-  signin: 'Sign In',
-  initialsigningin: 'Connecting…',
-  initialsignin: 'Connect',
-  forgotpassword: 'Forgot Password?',
-  servertype: 'Server Type',
-  back: 'Go back',
-});
-
-interface JellyfinSetupProps {
-  revalidate: () => void;
-  serverType?: MediaServerType;
-  onCancel?: () => void;
-}
-
-function JellyfinSetup({
-  revalidate,
-  serverType,
-  onCancel,
-}: JellyfinSetupProps) {
-  const toasts = useToasts();
-  const intl = useIntl();
-
-  const mediaServerFormatValues = {
-    mediaServerName:
-      serverType === MediaServerType.JELLYFIN
-        ? ServerType.JELLYFIN
-        : serverType === MediaServerType.EMBY
-        ? ServerType.EMBY
-        : 'Media Server',
-  };
-
-  const LoginSchema = Yup.object().shape({
-    hostname: Yup.string().required(
-      intl.formatMessage(
-        messages.validationhostrequired,
-        mediaServerFormatValues
-      )
-    ),
-    port: Yup.number().required(
-      intl.formatMessage(messages.validationPortRequired)
-    ),
-    urlBase: Yup.string()
-      .test(
-        'leading-slash',
-        intl.formatMessage(messages.validationUrlBaseLeadingSlash),
-        (value) => !value || value.startsWith('/')
-      )
-      .test(
-        'trailing-slash',
-        intl.formatMessage(messages.validationUrlBaseTrailingSlash),
-        (value) => !value || !value.endsWith('/')
-      ),
-    email: Yup.string()
-      .email(intl.formatMessage(messages.validationemailformat))
-      .required(intl.formatMessage(messages.validationemailrequired)),
-    username: Yup.string().required(
-      intl.formatMessage(messages.validationusernamerequired)
-    ),
-    password: Yup.string(),
-  });
-
-  return (
-    <Formik
-      initialValues={{
-        username: '',
-        password: '',
-        hostname: '',
-        port: 8096,
-        useSsl: false,
-        urlBase: '',
-        email: '',
-      }}
-      validationSchema={LoginSchema}
-      onSubmit={async (values) => {
-        try {
-          // Check if serverType is either 'Jellyfin' or 'Emby'
-          // if (serverType !== 'Jellyfin' && serverType !== 'Emby') {
-          //   throw new Error('Invalid serverType'); // You can customize the error message
-          // }
-
-          const res = await fetch('/api/v1/auth/jellyfin', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-              username: values.username,
-              password: values.password,
-              hostname: values.hostname,
-              port: values.port,
-              useSsl: values.useSsl,
-              urlBase: values.urlBase,
-              email: values.email,
-              serverType: serverType,
-            }),
-          });
-          if (!res.ok) throw new Error(res.statusText, { cause: res });
-        } catch (e) {
-          let errorData;
-          try {
-            errorData = await e.cause?.text();
-            errorData = JSON.parse(errorData);
-          } catch {
-            /* empty */
-          }
-          let errorMessage = null;
-          switch (errorData?.message) {
-            case ApiErrorCode.InvalidUrl:
-              errorMessage = messages.invalidurlerror;
-              break;
-            case ApiErrorCode.InvalidCredentials:
-              errorMessage = messages.credentialerror;
-              break;
-            case ApiErrorCode.NotAdmin:
-              errorMessage = messages.adminerror;
-              break;
-            case ApiErrorCode.NoAdminUser:
-              errorMessage = messages.noadminerror;
-              break;
-            default:
-              errorMessage = messages.loginerror;
-              break;
-          }
-
-          toasts.addToast(
-            intl.formatMessage(errorMessage, mediaServerFormatValues),
-            {
-              autoDismiss: true,
-              appearance: 'error',
-            }
-          );
-        } finally {
-          revalidate();
-        }
-      }}
-    >
-      {({ errors, touched, values, setFieldValue, isSubmitting, isValid }) => (
-        <Form>
-          <div className="sm:border-t sm:border-gray-800">
-            <div className="flex flex-col sm:flex-row sm:gap-4">
-              <div className="w-full">
-                <label htmlFor="hostname" className="text-label">
-                  {intl.formatMessage(
-                    messages.hostname,
-                    mediaServerFormatValues
-                  )}
-                </label>
-                <div className="mt-1 mb-2 sm:col-span-2 sm:mb-0 sm:mt-0">
-                  <div className="flex rounded-md shadow-sm">
-                    <span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-gray-100 sm:text-sm">
-                      {values.useSsl ? 'https://' : 'http://'}
-                    </span>
-                    <Field
-                      id="hostname"
-                      name="hostname"
-                      type="text"
-                      className="rounded-r-only flex-1"
-                      placeholder={intl.formatMessage(
-                        messages.hostname,
-                        mediaServerFormatValues
-                      )}
-                    />
-                  </div>
-                  {errors.hostname && touched.hostname && (
-                    <div className="error">{errors.hostname}</div>
-                  )}
-                </div>
-              </div>
-              <div className="flex-1">
-                <label htmlFor="port" className="text-label">
-                  {intl.formatMessage(messages.port)}
-                </label>
-                <div className="mt-1 sm:mt-0">
-                  <Field
-                    id="port"
-                    name="port"
-                    inputMode="numeric"
-                    type="text"
-                    className="short flex-1"
-                    placeholder={intl.formatMessage(messages.port)}
-                  />
-                  {errors.port && touched.port && (
-                    <div className="error">{errors.port}</div>
-                  )}
-                </div>
-              </div>
-            </div>
-            <label htmlFor="useSsl" className="text-label mt-2">
-              {intl.formatMessage(messages.enablessl)}
-            </label>
-            <div className="mt-1 mb-2 sm:col-span-2">
-              <div className="flex rounded-md shadow-sm">
-                <Field
-                  id="useSsl"
-                  name="useSsl"
-                  type="checkbox"
-                  onChange={() => {
-                    setFieldValue('useSsl', !values.useSsl);
-                    setFieldValue('port', values.useSsl ? 8096 : 443);
-                  }}
-                />
-              </div>
-            </div>
-            <label htmlFor="urlBase" className="text-label mt-1">
-              {intl.formatMessage(messages.urlBase)}
-            </label>
-            <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
-              <div className="flex rounded-md shadow-sm">
-                <Field
-                  type="text"
-                  inputMode="url"
-                  id="urlBase"
-                  name="urlBase"
-                  placeholder={intl.formatMessage(messages.urlBase)}
-                />
-              </div>
-              {errors.urlBase && touched.urlBase && (
-                <div className="error">{errors.urlBase}</div>
-              )}
-            </div>
-            <label
-              htmlFor="email"
-              className="text-label inline-flex gap-1 align-middle"
-            >
-              {intl.formatMessage(messages.email)}
-              <span className="label-tip">
-                <Tooltip
-                  content={intl.formatMessage(
-                    messages.emailtooltip,
-                    mediaServerFormatValues
-                  )}
-                >
-                  <span className="tooltip-trigger">
-                    <InformationCircleIcon className="h-4 w-4" />
-                  </span>
-                </Tooltip>
-              </span>
-            </label>
-            <div className="mt-1 sm:col-span-2 sm:mb-2 sm:mt-0">
-              <div className="flex rounded-md shadow-sm">
-                <Field
-                  id="email"
-                  name="email"
-                  type="text"
-                  placeholder={intl.formatMessage(messages.email)}
-                />
-              </div>
-              {errors.email && touched.email && (
-                <div className="error">{errors.email}</div>
-              )}
-            </div>
-            <label htmlFor="username" className="text-label">
-              {intl.formatMessage(messages.username)}
-            </label>
-            <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
-              <div className="flex rounded-md shadow-sm">
-                <Field
-                  id="username"
-                  name="username"
-                  type="text"
-                  placeholder={intl.formatMessage(messages.username)}
-                />
-              </div>
-              {errors.username && touched.username && (
-                <div className="error">{errors.username}</div>
-              )}
-            </div>
-            <label htmlFor="password" className="text-label">
-              {intl.formatMessage(messages.password)}
-            </label>
-            <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
-              <div className="flexrounded-md shadow-sm">
-                <Field
-                  id="password"
-                  name="password"
-                  type="password"
-                  placeholder={intl.formatMessage(messages.password)}
-                />
-              </div>
-              {errors.password && touched.password && (
-                <div className="error">{errors.password}</div>
-              )}
-            </div>
-          </div>
-          <div className="mt-8 border-t border-gray-700 pt-5">
-            <div className="flex flex-row-reverse justify-between">
-              <span className="inline-flex rounded-md shadow-sm">
-                <Button
-                  buttonType="primary"
-                  type="submit"
-                  disabled={isSubmitting || !isValid}
-                >
-                  {isSubmitting
-                    ? intl.formatMessage(messages.signingin)
-                    : intl.formatMessage(messages.signin)}
-                </Button>
-              </span>
-              {onCancel && (
-                <span className="inline-flex rounded-md shadow-sm">
-                  <Button buttonType="default" onClick={() => onCancel()}>
-                    <FormattedMessage {...messages.back} />
-                  </Button>
-                </span>
-              )}
-            </div>
-          </div>
-        </Form>
-      )}
-    </Formik>
-  );
-}
-
-export default JellyfinSetup;

src/components/Setup/LoginWithPlex.tsx

@@ -1,4 +1,4 @@
-import PlexLoginButton from '@app/components/Login/PlexLoginButton';
+import PlexLoginButton from '@app/components/PlexLoginButton';
 import { useUser } from '@app/hooks/useUser';
 import defineMessages from '@app/utils/defineMessages';
 import { useEffect, useState } from 'react';

src/components/Setup/SetupLogin.tsx

@@ -1,6 +1,6 @@
 import Button from '@app/components/Common/Button';
-import PlexLoginButton from '@app/components/Login/PlexLoginButton';
-import JellyfinSetup from '@app/components/Setup/JellyfinSetup';
+import JellyfinLogin from '@app/components/Login/JellyfinLogin';
+import PlexLoginButton from '@app/components/PlexLoginButton';
 import { useUser } from '@app/hooks/useUser';
 import defineMessages from '@app/utils/defineMessages';
 import { MediaServerType } from '@server/constants/server';
@@ -83,9 +83,11 @@ const SetupLogin: React.FC<LoginWithMediaServerProps> = ({
       </div>
       {serverType === MediaServerType.PLEX && (
         <>
-          <div className="flex justify-center bg-black/30 px-10 py-8">
+          <div
+            className="px-10 py-8"
+            style={{ backgroundColor: 'rgba(0,0,0,0.3)' }}
+          >
             <PlexLoginButton
-              large
               onAuthToken={(authToken) => {
                 setMediaServerType(MediaServerType.PLEX);
                 setAuthToken(authToken);
@@ -100,14 +102,16 @@ const SetupLogin: React.FC<LoginWithMediaServerProps> = ({
         </>
       )}
       {serverType === MediaServerType.JELLYFIN && (
-        <JellyfinSetup
+        <JellyfinLogin
+          initial={true}
           revalidate={revalidate}
           serverType={serverType}
           onCancel={onCancel}
         />
       )}
       {serverType === MediaServerType.EMBY && (
-        <JellyfinSetup
+        <JellyfinLogin
+          initial={true}
           revalidate={revalidate}
           serverType={serverType}
           onCancel={onCancel}

src/components/Setup/index.tsx

@@ -17,7 +17,7 @@ import { MediaServerType } from '@server/constants/server';
 import type { Library } from '@server/lib/settings';
 import Image from 'next/image';
 import { useRouter } from 'next/router';
-import { useCallback, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR, { mutate } from 'swr';
@@ -82,7 +82,41 @@ const Setup = () => {
     }
   };
 
-  const validateLibraries = useCallback(async () => {
+  const { data: backdrops } = useSWR<string[]>('/api/v1/backdrops', {
+    refreshInterval: 0,
+    refreshWhenHidden: false,
+    revalidateOnFocus: false,
+  });
+
+  useEffect(() => {
+    if (settings.currentSettings.initialized) {
+      router.push('/');
+    }
+
+    if (
+      settings.currentSettings.mediaServerType !==
+      MediaServerType.NOT_CONFIGURED
+    ) {
+      setMediaServerType(settings.currentSettings.mediaServerType);
+      if (currentStep < 3) {
+        setCurrentStep(3);
+      }
+    }
+
+    if (currentStep === 3) {
+      validateLibraries();
+    }
+  }, [
+    settings.currentSettings.mediaServerType,
+    settings.currentSettings.initialized,
+    router,
+    toasts,
+    intl,
+    currentStep,
+    mediaServerType,
+  ]);
+
+  const validateLibraries = async () => {
     try {
       const endpointMap: Record<MediaServerType, string> = {
         [MediaServerType.JELLYFIN]: '/api/v1/settings/jellyfin',
@@ -111,45 +145,7 @@ const Setup = () => {
 
       setMediaServerSettingsComplete(false);
     }
-  }, [intl, mediaServerType, toasts]);
-
-  const { data: backdrops } = useSWR<string[]>('/api/v1/backdrops', {
-    refreshInterval: 0,
-    refreshWhenHidden: false,
-    revalidateOnFocus: false,
-  });
-
-  useEffect(() => {
-    if (settings.currentSettings.initialized) {
-      router.push('/');
-    }
-
-    if (
-      settings.currentSettings.mediaServerType !==
-      MediaServerType.NOT_CONFIGURED
-    ) {
-      setMediaServerType(settings.currentSettings.mediaServerType);
-      if (currentStep < 3) {
-        setCurrentStep(3);
-      }
-    }
-  }, [
-    settings.currentSettings.mediaServerType,
-    settings.currentSettings.initialized,
-    router,
-    toasts,
-    intl,
-    currentStep,
-    mediaServerType,
-    validateLibraries,
-  ]);
-
-  useEffect(() => {
-    if (currentStep === 3) {
-      validateLibraries();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [currentStep]);
+  };
 
   const handleComplete = () => {
     validateLibraries();

src/components/TitleCard/index.tsx

@@ -51,7 +51,7 @@ const messages = defineMessages('components.TitleCard', {
   watchlistDeleted:
     '<strong>{title}</strong> Removed from watchlist  successfully!',
   watchlistCancel: 'watchlist for <strong>{title}</strong> canceled.',
-  watchlistError: 'Something went wrong. Please try again.',
+  watchlistError: 'Something went wrong try again.',
 });
 
 const TitleCard = ({

src/components/TvDetails/index.tsx

@@ -41,11 +41,13 @@ import {
   ExclamationTriangleIcon,
   EyeSlashIcon,
   FilmIcon,
-  MinusCircleIcon,
   PlayIcon,
-  StarIcon,
 } from '@heroicons/react/24/outline';
-import { ChevronDownIcon } from '@heroicons/react/24/solid';
+import {
+  ChevronDownIcon,
+  MinusCircleIcon,
+  StarIcon,
+} from '@heroicons/react/24/solid';
 import type { RTRating } from '@server/api/rating/rottentomatoes';
 import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
 import { IssueStatus } from '@server/constants/issue';
@@ -101,7 +103,7 @@ const messages = defineMessages('components.TvDetails', {
   watchlistSuccess: '<strong>{title}</strong> added to watchlist successfully!',
   watchlistDeleted:
     '<strong>{title}</strong> Removed from watchlist successfully!',
-  watchlistError: 'Something went wrong. Please try again.',
+  watchlistError: 'Something went wrong try again.',
   removefromwatchlist: 'Remove From Watchlist',
   addtowatchlist: 'Add To Watchlist',
 });

src/components/UserList/BulkEditModal.tsx

@@ -1,10 +1,9 @@
 import Modal from '@app/components/Common/Modal';
 import PermissionEdit from '@app/components/PermissionEdit';
 import type { User } from '@app/hooks/useUser';
-import { Permission, useUser } from '@app/hooks/useUser';
+import { useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
-import { hasPermission } from '@server/lib/permissions';
 import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -80,10 +79,7 @@ const BulkEditModal = ({
       const { permissions: allPermissionsEqual } = selectedUsers.reduce(
         ({ permissions: aPerms }, { permissions: bPerms }) => {
           return {
-            permissions:
-              aPerms === bPerms || hasPermission(Permission.ADMIN, aPerms)
-                ? aPerms
-                : NaN,
+            permissions: aPerms === bPerms ? aPerms : NaN,
           };
         },
         { permissions: selectedUsers[0].permissions }

src/components/UserProfile/UserSettings/UserLinkedAccountsSettings/LinkJellyfinModal.tsx

@@ -0,0 +1,188 @@
+import Alert from '@app/components/Common/Alert';
+import Modal from '@app/components/Common/Modal';
+import useSettings from '@app/hooks/useSettings';
+import { useUser } from '@app/hooks/useUser';
+import defineMessages from '@app/utils/defineMessages';
+import { Transition } from '@headlessui/react';
+import { MediaServerType } from '@server/constants/server';
+import { Field, Form, Formik } from 'formik';
+import { useState } from 'react';
+import { useIntl } from 'react-intl';
+import * as Yup from 'yup';
+
+const messages = defineMessages(
+  'components.UserProfile.UserSettings.LinkJellyfinModal',
+  {
+    title: 'Link {mediaServerName} Account',
+    description:
+      'Enter your {mediaServerName} credentials to link your account with {applicationName}.',
+    username: 'Username',
+    password: 'Password',
+    usernameRequired: 'You must provide a username',
+    passwordRequired: 'You must provide a password',
+    saving: 'Adding…',
+    save: 'Link',
+    errorUnauthorized:
+      'Unable to connect to {mediaServerName} using your credentials',
+    errorExists: 'This account is already linked to a {applicationName} user',
+    errorUnknown: 'An unknown error occurred',
+  }
+);
+
+interface LinkJellyfinModalProps {
+  show: boolean;
+  onClose: () => void;
+  onSave: () => void;
+}
+
+const LinkJellyfinModal: React.FC<LinkJellyfinModalProps> = ({
+  show,
+  onClose,
+  onSave,
+}) => {
+  const intl = useIntl();
+  const settings = useSettings();
+  const { user } = useUser();
+  const [error, setError] = useState<string | null>(null);
+
+  const JellyfinLoginSchema = Yup.object().shape({
+    username: Yup.string().required(
+      intl.formatMessage(messages.usernameRequired)
+    ),
+    password: Yup.string().required(
+      intl.formatMessage(messages.passwordRequired)
+    ),
+  });
+
+  const applicationName = settings.currentSettings.applicationTitle;
+  const mediaServerName =
+    settings.currentSettings.mediaServerType === MediaServerType.EMBY
+      ? 'Emby'
+      : 'Jellyfin';
+
+  return (
+    <Transition
+      appear
+      show={show}
+      enter="transition ease-in-out duration-300 transform opacity-0"
+      enterFrom="opacity-0"
+      enterTo="opacuty-100"
+      leave="transition ease-in-out duration-300 transform opacity-100"
+      leaveFrom="opacity-100"
+      leaveTo="opacity-0"
+    >
+      <Formik
+        initialValues={{
+          username: '',
+          password: '',
+        }}
+        validationSchema={JellyfinLoginSchema}
+        onSubmit={async ({ username, password }) => {
+          try {
+            setError(null);
+            const res = await fetch(
+              `/api/v1/user/${user?.id}/settings/linked-accounts/jellyfin`,
+              {
+                method: 'POST',
+                headers: {
+                  'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                  username,
+                  password,
+                }),
+              }
+            );
+            if (!res.ok) {
+              if (res.status === 401) {
+                setError(
+                  intl.formatMessage(messages.errorUnauthorized, {
+                    mediaServerName,
+                  })
+                );
+              } else if (res.status === 422) {
+                setError(
+                  intl.formatMessage(messages.errorExists, { applicationName })
+                );
+              } else {
+                setError(intl.formatMessage(messages.errorUnknown));
+              }
+            } else {
+              onSave();
+            }
+          } catch (e) {
+            setError(intl.formatMessage(messages.errorUnknown));
+          }
+        }}
+      >
+        {({ errors, touched, handleSubmit, isSubmitting, isValid }) => {
+          return (
+            <Modal
+              onCancel={() => {
+                setError(null);
+                onClose();
+              }}
+              okButtonType="primary"
+              okButtonProps={{ type: 'submit', form: 'link-jellyfin-account' }}
+              okText={
+                isSubmitting
+                  ? intl.formatMessage(messages.saving)
+                  : intl.formatMessage(messages.save)
+              }
+              okDisabled={isSubmitting || !isValid}
+              onOk={() => handleSubmit()}
+              title={intl.formatMessage(messages.title, { mediaServerName })}
+              dialogClass="sm:max-w-lg"
+            >
+              <Form id="link-jellyfin-account">
+                {intl.formatMessage(messages.description, {
+                  mediaServerName,
+                  applicationName,
+                })}
+                {error && (
+                  <div className="mt-2">
+                    <Alert type="error">{error}</Alert>
+                  </div>
+                )}
+                <label htmlFor="username" className="text-label">
+                  {intl.formatMessage(messages.username)}
+                </label>
+                <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
+                  <div className="flex rounded-md shadow-sm">
+                    <Field
+                      id="username"
+                      name="username"
+                      type="text"
+                      placeholder={intl.formatMessage(messages.username)}
+                    />
+                  </div>
+                  {errors.username && touched.username && (
+                    <div className="error">{errors.username}</div>
+                  )}
+                </div>
+                <label htmlFor="password" className="text-label">
+                  {intl.formatMessage(messages.password)}
+                </label>
+                <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
+                  <div className="flex rounded-md shadow-sm">
+                    <Field
+                      id="password"
+                      name="password"
+                      type="password"
+                      placeholder={intl.formatMessage(messages.password)}
+                    />
+                  </div>
+                  {errors.password && touched.password && (
+                    <div className="error">{errors.password}</div>
+                  )}
+                </div>
+              </Form>
+            </Modal>
+          );
+        }}
+      </Formik>
+    </Transition>
+  );
+};
+
+export default LinkJellyfinModal;

src/components/UserProfile/UserSettings/UserLinkedAccountsSettings/index.tsx

@@ -0,0 +1,276 @@
+import EmbyLogo from '@app/assets/services/emby-icon-only.svg';
+import JellyfinLogo from '@app/assets/services/jellyfin-icon.svg';
+import PlexLogo from '@app/assets/services/plex.svg';
+import Alert from '@app/components/Common/Alert';
+import ConfirmButton from '@app/components/Common/ConfirmButton';
+import Dropdown from '@app/components/Common/Dropdown';
+import PageTitle from '@app/components/Common/PageTitle';
+import useSettings from '@app/hooks/useSettings';
+import { Permission, UserType, useUser } from '@app/hooks/useUser';
+import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
+import PlexOAuth from '@app/utils/plex';
+import { TrashIcon } from '@heroicons/react/24/solid';
+import { MediaServerType } from '@server/constants/server';
+import { useRouter } from 'next/router';
+import { useMemo, useState } from 'react';
+import { useIntl } from 'react-intl';
+import useSWR from 'swr';
+import LinkJellyfinModal from './LinkJellyfinModal';
+
+const messages = defineMessages(
+  'components.UserProfile.UserSettings.UserLinkedAccountsSettings',
+  {
+    linkedAccounts: 'Linked Accounts',
+    linkedAccountsHint:
+      'These external accounts are linked to your {applicationName} account.',
+    noLinkedAccounts:
+      'You do not have any external accounts linked to your account.',
+    noPermissionDescription:
+      "You do not have permission to modify this user's linked accounts.",
+    plexErrorUnauthorized: 'Unable to connect to Plex using your credentials',
+    plexErrorExists: 'This account is already linked to a Plex user',
+    errorUnknown: 'An unknown error occurred',
+    deleteFailed: 'Unable to delete linked account.',
+  }
+);
+
+const plexOAuth = new PlexOAuth();
+
+enum LinkedAccountType {
+  Plex = 'Plex',
+  Jellyfin = 'Jellyfin',
+  Emby = 'Emby',
+}
+
+type LinkedAccount = {
+  type: LinkedAccountType;
+  username: string;
+};
+
+const UserLinkedAccountsSettings = () => {
+  const intl = useIntl();
+  const settings = useSettings();
+  const router = useRouter();
+  const { user: currentUser } = useUser();
+  const {
+    user,
+    hasPermission,
+    revalidate: revalidateUser,
+  } = useUser({ id: Number(router.query.userId) });
+  const { data: passwordInfo } = useSWR<{ hasPassword: boolean }>(
+    user ? `/api/v1/user/${user?.id}/settings/password` : null
+  );
+  const [showJellyfinModal, setShowJellyfinModal] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const applicationName = settings.currentSettings.applicationTitle;
+
+  const accounts: LinkedAccount[] = useMemo(() => {
+    const accounts: LinkedAccount[] = [];
+    if (!user) return accounts;
+    if (user.userType === UserType.PLEX && user.plexUsername)
+      accounts.push({
+        type: LinkedAccountType.Plex,
+        username: user.plexUsername,
+      });
+    if (user.userType === UserType.EMBY && user.jellyfinUsername)
+      accounts.push({
+        type: LinkedAccountType.Emby,
+        username: user.jellyfinUsername,
+      });
+    if (user.userType === UserType.JELLYFIN && user.jellyfinUsername)
+      accounts.push({
+        type: LinkedAccountType.Jellyfin,
+        username: user.jellyfinUsername,
+      });
+    return accounts;
+  }, [user]);
+
+  const linkPlexAccount = async () => {
+    setError(null);
+    try {
+      const authToken = await plexOAuth.login();
+      const res = await fetch(
+        `/api/v1/user/${user?.id}/settings/linked-accounts/plex`,
+        {
+          method: 'POST',
+          body: JSON.stringify({ authToken }),
+        }
+      );
+      if (!res.ok) {
+        if (res.status === 401) {
+          setError(intl.formatMessage(messages.plexErrorUnauthorized));
+        } else if (res.status === 422) {
+          setError(intl.formatMessage(messages.plexErrorExists));
+        } else {
+          setError(intl.formatMessage(messages.errorUnknown));
+        }
+      } else {
+        await revalidateUser();
+      }
+    } catch (e) {
+      setError(intl.formatMessage(messages.errorUnknown));
+    }
+  };
+
+  const linkable = [
+    {
+      name: 'Plex',
+      action: () => {
+        plexOAuth.preparePopup();
+        setTimeout(() => linkPlexAccount(), 1500);
+      },
+      hide:
+        settings.currentSettings.mediaServerType !== MediaServerType.PLEX ||
+        accounts.some((a) => a.type === LinkedAccountType.Plex),
+    },
+    {
+      name: 'Jellyfin',
+      action: () => setShowJellyfinModal(true),
+      hide:
+        settings.currentSettings.mediaServerType !== MediaServerType.JELLYFIN ||
+        accounts.some((a) => a.type === LinkedAccountType.Jellyfin),
+    },
+    {
+      name: 'Emby',
+      action: () => setShowJellyfinModal(true),
+      hide:
+        settings.currentSettings.mediaServerType !== MediaServerType.EMBY ||
+        accounts.some((a) => a.type === LinkedAccountType.Emby),
+    },
+  ].filter((l) => !l.hide);
+
+  const deleteRequest = async (account: string) => {
+    try {
+      const res = await fetch(
+        `/api/v1/user/${user?.id}/settings/linked-accounts/${account}`,
+        { method: 'DELETE' }
+      );
+      if (!res.ok) throw new Error();
+    } catch {
+      setError(intl.formatMessage(messages.deleteFailed));
+    }
+
+    await revalidateUser();
+  };
+
+  if (
+    currentUser?.id !== user?.id &&
+    hasPermission(Permission.ADMIN) &&
+    currentUser?.id !== 1
+  ) {
+    return (
+      <>
+        <div className="mb-6">
+          <h3 className="heading">
+            {intl.formatMessage(messages.linkedAccounts)}
+          </h3>
+        </div>
+        <Alert
+          title={intl.formatMessage(messages.noPermissionDescription)}
+          type="error"
+        />
+      </>
+    );
+  }
+
+  const enableMediaServerUnlink = user?.id !== 1 && passwordInfo?.hasPassword;
+
+  return (
+    <>
+      <PageTitle
+        title={[
+          intl.formatMessage(messages.linkedAccounts),
+          intl.formatMessage(globalMessages.usersettings),
+          user?.displayName,
+        ]}
+      />
+      <div className="mb-6 flex items-end justify-between">
+        <div>
+          <h3 className="heading">
+            {intl.formatMessage(messages.linkedAccounts)}
+          </h3>
+          <h6 className="description">
+            {intl.formatMessage(messages.linkedAccountsHint, {
+              applicationName,
+            })}
+          </h6>
+        </div>
+        {currentUser?.id === user?.id && !!linkable.length && (
+          <div>
+            <Dropdown text="Link Account" buttonType="ghost">
+              {linkable.map(({ name, action }) => (
+                <Dropdown.Item key={name} onClick={action}>
+                  {name}
+                </Dropdown.Item>
+              ))}
+            </Dropdown>
+          </div>
+        )}
+      </div>
+      {error && <Alert title={error} type="error" />}
+      {accounts.length ? (
+        <ul className="space-y-4">
+          {accounts.map((acct, i) => (
+            <li
+              key={i}
+              className="flex items-center gap-4 overflow-hidden rounded-lg bg-gray-800 bg-opacity-50 px-4 py-5 shadow ring-1 ring-gray-700 sm:p-6"
+            >
+              <div className="w-12">
+                {acct.type === LinkedAccountType.Plex ? (
+                  <div className="flex aspect-square h-full items-center justify-center rounded-full bg-neutral-800">
+                    <PlexLogo className="w-9" />
+                  </div>
+                ) : acct.type === LinkedAccountType.Emby ? (
+                  <EmbyLogo />
+                ) : (
+                  <JellyfinLogo />
+                )}
+              </div>
+              <div>
+                <div className="truncate text-sm font-bold text-gray-300">
+                  {acct.type}
+                </div>
+                <div className="text-xl font-semibold text-white">
+                  {acct.username}
+                </div>
+              </div>
+              <div className="flex-grow" />
+              {enableMediaServerUnlink && (
+                <ConfirmButton
+                  onClick={() => {
+                    deleteRequest(
+                      acct.type === LinkedAccountType.Plex ? 'plex' : 'jellyfin'
+                    );
+                  }}
+                  confirmText={intl.formatMessage(globalMessages.areyousure)}
+                >
+                  <TrashIcon />
+                  <span>{intl.formatMessage(globalMessages.delete)}</span>
+                </ConfirmButton>
+              )}
+            </li>
+          ))}
+        </ul>
+      ) : (
+        <div className="mt-4 text-center md:py-12">
+          <h3 className="text-lg font-semibold text-gray-400">
+            {intl.formatMessage(messages.noLinkedAccounts)}
+          </h3>
+        </div>
+      )}
+
+      <LinkJellyfinModal
+        show={showJellyfinModal}
+        onClose={() => setShowJellyfinModal(false)}
+        onSave={() => {
+          setShowJellyfinModal(false);
+          revalidateUser();
+        }}
+      />
+    </>
+  );
+};
+
+export default UserLinkedAccountsSettings;

src/components/UserProfile/UserSettings/index.tsx

@@ -18,6 +18,7 @@ import useSWR from 'swr';
 const messages = defineMessages('components.UserProfile.UserSettings', {
   menuGeneralSettings: 'General',
   menuChangePass: 'Password',
+  menuLinkedAccounts: 'Linked Accounts',
   menuNotifications: 'Notifications',
   menuPermissions: 'Permissions',
   unauthorizedDescription:
@@ -63,6 +64,11 @@ const UserSettings = ({ children }: UserSettingsProps) => {
           currentUser?.id !== user?.id &&
           hasPermission(Permission.ADMIN, user?.permissions ?? 0)),
     },
+    {
+      text: intl.formatMessage(messages.menuLinkedAccounts),
+      route: '/settings/linked-accounts',
+      regex: /\/settings\/linked-accounts/,
+    },
     {
       text: intl.formatMessage(messages.menuNotifications),
       route: data?.emailEnabled

src/context/SettingsContext.tsx

@@ -14,7 +14,6 @@ const defaultSettings = {
   applicationUrl: '',
   hideAvailable: false,
   localLogin: true,
-  mediaServerLogin: true,
   movie4kEnabled: false,
   series4kEnabled: false,
   discoverRegion: '',

src/hooks/usePlexLogin.ts

@@ -1,37 +0,0 @@
-import PlexOAuth from '@app/utils/plex';
-import { useState } from 'react';
-
-const plexOAuth = new PlexOAuth();
-
-function usePlexLogin({
-  onAuthToken,
-  onError,
-}: {
-  onAuthToken: (authToken: string) => void;
-  onError?: (err: string) => void;
-}) {
-  const [loading, setLoading] = useState(false);
-
-  const getPlexLogin = async () => {
-    setLoading(true);
-    try {
-      const authToken = await plexOAuth.login();
-      setLoading(false);
-      onAuthToken(authToken);
-    } catch (e) {
-      if (onError) {
-        onError(e.message);
-      }
-      setLoading(false);
-    }
-  };
-
-  const login = () => {
-    plexOAuth.preparePopup();
-    setTimeout(() => getPlexLogin(), 1500);
-  };
-
-  return { loading, login };
-}
-
-export default usePlexLogin;

src/hooks/useUser.ts

@@ -11,8 +11,8 @@ export type { PermissionCheckOptions };
 export interface User {
   id: number;
   warnings: string[];
-  plexUsername?: string;
-  jellyfinUsername?: string;
+  plexUsername?: string | null;
+  jellyfinUsername?: string | null;
   username?: string;
   displayName: string;
   email: string;

src/i18n/globalMessages.ts

@@ -58,7 +58,7 @@ const globalMessages = defineMessages('i18n', {
   blacklist: 'Blacklist',
   blacklisted: 'Blacklisted',
   blacklistSuccess: '<strong>{title}</strong> was successfully blacklisted.',
-  blacklistError: 'Something went wrong. Please try again.',
+  blacklistError: 'Something went wrong try again.',
   blacklistDuplicateError:
     '<strong>{title}</strong> has already been blacklisted.',
   removeFromBlacklistSuccess:

src/i18n/locale/ar.json

@@ -175,6 +175,8 @@
   "components.MovieDetails.originallanguage": "اللغة الأصلية",
   "components.MovieDetails.originaltitle": "الإسم الأصلي",
   "components.MovieDetails.overviewunavailable": "النظرة العامة غير متوفرة.",
+  "components.MovieDetails.play4konplex": "تشغيل بجودة فور كي في بليكس",
+  "components.MovieDetails.playonplex": "تشغيل في بليكس",
   "components.MovieDetails.productioncountries": "إنتاج {countryCount, plural, one {الدولة} other {الدول}}",
   "components.MovieDetails.recommendations": "توصيات",
   "components.MovieDetails.releasedate": "{releaseCount, plural, one {تاريخ الاصدار other {تواريخ الاصدار}}",
@@ -327,6 +329,7 @@
   "components.RequestModal.cancel": "إلغاء الطلب",
   "components.RequestModal.edit": "تعديل الطلب",
   "components.RequestModal.errorediting": "حدث خطأ ما أثناء محاولة تعديل الطلب.",
+  "components.RequestModal.extras": "إضافات",
   "components.RequestModal.numberofepisodes": "# حلقات",
   "components.RequestModal.pending4krequest": "طلب فور كي مُعلّق",
   "components.RequestModal.pendingapproval": "طلبك معلق بانتظار الموافقة.",
@@ -676,6 +679,7 @@
   "components.Settings.tautulliSettingsDescription": "بشكل إختياري أضبط إعدادات سيرفرك الخاص بـ Tautulli.أوفرسيرر سيقوم بجلب بيانات سجل المشاهدة لمحتوى بليكس من Tautulli.",
   "components.Settings.webhook": "ويب هوك Webhook",
   "components.Settings.webpush": "ويب بوش Web Push",
+  "components.Setup.configureplex": "إعداد بليكس",
   "components.Settings.SonarrModal.server4k": "سيرفر جودة الفور كي",
   "components.Settings.SonarrModal.servername": "إسم السيرفر",
   "components.Settings.SonarrModal.ssl": "إستخدم SSL",
@@ -771,10 +775,12 @@
   "components.Setup.finishing": "جاري الإنهاء…",
   "components.UserList.userdeleted": "تم حذف المستخدم بنجاح!",
   "components.UserList.users": "المستخدمين",
+  "components.TvDetails.play4konplex": "تشغيل بجودة فور كي في بليكس",
   "components.TvDetails.seasons": "{seasonCount, plural, one {# موسم} other {# مواسم}}",
   "components.TvDetails.showtype": "نوُع المسلسل",
   "components.UserList.accounttype": "نوع العضويّة",
   "components.UserList.admin": "مسؤول",
+  "components.UserList.displayName": "إسم العرض",
   "components.TvDetails.cast": "الطاقم",
   "components.TvDetails.streamingproviders": "يعرض حاليا على",
   "components.UserList.deleteuser": "حذف المستخدم",
@@ -804,8 +810,11 @@
   "i18n.delete": "حذف",
   "i18n.requesting": "جاري الطلب…",
   "pages.somethingwentwrong": "حدث خطأ ما",
+  "components.Setup.loginwithplex": "تسجيل دخول بواسطة بليكس",
+  "components.Setup.scanbackground": "الفحص سيستمر بالخلفية. تستطيع إكمال عملية الإعداد في الوقت الحالي.",
   "components.Setup.setup": "الإعداد",
   "components.Setup.signinMessage": "إبدأ من خلال تسجيل دخولك بحساب بليكس",
+  "components.Setup.tip": "تلميحات",
   "components.Setup.welcome": "مرحبا بك في أوفرسيرر",
   "components.StatusBadge.status": "{status}",
   "components.StatusBadge.status4k": "فور كي {status}",
@@ -821,6 +830,7 @@
   "components.TvDetails.originaltitle": "العنوان الأصلي",
   "components.TvDetails.overview": "نظرة عامة",
   "components.TvDetails.overviewunavailable": "النظرة العامة غير متاحة.",
+  "components.TvDetails.playonplex": "تشغيل في بليكس",
   "components.TvDetails.productioncountries": "إنتاج {countryCount, plural, one {الدولة} other {الدول}}",
   "components.TvDetails.recommendations": "التوصيات",
   "components.TvDetails.similar": "مسلسلات مشابهه",
@@ -1145,6 +1155,8 @@
   "components.Settings.SettingsMain.csrfProtectionTip": "إعداد خارجي بمفتاح API بصلاحية القراءة فقط (هذا الخيار يتطلب إتصال مُشفر HTTP)",
   "components.Settings.SettingsMain.generalsettings": "إعدادات عامة",
   "components.Settings.SettingsMain.locale": "لغة العرض",
+  "components.Settings.SettingsMain.region": "المنطقة/الإقليم الخاص بمحتوى إكتشف",
+  "components.Settings.SettingsMain.regionTip": "فلترة المحتوى بحسب توفّره بالإقليم/المنطقة",
   "components.Settings.SettingsMain.toastSettingsSuccess": "تم حفظ الإعدادات!",
   "components.Settings.SettingsMain.trustProxy": "تفعيل دعم البروكسي",
   "components.StatusChecker.appUpdatedDescription": "الرجاء النقر على الزر بالإسفل لإعادة تحميل الصفحة.",
@@ -1226,15 +1238,5 @@
   "components.Settings.SonarrModal.animeSeriesType": "نوع مسلسل الإنمي",
   "components.Settings.SonarrModal.seriesType": "نوع المسلسل",
   "components.UserProfile.UserSettings.UserNotificationSettings.sound": "صوت التنبيه",
-  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "الجهاز الإفتراضي",
-  "component.BlacklistBlock.blacklistedby": "مدرج في القائمة السوداء من قبل",
-  "component.BlacklistBlock.blacklistdate": "تاريخ الإدراج في القائمة السوداء",
-  "component.BlacklistModal.blacklisting": "القائمة السوداء",
-  "components.Blacklist.blacklistNotFoundError": "<strong>{title}</strong> غير مدرج في القائمة السوداء.",
-  "components.Blacklist.blacklistSettingsDescription": "إدارة الوسائط المدرجة في القائمة السوداء.",
-  "components.Blacklist.mediaType": "النوع",
-  "components.Blacklist.mediaName": "الاسم",
-  "components.Blacklist.blacklistdate": "التاريخ",
-  "components.Blacklist.blacklistsettings": "إعدادات القائمة السوداء",
-  "components.Blacklist.blacklistedby": "{date} بواسطة {user}"
+  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "الجهاز الإفتراضي"
 }

src/i18n/locale/bg.json

@@ -234,6 +234,7 @@
   "components.PermissionEdit.viewrequests": "Преглед на заявките",
   "components.RequestCard.failedretry": "Нещо се обърка при повторен опит за заявка.",
   "components.PermissionEdit.requestMovies": "Заявка за филми",
+  "components.RequestModal.extras": "Екстри",
   "components.RequestModal.QuotaDisplay.quotaLinkUser": "Можете да прегледате обобщение на ограниченията на заявки от потребителя на неговата <Profile Link>профилна страница</Profile Link>.",
   "components.Discover.StudioSlider.studios": "Студия",
   "components.ManageSlideOver.manageModalRequests": "Заявки",
@@ -711,6 +712,7 @@
   "components.Discover.FilterSlideover.voteCount": "Брой гласове между {minValue} и {maxValue}",
   "components.NotificationTypeSelector.issuecreated": "Проблемът е докладван",
   "components.RequestModal.alreadyrequested": "Вече е заявено",
+  "components.MovieDetails.play4konplex": "Пусни в 4K в Plex",
   "components.NotificationTypeSelector.mediaavailable": "Налична заявка",
   "components.Settings.Notifications.NotificationsPushbullet.pushbulletSettingsFailed": "Настройките за известяване към Pushbullet не успяха да бъдат запазени.",
   "components.PermissionEdit.autoapprove4kSeriesDescription": "Гарантирано автоматично одобрение за заявки за 4K сериали.",
@@ -722,6 +724,7 @@
   "components.NotificationTypeSelector.mediadeclinedDescription": "Изпращайте известия, когато медийните заявки бъдат отхвърлени.",
   "components.Settings.Notifications.validationSmtpPortRequired": "Трябва да предоставите валиден номер на порт",
   "components.NotificationTypeSelector.mediaautorequested": "Заявката е изпратена автоматично",
+  "components.MovieDetails.playonplex": "Пусни в Plex",
   "components.ManageSlideOver.manageModalClearMedia": "Изчистване на данните",
   "components.Settings.RadarrModal.apiKey": "API ключ",
   "components.MovieDetails.streamingproviders": "В момента се излъчва по",
@@ -739,6 +742,7 @@
   "components.Settings.SettingsMain.hideAvailable": "Скриване на наличните медии",
   "components.Settings.SettingsLogs.logDetails": "Подробности за лог файл",
   "components.UserProfile.UserSettings.UserGeneralSettings.toastSettingsSuccess": "Настройките са запазени успешно!",
+  "components.Settings.SettingsMain.regionTip": "Филтрирайте съдържанието по регионална наличност",
   "components.UserList.sortRequests": "Брой заявки",
   "components.Settings.SonarrModal.edit4ksonarr": "Редактирай 4К Sonarr сървър",
   "components.Settings.SettingsJobsCache.imagecache": "Кеш изображения",
@@ -766,6 +770,7 @@
   "components.Settings.SettingsLogs.logsDescription": "Можете също да видите тези лог файлове директно чрез <code>stdout</code> или в <code>{appDataPath}/logs/overseerr.log</code>.",
   "components.TvDetails.episodeCount": "{episodeCount, plural, one {# епизод} other {# епизоди}}",
   "components.UserProfile.UserSettings.UserGeneralSettings.discordId": "Discord User ID",
+  "components.Settings.SettingsMain.region": "Регион в Открийте",
   "components.TvDetails.firstAirDate": "Първа дата за ефир",
   "pages.errormessagewithcode": "{statusCode} - {error}",
   "components.Settings.SettingsMain.trustProxy": "Активирайте поддръжката на прокси",
@@ -823,6 +828,7 @@
   "components.Settings.SettingsLogs.filterInfo": "Информация",
   "i18n.view": "Преглед",
   "components.Settings.scan": "Синхронизиране на библиотеки",
+  "components.TvDetails.playonplex": "Пусни в Plex",
   "components.Settings.SettingsJobsCache.jobScheduleEditSaved": "Заданието редактирана успешно!",
   "components.UserList.usercreatedsuccess": "Потребителят е създаден успешно!",
   "components.UserProfile.UserSettings.UserNotificationSettings.emailsettingssaved": "Настройките за известяване по имейл са запазени успешно!",
@@ -857,6 +863,7 @@
   "components.Settings.SonarrModal.selectRootFolder": "Изберете главна папка",
   "i18n.delimitedlist": "{a}, {b}",
   "components.UserProfile.UserSettings.UserNotificationSettings.webpush": "Web Push",
+  "components.Setup.scanbackground": "Сканирането ще работи във фонов режим. Междувременно можете да продължите процеса на настройка.",
   "components.UserProfile.UserSettings.UserNotificationSettings.notifications": "Известия",
   "components.Settings.SonarrModal.validationApplicationUrl": "Трябва да предоставите валиден URL адрес",
   "components.Settings.SonarrModal.seasonfolders": "Папки по сезони",
@@ -894,6 +901,7 @@
   "components.Settings.plexsettingsDescription": "Конфигурирайте настройките за вашия Plex сървър. Overseerr сканира вашите Plex библиотеки, за да определи наличното съдържанието.",
   "i18n.import": "Импорт",
   "components.Settings.SettingsMain.applicationTitle": "Заглавие на приложението",
+  "components.TvDetails.play4konplex": "Пусни в 4K в Plex",
   "components.StatusBadge.playonplex": "Пусни в Plex",
   "i18n.open": "Отвори",
   "components.Settings.port": "Порт",
@@ -937,6 +945,7 @@
   "components.UserList.accounttype": "Тип",
   "components.Settings.webAppUrl": "<WebAppLink>Web App</WebAppLink> URL",
   "components.TvDetails.manageseries": "Управление на сериали",
+  "components.Setup.tip": "Съвет",
   "components.UserProfile.UserSettings.UserNotificationSettings.discordsettingsfailed": "Настройките за известяване към Discord не успяха да бъдат запазени.",
   "components.UserProfile.UserSettings.UserPasswordChange.noPasswordSetOwnAccount": "Вашият акаунт в момента няма зададена парола. Конфигурирайте парола по-долу, за да разрешите влизане като „локален потребител“, използвайки своя имейл адрес.",
   "components.Settings.SettingsJobsCache.editJobSchedulePrompt": "Нова честота",
@@ -946,6 +955,7 @@
   "i18n.resolved": "Разрешен",
   "components.TvDetails.Season.somethingwentwrong": "Нещо се обърка при извличане на данни за сезона.",
   "components.StatusChecker.appUpdatedDescription": "Моля, щракнете върху бутона по-долу, за да презаредите приложението.",
+  "components.UserList.displayName": "Показвано име",
   "components.UserList.bulkedit": "Групово редактиране",
   "components.UserProfile.UserSettings.UserNotificationSettings.validationPushoverUserKey": "Трябва да предоставите валиден потребителски или групов ключ",
   "components.Settings.SettingsMain.toastApiKeyFailure": "Нещо се обърка при генерирането на нов API ключ.",
@@ -970,6 +980,7 @@
   "components.Settings.SonarrModal.loadingprofiles": "Зареждат се профилите за качество…",
   "i18n.testing": "Тествам…",
   "components.UserProfile.UserSettings.UserPasswordChange.toastSettingsFailureVerifyCurrent": "Нещо се обърка при запазването на паролата. Вашата текуща парола правилно ли е въведена?",
+  "components.Setup.loginwithplex": "Влезте с Plex",
   "components.Settings.SettingsUsers.userSettingsDescription": "Конфигурирайте глобалните потребителски настройки и настройките по подразбиране.",
   "i18n.noresults": "Няма резултати.",
   "components.Settings.notificationAgentSettingsDescription": "Конфигурирайте и активирайте агенти за уведомяване.",
@@ -1115,6 +1126,7 @@
   "components.UserProfile.ProfileHeader.userid": "Потребителски идентификатор: {userid}",
   "components.Settings.SettingsJobsCache.radarr-scan": "Radarr сканиране",
   "components.UserList.importfromplex": "Импортиране на потребители на Plex",
+  "components.Setup.configureplex": "Конфигурирайте Plex",
   "components.Settings.SonarrModal.port": "Порт",
   "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletAccessTokenTip": "Създайте токен от вашите <PushbulletSettingsLink>Настройки на акаунта</PushbulletSettingsLink>",
   "components.UserList.userdeleted": "Потребителят е изтрит успешно!",

src/i18n/locale/ca.json

@@ -17,6 +17,7 @@
   "components.RequestModal.pendingrequest": "Sol·licitud pendent",
   "components.RequestModal.pending4krequest": "Sol·licitud en 4K pendent",
   "components.RequestModal.numberofepisodes": "# d'episodis",
+  "components.RequestModal.extras": "Extres",
   "components.RequestModal.errorediting": "S'ha produït un error en editar la sol·licitud.",
   "components.RequestModal.cancel": "Cancel·la la sol·licitud",
   "components.RequestModal.autoapproval": "Aprovació automàtica",
@@ -129,6 +130,8 @@
   "components.MovieDetails.runtime": "Ingressos",
   "components.MovieDetails.releasedate": "{releaseCount, plural, one {Data} other {Dates}} de llançament",
   "components.MovieDetails.recommendations": "Recomanacions",
+  "components.MovieDetails.play4konplex": "Reprodueix en 4K a Plex",
+  "components.MovieDetails.playonplex": "Reprodueix a Plex",
   "components.MovieDetails.overviewunavailable": "Descripció general no disponible.",
   "components.MovieDetails.overview": "Visió general",
   "components.MovieDetails.originaltitle": "Títol original",
@@ -402,18 +405,30 @@
   "components.TvDetails.anime": "Anime",
   "components.TvDetails.TvCrew.fullseriescrew": "Equip complet de la sèrie",
   "components.TvDetails.TvCast.fullseriescast": "Repartiment complet de la sèrie",
+  "components.StatusChacker.newversionavailable": "Actualització de l'aplicació",
+  "components.StatusChacker.newversionDescription": "Jellyseerr s'ha actualitzat! Feu clic al botó següent per tornar a carregar la pàgina.",
   "components.StatusBadge.status4k": "4K {status}",
   "components.Setup.welcome": "Benvingut a Jellyseerr",
+  "components.Setup.tip": "Consell",
   "components.Setup.signinMessage": "Comenceu iniciant sessió amb el vostre compte de Plex",
   "components.Setup.setup": "Configuració",
+  "components.Setup.scanbackground": "L’exploració s’executarà en segon pla. Mentrestant, podeu continuar el procés de configuració.",
+  "components.Setup.loginwithplex": "Inicieu sessió amb Plex",
   "components.Setup.finishing": "S'està acabant…",
   "components.Setup.finish": "Finalitza la configuració",
   "components.Setup.continue": "Continua",
   "components.Setup.configureservices": "Configureu els serveis",
   "components.Settings.toastPlexRefresh": "S'està recuperant la llista de servidors de Plex…",
+  "components.Setup.configureplex": "Configureu Plex",
   "components.Settings.webhook": "Webhook",
   "components.Settings.validationPortRequired": "Heu de proporcionar un número de port vàlid",
   "components.Settings.validationHostnameRequired": "Heu de proporcionar un nom d’amfitrió o una adreça IP vàlida",
+  "components.Settings.validationApplicationUrlTrailingSlash": "L'URL no pot acabar amb una barra inclinada final",
+  "components.Settings.validationApplicationUrl": "Heu de proporcionar un URL vàlid",
+  "components.Settings.validationApplicationTitle": "Heu de proporcionar un títol d'aplicació",
+  "components.Settings.trustProxyTip": "Permet a Jellyseerr registrar correctament les adreces IP del client darrere d’un servidor intermediari (s’ha de tornar a carregar Jellyseerr perquè els canvis tinguin efecte)",
+  "components.Settings.toastSettingsSuccess": "La configuració s'ha desat correctament!",
+  "components.Settings.toastSettingsFailure": "S'ha produït un error en desar la configuració.",
   "components.Settings.toastPlexRefreshSuccess": "La llista de servidors Plex s'ha recuperat correctament!",
   "components.Settings.toastPlexRefreshFailure": "No s'ha pogut recuperar la llista de servidors Plex.",
   "components.Settings.toastPlexConnectingSuccess": "La connexió amb Plex s'ha establert correctament!",
@@ -439,6 +454,9 @@
   "components.Settings.plexlibrariesDescription": "Les biblioteques en les que Jellyseerr explora títols. Configureu i deseu la configuració de la connexió Plex i feu clic al botó següent si no apareix cap.",
   "components.Settings.plexlibraries": "Biblioteques Plex",
   "components.Settings.plex": "Plex",
+  "components.Settings.partialRequestsEnabled": "Permet sol·licituds parcials de Sèries",
+  "components.Settings.originallanguageTip": "Filtra el contingut per l'idioma original",
+  "components.Settings.originallanguage": "Idioma per a la secció \"Descobriu\"",
   "components.Settings.manualscanDescription": "Normalment, només s’executarà una vegada cada 24 hores. Jellyseerr comprovarà de forma més agressiva el contingut afegit recentment del seu servidor Plex. Si és la primera vegada que configureu Plex, es recomana fer una exploració manual completa de la biblioteca!",
   "components.Settings.SettingsJobsCache.plex-recently-added-scan": "Exploració d'elements de Plex afegits recentment",
   "components.Settings.notrunning": "No s'està executant",
@@ -451,6 +469,8 @@
   "components.Settings.menuNotifications": "Notificacions",
   "components.Settings.menuLogs": "Registres",
   "components.Settings.menuJobs": "Tasques programades i memòria cau",
+  "components.Settings.hideAvailable": "Amaga els suports disponibles",
+  "components.Settings.generalsettingsDescription": "Configureu els paràmetres globals i predeterminats per a Jellyseerr.",
   "components.Settings.menuGeneralSettings": "General",
   "components.Settings.menuAbout": "Quant a",
   "components.Settings.manualscan": "Exploració manual de la biblioteca",
@@ -651,6 +671,8 @@
   "components.TvDetails.showtype": "Tipus de sèrie",
   "components.TvDetails.seasons": "{seasonCount, plural, one {# Temporada} other {# Temporades}}",
   "components.TvDetails.recommendations": "Recomanacions",
+  "components.TvDetails.playonplex": "Reprodueix a Plex",
+  "components.TvDetails.play4konplex": "Reprodueix a Plex en 4K",
   "components.Settings.SonarrModal.testFirstTags": "Proveu la connexió per carregar etiquetes",
   "components.Settings.SonarrModal.tags": "Etiquetes",
   "components.Settings.SonarrModal.selecttags": "Seleccioneu les etiquetes",
@@ -782,6 +804,7 @@
   "components.Settings.Notifications.webhookUrlTip": "Creeu una <DiscordWebhookLink>integració de webhook</DiscordWebhookLink> al vostre servidor",
   "components.Settings.Notifications.encryptionOpportunisticTls": "Utilitzeu sempre STARTTLS",
   "components.Settings.Notifications.encryptionNone": "Cap",
+  "components.UserList.displayName": "Nom de visualització",
   "components.Settings.SettingsUsers.localLoginTip": "Permetre als usuaris iniciar la sessió mitjançant la seva adreça de correu electrònic i contrasenya, en lloc de l'autenticació de Plex",
   "components.Settings.SettingsUsers.defaultPermissionsTip": "Permisos inicials assignats a usuaris nous",
   "components.RequestList.RequestItem.requesteddate": "Sol·licitat",
@@ -1202,10 +1225,12 @@
   "components.Settings.SettingsMain.locale": "Idioma de visualització",
   "components.Settings.SettingsMain.originallanguage": "Idioma a Descobriu",
   "components.Settings.SettingsMain.originallanguageTip": "Filtrar el contingut per idioma original",
+  "components.Settings.SettingsMain.regionTip": "Filtrar continguts per disponibilitat regional",
   "components.Settings.SettingsMain.toastApiKeyFailure": "S'ha produït un error en generar una clau API nova.",
   "components.Settings.SettingsMain.toastApiKeySuccess": "La clau API s'ha generat correctament!",
   "components.Settings.SettingsMain.toastSettingsFailure": "S'ha produït un error en desar la configuració.",
   "components.Settings.SettingsMain.partialRequestsEnabled": "Permet sol·licituds parcials de sèries",
+  "components.Settings.SettingsMain.region": "Regió de Descobriu",
   "components.Settings.SettingsMain.toastSettingsSuccess": "La configuració s'ha desat correctament!",
   "components.Settings.SettingsMain.validationApplicationUrlTrailingSlash": "L'URL no ha d'acabar amb una barra inclinada final",
   "components.Settings.SettingsMain.trustProxy": "Habilitar la compatibilitat amb proxy",

src/i18n/locale/cs.json

@@ -1,8 +1,11 @@
 {
   "components.Settings.notificationsettings": "Nastavení oznámení",
+  "components.Settings.locale": "Jazyk zobrazení",
+  "components.Settings.generalsettings": "Obecná nastavení",
   "components.Settings.enablessl": "Použít SSL",
   "components.Settings.default4k": "Výchozí 4K",
   "components.Settings.cancelscan": "Zrušit skenování",
+  "components.Settings.apikey": "API klíč",
   "components.Settings.activeProfile": "Aktivní profil",
   "components.Settings.SonarrModal.syncEnabled": "Povolit skenování",
   "components.Settings.SonarrModal.ssl": "Použít SSL",
@@ -123,6 +126,7 @@
   "components.PersonDetails.ascharacter": "jako {character}",
   "components.PermissionEdit.viewrequests": "Zobrazit žádosti",
   "components.PermissionEdit.users": "Spravovat uživatele",
+  "components.PermissionEdit.settings": "Spravovat nastavení",
   "components.PermissionEdit.requestTv": "Žádat seriály",
   "components.PermissionEdit.requestMovies": "Vyžádat filmy",
   "components.PermissionEdit.request4k": "Vyžádat ve 4K",
@@ -151,6 +155,8 @@
   "components.TvDetails.overview": "Přehled",
   "components.TvDetails.cast": "Obsazení",
   "components.TvDetails.anime": "Anime",
+  "components.StatusChacker.reloadOverseerr": "Znovu načíst",
+  "components.Setup.tip": "Tip",
   "components.Setup.setup": "Konfigurace",
   "components.Setup.finishing": "Dokončování…",
   "components.Setup.continue": "Pokračovat",
@@ -175,6 +181,7 @@
   "components.Settings.mediaTypeSeries": "seriál",
   "components.Settings.mediaTypeMovie": "film",
   "components.Settings.is4k": "4K",
+  "components.Settings.general": "Obecné",
   "components.Settings.email": "E-mail",
   "components.Settings.default": "Výchozí",
   "components.Settings.address": "Adresy",
@@ -210,6 +217,7 @@
   "components.Search.search": "Vyhledat",
   "components.ResetPassword.password": "Heslo",
   "components.RequestModal.season": "Série",
+  "components.RequestModal.extras": "Extra",
   "components.RequestModal.QuotaDisplay.season": "série",
   "components.RequestModal.QuotaDisplay.movie": "film",
   "components.RequestModal.AdvancedRequester.tags": "Značky",
@@ -398,12 +406,17 @@
   "components.NotificationTypeSelector.usermediadeclinedDescription": "Dostat oznámení o odmítnutí vašich požadavků na média.",
   "components.NotificationTypeSelector.usermediaavailableDescription": "Dostat oznámení, jakmile budou k dispozici žádosti o média.",
   "components.Layout.VersionStatus.commitsbehind": "{commitsBehind} {commitsBehind, plural, one {potvrzení} few {potvrzení} other {potvrzení}} za",
+  "components.Setup.configureplex": "Konfigurovat Plex",
   "components.Settings.serverpresetRefreshing": "Načítání serverů…",
+  "components.Settings.applicationTitle": "Název aplikace",
+  "components.Settings.originallanguage": "Jazyk pro vyhledávání",
   "components.Settings.plexsettings": "Nastavení Plexu",
   "components.Settings.scan": "Synchronizovat knihovny",
   "components.Settings.plexlibraries": "Plex knihovny",
+  "components.Settings.applicationurl": "Adresa URL aplikace",
   "components.Settings.notrunning": "Není spuštěno",
   "components.Settings.radarrsettings": "Nastavení Radarru",
+  "components.Settings.region": "Region pro vyhledávání",
   "components.Settings.startscan": "Spustit skenování",
   "components.Settings.serverpresetManualMessage": "Manuální konfigurace",
   "components.Settings.sonarrsettings": "Nastavení Sonarru",
@@ -474,6 +487,7 @@
   "components.RequestModal.requestSuccess": "<strong>{title}</strong> bylo úspěšně zažádáno!",
   "components.Settings.SettingsLogs.logDetails": "Podrobnosti o záznamu",
   "components.StatusBadge.status4k": "4K {status}",
+  "components.StatusChacker.newversionavailable": "Aktualizace aplikace",
   "components.TvDetails.episodeRuntime": "Délka epizody",
   "components.TvDetails.episodeRuntimeMinutes": "{runtime} minut",
   "components.TvDetails.originallanguage": "Původní jazyk",
@@ -588,6 +602,7 @@
   "components.Settings.notificationAgentSettingsDescription": "Konfigurace a povolení agentů pro oznámení.",
   "components.Settings.settingUpPlexDescription": "Chcete-li nastavit službu Plex, můžete buď zadat údaje ručně, nebo vybrat server získaný z adresy <RegisterPlexTVLink>plex.tv</RegisterPlexTVLink>. Stisknutím tlačítka vpravo od rozevírací nabídky načtete seznam dostupných serverů.",
   "components.Settings.toastPlexRefreshFailure": "Nepodařilo se načíst seznam serverů Plex.",
+  "components.StatusChacker.newversionDescription": "Jellyseerr byl aktualizován! Kliknutím na tlačítko níže stránku znovu načtete.",
   "components.TvDetails.play4k": "Přehrát v {mediaServerName} ve 4K",
   "components.TvDetails.play": "Přehrát v {mediaServerName}",
   "components.UserProfile.UserSettings.UserGeneralSettings.regionTip": "Filtrování obsahu podle regionální dostupnosti",
@@ -616,15 +631,20 @@
   "components.Settings.SonarrModal.testFirstRootFolders": "Test připojení pro načtení kořenových složek",
   "components.Settings.SonarrModal.validationApiKeyRequired": "Musíte zadat klíč API",
   "components.Settings.SonarrModal.validationApplicationUrl": "Musíte zadat platnou adresu URL",
+  "components.Settings.csrfProtectionTip": "Nastavení externího přístupu k rozhraní API pouze pro čtení (vyžaduje protokol HTTPS a aby se změny projevily, musí být znovu načtena aplikace Jellyseerr)",
   "components.Settings.deleteserverconfirm": "Opravdu chcete tento server odstranit?",
   "components.Settings.menuJobs": "Práce a mezipaměť",
+  "components.Settings.toastApiKeyFailure": "Při generování nového klíče API se něco pokazilo.",
+  "components.Settings.toastApiKeySuccess": "Nový klíč API byl úspěšně vygenerován!",
   "components.TvDetails.similar": "Podobné série",
   "components.TvDetails.streamingproviders": "V současné době streamuje na",
   "components.UserList.nouserstoimport": "Neexistují žádní uživatelé systému Plex, které by bylo možné importovat.",
   "components.UserProfile.UserSettings.UserGeneralSettings.toastSettingsSuccess": "Nastavení úspěšně uloženo!",
   "components.Settings.SettingsJobsCache.nextexecution": "Další spuštení",
+  "components.Settings.generalsettingsDescription": "Konfigurace globálních a výchozích nastavení pro Jellyseerr.",
   "components.TvDetails.nextAirDate": "Další datum vysílání",
   "components.TvDetails.viewfullcrew": "Zobrazit celé obsazení",
+  "components.UserList.displayName": "Zobrazené jméno",
   "components.UserList.edituser": "Úprava oprávnění uživatele",
   "components.NotificationTypeSelector.issuecreatedDescription": "Odesílat upozornění, když jsou nahlášeny problémy.",
   "components.NotificationTypeSelector.issuereopenedDescription": "Odesílat upozornění, když se problémy znovu otevřou.",
@@ -664,6 +684,7 @@
   "components.PermissionEdit.request4kTv": "Vyžádat si sérii 4K",
   "components.PermissionEdit.requestMoviesDescription": "Udělit povolení k předkládání žádostí o filmy jiné než 4K.",
   "components.PermissionEdit.requestTvDescription": "Udělit povolení k předkládání žádostí pro jiné série než 4K.",
+  "components.PermissionEdit.settingsDescription": "Udělení oprávnění ke změně globálního nastavení. Uživatel musí mít toto oprávnění, aby je mohl udělit ostatním.",
   "components.PermissionEdit.viewissuesDescription": "Udělit oprávnění k zobrazení problémů s médii nahlášených jinými uživateli.",
   "components.PermissionEdit.viewrequestsDescription": "Udělit oprávnění k zobrazení požadavků na média zadaných jinými uživateli.",
   "components.PersonDetails.alsoknownas": "Známý také jako: {names}",
@@ -686,11 +707,15 @@
   "components.Settings.SonarrModal.toastSonarrTestFailure": "Nepodařilo se připojit k systému Sonarr.",
   "components.Settings.SonarrModal.toastSonarrTestSuccess": "Připojení Sonarr úspěšně navázáno!",
   "components.Settings.SonarrModal.validationBaseUrlLeadingSlash": "Základní adresa URL musí mít na začátku lomítko",
+  "components.Settings.cacheImages": "Povolení ukládání obrázků do mezipaměti",
+  "components.Settings.cacheImagesTip": "Ukládat do mezipaměti a poskytovat optimalizované obrazy (vyžaduje značné množství místa na disku)",
   "components.Settings.manualscanDescription": "Obvykle se provádí pouze jednou za 24 hodin. Jellyseerr bude kontrolovat nedávno přidané položky vašeho serveru Plex agresivněji. Pokud Plex konfigurujete poprvé, doporučujeme provést jednorázovou úplnou ruční kontrolu knihovny!",
+  "components.Settings.originallanguageTip": "Filtrování obsahu podle původního jazyka",
   "components.Settings.urlBase": "Základní adresa URL",
   "components.Settings.tautulliSettingsDescription": "Volitelně nakonfigurujte nastavení serveru Tautulli. Jellyseerr načte data historie sledování pro vaše média Plex z Tautulli.",
   "components.Settings.toastPlexConnecting": "Pokus o připojení k systému Plex…",
   "components.Settings.validationApiKey": "Musíte zadat klíč API",
+  "components.Settings.validationApplicationUrlTrailingSlash": "Adresa URL nesmí končit koncovým lomítkem",
   "components.Settings.validationHostnameRequired": "Musíte zadat platný název hostitele nebo IP adresu",
   "components.Settings.validationPortRequired": "Musíte zadat platné číslo portu",
   "components.Settings.validationUrl": "Musíte zadat platnou adresu URL",
@@ -778,15 +803,23 @@
   "components.Settings.addradarr": "Přidání serveru Radarr",
   "components.Settings.addsonarr": "Adding a Radarr server",
   "components.Settings.copied": "Zkopírování klíče API do schránky.",
+  "components.Settings.csrfProtection": "Povolení ochrany CSRF",
   "components.Settings.externalUrl": "Externí adresa URL",
+  "components.Settings.hideAvailable": "Skrýt dostupná média",
   "components.Settings.hostname": "Název hostitele nebo IP adresa",
   "components.Settings.manualscan": "Manuální skenování knihovny",
+  "components.Settings.partialRequestsEnabled": "Povolení požadavků na částečné série",
   "components.Settings.plexlibrariesDescription": "Knihovny Jellyseerr vyhledává tituly. Nastavte a uložte nastavení připojení k systému Plex a poté klikněte na tlačítko níže, pokud nejsou v seznamu uvedeny žádné knihovny.",
   "components.Settings.serverpresetLoad": "Stisknutím tlačítka načtete dostupné servery",
+  "components.Settings.toastSettingsSuccess": "Nastavení úspěšně uloženo!",
   "components.Settings.toastTautulliSettingsFailure": "Při ukládání nastavení Tautulli se něco pokazilo.",
+  "components.Settings.validationApplicationTitle": "Musíte uvést název žádosti",
+  "components.Settings.validationApplicationUrl": "Musíte zadat platnou adresu URL",
   "components.Settings.webAppUrl": "<WebAppLink>Webová aplikace</WebAppLink> Adresa URL",
   "components.Settings.validationUrlTrailingSlash": "Adresa URL nesmí končit koncovým lomítkem",
   "components.Settings.webAppUrlTip": "Volitelné přesměrování uživatelů na webovou aplikaci na vašem serveru namísto hostované webové aplikace",
+  "components.Setup.loginwithplex": "Přihlášení pomocí služby Plex",
+  "components.Setup.scanbackground": "Skenování bude probíhat na pozadí. Mezitím můžete pokračovat v procesu nastavení.",
   "components.Setup.welcome": "Vítejte v Jellyseerr",
   "components.Setup.signinMessage": "Skenování bude probíhat na pozadí. Mezitím můžete pokračovat v procesu nastavení",
   "components.TvDetails.TvCrew.fullseriescrew": "Posádka celé série",
@@ -831,7 +864,10 @@
   "components.Settings.noDefault4kServer": "Server 4K {serverType} musí být označen jako výchozí, aby uživatelé mohli odesílat požadavky 4K {mediaType}.",
   "components.Settings.noDefaultNon4kServer": "Pokud máte pouze jeden server {serverType} pro obsah jiný než 4K i 4K (nebo pokud stahujete pouze obsah 4K), váš server {serverType} by <strong>neměl</strong> být označen jako server 4K.",
   "components.Settings.noDefaultServer": "Aby mohly být zpracovány požadavky typu {mediaType}, musí být alespoň jeden server typu {serverType} označen jako výchozí.",
+  "components.Settings.regionTip": "Filtrování obsahu podle regionální dostupnosti",
   "components.Settings.plexsettingsDescription": "Knihovny Jellyseerr vyhledává tituly. Nastavte a uložte nastavení připojení k systému Plex a poté klikněte na tlačítko níže, pokud nejsou v seznamu uvedeny žádné knihovny.",
+  "components.Settings.toastSettingsFailure": "Při ukládání nastavení se něco pokazilo.",
+  "components.Settings.trustProxy": "Povolení podpory proxy serveru",
   "components.Settings.toastPlexRefresh": "Získání seznamu serverů z aplikace Plex…",
   "components.Settings.toastPlexRefreshSuccess": "Seznam serverů Plex úspěšně načten!",
   "components.UserList.passwordinfodescription": "Nakonfigurujte adresu URL aplikace a povolte e-mailová oznámení, která umožní automatické generování hesla.",
@@ -857,6 +893,7 @@
   "components.RequestCard.failedretry": "Při opakovaném pokusu o zadání požadavku se něco pokazilo.",
   "components.Settings.Notifications.NotificationsLunaSea.profileNameTip": "Vyžaduje se pouze v případě, že nepoužíváte profil <code>default</code>",
   "components.RequestCard.mediaerror": "{mediaType} Nenalezeno",
+  "components.Settings.trustProxyTip": "Povolit Jellyseerr správně registrovat IP adresy klientů za proxy serverem",
   "components.RequestList.RequestItem.mediaerror": "{mediaType} Nenalezeno",
   "components.RequestModal.QuotaDisplay.allowedRequests": "Můžete požádat o <strong>{limit}</strong> {type} každé <strong>{days}</strong> dny.",
   "components.RequestModal.SearchByNameModal.notvdbiddescription": "Tuto sérii jsme nemohli automaticky spárovat. Níže prosím vyberte správnou shodu.",
@@ -938,6 +975,7 @@
   "components.Settings.SonarrModal.validationLanguageProfileRequired": "Je třeba vybrat jazykový profil",
   "components.Settings.SonarrModal.validationNameRequired": "Je třeba zadat název serveru",
   "components.UserProfile.UserSettings.UserGeneralSettings.displayName": "Zobrazované jméno",
+  "components.Settings.csrfProtectionHoverTip": "Toto nastavení NEPOVOLUJTE, pokud nerozumíte tomu, co děláte!",
   "components.Settings.tautulliSettings": "Tautulli Nastavení",
   "components.Settings.toastTautulliSettingsSuccess": "Nastavení Tautulli úspěšně uloženo!",
   "components.UserProfile.UserSettings.unauthorizedDescription": "Nemáte oprávnění měnit nastavení tohoto uživatele.",
@@ -1200,6 +1238,8 @@
   "components.Settings.SettingsMain.originallanguage": "Objevte jazyk",
   "components.Settings.SettingsMain.originallanguageTip": "Filtrování obsahu podle původního jazyka",
   "components.Settings.SettingsMain.partialRequestsEnabled": "Povolení požadavků na částečné série",
+  "components.Settings.SettingsMain.region": "Objevte region",
+  "components.Settings.SettingsMain.regionTip": "Filtrování obsahu podle regionální dostupnosti",
   "components.Settings.SettingsMain.trustProxyTip": "Umožnit Jellyseerru správně registrovat klientské IP adresy za proxy serverem",
   "components.Settings.SettingsJobsCache.imagecachecount": "Obrázky v mezipaměti",
   "components.Settings.SettingsJobsCache.imagecache": "Vyrovnávací paměť obrázků",

src/i18n/locale/da.json

@@ -1,4 +1,5 @@
 {
+  "components.Discover.discovermovies": "Populære Film",
   "components.MediaSlider.ShowMoreCard.seemore": "Se Mere",
   "components.Login.validationpasswordrequired": "Angiv et kodeord",
   "components.Login.validationemailrequired": "Angiv en gyldig email adresse",
@@ -31,6 +32,7 @@
   "components.Discover.recentlyAdded": "Nyligt tilføjet",
   "components.Discover.populartv": "Populære Serier",
   "components.Discover.popularmovies": "Populære Film",
+  "components.Discover.discovertv": "Populære Serier",
   "components.Discover.discover": "Udforsk",
   "components.Discover.TvGenreSlider.tvgenres": "Seriegenrer",
   "components.Discover.TvGenreList.seriesgenres": "Seriegenrer",
@@ -67,8 +69,10 @@
   "components.MovieDetails.releasedate": "{releaseCount, plural, one {Udgivelsesdato} other {Udgivelsesdatoer}}",
   "components.MovieDetails.revenue": "Omsætning",
   "components.MovieDetails.runtime": "{minutes} minutter",
+  "components.MovieDetails.play4konplex": "Afspil i 4K i Plex",
   "components.MovieDetails.similar": "Lignende Titler",
   "components.MovieDetails.streamingproviders": "Kan I Øjeblikket Streames På",
+  "components.MovieDetails.playonplex": "Afspil i Plex",
   "components.MovieDetails.viewfullcrew": "Vis Filmstab",
   "components.MovieDetails.watchtrailer": "Se Trailer",
   "components.PermissionEdit.advancedrequestDescription": "Giv tilladelse til at modificere avancerede medieforespørgselsindstillinger.",
@@ -218,6 +222,7 @@
   "components.PermissionEdit.requestTv": "Forespørg Serier",
   "components.PermissionEdit.autoapproveMoviesDescription": "Giv automatisk godkendelse for alle ikke-4K filmforespørgsler.",
   "components.PermissionEdit.requestTvDescription": "Bliv notificeret når problemer er genåbnet af andre brugere.",
+  "components.PermissionEdit.settings": "Administrér Indstillinger",
   "components.RegionSelector.regionServerDefault": "Standard ({region})",
   "components.RequestCard.deleterequest": "Slet Forespørgsel",
   "components.RequestCard.mediaerror": "Den forbundne titel for denne forespørgsel er ikke længere tilgængelig.",
@@ -246,6 +251,7 @@
   "components.RequestModal.QuotaDisplay.allowedRequests": "Du kan forespørge om <strong>{limit}</strong> {type} hver <strong>{days}</strong> dag.",
   "components.RequestModal.QuotaDisplay.allowedRequestsUser": "Denne bruger kan forespørge om <strong>{limit}</strong> {type} hver <strong>{days}</strong> dag.",
   "components.IssueDetails.IssueComment.validationComment": "Du skal skrive en besked",
+  "components.PermissionEdit.settingsDescription": "Giv tilladelse til at modificere globale indstillinger. En bruger skal have denne rettighed for at kunne give den til andre.",
   "components.ManageSlideOver.manageModalIssues": "Åbne Problemer",
   "components.MovieDetails.showless": "Vis Mindre",
   "components.MovieDetails.cast": "Medvirkende",
@@ -284,6 +290,7 @@
   "components.RequestModal.cancel": "Annullér Forespørgsel",
   "components.RequestModal.edit": "Redigér Forespørgsel",
   "components.RequestModal.errorediting": "Noget gik galt under redigeringen af forespørgslen.",
+  "components.RequestModal.extras": "Ekstra",
   "components.RequestModal.numberofepisodes": "Antal Episoder",
   "components.RequestModal.pending4krequest": "Afventende 4K Forespørgsler",
   "components.RequestModal.pendingapproval": "Din forespørgsel afventer godkendelse.",
@@ -597,7 +604,13 @@
   "components.Settings.SonarrModal.validationRootFolderRequired": "Du skal angive en rodmappe",
   "components.Settings.address": "Adresse",
   "components.Settings.addsonarr": "Tilføj Sonarr Server",
+  "components.Settings.apikey": "API-nøgle",
+  "components.Settings.applicationTitle": "Applikationstitel",
+  "components.Settings.applicationurl": "Applikations-URL",
+  "components.Settings.cacheImagesTip": "Optimér og gem alle billeder lokalt (anvender en betydelig mængde diskplads)",
   "components.Settings.copied": "API-nøgle er kopieret til udklipsholder.",
+  "components.Settings.csrfProtection": "Aktivér CSRF Beskyttelse",
+  "components.Settings.csrfProtectionHoverTip": "Aktivér IKKE denne indstilling hvis ikke du forstår hvad du gør!",
   "components.Settings.currentlibrary": "Nuværende Bibliotek: {name}",
   "components.Settings.email": "Email",
   "components.Settings.enablessl": "Benyt SSL",
@@ -615,9 +628,17 @@
   "components.Settings.noDefaultServer": "Mindst én {serverType}server skal markeres som standard for at {mediaType}forespørgsler kan afvikles.",
   "components.Settings.notificationAgentSettingsDescription": "Konfigurér og aktivér notifikationsagenter.",
   "components.Settings.notifications": "Notifikationer",
+  "components.Settings.originallanguage": "Udforsk Sprog",
+  "components.Settings.originallanguageTip": "Filtrer indhold efter originalsprog",
+  "components.Settings.partialRequestsEnabled": "Tillad Delvise Serieforespørgsler",
   "components.Settings.plex": "Plex",
   "components.Settings.SettingsJobsCache.jobScheduleEditSaved": "Jobbet er blevet redigeret!",
+  "components.Settings.csrfProtectionTip": "Sæt ekstern API-adgang til skrivebeskyttet (kræver HTTPS samt at Jellyseerr genstartes for at ændringerne vil træde i kraft)",
+  "components.Settings.generalsettingsDescription": "Konfigurér global- og standardindstillinger for Jellyseerr.",
+  "components.Settings.general": "Generelt",
+  "components.Settings.hideAvailable": "Skjul Tilgængelige Medier",
   "components.Settings.hostname": "Domænenavn eller IP Adresse",
+  "components.Settings.generalsettings": "Generelle Indstillinger",
   "components.Settings.menuAbout": "Om",
   "components.Settings.SettingsLogs.label": "Label",
   "components.Settings.SettingsLogs.level": "Alvorlighed",
@@ -625,6 +646,8 @@
   "components.Settings.SonarrModal.baseUrl": "URL Kilde",
   "components.Settings.SonarrModal.create4ksonarr": "Tilføj Ny 4K Sonarr Server",
   "components.Settings.SonarrModal.loadingprofiles": "Indlæser kvalitetsprofiler…",
+  "components.Settings.cacheImages": "Aktivér billede-caching",
+  "components.Settings.locale": "Grænsefladesprog",
   "components.Settings.manualscan": "Manuel Biblioteksskanning",
   "components.Settings.mediaTypeMovie": "film",
   "components.Settings.mediaTypeSeries": "serier",
@@ -693,11 +716,15 @@
   "components.Settings.sonarrsettings": "Sonarr-indstillinger",
   "components.Settings.ssl": "SSL",
   "components.Settings.startscan": "Start Skanning",
+  "components.Settings.toastApiKeySuccess": "Ny API-nøgle er blevet genereret!",
+  "components.Settings.validationApplicationUrl": "Du skal angive en gyldig URL",
   "components.Settings.webAppUrlTip": "Brugere dirigeres som alternativ til web-app'en på din server i stedet for den \"hostede\" web-app",
   "components.Settings.webAppUrl": "<WebAppLink>Web-App</WebAppLink>-URL",
   "components.Settings.webhook": "Webhook",
   "components.StatusBadge.status4k": "4K {status}",
+  "components.Setup.tip": "Tip",
   "components.Setup.welcome": "Velkommen til Jellyseerr",
+  "components.StatusChacker.reloadOverseerr": "Genindlæs",
   "components.TvDetails.anime": "Anime",
   "components.TvDetails.cast": "Roller",
   "components.TvDetails.episodeRuntimeMinutes": "{runtime} minutter",
@@ -727,7 +754,11 @@
   "components.Settings.plexlibrariesDescription": "Bibliotekerne Jellyseerr skanner for titler. Konfigurér og gem dine Plex-forbindelsesindstillinger og klik på knappen nedenfor hvis der ikke er vist nogle biblioteker.",
   "components.Settings.plexsettingsDescription": "Konfigurér indstillingerne for din Plex server. Jellyseerr skanner dine Plex-biblioteker for at afgøre tilgængeligheden af indhold.",
   "components.Settings.radarrsettings": "Radarr-indstillinger",
+  "components.Settings.region": "Udforsk Region",
+  "components.Settings.trustProxy": "Aktivér Proxy-understøttelse",
+  "components.Settings.trustProxyTip": "Tillad Jellyseerr at registrere klienters IP addresser korrekt bag en proxy (Jellyseerr skal genstartes for at ændringerne træder i kraft)",
   "components.TvDetails.nextAirDate": "Næste Udsendelsesdato",
+  "components.TvDetails.playonplex": "Afspil i Plex",
   "components.TvDetails.recommendations": "Anbefalinger",
   "components.TvDetails.seasons": "{seasonCount, plural, one {# Sæson} other {# Sæsoner}}",
   "components.TvDetails.streamingproviders": "Kan I Øjeblikket Streames På",
@@ -764,6 +795,7 @@
   "components.Settings.serverSecure": "sikker",
   "components.Settings.serverpresetLoad": "Klik på knappen for at indlæse tilgængelige servere",
   "components.Settings.services": "Tjenester",
+  "components.Settings.toastSettingsSuccess": "Indstillingerne er blevet gemt!",
   "components.Settings.webpush": "Web Push",
   "components.UserList.userlist": "Brugerliste",
   "components.Settings.plexsettings": "Plex-indstillinger",
@@ -776,28 +808,40 @@
   "components.TvDetails.showtype": "Serietype",
   "components.UserList.sortCreated": "Tilmeldingsdato",
   "components.UserList.deleteconfirm": "Er du sikker på at du vil slette denne bruger? Alle deres forespørgselsdata vil blive slettet permanent.",
+  "components.Settings.regionTip": "Filtrer indhold efter regional tilgængelighed",
   "components.Settings.serverpresetManualMessage": "Manuel konfiguration",
   "components.Settings.serverpresetRefreshing": "Henter servere…",
   "components.Settings.serviceSettingsDescription": "Konfigurér dine {serverType}server(e) nedenfor. Du kan forbinde til flere forskellige {serverType}servere men kun to af dem kan markeres som standard (én ikke-4K og én 4K). Administratorer kan ændre på serveren der bruges til at behandle nye forespørgsler inden godkendelse.",
   "components.Settings.settingUpPlexDescription": "For at sætte Plex op skal du enten indtaste oplysningerne manuelt eller vælge en server som hentes fra <RegisterPlexTVLink>plex.tv</RegisterPlexTVLink>. Klik på knappen til højre for rullemenuen for at hente en liste af tilgængelige servere.",
+  "components.Settings.toastApiKeyFailure": "Noget gik galt under genereringen af en nye API-nøgle.",
   "components.Settings.toastPlexConnectingFailure": "Kunne ikke forbinde til Plex.",
   "components.Settings.toastPlexConnectingSuccess": "Plex forbindelse er etableret!",
   "components.Settings.toastPlexRefresh": "Henter serverliste fra Plex…",
   "components.Settings.toastPlexRefreshFailure": "Kunne ikke hente Plex-serverliste.",
   "components.Settings.toastPlexRefreshSuccess": "Plex-serverliste er blevet hentet!",
+  "components.Settings.toastSettingsFailure": "Noget gik galt. Indstillingerne kunne ikke gemmes.",
+  "components.Settings.validationApplicationTitle": "Du skal angive en applikationstitel",
+  "components.Settings.validationApplicationUrlTrailingSlash": "URL'en må ikke afsluttes med en skråstreg",
   "components.Settings.validationHostnameRequired": "Du skal angive et gyldigt domænenavn eller en gyldig IP adresse",
+  "components.Setup.configureplex": "Konfigurér Plex",
   "components.Settings.validationPortRequired": "Du skal angive et gyldigt port-nummer",
   "components.Setup.configureservices": "Konfigurér Tjenester",
   "components.Setup.continue": "Videre",
   "components.Setup.finish": "Fuldfør Opsætning",
   "components.Setup.finishing": "Færdiggører…",
+  "components.Setup.loginwithplex": "Log in med Plex",
+  "components.Setup.scanbackground": "Skanningen wil køre i baggrunden. Du kan fortsætte opsætningsprocessen i mellemtiden.",
   "components.Setup.setup": "Opsætning",
+  "components.StatusChacker.newversionDescription": "Jellyseerr er blevet opdateret! Klik venligst på knappen nedenfor for at genindlæse siden.",
   "components.TvDetails.firstAirDate": "Første Udsendelsesdato",
   "components.TvDetails.overview": "Oversigt",
+  "components.StatusChacker.newversionavailable": "Applikationsopdatering",
   "components.TvDetails.TvCrew.fullseriescrew": "Komplet Rolleliste",
   "components.TvDetails.overviewunavailable": "Oversigt utilgængelig.",
+  "components.TvDetails.play4konplex": "Afspil i 4K i Plex",
   "components.UserList.localuser": "Lokal Bruger",
   "components.UserList.deleteuser": "Slet Bruger",
+  "components.UserList.displayName": "Kaldenavn",
   "components.UserList.nouserstoimport": "Ingen nye brugere som kan importeres fra Plex.",
   "components.UserList.edituser": "Redigér Brugertilladelser",
   "components.UserList.email": "Email Adresse",
@@ -1159,6 +1203,8 @@
   "components.Settings.SettingsMain.generalsettingsDescription": "Konfigurér global- og standardindstillinger for Jellyseerr.",
   "components.Settings.SettingsMain.hideAvailable": "Skjul Tilgængelige Medier",
   "components.Settings.SettingsMain.partialRequestsEnabled": "Tillad delvise serieanmodninger",
+  "components.Settings.SettingsMain.region": "Discover region",
+  "components.Settings.SettingsMain.regionTip": "Filtrér indhold efter regional tilgængelighed",
   "components.Settings.SettingsMain.toastApiKeyFailure": "Noget gik galt under genereringen af en nye API-nøgle.",
   "components.Settings.SettingsMain.trustProxy": "Aktivér Proxy-understøttelse",
   "components.Settings.SettingsMain.trustProxyTip": "Tillad Jellyseerr at registrere klienters IP addresser korrekt bag en proxy",

src/i18n/locale/de.json

@@ -21,8 +21,11 @@
   "components.Discover.TvGenreList.seriesgenres": "Seriengenres",
   "components.Discover.TvGenreSlider.tvgenres": "Seriengenres",
   "components.Discover.discover": "Entdecken",
+  "components.Discover.discovermovies": "Beliebte Filme",
+  "components.Discover.discovertv": "Beliebte Serien",
   "components.Discover.emptywatchlist": "Hier erscheinen deine zur <PlexWatchlistSupportLink>Plex Watchlist</PlexWatchlistSupportLink> hinzugefügte Medien.",
-  "components.Discover.plexwatchlist": "Deine Watchlist",
+  "components.Discover.noRequests": "Keine Anfragen.",
+  "components.Discover.plexwatchlist": "Deine Plex Watchlist",
   "components.Discover.RecentlyAddedSlider.recentlyAdded": "Kürzlich hinzugefügt",
   "components.Discover.popularmovies": "Beliebte Filme",
   "components.Discover.populartv": "Beliebte Serien",
@@ -124,7 +127,7 @@
   "components.Layout.VersionStatus.commitsbehind": "{commitsBehind} {commitsBehind, plural, one {Version} other {Versionen}} hinterher",
   "components.Layout.VersionStatus.outofdate": "Veraltet",
   "components.Layout.VersionStatus.streamdevelop": "Jellyseerr Entwicklung",
-  "components.Layout.VersionStatus.streamstable": "Jellyseerr stabil",
+  "components.Layout.VersionStatus.streamstable": "Jellyseerr Stable",
   "components.Login.email": "E-Mail-Adresse",
   "components.Login.forgotpassword": "Passwort vergessen?",
   "components.Login.loginerror": "Beim Anmelden ist etwas schief gelaufen.",
@@ -173,6 +176,8 @@
   "components.MovieDetails.overview": "Übersicht",
   "components.MovieDetails.overviewunavailable": "Übersicht nicht verfügbar.",
   "components.MovieDetails.physicalrelease": "DVD/Bluray-Veröffentlichungen",
+  "components.MovieDetails.play4konplex": "In 4K auf Plex abspielen",
+  "components.MovieDetails.playonplex": "Auf Plex abspielen",
   "components.MovieDetails.productioncountries": "Produktions {countryCount, plural, one {Land} other {Länder}}",
   "components.MovieDetails.recommendations": "Empfehlungen",
   "components.MovieDetails.releasedate": "{releaseCount, plural, one {Veröffentlichungstermin} other {Veröffentlichungstermine}}",
@@ -206,7 +211,7 @@
   "components.NotificationTypeSelector.mediaapproved": "Anfrage genehmigt",
   "components.NotificationTypeSelector.mediaapprovedDescription": "Sende Benachrichtigungen, wenn angeforderte Medien manuell genehmigt wurden.",
   "components.NotificationTypeSelector.mediaautorequested": "Automatisch übermittelte Anfrage",
-  "components.NotificationTypeSelector.mediaautorequestedDescription": "Erhalten eine Benachrichtigung, wenn neue Medienanfragen für Objekte auf deiner Watchlist automatisch übermittelt werden.",
+  "components.NotificationTypeSelector.mediaautorequestedDescription": "Erhalten eine Benachrichtigung, wenn neue Medienanfragen für Objekte auf deiner Plex Watchlist automatisch übermittelt werden.",
   "components.NotificationTypeSelector.mediaavailable": "Anfrage verfügbar",
   "components.NotificationTypeSelector.mediaavailableDescription": "Sendet Benachrichtigungen, wenn angeforderte Medien verfügbar werden.",
   "components.NotificationTypeSelector.mediadeclined": "Anfrage abgelehnt",
@@ -266,6 +271,8 @@
   "components.PermissionEdit.requestMoviesDescription": "Autorisierung zur Übermittlung von Anfragen für nicht-4K-Filme.",
   "components.PermissionEdit.requestTv": "Serien anfragen",
   "components.PermissionEdit.requestTvDescription": "Autorisierung zur Übermittlung von Anfragen für nicht-4K-Serien.",
+  "components.PermissionEdit.settings": "Einstellungen verwalten",
+  "components.PermissionEdit.settingsDescription": "Gewähre Berechtigung um globale Einstellungen zu ändern. Ein Benutzer muss über diese Berechtigung verfügen, um sie anderen Benutzern erteilen zu können.",
   "components.PermissionEdit.users": "Benutzer verwalten",
   "components.PermissionEdit.usersDescription": "Autorisierung zur Benutzerverwaltung erteilen. Benutzer mit dieser Berechtigung können keine Benutzer mit Admin-Recht ändern oder das Admin-Recht gewähren.",
   "components.PermissionEdit.viewissues": "Probleme ansehen",
@@ -274,8 +281,8 @@
   "components.PermissionEdit.viewrecentDescription": "Autorisierung zur Anzeige der Liste der kürzlich hinzugefügten Medien.",
   "components.PermissionEdit.viewrequests": "Anfragen anzeigen",
   "components.PermissionEdit.viewrequestsDescription": "Autorisierung zur Anzeige der von anderen Benutzern eingereichten Medienanfragen.",
-  "components.PermissionEdit.viewwatchlists": "{mediaServerName} Watchlists anzeigen",
-  "components.PermissionEdit.viewwatchlistsDescription": "Autorisierung zur Anzeige von {mediaServerName} Watchlists anderer Benutzer.",
+  "components.PermissionEdit.viewwatchlists": "Plex Watchlist anzeigen",
+  "components.PermissionEdit.viewwatchlistsDescription": "Autorisierung zur Anzeige von Plex Watchlists anderer Benutzer.",
   "components.PersonDetails.alsoknownas": "Auch bekannt unter: {names}",
   "components.PersonDetails.appearsin": "Auftritte",
   "components.PersonDetails.ascharacter": "als {character}",
@@ -377,6 +384,7 @@
   "components.RequestModal.cancel": "Anfrage abbrechen",
   "components.RequestModal.edit": "Anfrage bearbeiten",
   "components.RequestModal.errorediting": "Beim Bearbeiten der Anfrage ist etwas schief gelaufen.",
+  "components.RequestModal.extras": "Extras",
   "components.RequestModal.numberofepisodes": "Anzahl der Folgen",
   "components.RequestModal.pending4krequest": "Ausstehende 4K Anfrage",
   "components.RequestModal.pendingapproval": "Deine Anfrage steht noch aus.",
@@ -454,7 +462,7 @@
   "components.Settings.Notifications.NotificationsPushbullet.validationAccessTokenRequired": "Du musst ein Zugangstoken angeben",
   "components.Settings.Notifications.NotificationsPushbullet.validationTypes": "Sie müssen mindestens einen Benachrichtigungstypen auswählen",
   "components.Settings.Notifications.NotificationsPushover.accessToken": "Anwendungs API-Token",
-  "components.Settings.Notifications.NotificationsPushover.accessTokenTip": "<ApplicationRegistrationLink>Registriere eine Anwendung</ApplicationRegistrationLink> , um diese mit Jellyseerr benutzen zu können",
+  "components.Settings.Notifications.NotificationsPushover.accessTokenTip": "<ApplicationRegistrationLink>Registriere eine Anwendung</ApplicationRegistrationLink> für die Benutzung mit Jellyseerr",
   "components.Settings.Notifications.NotificationsPushover.agentenabled": "Agent aktivieren",
   "components.Settings.Notifications.NotificationsPushover.pushoversettingsfailed": "Pushover-Benachrichtigungseinstellungen konnten nicht gespeichert werden.",
   "components.Settings.Notifications.NotificationsPushover.pushoversettingssaved": "Pushover-Benachrichtigungseinstellungen erfolgreich gespeichert!",
@@ -477,7 +485,7 @@
   "components.Settings.Notifications.NotificationsSlack.webhookUrl": "Webhook URL",
   "components.Settings.Notifications.NotificationsSlack.webhookUrlTip": "Erstelle eine <WebhookLink>Eingehende Webhook</WebhookLink> integration",
   "components.Settings.Notifications.NotificationsWebPush.agentenabled": "Agent aktivieren",
-  "components.Settings.Notifications.NotificationsWebPush.httpsRequirement": "Jellyseerr muss via HTTPS bereitgestellt werden, um Web-Push Benachrichtigungen empfangen zu können.",
+  "components.Settings.Notifications.NotificationsWebPush.httpsRequirement": "Um web push Benachrichtigungen zu erhalten, muss Jellyseerr über HTTPS gehen.",
   "components.Settings.Notifications.NotificationsWebPush.toastWebPushTestFailed": "Web push Test Benachrichtigung fehlgeschlagen.",
   "components.Settings.Notifications.NotificationsWebPush.toastWebPushTestSending": "Web push test Benachrichtigung wird gesendet…",
   "components.Settings.Notifications.NotificationsWebPush.toastWebPushTestSuccess": "Web push test Benachrichtigung gesendet!",
@@ -503,7 +511,7 @@
   "components.Settings.Notifications.authPass": "SMTP-Passwort",
   "components.Settings.Notifications.authUser": "SMTP-Benutzername",
   "components.Settings.Notifications.botAPI": "Bot-Autorisierungstoken",
-  "components.Settings.Notifications.botApiTip": "<CreateBotLink>Bot erstellen</CreateBotLink> für die Verwendung mit Jellyseerr",
+  "components.Settings.Notifications.botApiTip": "<CreateBotLink>Erstelle einen Bot</CreateBotLink> für die Verwendung mit Jellyseerr",
   "components.Settings.Notifications.botAvatarUrl": "Bot Avatar URL",
   "components.Settings.Notifications.botUsername": "Bot Benutzername",
   "components.Settings.Notifications.botUsernameTip": "Benutzern erlauben, einen Chat mit dem Bot zu starten und ihre eigenen Benachrichtigungen konfigurieren",
@@ -617,7 +625,7 @@
   "components.Settings.SettingsAbout.outofdate": "Veraltet",
   "components.Settings.SettingsAbout.overseerrinformation": "Über Jellyseerr",
   "components.Settings.SettingsAbout.preferredmethod": "Bevorzugt",
-  "components.Settings.SettingsAbout.runningDevelop": "Sie benutzen den Branch<code>develop</code> von Jellyseerr, welcher nur für Entwickler, bzw. \"Bleeding-Edge\" Tests empfohlen wird.",
+  "components.Settings.SettingsAbout.runningDevelop": "Sie benutzen den <code>develop</code> von Jellyseerr, der nur für diejenigen empfohlen wird, die an der Entwicklung mitwirken oder bei den neuesten Tests helfen.",
   "components.Settings.SettingsAbout.supportoverseerr": "Unterstütze Jellyseerr",
   "components.Settings.SettingsAbout.timezone": "Zeitzone",
   "components.Settings.SettingsAbout.totalmedia": "Medien insgesamt",
@@ -625,7 +633,7 @@
   "components.Settings.SettingsAbout.uptodate": "Auf dem neusten Stand",
   "components.Settings.SettingsAbout.version": "Version",
   "components.Settings.SettingsJobsCache.cache": "Cache",
-  "components.Settings.SettingsJobsCache.cacheDescription": "Zur Leistungsoptimierung und um unnötige Anfragen zu minimieren, speichert Jellyseerr Anfragen zwischen.",
+  "components.Settings.SettingsJobsCache.cacheDescription": "Jellyseerr speichert Anfragen an externe API Endpunkte zwischen, um die Leistung zu optimieren und unnötige API Aufrufe zu minimieren.",
   "components.Settings.SettingsJobsCache.cacheflushed": "{cachename} Cache geleert.",
   "components.Settings.SettingsJobsCache.cachehits": "Treffer",
   "components.Settings.SettingsJobsCache.cachekeys": "Schlüssel insgesamt",
@@ -645,7 +653,7 @@
   "components.Settings.SettingsJobsCache.flushcache": "Cache leeren",
   "components.Settings.SettingsJobsCache.image-cache-cleanup": "Bild-Cache-Bereinigung",
   "components.Settings.SettingsJobsCache.imagecache": "Bild-Cache",
-  "components.Settings.SettingsJobsCache.imagecacheDescription": "Wenn diese Einstellung aktiviert ist, wird Jellyseerr Bilder aus vorkonfigurierten externen Quellen im Proxy-Cache zwischenspeichern. Bilder im Zwischenspeicher werden in deinem Konfigurationsordner gespeichert: <code>{appDataPath}/cache/images</code>.",
+  "components.Settings.SettingsJobsCache.imagecacheDescription": "Wenn diese Funktion in den Einstellungen aktiviert ist, wird Jellyseerr Bilder aus vorkonfigurierten externen Quellen im Proxy-Cache zwischenspeichern. Bilder im Zwischenspeicher werden in deinem Konfigurationsordner gespeichert. Du findest die Dateien unter <code>{appDataPath}/cache/images</code>.",
   "components.Settings.SettingsJobsCache.imagecachecount": "Bilder im Cache",
   "components.Settings.SettingsJobsCache.imagecachesize": "Gesamtgröße des Caches",
   "components.Settings.SettingsJobsCache.jellyfin-recently-added-scan": "Scan der zuletzt hinzugefügten Jellyfin Medien",
@@ -655,7 +663,7 @@
   "components.Settings.SettingsJobsCache.jobcancelled": "{jobname} abgebrochen.",
   "components.Settings.SettingsJobsCache.jobname": "Aufgabenname",
   "components.Settings.SettingsJobsCache.jobs": "Aufgaben",
-  "components.Settings.SettingsJobsCache.jobsDescription": "Jellyseerr führt bestimmte Wartungsaufgaben als regulär geplante Aufgaben durch. Diese können allerdings auch manuell ausgeführt werden, ohne dabei den regulären Zeitplan abzuändern.",
+  "components.Settings.SettingsJobsCache.jobsDescription": "Jellyseerr führt bestimmte Wartungsaufgaben als regulär geplante Aufgaben durch, aber sie können auch manuell ausgeführt werden. Manuelles Ausführen einer Aufgabe ändert ihren Zeitplan nicht.",
   "components.Settings.SettingsJobsCache.jobsandcache": "Aufgaben und Cache",
   "components.Settings.SettingsJobsCache.jobstarted": "{jobname} gestartet.",
   "components.Settings.SettingsJobsCache.jobtype": "Art",
@@ -756,8 +764,16 @@
   "components.Settings.address": "Adresse",
   "components.Settings.addsonarr": "Sonarr-Server hinzufügen",
   "components.Settings.advancedTooltip": "Bei falscher Konfiguration dieser Einstellung, kann dies zu einer Funktionsstörung führen",
+  "components.Settings.apikey": "API-Schlüssel",
+  "components.Settings.applicationTitle": "Anwendungstitel",
+  "components.Settings.applicationurl": "Anwendungs-URL",
+  "components.Settings.cacheImages": "Bild-Caching aktivieren",
+  "components.Settings.cacheImagesTip": "Alle Bilder Optimieren und lokal speichern (verbraucht viel Speicherplatz)",
   "components.Settings.cancelscan": "Durchsuchung abbrechen",
   "components.Settings.copied": "API-Schlüssel in die Zwischenablage kopiert.",
+  "components.Settings.csrfProtection": "Aktiviere CSRF Schutz",
+  "components.Settings.csrfProtectionHoverTip": "Aktiviere diese Option NICHT, es sei denn du weißt, was du tust!",
+  "components.Settings.csrfProtectionTip": "Macht den externen API Zugang schreibgeschützt (setzt HTTPS voraus und Jellyseerr muss neu gestartet werden, damit die Änderungen wirksam werden)",
   "components.Settings.currentlibrary": "Aktuelle Bibliothek: {name}",
   "components.Settings.default": "Standardmäßig",
   "components.Settings.default4k": "Standard-4K",
@@ -767,11 +783,16 @@
   "components.Settings.enablessl": "SSL aktivieren",
   "components.Settings.experimentalTooltip": "Die Aktivierung dieser Einstellung kann zu einem unerwarteten Verhalten der Anwendung führen",
   "components.Settings.externalUrl": "Externe URL",
+  "components.Settings.general": "Allgemein",
+  "components.Settings.generalsettings": "Allgemeine Einstellungen",
+  "components.Settings.generalsettingsDescription": "Konfiguriere Globale und Standard Jellyseerr-Einstellungen.",
+  "components.Settings.hideAvailable": "Verfügbare Medien ausblenden",
   "components.Settings.hostname": "Hostname oder IP-Adresse",
   "components.Settings.is4k": "4K",
   "components.Settings.librariesRemaining": "Verbleibende Bibliotheken: {count}",
+  "components.Settings.locale": "Sprache darstellen",
   "components.Settings.manualscan": "Manuelle Bibliotheksdurchsuchung",
-  "components.Settings.manualscanDescription": "Normalerweise wird dies nur einmal alle 24 Stunden ausgeführt. Jellyseerr überprüft die kürzlich hinzugefügten Plex-Server aggressiver. Falls du Plex zum ersten Mal konfigurierst, wird empfohlen, einmalig eine manuelle, komplette Bibliotheksdurchsuchung anzustoßen!",
+  "components.Settings.manualscanDescription": "Normalerweise wird dies nur einmal alle 24 Stunden ausgeführt. Jellyseerr überprüft die kürzlich hinzugefügten Plex-Server aggressiver. Falls du Plex zum ersten Mal konfigurierst, wird eine einmalige vollständige manuelle Bibliotheksdurchsuchung empfohlen!",
   "components.Settings.mediaTypeMovie": "Film",
   "components.Settings.mediaTypeSeries": "Serie",
   "components.Settings.menuAbout": "Über",
@@ -789,14 +810,19 @@
   "components.Settings.notifications": "Benachrichtigungen",
   "components.Settings.notificationsettings": "Benachrichtigungseinstellungen",
   "components.Settings.notrunning": "Nicht aktiv",
+  "components.Settings.originallanguage": "Sprache Entdecken",
+  "components.Settings.originallanguageTip": "Filtere Inhalte nach Originalsprache",
+  "components.Settings.partialRequestsEnabled": "Teilserienanfragen erlauben",
   "components.Settings.plex": "Plex",
   "components.Settings.plexlibraries": "Plex-Bibliotheken",
-  "components.Settings.plexlibrariesDescription": "Die Bibliotheken, welche Jellyseerr nach Titeln durchsucht. Richte deine Plex Verbindungseinstellungen ein und speichere sie. Sollten keine aufgelistet sein, klicke auf den Button weiter unten.",
+  "components.Settings.plexlibrariesDescription": "Die Bibliotheken, welche Jellyseerr nach Titeln durchsucht. Richte deine Plex-Verbindungseinstellungen ein und speichere sie, klicke auf die Schaltfläche unten, wenn keine aufgeführt sind.",
   "components.Settings.plexsettings": "Plex-Einstellungen",
-  "components.Settings.plexsettingsDescription": "Konfiguriere die Einstellungen deines Plex Servers. Jellyseerr durchsucht deine Plex Bibliotheken zur Feststellung der verfügbaren Inhalte.",
+  "components.Settings.plexsettingsDescription": "Konfiguriere die Einstellungen für deinen Plex-Server. Jellyseerr durchsucht deine Plex-Bibliotheken, um festzustellen welche Inhalte verfügbar sind.",
   "components.Settings.port": "Port",
   "components.Settings.radarrsettings": "Radarr-Einstellungen",
-  "components.Settings.restartrequiredTooltip": "Jellyseerr muss neu gestartet werden, damit Änderungen angewendet werden können",
+  "components.Settings.region": "Region Entdecken",
+  "components.Settings.regionTip": "Filtere Inhalte nach regionaler Verfügbarkeit",
+  "components.Settings.restartrequiredTooltip": "Jellyseerr muss neu gestartet werden, damit Änderungen an dieser Einstellung wirksam werden",
   "components.Settings.scan": "Bibliotheken synchronisieren",
   "components.Settings.scanning": "Synchronisieren…",
   "components.Settings.serverLocal": "lokal",
@@ -814,17 +840,26 @@
   "components.Settings.startscan": "Durchsuchung starten",
   "components.Settings.tautulliApiKey": "API-Schlüssel",
   "components.Settings.tautulliSettings": "Tautulli Einstellungen",
-  "components.Settings.tautulliSettingsDescription": "Optionale Einstellungen für den Tautulli-Server konfigurieren. Jellyseerr holt die Überwachungsdaten für Ihre Plex-Medien von Tautulli.",
+  "components.Settings.tautulliSettingsDescription": "Optional die Einstellungen für den Tautulli-Server konfigurieren. Jellyseerr holt die Überwachungsdaten für Ihre Plex-Medien von Tautulli.",
+  "components.Settings.toastApiKeyFailure": "Bei der Generierung eines neuen API-Schlüssels ist etwas schief gelaufen.",
+  "components.Settings.toastApiKeySuccess": "Neuer API-Schlüssel erfolgreich generiert!",
   "components.Settings.toastPlexConnecting": "Versuche mit Plex zu verbinden …",
   "components.Settings.toastPlexConnectingFailure": "Verbindung zu Plex fehlgeschlagen.",
   "components.Settings.toastPlexConnectingSuccess": "Plex-Verbindung erfolgreich hergestellt!",
   "components.Settings.toastPlexRefresh": "Abrufen der Serverliste von Plex …",
   "components.Settings.toastPlexRefreshFailure": "Fehler beim Abrufen der Plex-Serverliste.",
   "components.Settings.toastPlexRefreshSuccess": "Plex-Serverliste erfolgreich abgerufen!",
+  "components.Settings.toastSettingsFailure": "Beim Speichern der Einstellungen ist etwas schief gelaufen.",
+  "components.Settings.toastSettingsSuccess": "Einstellungen erfolgreich gespeichert!",
   "components.Settings.toastTautulliSettingsFailure": "Beim Speichern der Tautulli-Einstellungen ist etwas schief gegangen.",
   "components.Settings.toastTautulliSettingsSuccess": "Tautulli-Einstellungen erfolgreich gespeichert!",
+  "components.Settings.trustProxy": "Proxy-Unterstützung aktivieren",
+  "components.Settings.trustProxyTip": "Erlaubt es Jellyseerr Client IP Adressen hinter einem Proxy korrekt zu registrieren (Jellyseerr muss neu gestartet werden, damit die Änderungen wirksam werden)",
   "components.Settings.urlBase": "URL-Basis",
   "components.Settings.validationApiKey": "Die Angabe eines API-Schlüssels ist erforderlich",
+  "components.Settings.validationApplicationTitle": "Du musst einen Anwendungstitel angeben",
+  "components.Settings.validationApplicationUrl": "Du musst eine gültige URL angeben",
+  "components.Settings.validationApplicationUrlTrailingSlash": "Die URL darf nicht mit einem abschließenden Schrägstrich enden",
   "components.Settings.validationHostnameRequired": "Ein gültiger Hostnamen oder eine IP-Adresse muss angeben werden",
   "components.Settings.validationPortRequired": "Du musst einen gültigen Port angeben",
   "components.Settings.validationUrl": "Die Angabe einer gültigen URL ist erforderlich",
@@ -835,19 +870,26 @@
   "components.Settings.webAppUrlTip": "Leite Benutzer optional zur Web-App auf deinen Server statt zur „gehosteten“ Web-App weiter",
   "components.Settings.webhook": "Webhook",
   "components.Settings.webpush": "Web Push",
+  "components.Setup.configureplex": "Plex konfigurieren",
   "components.Setup.configureservices": "Dienste konfigurieren",
   "components.Setup.continue": "Fortfahren",
   "components.Setup.finish": "Konfiguration beenden",
   "components.Setup.finishing": "Fertigstellung …",
+  "components.Setup.loginwithplex": "Mit Plex anmelden",
+  "components.Setup.scanbackground": "Das Scannen läuft im Hintergrund. Du kannst in der Zwischenzeit das Setup fortsetzen.",
   "components.Setup.setup": "Einrichtung",
-  "components.Setup.signinMessage": "Melde dich zunächst an",
+  "components.Setup.signinMessage": "Melde dich zunächst mit deinem Plex-Konto an",
+  "components.Setup.tip": "Tipp",
   "components.Setup.welcome": "Willkommen bei Jellyseerr",
   "components.StatusBadge.managemedia": "{mediaType} verwalten",
   "components.StatusBadge.openinarr": "In {arr} öffnen",
-  "components.StatusBadge.playonplex": "Auf {mediaServerName} abspielen",
+  "components.StatusBadge.playonplex": "Auf Plex abspielen",
   "components.StatusBadge.seasonepisodenumber": "S{seasonNumber}F{episodeNumber}",
   "components.StatusBadge.status": "{status}",
   "components.StatusBadge.status4k": "4K {status}",
+  "components.StatusChacker.newversionDescription": "Jellyseerr wurde aktualisiert! Bitte klicke auf die Schaltfläche unten, um die Seite neu zu laden.",
+  "components.StatusChacker.newversionavailable": "Anwendungsaktualisierung",
+  "components.StatusChacker.reloadJellyseerr": "Jellyseerr neu laden",
   "components.StatusChecker.appUpdated": "{applicationTitle} aktualisiert",
   "components.StatusChecker.appUpdatedDescription": "Klicke bitte auf die Schaltfläche unten, um die Anwendung neu zu laden.",
   "components.StatusChecker.reloadApp": "{applicationTitle} neu laden",
@@ -874,6 +916,8 @@
   "components.TvDetails.originaltitle": "Originaltitel",
   "components.TvDetails.overview": "Übersicht",
   "components.TvDetails.overviewunavailable": "Übersicht nicht verfügbar.",
+  "components.TvDetails.play4konplex": "In 4K auf Plex abspielen",
+  "components.TvDetails.playonplex": "Auf Plex abspielen",
   "components.TvDetails.productioncountries": "Produktions {countryCount, plural, one {Land} other {Länder}}",
   "components.TvDetails.recommendations": "Empfehlungen",
   "components.TvDetails.reportissue": "Problem melden",
@@ -900,6 +944,7 @@
   "components.UserList.creating": "Erstelle…",
   "components.UserList.deleteconfirm": "Möchtest du diesen Benutzer wirklich löschen? Alle seine Anfragendaten werden dauerhaft entfernt.",
   "components.UserList.deleteuser": "Benutzer löschen",
+  "components.UserList.displayName": "Anzeigename",
   "components.UserList.edituser": "Benutzerberechtigungen Bearbeiten",
   "components.UserList.email": "E-Mail-Adresse",
   "components.UserList.importedfromplex": "<strong>{userCount}</strong> {userCount, Plural, ein {Benutzer} other {Benutzer}} Plex-Benutzer erfolgreich importiert!",
@@ -925,7 +970,7 @@
   "i18n.experimental": "Experimentell",
   "components.UserList.userssaved": "Benutzerberechtigungen erfolgreich gespeichert!",
   "i18n.advanced": "Erweitert",
-  "components.UserList.validationEmail": "E-Mail-Adresse benötigt",
+  "components.UserList.validationEmail": "Du musst eine gültige E-Mail-Adresse angeben",
   "components.UserList.users": "Benutzer",
   "components.UserProfile.recentrequests": "Kürzliche Anfragen",
   "components.UserProfile.UserSettings.menuPermissions": "Berechtigungen",
@@ -1084,7 +1129,7 @@
   "components.Settings.SettingsMain.validationApplicationUrl": "Du musst eine valide URL spezifizieren",
   "components.Settings.SettingsMain.validationApplicationUrlTrailingSlash": "Die URL darf nicht mit einem Slash \"/\" enden",
   "components.Discover.DiscoverMovieKeyword.keywordMovies": "{keywordTitle} Filme",
-  "components.Discover.PlexWatchlistSlider.plexwatchlist": "Deine Watchlist",
+  "components.Discover.PlexWatchlistSlider.plexwatchlist": "Deine Plex Watchlist",
   "components.Discover.tmdbsearch": "TMDB Suche",
   "components.Settings.SettingsMain.toastApiKeyFailure": "Etwas ist schiefgelaufen während der Generierung eines neuen API Schlüssels.",
   "components.Settings.SettingsMain.toastSettingsSuccess": "Einstellungen erfolgreich gespeichert!",
@@ -1097,13 +1142,15 @@
   "components.Discover.tmdbstudio": "TMDB Studio",
   "components.Settings.SettingsMain.applicationurl": "Anwendung URL",
   "components.Settings.SettingsMain.cacheImages": "Bild-Caching aktivieren",
-  "components.Settings.SettingsMain.generalsettingsDescription": "Globale- und Standardeinstellungen für Jellyseerr konfigurieren.",
+  "components.Settings.SettingsMain.generalsettingsDescription": "Konfiguration der globalen und Standardeinstellungen für Jellyseerr.",
   "components.Settings.SettingsMain.originallanguage": "\"Entdecken\" Sprache",
   "components.Settings.SettingsMain.partialRequestsEnabled": "Teilweise Serienanfragen zulassen",
+  "components.Settings.SettingsMain.region": "\"Entdecken\" Region",
   "components.Settings.SettingsMain.toastSettingsFailure": "Beim Speichern der Einstellungen ist ein Fehler aufgetreten.",
+  "components.Settings.SettingsMain.regionTip": "Inhalte nach regionaler Verfügbarkeit filtern",
   "components.Discover.tmdbnetwork": "TMDB Sender",
   "components.Settings.SettingsMain.originallanguageTip": "Inhalt nach Originalsprache filtern",
-  "components.Settings.SettingsMain.trustProxyTip": "Erlaube Jellyseerr die Client-IP-Adressen hinter einem Proxy korrekt zu erfassen",
+  "components.Settings.SettingsMain.trustProxyTip": "Erlaube Jellyseerr, Client-IP-Adressen hinter einem Proxy korrekt zu registrieren",
   "components.Discover.CreateSlider.addSlider": "Slider hinzufügen",
   "components.Discover.CreateSlider.addcustomslider": "Benutzerdefinierten Slider erstellen",
   "components.Discover.CreateSlider.addfail": "Neuer Slider konnte nicht erstellt werden.",
@@ -1200,6 +1247,7 @@
   "components.Layout.UserWarnings.emailInvalid": "E-Mail ist nicht valide.",
   "components.Login.credentialerror": "Der Benutzername oder das Passwort ist falsch.",
   "components.Login.emailtooltip": "Die Adresse muss nicht mit Ihrer {mediaServerName}-Instanz verbunden sein.",
+  "components.Login.host": "{mediaServerName} URL",
   "components.Login.initialsignin": "Verbinde",
   "components.Login.initialsigningin": "Verbinden…",
   "components.Login.save": "hinzufügen",
@@ -1231,8 +1279,8 @@
   "components.Settings.syncing": "Synchronisierung",
   "components.Settings.timeout": "Zeitüberschreitung",
   "components.Setup.signin": "Anmelden",
-  "components.Setup.signinWithJellyfin": "Gib deine Jellyfin Daten ein",
-  "components.Setup.signinWithPlex": "Gib deine Plex Daten ein",
+  "components.Setup.signinWithJellyfin": "Verwende dein {mediaServerName} Konto",
+  "components.Setup.signinWithPlex": "Verwende dein Plex-Konto",
   "components.TitleCard.watchlistDeleted": "<strong>{title}</strong> Erfolgreich von der Beobachtungsliste entfernt!",
   "components.TitleCard.watchlistError": "Etwas ist schief gelaufen, versuche es noch einmal.",
   "components.TitleCard.watchlistSuccess": "<strong>{title}</strong> erfolgreich zur Beobachtungsliste hinzugefügt!",
@@ -1255,7 +1303,7 @@
   "i18n.deleting": "Löschen…",
   "i18n.failed": "Fehlgeschlagen",
   "i18n.movies": "Filme",
-  "i18n.open": "Offen",
+  "i18n.open": "Öffnen",
   "i18n.pending": "Ausstehend",
   "i18n.processing": "Verarbeitung",
   "i18n.request": "Anfrage",
@@ -1268,7 +1316,8 @@
   "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Gerätestandard",
   "components.Settings.RadarrModal.tagRequests": "Tag-Anfragen",
   "components.Settings.SettingsAbout.supportjellyseerr": "Jellyseerr unterstützen",
-  "components.Settings.jellyfinSettingsDescription": "Konfiguriere optional die internen und externen Endpunkte für deinen {mediaServerName} Server. In den meisten Fällen ist die externe URL eine andere als die interne URL. Für die Anmeldung bei {mediaServerName} kann auch eine benutzerdefinierte URL zum Zurücksetzen des Passworts festgelegt werden, falls du auf eine andere Seite zum Zurücksetzen des Passworts umleiten möchtest. Du kannst auch selber einen API Key für Jellyfin anlegen, was bisher automatisch geschah.",
+  "components.Settings.internalUrl": "Interne URL",
+  "components.Settings.jellyfinSettingsDescription": "Konfiguriere optional die internen und externen Endpunkte für deinen {mediaServerName} Server. In den meisten Fällen ist die externe URL eine andere als die interne URL. Für die Anmeldung bei {mediaServerName} kann auch eine benutzerdefinierte URL zum Zurücksetzen des Passworts festgelegt werden, falls du auf eine andere Seite zum Zurücksetzen des Passworts umleiten möchtest.",
   "components.Settings.jellyfinSettingsFailure": "Beim Speichern der Einstellungen von {mediaServerName} ist ein Fehler aufgetreten.",
   "components.Settings.manualscanDescriptionJellyfin": "Normalerweise wird dieser Vorgang nur einmal alle 24 Stunden durchgeführt. Jellyseerr wird die kürzlich hinzugefügten Bibliotheken deines {mediaServerName} Servers aggressiver überprüfen. Wenn dies das erste Mal ist, dass du Jellyseerr konfigurierst, wird ein einmaliger vollständiger manueller Bibliotheks-Scan empfohlen!",
   "components.Settings.save": "Änderungen speichern",
@@ -1296,55 +1345,5 @@
   "components.UserProfile.UserSettings.UserNotificationSettings.webpushsettingsfailed": "Die Einstellungen für Web-Push-Benachrichtigungen konnten nicht gespeichert werden.",
   "components.UserProfile.localWatchlist": "Beobachtungsliste von {username}",
   "i18n.approved": "Genehmigt",
-  "pages.returnHome": "Zurück nach Hause",
-  "components.Discover.FilterSlideover.status": "Status",
-  "components.UserList.username": "Benutzername",
-  "components.Login.adminerror": "Du musst einen Adminaccount für den Zugang benutzen.",
-  "components.MovieDetails.watchlistError": "Da ist was schief gelaufen - bitte versuche es noch einmal.",
-  "components.RequestList.RequestItem.profileName": "Profil",
-  "components.Selector.searchStatus": "Status auswählen...",
-  "components.Settings.invalidurlerror": "Es kann keine Verbindung zu {mediaServerName} hergestellt werden.",
-  "components.Settings.jellyfinSyncFailedGenericError": "Es trat ein unbekannter Fehler während der Bibliothekssynchronisation auf",
-  "components.UserList.validationUsername": "Du musst einen Benutzernamen angeben",
-  "components.UserProfile.UserSettings.UserGeneralSettings.validationemailrequired": "Email benötigt",
-  "components.Login.invalidurlerror": "Es kann keine Verbindung zu {mediaServerName} hergestellt werden.",
-  "components.MovieDetails.removefromwatchlist": "Von der Watchlist entfernen",
-  "components.TvDetails.watchlistDeleted": "<strong>{title}</strong> erfolgreich aus der Watchlist entfernt!",
-  "components.Login.back": "Zurück",
-  "components.Login.servertype": "Servertyp",
-  "components.Login.validationHostnameRequired": "Du musst eine gültige IP-Adresse oder einen gültigen Hostnamen angeben",
-  "components.Login.validationPortRequired": "Du musst einen gültigen Port angeben",
-  "components.Login.validationUrlBaseLeadingSlash": "Der URL muss ein Slash vorangestellt sein",
-  "components.Login.validationUrlBaseTrailingSlash": "Die URL-Basis darf nicht auf einem Slash enden",
-  "components.Login.validationUrlTrailingSlash": "Die URL darf nicht auf einem Slash enden",
-  "components.Login.validationservertyperequired": "Bitte wähle einen Servertypen",
-  "components.MovieDetails.addtowatchlist": "Zur Watchlist hinzufügen",
-  "components.MovieDetails.watchlistDeleted": "<strong>{title}</strong> erfolgreich aus der Watchlist entfernt!",
-  "components.MovieDetails.watchlistSuccess": "<strong>{title}</strong> erfolgreich zur Watchlist hinzugefügt!",
-  "components.Selector.canceled": "Abgebrochen",
-  "components.Selector.ended": "Beendet",
-  "components.Selector.inProduction": "In Produktion",
-  "components.Selector.pilot": "Pilotfolge",
-  "components.Selector.planned": "Geplant",
-  "components.Selector.returningSeries": "Wiederkehrende Serie",
-  "components.Setup.back": "Zurückgehen",
-  "components.Setup.configemby": "Emby konfigurieren",
-  "components.Setup.configjellyfin": "Jellyfin konfigurieren",
-  "components.Setup.configplex": "Plex konfigurieren",
-  "components.Setup.servertype": "Servertyp auswählen",
-  "components.Setup.signinWithEmby": "Emby-Daten eintragen",
-  "components.Setup.subtitle": "Leg los, indem du einen Medienserver auswählst",
-  "components.StatusBadge.seasonnumber": "S{seasonNumber}",
-  "components.TvDetails.addtowatchlist": "Zur Watchlist hinzufügen",
-  "components.TvDetails.removefromwatchlist": "Von der Watchlist entfernen",
-  "components.TvDetails.watchlistError": "Da lief etwas falsch, versuch es noch einmal.",
-  "components.TvDetails.watchlistSuccess": "<strong>{title}</strong> erfolgreich zur Watchlist hinzugefügt!",
-  "components.UserProfile.UserSettings.UserGeneralSettings.validationemailformat": "Gültige email benötigt",
-  "components.Login.hostname": "{mediaServerName} URL",
-  "components.Login.port": "Port",
-  "components.Login.urlBase": "URL-Basis",
-  "components.Login.enablessl": "Benutze SSL",
-  "components.Settings.jellyfinForgotPasswordUrl": "Passwort vergessen URL",
-  "components.Settings.jellyfinSyncFailedAutomaticGroupedFolders": "Eine benutzerdefinierte Authentifizierung mit automatischer Bibliotheksbündelung wird nicht unterstützt",
-  "components.Settings.jellyfinSyncFailedNoLibrariesFound": "Es wurden keine Bibliotheken gefunden"
+  "pages.returnHome": "Zurück nach Hause"
 }

src/i18n/locale/el.json

@@ -1,5 +1,7 @@
 {
   "components.PermissionEdit.users": "Διαχείριση Χρηστών",
+  "components.PermissionEdit.settingsDescription": "Εκχώρηση άδειας για τροποποίηση των ρυθμίσεων Jellyseerr. Ένας χρήστης χρειάζεται να έχει αυτό το δικαίωμα για να το εκχωρήσει σε άλλους.",
+  "components.PermissionEdit.settings": "Διαχείριση Ρυθμίσεων",
   "components.PermissionEdit.requestTvDescription": "Χορήγηση άδειας για υποβολής αιτημάτων σειρών που δεν είναι 4K.",
   "components.PermissionEdit.requestTv": "Αιτήματα για Σειρές",
   "components.PermissionEdit.requestMoviesDescription": "Χορήγηση άδειας για υποβολή αιτημάτων ταινιών που δεν είναι 4K.",
@@ -50,6 +52,8 @@
   "components.MovieDetails.revenue": "Έσοδα",
   "components.MovieDetails.releasedate": "{releaseCount, plural, one {Release Date} other {Release Dates}}",
   "components.MovieDetails.recommendations": "Προτάσεις",
+  "components.MovieDetails.playonplex": "Αναπαραγωγή στο Plex",
+  "components.MovieDetails.play4konplex": "Αναπαραγωγή σε 4K στο Plex",
   "components.MovieDetails.overviewunavailable": "Επισκόπηση μη διαθέσιμη.",
   "components.MovieDetails.overview": "Επισκόπηση",
   "components.MovieDetails.originaltitle": "Αρχικός Τίτλος",
@@ -74,6 +78,8 @@
   "components.Login.email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
   "components.Layout.VersionStatus.streamstable": "Overseer Σταθερή Έκδοση",
   "components.Discover.popularmovies": "Δημοφιλείς Ταινίες",
+  "components.Discover.discovertv": "Δημοφιλείς Σειρές",
+  "components.Discover.discovermovies": "Δημοφιλείς Ταινίες",
   "components.Discover.discover": "Ανακάλυψε",
   "components.Discover.TvGenreSlider.tvgenres": "Είδη Σειρών",
   "components.Discover.TvGenreList.seriesgenres": "Είδη Σειρών",
@@ -613,6 +619,8 @@
   "components.TvDetails.showtype": "Τύπος σειράς",
   "components.TvDetails.seasons": "{seasonCount, plural, one {# Σεζόν} other {# Σεζόν}}",
   "components.TvDetails.recommendations": "Προτάσεις",
+  "components.TvDetails.playonplex": "Αναπαραγωγή στο Plex",
+  "components.TvDetails.play4konplex": "Αναπαραγωγή σε 4K στο Plex",
   "components.TvDetails.overviewunavailable": "Επισκόπηση μη διαθέσιμη.",
   "components.TvDetails.overview": "Επισκόπηση",
   "components.TvDetails.originaltitle": "Αρχικός τίτλος",
@@ -626,25 +634,41 @@
   "components.TvDetails.anime": "Anime",
   "components.TvDetails.TvCrew.fullseriescrew": "Όλο το Πλήρωμα της Σειράς",
   "components.TvDetails.TvCast.fullseriescast": "Όλοι οι Ηθοποιοί της Σειράς",
+  "components.StatusChacker.reloadOverseerr": "Επαναφόρτωση",
+  "components.StatusChacker.newversionavailable": "Ενημέρωση εφαρμογής",
+  "components.StatusChacker.newversionDescription": "Το Jellyseerr έχει ενημερωθεί! Κάνε κλικ στο παρακάτω κουμπί για να φορτώσει ξανά η σελίδα.",
   "components.StatusBadge.status4k": "4K {status}",
   "components.Setup.welcome": "Καλώς ήρθες στο Jellyseerr",
+  "components.Setup.tip": "Συμβουλή",
   "components.Setup.signinMessage": "Ξεκίνα με την σύνδεση στον λογαριασμό του Plex σου",
   "components.Setup.setup": "Εγκατάσταση",
+  "components.Setup.scanbackground": "Η σάρωση θα εκτελείται στο παρασκήνιο. Εν τω μεταξύ, μπορείς να συνεχίσεις την διαδικασία εγκατάστασης.",
+  "components.Setup.loginwithplex": "Συνδέσου με το Plex",
   "components.Setup.finishing": "Ολοκληρώνει…",
   "components.Setup.finish": "Ολοκλήρωση εγκατάστασης",
   "components.Setup.continue": "Συνέχεια",
   "components.Setup.configureservices": "Διαμόρφωση υπηρεσιών",
+  "components.Setup.configureplex": "Διαμόρφωση του Plex",
   "components.Settings.webpush": "Web Push",
   "components.Settings.webhook": "Webhook",
   "components.Settings.webAppUrlTip": "Προαιρετικά κατεύθυνε τους χρήστες στην εφαρμογή ιστού στον διακομιστή σας αντί για την εφαρμογή ιστού που \"φιλοξενείται\"",
   "components.Settings.webAppUrl": "<WebAppLink>Web App</WebAppLink> διεύθυνση URL",
   "components.Settings.validationPortRequired": "Πρέπει να δώσεις έναν έγκυρο αριθμό θύρας",
+  "components.Settings.validationApplicationUrlTrailingSlash": "Η διεύθυνση URL δεν πρέπει να τελειώνει με κάθετο",
+  "components.Settings.validationApplicationUrl": "Πρέπει να βάλεις μια έγκυρη διεύθυνση URL",
+  "components.Settings.validationApplicationTitle": "Πρέπει να δώσεις έναν τίτλο εφαρμογής",
+  "components.Settings.trustProxyTip": "Επίτρεψε στο Jellyseerr να καταχωρίζει σωστά τις διευθύνσεις IP του πελάτη πίσω από έναν διακομιστή μεσολάβησης (το Jellyseerr πρέπει να φορτωθεί ξανά για να εφαρμοστούν οι αλλαγές)",
+  "components.Settings.trustProxy": "Ενεργοποίηση υποστήριξης διαμεσολαβητή",
+  "components.Settings.toastSettingsSuccess": "Οι ρυθμίσεις αποθηκεύτηκαν με επιτυχία!",
+  "components.Settings.toastSettingsFailure": "Κάτι πήγε στραβά κατά την αποθήκευση των ρυθμίσεων.",
   "components.Settings.toastPlexRefreshSuccess": "Η λίστα διακομιστών Plex ανακτήθηκε με επιτυχία!",
   "components.Settings.toastPlexRefreshFailure": "Απέτυχε η ανάκτηση της λίστας με τους διακομιστές Plex.",
   "components.Settings.toastPlexRefresh": "Ανάκτηση λίστας διακομιστών από το Plex…",
   "components.Settings.toastPlexConnectingSuccess": "Η σύνδεση Plex δημιουργήθηκε με επιτυχία!",
   "components.Settings.toastPlexConnectingFailure": "Απέτυχε να συνδεθεί στο Plex.",
   "components.Settings.toastPlexConnecting": "Προσπάθεια σύνδεσης στο Plex…",
+  "components.Settings.toastApiKeySuccess": "Δημιουργήθηκε νέο κλειδί API με επιτυχία!",
+  "components.Settings.toastApiKeyFailure": "Κάτι πήγε στραβά κατά τη δημιουργία νέου κλειδιού API.",
   "components.Settings.startscan": "Έναρξη σάρωσης",
   "components.Settings.ssl": "SSL",
   "components.Settings.sonarrsettings": "Ρυθμίσεις Sonarr",
@@ -660,6 +684,8 @@
   "components.Settings.serverLocal": "τοπικά",
   "components.Settings.scanning": "Συγχρονίζει…",
   "components.Settings.scan": "Συγχρονισμός των βιβλιοθήκων",
+  "components.Settings.regionTip": "Φιλτράρει το περιεχόμενο βάσει της διαθεσιμότητας του περιεχομένου",
+  "components.Settings.region": "Ανακάλυψε βάσει την περιοχή",
   "components.Settings.radarrsettings": "Ρυθμίσεις Radarr",
   "components.Settings.port": "Θύρα",
   "components.Settings.plexsettingsDescription": "Διαμόρφωσε τις ρυθμίσεις του Plex διακομιστή σου. Το Jellyseerr σαρώνει τις βιβλιοθήκες του Plex για να προσδιορίσει τη διαθεσιμότητα περιεχομένου.",
@@ -667,6 +693,9 @@
   "components.Settings.plexlibrariesDescription": "Οι βιβλιοθήκες που το Jellyseerr θα σαρώνει για τίτλους. Ρύθμισε και αποθήκευσε τις ρυθμίσεις της σύνδεσης του Plex και, στη συνέχεια, κάνε κλικ στο παρακάτω κουμπί, εάν δεν εμφανιστύν οι βιβλιοθήκες.",
   "components.Settings.plexlibraries": "Βιβλιοθήκες Plex",
   "components.Settings.plex": "Plex",
+  "components.Settings.partialRequestsEnabled": "Να επιτρέπονται τα εν μέρει αιτήματα για τις Σειρές",
+  "components.Settings.originallanguage": "Ανακάλυψη με βάση την γλώσσα",
+  "components.Settings.originallanguageTip": "Φίλτραρε το περιεχόμενο με βάση την αρχική γλώσσα",
   "components.Settings.notrunning": "Δεν τρέχει",
   "components.Settings.notificationsettings": "Ρυθμίσεις Ειδοποιήσεων",
   "components.Settings.notifications": "Ειδοποιήσεις",
@@ -686,17 +715,29 @@
   "components.Settings.mediaTypeMovie": "ταινία",
   "components.Settings.manualscanDescription": "Κανονικά, αυτό εκτελείται μόνο μία φορά κάθε 24 ώρες. Το Jellyseerr θα ελέγχει πιο επιθετικά τις προσθήκες που έγιναν πρόσφατα στον διακομιστή Plex. Εάν αυτή είναι η πρώτη φορά που ρυθμίζεις το Plex, συνιστάται μια εφάπαξ πλήρης χειροκίνητη σάρωση βιβλιοθήκης!",
   "components.Settings.manualscan": "Χειροκίνητη σάρωση βιβλιοθήκης",
+  "components.Settings.locale": "Προβολή Γλώσσας",
   "components.Settings.librariesRemaining": "Βιβλιοθήκες που απομένουν: {count}",
   "components.Settings.is4k": "4K",
   "components.Settings.hostname": "Όνομα κεντρικού υπολογιστή ή διεύθυνση IP",
+  "components.Settings.hideAvailable": "Απόκρυψη διαθέσιμων μέσων",
+  "components.Settings.generalsettings": "Γενικές Ρυθμίσεις",
+  "components.Settings.general": "Γενικές",
   "components.Settings.enablessl": "Χρήση SSL",
   "components.Settings.email": "Email",
   "components.Settings.deleteserverconfirm": "Είσαι σίγουρος ότι θες να διαγράψεις αυτόν τον διακομιστή;",
   "components.Settings.default4k": "Προεπιλεγμένο 4K",
   "components.Settings.default": "Προκαθορισμένο",
   "components.Settings.currentlibrary": "Τρέχουσα βιβλιοθήκη: {name}",
+  "components.Settings.csrfProtectionTip": "Ορισμός εξωτερικής πρόσβασης API σε μόνο για ανάγνωση (απαιτείται HTTPS και το Jellyseerr πρέπει να φορτωθεί ξανά για να εφαρμοστούν οι αλλαγές)",
+  "components.Settings.csrfProtectionHoverTip": "ΜΗΝ ενεργοποιήσεις αυτή τη ρύθμιση αν δεν καταλαβαίνεις τι κάνεις!",
+  "components.Settings.csrfProtection": "Ενεργοποίηση της προστασίας CSRF",
   "components.Settings.copied": "Αντιγράφηκε το κλειδί API στο πρόχειρο.",
   "components.Settings.cancelscan": "Ακύρωση σάρωσης",
+  "components.Settings.cacheImagesTip": "Βελτιστοποίηση και αποθήκευση όλων των εικόνων τοπικά (καταναλώνει σημαντικό χώρο στο δίσκο)",
+  "components.Settings.cacheImages": "Ενεργοποίηση προσωρινής αποθήκευσης εικόνων",
+  "components.Settings.applicationurl": "Διεύθυνση URL εφαρμογής",
+  "components.Settings.applicationTitle": "Τίτλος εφαρμογής",
+  "components.Settings.apikey": "Κλειδί API",
   "components.Settings.addsonarr": "Προσθήκη διακομιστή Sonarr",
   "components.Settings.address": "Διεύθυνση",
   "components.Settings.addradarr": "Προσθήκη διακομιστή Radarr",
@@ -755,6 +796,7 @@
   "components.Settings.SonarrModal.add": "Προσθήκη διακομιστή",
   "components.Settings.SettingsUsers.users": "Χρήστες",
   "components.Settings.SettingsUsers.userSettings": "Ρυθμίσεις χρήστη",
+  "components.Settings.generalsettingsDescription": "Διαμόρφωση των γενικών και προεπιλεγμένων ρυθμίσεων του Jellyseerr.",
   "components.Settings.SettingsUsers.userSettingsDescription": "Διαμόρφωση των γενικών και προεπιλεγμένων ρυθμίσεων του χρήστη.",
   "components.Settings.SettingsUsers.tvRequestLimitLabel": "Καθολικό όριο των αιτημάτων στις Σειρές",
   "components.Settings.SettingsUsers.toastSettingsSuccess": "Οι ρυθμίσεις του χρήστη αποθηκεύτηκαν επιτυχώς!",
@@ -765,6 +807,7 @@
   "components.Settings.Notifications.NotificationsWebhook.templatevariablehelp": "Template Variable Help",
   "components.Settings.Notifications.NotificationsLunaSea.webhookUrlTip": "Ο χρήστης σου ή η συσκευή <LunaSeaLink>ειδοποίηση webhook URL</LunaSeaLink>",
   "components.RequestModal.numberofepisodes": "# Αριθμός Επεισοδίων",
+  "components.RequestModal.extras": "Έξτρας",
   "components.MovieDetails.studio": "{studioCount, plural, one {Στούντιο} other {Στούντιο}}",
   "components.Layout.VersionStatus.commitsbehind": "{commitsBehind} {commitsBehind, plural, one {commit} other {commits}} πίσω",
   "pages.serviceunavailable": "Η υπηρεσία δεν είναι διαθέσιμη",
@@ -844,6 +887,7 @@
   "components.Settings.SettingsMain.csrfProtectionTip": "Ορισμός εξωτερικής πρόσβασης API σε read-only (απαιτεί HTTPS)",
   "components.Settings.SettingsMain.general": "Γενικά",
   "components.Settings.SettingsMain.generalsettingsDescription": "Διαμόρφωση των γενικών και προεπιλεγμένων ρυθμίσεων για το Jellyseerr.",
+  "components.Settings.SettingsMain.regionTip": "Φιλτράρετε το περιεχόμενο βάσει διαθεσιμότητας ανά περιοχή",
   "components.Settings.SettingsMain.toastSettingsFailure": "Κάτι πήγε στραβά κατά την αποθήκευση των ρυθμίσεων.",
   "components.Settings.SettingsMain.validationApplicationUrlTrailingSlash": "Το URL δε μπορεί να τελειώνει με κάθετο",
   "components.Settings.SettingsUsers.defaultPermissionsTip": "Αρχικά δικαιώματα που ορίζονται σε νέους χρήστες",
@@ -977,6 +1021,7 @@
   "components.Settings.SettingsJobsCache.plex-watchlist-sync": "Συγχρονισμός λίστας παρακολούθησης Plex",
   "components.Settings.SettingsMain.generalsettings": "Γενικές ρυθμίσεις",
   "components.Settings.SettingsMain.hideAvailable": "Απόκρυψη διαθέσιμου περιεχομένου",
+  "components.Settings.SettingsMain.region": "Περιοχή σελίδας ανακάλυψης",
   "components.Settings.restartrequiredTooltip": "Το Jellyseerr πρέπει να κάνει επανεκκίνηση ώστε να εφαρμοστεί αυτή η ρύθμιση",
   "components.Settings.tautulliSettings": "Ρυθμίσεις Tautulli",
   "components.Settings.toastTautulliSettingsSuccess": "Οι ρυθμίσεις του Tautulli αποθηκεύτηκαν επιτυχώς!",
@@ -1065,6 +1110,7 @@
   "components.Settings.validationUrl": "Πρέπει να δώσετε ένα έγκυρο URL",
   "components.StatusBadge.managemedia": "Διαχείριση {mediaType}",
   "components.StatusBadge.openinarr": "Άνοιγμα σε {arr}",
+  "components.UserList.displayName": "Εμφανιζόμενο όνομα",
   "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncseries": "Αυτόματη αίτηση σειρών",
   "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletAccessTokenTip": "Δημιουργήστε ένα token από τις <PushbulletSettingsLink>Ρυθμίσεις Λογαριασμού</PushbulletSettingsLink>",
   "components.UserProfile.UserSettings.UserNotificationSettings.pushoverApplicationTokenTip": "<ApplicationRegistrationLink>Καταχωρήστε μια εφαρμογή</ApplicationRegistrationLink> για χρήση με το {applicationTitle}",

src/i18n/locale/en.json

@@ -246,9 +246,6 @@
   "components.Login.initialsigningin": "Connecting…",
   "components.Login.invalidurlerror": "Unable to connect to {mediaServerName} server.",
   "components.Login.loginerror": "Something went wrong while trying to sign in.",
-  "components.Login.loginwithapp": "Login with {appName}",
-  "components.Login.noadminerror": "No admin user found on the server.",
-  "components.Login.orsigninwith": "Or sign in with",
   "components.Login.password": "Password",
   "components.Login.port": "Port",
   "components.Login.save": "Add",
@@ -342,7 +339,7 @@
   "components.MovieDetails.tmdbuserscore": "TMDB User Score",
   "components.MovieDetails.viewfullcrew": "View Full Crew",
   "components.MovieDetails.watchlistDeleted": "<strong>{title}</strong> Removed from watchlist successfully!",
-  "components.MovieDetails.watchlistError": "Something went wrong. Please try again.",
+  "components.MovieDetails.watchlistError": "Something went wrong try again.",
   "components.MovieDetails.watchlistSuccess": "<strong>{title}</strong> added to watchlist successfully!",
   "components.MovieDetails.watchtrailer": "Watch Trailer",
   "components.NotificationTypeSelector.adminissuecommentDescription": "Get notified when other users comment on issues.",
@@ -443,6 +440,8 @@
   "components.PersonDetails.birthdate": "Born {birthdate}",
   "components.PersonDetails.crewmember": "Crew",
   "components.PersonDetails.lifespan": "{birthdate} – {deathdate}",
+  "components.PlexLoginButton.signingin": "Signing In…",
+  "components.PlexLoginButton.signinwithplex": "Sign In",
   "components.QuotaSelector.days": "{count, plural, one {day} other {days}}",
   "components.QuotaSelector.movieRequests": "{quotaLimit} <quotaUnits>{movies} per {quotaDays} {days}</quotaUnits>",
   "components.QuotaSelector.movies": "{count, plural, one {movie} other {movies}}",
@@ -920,11 +919,7 @@
   "components.Settings.SettingsMain.csrfProtectionTip": "Set external API access to read-only (requires HTTPS)",
   "components.Settings.SettingsMain.discoverRegion": "Discover Region",
   "components.Settings.SettingsMain.discoverRegionTip": "Filter content by regional availability",
-  "components.Settings.SettingsMain.dnsServers": "Custom DNS Servers",
-  "components.Settings.SettingsMain.dnsServersTip": "Comma-separated list of custom DNS servers, e.g. \"1.1.1.1,[2606:4700:4700::1111]\"",
   "components.Settings.SettingsMain.enableSpecialEpisodes": "Allow Special Episodes Requests",
-  "components.Settings.SettingsMain.forceIpv4First": "IPv4 Resolution First",
-  "components.Settings.SettingsMain.forceIpv4FirstTip": "Force Jellyseerr to resolve IPv4 addresses first instead of IPv6",
   "components.Settings.SettingsMain.general": "General",
   "components.Settings.SettingsMain.generalsettings": "General Settings",
   "components.Settings.SettingsMain.generalsettingsDescription": "Configure global and default settings for Jellyseerr.",
@@ -954,15 +949,10 @@
   "components.Settings.SettingsMain.validationApplicationUrl": "You must provide a valid URL",
   "components.Settings.SettingsMain.validationApplicationUrlTrailingSlash": "URL must not end in a trailing slash",
   "components.Settings.SettingsMain.validationProxyPort": "You must provide a valid port",
-  "components.Settings.SettingsUsers.atLeastOneAuth": "At least one authentication method must be selected.",
   "components.Settings.SettingsUsers.defaultPermissions": "Default Permissions",
   "components.Settings.SettingsUsers.defaultPermissionsTip": "Initial permissions assigned to new users",
   "components.Settings.SettingsUsers.localLogin": "Enable Local Sign-In",
-  "components.Settings.SettingsUsers.localLoginTip": "Allow users to sign in using their email address and password",
-  "components.Settings.SettingsUsers.loginMethods": "Login Methods",
-  "components.Settings.SettingsUsers.loginMethodsTip": "Configure login methods for users.",
-  "components.Settings.SettingsUsers.mediaServerLogin": "Enable {mediaServerName} Sign-In",
-  "components.Settings.SettingsUsers.mediaServerLoginTip": "Allow users to sign in using their {mediaServerName} account",
+  "components.Settings.SettingsUsers.localLoginTip": "Allow users to sign in using their email address and password, instead of {mediaServerName} OAuth",
   "components.Settings.SettingsUsers.movieRequestLimitLabel": "Global Movie Request Limit",
   "components.Settings.SettingsUsers.newPlexLogin": "Enable New {mediaServerName} Sign-In",
   "components.Settings.SettingsUsers.newPlexLoginTip": "Allow {mediaServerName} users to sign in without first being imported",
@@ -1176,7 +1166,7 @@
   "components.TitleCard.tvdbid": "TheTVDB ID",
   "components.TitleCard.watchlistCancel": "watchlist for <strong>{title}</strong> canceled.",
   "components.TitleCard.watchlistDeleted": "<strong>{title}</strong> Removed from watchlist  successfully!",
-  "components.TitleCard.watchlistError": "Something went wrong. Please try again.",
+  "components.TitleCard.watchlistError": "Something went wrong try again.",
   "components.TitleCard.watchlistSuccess": "<strong>{title}</strong> added to watchlist  successfully!",
   "components.TvDetails.Season.noepisodes": "Episode list unavailable.",
   "components.TvDetails.Season.somethingwentwrong": "Something went wrong while retrieving season data.",
@@ -1214,7 +1204,7 @@
   "components.TvDetails.tmdbuserscore": "TMDB User Score",
   "components.TvDetails.viewfullcrew": "View Full Crew",
   "components.TvDetails.watchlistDeleted": "<strong>{title}</strong> Removed from watchlist successfully!",
-  "components.TvDetails.watchlistError": "Something went wrong. Please try again.",
+  "components.TvDetails.watchlistError": "Something went wrong try again.",
   "components.TvDetails.watchlistSuccess": "<strong>{title}</strong> added to watchlist successfully!",
   "components.TvDetails.watchtrailer": "Watch Trailer",
   "components.UserList.accounttype": "Type",
@@ -1271,6 +1261,17 @@
   "components.UserProfile.ProfileHeader.profile": "View Profile",
   "components.UserProfile.ProfileHeader.settings": "Edit Settings",
   "components.UserProfile.ProfileHeader.userid": "User ID: {userid}",
+  "components.UserProfile.UserSettings.LinkJellyfinModal.description": "Enter your {mediaServerName} credentials to link your account with {applicationName}.",
+  "components.UserProfile.UserSettings.LinkJellyfinModal.errorExists": "This account is already linked to a {applicationName} user",
+  "components.UserProfile.UserSettings.LinkJellyfinModal.errorUnauthorized": "Unable to connect to {mediaServerName} using your credentials",
+  "components.UserProfile.UserSettings.LinkJellyfinModal.errorUnknown": "An unknown error occurred",
+  "components.UserProfile.UserSettings.LinkJellyfinModal.password": "Password",
+  "components.UserProfile.UserSettings.LinkJellyfinModal.passwordRequired": "You must provide a password",
+  "components.UserProfile.UserSettings.LinkJellyfinModal.save": "Link",
+  "components.UserProfile.UserSettings.LinkJellyfinModal.saving": "Adding…",
+  "components.UserProfile.UserSettings.LinkJellyfinModal.title": "Link {mediaServerName} Account",
+  "components.UserProfile.UserSettings.LinkJellyfinModal.username": "Username",
+  "components.UserProfile.UserSettings.LinkJellyfinModal.usernameRequired": "You must provide a username",
   "components.UserProfile.UserSettings.UserGeneralSettings.accounttype": "Account Type",
   "components.UserProfile.UserSettings.UserGeneralSettings.admin": "Admin",
   "components.UserProfile.UserSettings.UserGeneralSettings.applanguage": "Display Language",
@@ -1311,6 +1312,14 @@
   "components.UserProfile.UserSettings.UserGeneralSettings.validationDiscordId": "You must provide a valid Discord user ID",
   "components.UserProfile.UserSettings.UserGeneralSettings.validationemailformat": "Valid email required",
   "components.UserProfile.UserSettings.UserGeneralSettings.validationemailrequired": "Email required",
+  "components.UserProfile.UserSettings.UserLinkedAccountsSettings.deleteFailed": "Unable to delete linked account.",
+  "components.UserProfile.UserSettings.UserLinkedAccountsSettings.errorUnknown": "An unknown error occurred",
+  "components.UserProfile.UserSettings.UserLinkedAccountsSettings.linkedAccounts": "Linked Accounts",
+  "components.UserProfile.UserSettings.UserLinkedAccountsSettings.linkedAccountsHint": "These external accounts are linked to your {applicationName} account.",
+  "components.UserProfile.UserSettings.UserLinkedAccountsSettings.noLinkedAccounts": "You do not have any external accounts linked to your account.",
+  "components.UserProfile.UserSettings.UserLinkedAccountsSettings.noPermissionDescription": "You do not have permission to modify this user's linked accounts.",
+  "components.UserProfile.UserSettings.UserLinkedAccountsSettings.plexErrorExists": "This account is already linked to a Plex user",
+  "components.UserProfile.UserSettings.UserLinkedAccountsSettings.plexErrorUnauthorized": "Unable to connect to Plex using your credentials",
   "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Device Default",
   "components.UserProfile.UserSettings.UserNotificationSettings.discordId": "User ID",
   "components.UserProfile.UserSettings.UserNotificationSettings.discordIdTip": "The <FindDiscordIdLink>multi-digit ID number</FindDiscordIdLink> associated with your user account",
@@ -1373,6 +1382,7 @@
   "components.UserProfile.UserSettings.UserPermissions.unauthorizedDescription": "You cannot modify your own permissions.",
   "components.UserProfile.UserSettings.menuChangePass": "Password",
   "components.UserProfile.UserSettings.menuGeneralSettings": "General",
+  "components.UserProfile.UserSettings.menuLinkedAccounts": "Linked Accounts",
   "components.UserProfile.UserSettings.menuNotifications": "Notifications",
   "components.UserProfile.UserSettings.menuPermissions": "Permissions",
   "components.UserProfile.UserSettings.unauthorizedDescription": "You do not have permission to modify this user's settings.",
@@ -1398,7 +1408,7 @@
   "i18n.back": "Back",
   "i18n.blacklist": "Blacklist",
   "i18n.blacklistDuplicateError": "<strong>{title}</strong> has already been blacklisted.",
-  "i18n.blacklistError": "Something went wrong. Please try again.",
+  "i18n.blacklistError": "Something went wrong try again.",
   "i18n.blacklistSuccess": "<strong>{title}</strong> was successfully blacklisted.",
   "i18n.blacklisted": "Blacklisted",
   "i18n.cancel": "Cancel",

src/i18n/locale/es.json

@@ -70,6 +70,7 @@
   "components.RequestModal.requestCancel": "Solicitud para <strong>{title}</strong> cancelada.",
   "components.RequestModal.pendingrequest": "Solicitud pendiente",
   "components.RequestModal.numberofepisodes": "# de Episodios",
+  "components.RequestModal.extras": "Extras",
   "components.RequestModal.cancel": "Cancelar Petición",
   "components.RequestList.requests": "Solicitudes",
   "components.RequestList.RequestItem.seasons": "{seasonCount, plural, one {Temporada} other {Temporadas}}",
@@ -143,9 +144,11 @@
   "components.TvDetails.TvCast.fullseriescast": "Reparto completo de la serie",
   "components.Setup.welcome": "Bienvenido a Jellyseerr",
   "components.Setup.signinMessage": "Comience iniciando sesión con su cuenta de Plex",
+  "components.Setup.loginwithplex": "Iniciar sesión con Plex",
   "components.Setup.finishing": "Finalizando…",
   "components.Setup.finish": "Finalizar configuración",
   "components.Setup.continue": "Continuar",
+  "components.Setup.configureplex": "Configurar Plex",
   "components.Setup.configureservices": "Configurar servicios",
   "components.Settings.validationPortRequired": "Debes proporcionar un número de puerto válido",
   "components.Settings.validationHostnameRequired": "Debes proporcionar un nombre de host o dirección IP válido",
@@ -176,6 +179,7 @@
   "components.Settings.currentlibrary": "Biblioteca actual: {name}",
   "components.Settings.copied": "Clave API copiada en el portapapeles.",
   "components.Settings.cancelscan": "Cancelar Escaneo",
+  "components.Setup.tip": "Consejo",
   "i18n.deleting": "Eliminando…",
   "components.UserList.userdeleteerror": "Algo salió mal al eliminar al usuario.",
   "components.UserList.userdeleted": "¡Usuario eliminado con éxito!",
@@ -378,6 +382,8 @@
   "components.PermissionEdit.adminDescription": "Acceso completo de administrador. Ignora otras comprobaciones de permisos.",
   "components.NotificationTypeSelector.mediaAutoApprovedDescription": "Envía notificaciones cuando los usuarios solicitan nuevos contenidos que se aprueban automáticamente.",
   "components.NotificationTypeSelector.mediaAutoApproved": "Petición Aprobada Automáticamente",
+  "components.MovieDetails.playonplex": "Ver en Plex",
+  "components.MovieDetails.play4konplex": "Ver en Plex en 4K",
   "components.MovieDetails.markavailable": "Marcar como Disponible",
   "components.MovieDetails.mark4kavailable": "Marcar como Disponible en 4K",
   "components.Login.forgotpassword": "¿Contraseña olvidada?",
@@ -480,10 +486,13 @@
   "components.UserList.edituser": "Editar Permisos de Usuario",
   "components.UserList.bulkedit": "Edición Masiva",
   "components.UserList.accounttype": "Tipo",
+  "components.TvDetails.playonplex": "Ver en Plex",
+  "components.TvDetails.play4konplex": "Ver en Plex en 4K",
   "components.TvDetails.nextAirDate": "Próxima Emisión",
   "components.TvDetails.episodeRuntimeMinutes": "{runtime} minutos",
   "components.TvDetails.episodeRuntime": "Duración del Episodio",
   "components.Setup.setup": "Configuración",
+  "components.Setup.scanbackground": "El escaneo seguirá en segundo plano. Puedes continuar mientras el proceso de configuración.",
   "components.Settings.webhook": "Webhook",
   "components.Settings.toastPlexRefreshSuccess": "¡Recibida la lista de servidores de Plex con éxito!",
   "components.Settings.toastPlexRefreshFailure": "Fallo al obtener la lista de servidores de Plex.",
@@ -781,6 +790,7 @@
   "components.Settings.Notifications.validationTypes": "Debes seleccionar, al menos, un tipo de notificación",
   "components.Settings.SettingsUsers.localLoginTip": "Permite a los usuarios registrarse consumo email y password, en lugar de la OAuth de Plex",
   "components.Settings.webAppUrl": "Url de la <WebAppLink>Web App</WebAppLink>",
+  "components.UserList.displayName": "Nombre en Pantalla",
   "components.Settings.Notifications.encryption": "Método de Encriptación",
   "components.Settings.Notifications.encryptionDefault": "Usa STARTTLS si está disponible",
   "components.Settings.Notifications.encryptionNone": "Ninguna",
@@ -1125,6 +1135,8 @@
   "components.Settings.SettingsMain.locale": "Idioma de visualización",
   "components.Settings.SettingsMain.originallanguageTip": "Filtrar contenidos por idioma original",
   "components.Settings.SettingsMain.partialRequestsEnabled": "Permitir Solicitudes Parciales de Series",
+  "components.Settings.SettingsMain.region": "Región de Descubre",
+  "components.Settings.SettingsMain.regionTip": "Filtrar contenidos por disponibilidad regional",
   "components.Settings.SettingsMain.toastApiKeyFailure": "Algo ha ido mal al generar una nueva clave API.",
   "components.Settings.SettingsMain.toastApiKeySuccess": "¡Nueva clave API generada con éxito!",
   "components.Settings.SettingsMain.trustProxy": "Activar la compatibilidad con proxy",
@@ -1195,6 +1207,7 @@
   "components.MovieDetails.imdbuserscore": "Puntuación de los usuarios de IMDB",
   "components.Layout.UserWarnings.passwordRequired": "Se requiere una contraseña.",
   "components.Login.credentialerror": "El usuario o contraseña es incorrecto.",
+  "components.Login.host": "{mediaServerName} URL",
   "components.Login.initialsignin": "Conectar",
   "components.Login.initialsigningin": "Conectando…",
   "components.Login.emailtooltip": "No es necesario asociar la dirección con su instancia de {mediaServerName}.",
@@ -1277,6 +1290,7 @@
   "components.UserProfile.UserSettings.UserNotificationSettings.validationPushbulletAccessToken": "Debes indicar un token de acceso",
   "components.Login.signinwithjellyfin": "Utiliza tu cuenta de {mediaServerName}",
   "components.ManageSlideOver.removearr4k": "Eliminar de {arr} 4K",
+  "components.Settings.internalUrl": "URL Interna",
   "components.TvDetails.play4k": "Reproducir 4K en {mediaServerName}",
   "components.Setup.signin": "Iniciar Sesión",
   "components.Setup.signinWithJellyfin": "Utiliza tu cuenta de {mediaServerName}",

src/i18n/locale/es_MX.json

@@ -70,6 +70,7 @@
   "components.RequestModal.requestCancel": "Solicitud para <strong>{title}</strong> cancelada.",
   "components.RequestModal.pendingrequest": "Solicitud pendiente",
   "components.RequestModal.numberofepisodes": "# de Episodios",
+  "components.RequestModal.extras": "Extras",
   "components.RequestModal.cancel": "Cancelar Petición",
   "components.RequestList.requests": "Solicitudes",
   "components.RequestList.RequestItem.seasons": "{seasonCount, plural, one {Temporada} other {Temporadas}}",
@@ -143,9 +144,11 @@
   "components.TvDetails.TvCast.fullseriescast": "Reparto completo de la serie",
   "components.Setup.welcome": "Bienvenido a Jellyseerr",
   "components.Setup.signinMessage": "Comience iniciando sesión con su cuenta de Plex",
+  "components.Setup.loginwithplex": "Iniciar sesión con Plex",
   "components.Setup.finishing": "Finalizando…",
   "components.Setup.finish": "Finalizar configuración",
   "components.Setup.continue": "Continuar",
+  "components.Setup.configureplex": "Configurar Plex",
   "components.Setup.configureservices": "Configurar servicios",
   "components.Settings.validationPortRequired": "Debes proporcionar un número de puerto válido",
   "components.Settings.validationHostnameRequired": "Debes proporcionar un nombre de host o dirección IP válido",
@@ -176,6 +179,7 @@
   "components.Settings.currentlibrary": "Biblioteca actual: {name}",
   "components.Settings.copied": "Clave API copiada en el portapapeles.",
   "components.Settings.cancelscan": "Cancelar Escaneo",
+  "components.Setup.tip": "Consejo",
   "i18n.deleting": "Eliminando…",
   "components.UserList.userdeleteerror": "Algo salió mal al eliminar al usuario.",
   "components.UserList.userdeleted": "¡Usuario eliminado con éxito!",
@@ -378,6 +382,8 @@
   "components.PermissionEdit.adminDescription": "Acceso completo de administrador. Ignora otras comprobaciones de permisos.",
   "components.NotificationTypeSelector.mediaAutoApprovedDescription": "Envía notificaciones cuando los usuarios solicitan nuevos contenidos que se aprueban automáticamente.",
   "components.NotificationTypeSelector.mediaAutoApproved": "Petición Aprobada Automáticamente",
+  "components.MovieDetails.playonplex": "Ver en Plex",
+  "components.MovieDetails.play4konplex": "Ver en Plex en 4K",
   "components.MovieDetails.markavailable": "Marcar como Disponible",
   "components.MovieDetails.mark4kavailable": "Marcar como Disponible en 4K",
   "components.Login.forgotpassword": "¿Contraseña olvidada?",
@@ -480,10 +486,13 @@
   "components.UserList.edituser": "Editar Permisos de Usuario",
   "components.UserList.bulkedit": "Edición Masiva",
   "components.UserList.accounttype": "Tipo",
+  "components.TvDetails.playonplex": "Ver en Plex",
+  "components.TvDetails.play4konplex": "Ver en Plex en 4K",
   "components.TvDetails.nextAirDate": "Próxima Emisión",
   "components.TvDetails.episodeRuntimeMinutes": "{runtime} minutos",
   "components.TvDetails.episodeRuntime": "Duración del Episodio",
   "components.Setup.setup": "Configuración",
+  "components.Setup.scanbackground": "El escaneo seguirá en segundo plano. Puedes continuar mientras el proceso de configuración.",
   "components.Settings.webhook": "Webhook",
   "components.Settings.toastPlexRefreshSuccess": "¡Recibida la lista de servidores de Plex con éxito!",
   "components.Settings.toastPlexRefreshFailure": "Fallo al obtener la lista de servidores de Plex.",
@@ -781,6 +790,7 @@
   "components.Settings.Notifications.validationTypes": "Debes seleccionar, al menos, un tipo de notificación",
   "components.Settings.SettingsUsers.localLoginTip": "Permite a los usuarios registrarse consumo email y password, en lugar de la OAuth de Plex",
   "components.Settings.webAppUrl": "Url de la <WebAppLink>Web App</WebAppLink>",
+  "components.UserList.displayName": "Nombre en Pantalla",
   "components.Settings.Notifications.encryption": "Método de Encriptación",
   "components.Settings.Notifications.encryptionDefault": "Usa STARTTLS si está disponible",
   "components.Settings.Notifications.encryptionNone": "Ninguna",
@@ -1125,6 +1135,8 @@
   "components.Settings.SettingsMain.locale": "Idioma de visualización",
   "components.Settings.SettingsMain.originallanguageTip": "Filtrar contenidos por idioma original",
   "components.Settings.SettingsMain.partialRequestsEnabled": "Permitir Solicitudes Parciales de Series",
+  "components.Settings.SettingsMain.region": "Región de Descubre",
+  "components.Settings.SettingsMain.regionTip": "Filtrar contenidos por disponibilidad regional",
   "components.Settings.SettingsMain.toastApiKeyFailure": "Algo ha ido mal al generar una nueva clave API.",
   "components.Settings.SettingsMain.toastApiKeySuccess": "¡Nueva clave API generada con éxito!",
   "components.Settings.SettingsMain.trustProxy": "Activar la compatibilidad con proxy",

src/i18n/locale/eu.json

@@ -1,238 +0,0 @@
-{
-  "components.Blacklist.blacklistedby": "{date} {user} erabiltzailearengatik",
-  "components.Blacklist.blacklistsettings": "Zerrenda beltzaren ezarpenak",
-  "components.Blacklist.mediaName": "Izena",
-  "components.Blacklist.mediaTmdbId": "tmdb Id",
-  "components.Blacklist.mediaType": "Mota",
-  "components.CollectionDetails.numberofmovies": "{count} film",
-  "components.CollectionDetails.overview": "Ikuspegi orokorra",
-  "component.BlacklistBlock.blacklistdate": "Zerrenda beltzeko data",
-  "component.BlacklistBlock.blacklistedby": "Zerrenda beltzera honengatik gehituta",
-  "components.AirDateBadge.airedrelative": "{relativeTime} igorrita",
-  "components.AirDateBadge.airsrelative": "{relativeTime} igortzen",
-  "components.Discover.CreateSlider.addSlider": "Gehitu irristaria",
-  "components.Discover.CreateSlider.addfail": "Irristari berria sortzeak huts egin du.",
-  "components.Discover.DiscoverSliderEdit.remove": "Kendu",
-  "components.Discover.FilterSlideover.genres": "Generoak",
-  "components.Discover.FilterSlideover.keywords": "Gako-hitzak",
-  "components.Discover.FilterSlideover.runtime": "Iraupena",
-  "components.IssueDetails.comments": "Iruzkinak",
-  "components.IssueDetails.issuetype": "Mota",
-  "components.IssueDetails.leavecomment": "Iruzkindu",
-  "components.IssueList.IssueItem.issuestatus": "Egoera",
-  "components.IssueList.IssueItem.issuetype": "Mota",
-  "components.IssueList.IssueItem.opened": "Irekita",
-  "components.IssueList.IssueItem.unknownissuetype": "Ezezaguna",
-  "components.IssueModal.issueAudio": "Audio",
-  "components.IssueModal.issueOther": "Bestelakoa",
-  "components.IssueModal.issueVideo": "Bideoa",
-  "components.Layout.Sidebar.blacklist": "Zerrenda beltza",
-  "components.Layout.Sidebar.browsemovies": "Filmak",
-  "components.Layout.Sidebar.dashboard": "Aurkitu",
-  "components.Layout.Sidebar.issues": "Intzidentziak",
-  "components.Layout.Sidebar.requests": "Eskaerak",
-  "components.Layout.Sidebar.settings": "Ezarpenak",
-  "components.Layout.Sidebar.users": "Erabiltzaileak",
-  "components.Layout.UserDropdown.myprofile": "Profila",
-  "components.Layout.UserDropdown.requests": "Eskaerak",
-  "components.Layout.UserDropdown.settings": "Ezarpenak",
-  "components.Login.initialsigningin": "Konektatzen…",
-  "components.Login.password": "Pasahitza",
-  "components.Login.port": "Ataka",
-  "components.Login.save": "Gehitu",
-  "components.Login.saving": "Gehitzen…",
-  "components.ManageSlideOver.manageModalAdvanced": "Aurreratua",
-  "components.ManageSlideOver.manageModalMedia": "Multimedia",
-  "components.ManageSlideOver.manageModalRequests": "Eskaerak",
-  "components.ManageSlideOver.movie": "filma",
-  "components.MovieDetails.budget": "Aurrekontua",
-  "components.MovieDetails.cast": "Aktoreak",
-  "components.MovieDetails.recommendations": "Gomendioak",
-  "components.MovieDetails.revenue": "Bilduta",
-  "components.PermissionEdit.autoapprove": "Auto-onarpena",
-  "components.PermissionEdit.request": "Eskaera",
-  "components.PersonDetails.crewmember": "Taldea",
-  "components.QuotaSelector.unlimited": "Mugagabea",
-  "components.RequestList.RequestItem.profileName": "Profila",
-  "components.RequestList.RequestItem.requesteddate": "Eskatuta",
-  "components.RequestModal.AdvancedRequester.advancedoptions": "Aurreratuak",
-  "components.ResetPassword.password": "Pasahitza",
-  "components.Selector.canceled": "Utzita",
-  "components.Selector.ended": "Bukatuta",
-  "components.Selector.planned": "Planifikatuta",
-  "components.Settings.RadarrModal.port": "Ataka",
-  "components.Settings.RadarrModal.released": "Kaleratuta",
-  "components.Settings.RadarrModal.tags": "Etiketak",
-  "components.Settings.SettingsAbout.Releases.latestversion": "Azken bertsioa",
-  "components.Settings.SettingsAbout.Releases.releases": "Bertsioak",
-  "components.Settings.SettingsAbout.about": "Honi buruz",
-  "components.Settings.SettingsAbout.documentation": "Dokumentazioa",
-  "components.Settings.SettingsAbout.preferredmethod": "Nahiagokoa",
-  "components.Settings.SettingsAbout.version": "Bertsioa",
-  "components.Settings.SettingsJobsCache.cachehits": "Kontsultak",
-  "components.Settings.SettingsJobsCache.cachemisses": "Hutsegiteak",
-  "components.Settings.SettingsJobsCache.command": "Komandoa",
-  "components.Settings.SettingsJobsCache.jobs": "Atazak",
-  "components.Settings.SettingsJobsCache.jobtype": "Mota",
-  "components.Settings.SettingsLogs.filterDebug": "Arazketa",
-  "components.Settings.SettingsLogs.filterError": "Errorea",
-  "components.Settings.SettingsLogs.filterInfo": "Informazioa",
-  "components.Settings.SettingsLogs.filterWarn": "Oharra",
-  "components.Settings.SettingsLogs.label": "Etiketa",
-  "components.Settings.SettingsLogs.level": "Larritasuna",
-  "components.Settings.SettingsLogs.logs": "Erregistroak",
-  "components.Settings.SettingsLogs.message": "Mezua",
-  "components.Settings.SettingsLogs.pauseLogs": "Pausatu",
-  "components.Settings.SettingsLogs.resumeLogs": "Jarraitu",
-  "components.Settings.SettingsLogs.time": "Denbora-zigilua",
-  "components.Settings.SonarrModal.port": "Ataka",
-  "components.Settings.address": "Helbidea",
-  "components.Settings.default": "Lehenetsia",
-  "components.Settings.menuAbout": "Honi buruz",
-  "components.Settings.menuJellyfinSettings": "{mediaServerName}",
-  "components.Settings.menuLogs": "Erregistroak",
-  "components.Settings.menuNotifications": "Jakinarazpenak",
-  "components.Settings.menuPlexSettings": "Plex",
-  "components.Settings.menuServices": "Zerbitzuak",
-  "components.Settings.menuUsers": "Erabiltzaileak",
-  "components.Settings.notifications": "Jakinarazpenak",
-  "components.Settings.plex": "Plex",
-  "components.Settings.saving": "Gordetzen…",
-  "components.Settings.scanning": "Sinkronizatzen…",
-  "components.Settings.serverLocal": "lokala",
-  "components.Settings.serverRemote": "urrunekoa",
-  "components.Settings.serverSecure": "segurua",
-  "components.Settings.serverpreset": "Zerbitzaria",
-  "components.Settings.services": "Zerbitzuak",
-  "components.Settings.ssl": "SSL",
-  "components.Settings.tip": "Aholkua",
-  "components.Settings.webhook": "Webhook",
-  "components.Setup.continue": "Jarraitu",
-  "components.Setup.finishing": "Amaitzen…",
-  "components.Setup.setup": "Konfigurazioa",
-  "components.StatusBadge.seasonnumber": "S{seasonNumber}",
-  "components.StatusBadge.status": "{status}",
-  "components.TvDetails.anime": "Animea",
-  "components.TvDetails.cast": "Aktoreak",
-  "components.TvDetails.recommendations": "Gomendioak",
-  "components.TvDetails.seasonstitle": "Denboraldiak",
-  "components.UserList.accounttype": "Mota",
-  "components.UserList.create": "Sortu",
-  "components.UserList.created": "Bat eginda",
-  "components.UserList.creating": "Sortzen…",
-  "components.UserList.owner": "Jabea",
-  "components.UserList.password": "Pasahitza",
-  "components.UserList.role": "Rola",
-  "components.UserList.user": "Erabiltzailea",
-  "components.UserList.username": "Erabiltzaile-izena",
-  "components.UserList.users": "Erabiltzaileak",
-  "components.UserProfile.UserSettings.UserGeneralSettings.email": "E-posta",
-  "components.UserProfile.UserSettings.UserGeneralSettings.general": "Orokorra",
-  "components.UserProfile.UserSettings.UserGeneralSettings.owner": "Jabea",
-  "components.UserProfile.UserSettings.UserGeneralSettings.saving": "Gordetzen…",
-  "components.UserProfile.UserSettings.UserGeneralSettings.user": "Erabiltzailea",
-  "components.UserProfile.UserSettings.UserNotificationSettings.notifications": "Jakinarazpenak",
-  "components.UserProfile.UserSettings.menuChangePass": "Pasahitza",
-  "components.UserProfile.UserSettings.menuGeneralSettings": "Orokorra",
-  "components.UserProfile.UserSettings.menuNotifications": "Jakinarazpenak",
-  "components.UserProfile.unlimited": "Mugagabeak",
-  "i18n.advanced": "Aurreratua",
-  "i18n.all": "Denak",
-  "i18n.approve": "Onartu",
-  "i18n.available": "Eskuragarri",
-  "i18n.back": "Itzuli",
-  "i18n.blacklist": "Zerrenda beltza",
-  "i18n.blacklisted": "Zerrenda beltzean",
-  "i18n.cancel": "Utzi",
-  "i18n.canceling": "Uzten…",
-  "i18n.close": "Itxi",
-  "i18n.collection": "Bilduma",
-  "i18n.decline": "Uko egin",
-  "i18n.declined": "Ukatuta",
-  "i18n.delete": "Ezabatu",
-  "i18n.edit": "Editatu",
-  "i18n.experimental": "Esperimentala",
-  "i18n.failed": "Huts egin du",
-  "i18n.import": "Inportatu",
-  "i18n.importing": "Inportatzen…",
-  "i18n.loading": "Kargatzen…",
-  "i18n.movie": "Filma",
-  "i18n.movies": "Filmak",
-  "i18n.next": "Aurrera",
-  "i18n.open": "Ireki",
-  "i18n.pending": "Zain",
-  "i18n.previous": "Aurrekoa",
-  "i18n.request": "Eskatu",
-  "i18n.requested": "Eskatuta",
-  "i18n.requesting": "Eskatzen…",
-  "i18n.resolved": "Ebatzita",
-  "i18n.retry": "Saiatu berriro",
-  "i18n.retrying": "Berriro saiatzen…",
-  "i18n.saving": "Gordetzen…",
-  "i18n.settings": "Ezarpenak",
-  "i18n.specials": "Bereziak",
-  "i18n.test": "Frogatu",
-  "i18n.testing": "Frogatzen…",
-  "i18n.unavailable": "Ez dago",
-  "i18n.view": "Ikusi",
-  "pages.oops": "Ai!",
-  "components.Blacklist.blacklistdate": "data",
-  "components.CollectionDetails.requestcollection": "Eskatu bilduma",
-  "components.IssueModal.CreateIssueModal.extras": "Gehigarriak",
-  "components.MovieDetails.overview": "Ikuspegi orokorra",
-  "components.PermissionEdit.autorequest": "Auto-eskaera",
-  "components.PersonDetails.appearsin": "Agerraldiak",
-  "components.RequestModal.QuotaDisplay.movie": "filmak",
-  "components.Selector.pilot": "Pilotoa",
-  "components.Settings.RadarrModal.announced": "Iragarrita",
-  "components.Settings.timeout": "Denbora-muga",
-  "components.UserList.admin": "Administratzailea",
-  "components.UserList.totalrequests": "Eskaerak",
-  "components.UserProfile.UserSettings.UserNotificationSettings.email": "E-posta",
-  "components.UserProfile.UserSettings.menuPermissions": "Baimenak",
-  "components.Discover.DiscoverMovies.discovermovies": "Filmak",
-  "components.CollectionDetails.requestcollection4k": "Eskatu bilduma 4K-n",
-  "components.IssueDetails.issuepagetitle": "Intzidentzia",
-  "components.IssueList.issues": "Intzidentziak",
-  "components.ManageSlideOver.downloadstatus": "Deskargaren egoera",
-  "components.PermissionEdit.admin": "Administratzailea",
-  "components.RequestList.requests": "Eskaerak",
-  "components.RequestModal.AdvancedRequester.tags": "Etiketak",
-  "components.RequestModal.QuotaDisplay.season": "denboraldia",
-  "components.Search.search": "Bilatu",
-  "components.Settings.SettingsAbout.Releases.currentversion": "Unekoa",
-  "components.Discover.CreateSlider.addcustomslider": "Sortu irristari pertsonalizatua",
-  "components.Discover.CreateSlider.editSlider": "Editatu irristaria",
-  "components.IssueDetails.unknownissuetype": "Ezezaguna",
-  "components.Login.username": "Erabiltzaile-izena",
-  "components.Settings.Notifications.encryptionNone": "Bat ere ez",
-  "components.Settings.SettingsUsers.users": "Erabiltzaileak",
-  "components.Settings.email": "E-posta",
-  "components.Settings.mediaTypeMovie": "filma",
-  "components.Settings.port": "Ataka",
-  "components.UserProfile.UserSettings.UserPasswordChange.password": "Pasahitza",
-  "i18n.deleting": "Ezabatzen…",
-  "i18n.processing": "Prozesatzen",
-  "components.Discover.FilterSlideover.filters": "Iragazkiak",
-  "components.Discover.DiscoverTv.discovertv": "Telesailak",
-  "components.IssueModal.issueSubtitles": "Azpititulua",
-  "components.Login.initialsignin": "Konektatu",
-  "components.RequestList.RequestItem.modified": "Aldatuta",
-  "components.RequestList.RequestItem.requested": "Eskatuta",
-  "components.RequestModal.season": "Denboraldia",
-  "components.Settings.SettingsMain.general": "Orokorra",
-  "components.Settings.is4k": "4K",
-  "components.StatusBadge.seasonepisodenumber": "S{seasonNumber}E{episodeNumber}",
-  "components.UserProfile.UserSettings.UserPermissions.permissions": "Baimenak",
-  "i18n.status": "Egoera",
-  "components.Discover.FilterSlideover.status": "Egoera",
-  "components.Settings.SettingsJobsCache.cache": "Cachea",
-  "components.Settings.SettingsJobsCache.process": "Prozesua",
-  "components.Settings.SonarrModal.tags": "Etiketak",
-  "components.Settings.menuGeneralSettings": "Orokorra",
-  "components.Settings.syncing": "Sinkronizatzen",
-  "components.TvDetails.overview": "Ikuspegi orokorra",
-  "components.UserProfile.UserSettings.UserGeneralSettings.admin": "Administratzailea",
-  "components.UserProfile.UserSettings.UserGeneralSettings.role": "Rola",
-  "i18n.approved": "Onartuta"
-}

src/i18n/locale/fi.json

@@ -31,219 +31,5 @@
   "components.Discover.CreateSlider.nooptions": "Ei tuloksia.",
   "components.Discover.CreateSlider.searchKeywords": "Etsi avainsanoja…",
   "components.Discover.DiscoverMovies.discovermovies": "Elokuvat",
-  "components.Discover.CreateSlider.providetmdbgenreid": "Anna TMDB Genre ID",
-  "components.Discover.DiscoverMovies.sortReleaseDateDesc": "Julkaisupäivä laskevassa järjestyksessä",
-  "components.Discover.DiscoverTvLanguage.languageSeries": "{language} Sarjat",
-  "components.Discover.PlexWatchlistSlider.emptywatchlist": "<PlexWatchlistSupportLink>Plex katselulistalle</PlexWatchlistSupportLink> lisätty media näkyy täällä.",
-  "components.PermissionEdit.blacklistedItems": "Estä mediaa.",
-  "components.PermissionEdit.manageblacklistDescription": "Salli estetyn median hallinnointi.",
-  "components.Discover.updatesuccess": "Päivitettiin tutustumisen mukautusasetukset.",
-  "components.IssueDetails.toasteditdescriptionfailed": "Jokin meni pieleen muokatessa ongelman kuvausta.",
-  "components.IssueModal.CreateIssueModal.toastFailedCreate": "Jokin meni pieleen lähettäessä ongelmaa.",
-  "component.BlacklistBlock.blacklistdate": "Estetty päivämäärä",
-  "components.Blacklist.blacklistNotFoundError": "<strong>{title}</strong> ei ole estetty.",
-  "components.Discover.FilterSlideover.ratingText": "Arvostelut välillä {minValue} ja {maxValue}",
-  "components.Discover.FilterSlideover.voteCount": "Pisteytys välillä {minValue} ja {maxValue}",
-  "components.Layout.Sidebar.blacklist": "Estolista",
-  "components.Discover.tmdbmoviekeyword": "TMDB Elokuvan Avainsana",
-  "components.IssueDetails.IssueComment.postedbyedited": "Lähetetty {relativeTime} käyttäjältä {username} (Muokattu)",
-  "components.IssueDetails.deleteissueconfirm": "Haluatko varmasti poistaa ongelman?",
-  "components.IssueDetails.problemepisode": "Liittyvä jakso",
-  "components.IssueList.IssueItem.problemepisode": "Liittyvä jakso",
-  "components.IssueList.IssueItem.unknownissuetype": "Tuntematon",
-  "components.Discover.CreateSlider.addsuccess": "Luotiin uusi liukusäädin ja tallennettiin ehdotusten kustomointiasetus.",
-  "components.Discover.DiscoverSliderEdit.deletesuccess": "Liukusäätimen poisto onnistui.",
-  "components.IssueDetails.IssueComment.edit": "Muokkaa kommenttia",
-  "components.IssueModal.CreateIssueModal.episode": "Jakso {episodeNumber}",
-  "components.Layout.Sidebar.requests": "Pyynnöt",
-  "components.Layout.UserWarnings.emailRequired": "Sähköpostiosoite on pakollinen.",
-  "components.Layout.UserWarnings.passwordRequired": "Salasana on pakollinen.",
-  "components.Discover.DiscoverTv.sortTitleAsc": "Otsikko (A-Z) nousevassa järjestyksessä",
-  "components.Discover.resetfailed": "Jokin meni pieleen tutustumisen mukautusasetusten tyhjentämisessä.",
-  "components.Discover.upcoming": "Tulevat Elokuvat",
-  "components.Layout.UserWarnings.emailInvalid": "Sähköpostiosoite ei kelpaa.",
-  "components.Login.back": "Palaa takaisin",
-  "components.Login.credentialerror": "Käyttäjätunnus tai salasana on väärin.",
-  "component.BlacklistBlock.blacklistedby": "Estänyt",
-  "component.BlacklistModal.blacklisting": "Estäminen",
-  "components.Blacklist.blacklistSettingsDescription": "Hallinnoi estettyä mediaa.",
-  "components.Blacklist.blacklistdate": "päivämäärä",
-  "components.Blacklist.blacklistedby": "{date} käyttäjä {user}",
-  "components.Blacklist.blacklistsettings": "Estämisen Asetukset",
-  "components.Blacklist.mediaName": "Nimi",
-  "components.Blacklist.mediaType": "Tyyppi",
-  "components.Blacklist.mediaTmdbId": "",
-  "components.Discover.DiscoverMovies.sortReleaseDateAsc": "Julkaisupäivä nousevassa järjestyksessä",
-  "components.Discover.DiscoverMovies.sortTitleAsc": "Otsikko (A-Z) nousevassa järjestyksessä",
-  "components.Discover.DiscoverMovies.sortTitleDesc": "Otsikko (A-Z) laskevassa järjestyksessä",
-  "components.Discover.DiscoverMovies.sortTmdbRatingAsc": "TMDB Rating nousevassa järjestyksessä",
-  "components.Discover.DiscoverMovies.sortTmdbRatingDesc": "TMDB Rating laskevassa järjestyksessä",
-  "components.Discover.DiscoverNetwork.networkSeries": "{network} Sarjat",
-  "components.Discover.DiscoverSliderEdit.deletefail": "Liukusäätimen poisto epäonnistui.",
-  "components.Discover.DiscoverSliderEdit.enable": "Vaihda näkyvyys",
-  "components.Discover.DiscoverSliderEdit.remove": "Poista",
-  "components.Discover.DiscoverStudio.studioMovies": "{studio} Elokuvat",
-  "components.Discover.DiscoverTv.discovertv": "Sarjat",
-  "components.Discover.DiscoverTv.sortFirstAirDateAsc": "Ensiesitys nousevassa järjestyksessä",
-  "components.Discover.DiscoverTv.sortFirstAirDateDesc": "Ensiesitys laskevassa järjestyksessä",
-  "components.Discover.DiscoverTv.sortPopularityAsc": "Suosio nousevassa järjestyksessä",
-  "components.Discover.DiscoverTv.sortPopularityDesc": "Suosio laskevassa järjestyksessä",
-  "components.Discover.DiscoverTv.sortTitleDesc": "Otsikko (A-Z) laskevassa järjestyksessä",
-  "components.Discover.DiscoverTv.sortTmdbRatingAsc": "TMDB Rating nousevassa järjestyksessä",
-  "components.Discover.DiscoverTv.sortTmdbRatingDesc": "TMDB Rating laskevassa järjestyksessä",
-  "components.Discover.DiscoverTvGenre.genreSeries": "{genre} Sarjat",
-  "components.Discover.DiscoverTvKeyword.keywordSeries": "{keywordTitle} Sarjat",
-  "components.Discover.DiscoverWatchlist.discoverwatchlist": "Katselulistasi",
-  "components.Discover.DiscoverWatchlist.watchlist": "Plex Katselulista",
-  "components.Discover.FilterSlideover.clearfilters": "Tyhjennä aktiiviset suodattimet",
-  "components.Discover.FilterSlideover.filters": "Suodattimet",
-  "components.Discover.FilterSlideover.firstAirDate": "Ensiesitys",
-  "components.Discover.FilterSlideover.from": "Alkaen",
-  "components.Discover.FilterSlideover.genres": "Tyylilaji",
-  "components.Discover.FilterSlideover.keywords": "Avainsanat",
-  "components.Discover.FilterSlideover.originalLanguage": "Alkuperäinen kieli",
-  "components.Discover.FilterSlideover.releaseDate": "Julkaisupäivä",
-  "components.Discover.FilterSlideover.runtime": "Kesto",
-  "components.Discover.FilterSlideover.runtimeText": "{minValue}-{maxValue} minuutin kesto",
-  "components.Discover.FilterSlideover.status": "Tila",
-  "components.Discover.FilterSlideover.streamingservices": "Suoratoistopalvelut",
-  "components.Discover.FilterSlideover.studio": "Studio",
-  "components.Discover.FilterSlideover.tmdbuserscore": "TMDB Käyttäjien pisteytys",
-  "components.Discover.FilterSlideover.tmdbuservotecount": "TMDB Pisteytystä",
-  "components.Discover.FilterSlideover.to": "Saakka",
-  "components.Discover.MovieGenreList.moviegenres": "Elokuvien tyylilajit",
-  "components.Discover.MovieGenreSlider.moviegenres": "Elokuvien tyylilajit",
-  "components.Discover.NetworkSlider.networks": "Kanavat",
-  "components.Discover.PlexWatchlistSlider.plexwatchlist": "Katselulistasi",
-  "components.Discover.RecentlyAddedSlider.recentlyAdded": "Viimeksi lisätty",
-  "components.Discover.StudioSlider.studios": "Studiot",
-  "components.Discover.TvGenreList.seriesgenres": "Sarjojen tyylilajit",
-  "components.Discover.TvGenreSlider.tvgenres": "Sarjojen tyylilajit",
-  "components.Discover.createnewslider": "Luo uusi liukusäädin",
-  "components.Discover.customizediscover": "Mukauta Tutustumista",
-  "components.Discover.discover": "Tutustu",
-  "components.Discover.emptywatchlist": "<PlexWatchlistSupportLink>Plex Katselulistalle</PlexWatchlistSupportLink> lisätty media näkyy täällä.",
-  "components.Discover.moviegenres": "Elokuvien tyylilajit",
-  "components.Discover.networks": "Kanavat",
-  "components.Discover.plexwatchlist": "Katselulistasi",
-  "components.Discover.popularmovies": "Suositut Elokuvat",
-  "components.Discover.populartv": "Suositut Sarjat",
-  "components.Discover.recentlyAdded": "Viimeksi Lisätty",
-  "components.Discover.recentrequests": "Viimeksi Pyydetty",
-  "components.Discover.resetsuccess": "Tutustumisen mukautusasetukset tyhjennetty.",
-  "components.Discover.resettodefault": "Palauta Oletusasetukset",
-  "components.Discover.resetwarning": "Palauta liukusäätimet. Tämä poistaa myös mukautetut säätimet!",
-  "components.Discover.stopediting": "Lopeta Muokkaaminen",
-  "components.Discover.studios": "Studiot",
-  "components.Discover.tmdbmoviegenre": "TMDB Elokuvan tyylilaji",
-  "components.Discover.tmdbmoviestreamingservices": "TMDB Elokuvan suoratoistopalvelu",
-  "components.Discover.tmdbnetwork": "TMDB Kanava",
-  "components.Discover.tmdbsearch": "TMDB Haku",
-  "components.Discover.tmdbstudio": "TMDB Studio",
-  "components.Discover.tmdbtvgenre": "TMDB Sarjan tyylilaji",
-  "components.Discover.tmdbtvkeyword": "TMDB Sarjan Avainsana",
-  "components.Discover.tmdbtvstreamingservices": "TMDB TV Suoratoistopalvelut",
-  "components.Discover.trending": "Trendaava",
-  "components.Discover.tvgenres": "Sarjojen Tyylilajit",
-  "components.Discover.upcomingmovies": "Tulevat Elokuvat",
-  "components.Discover.upcomingtv": "Tulevat Sarjat",
-  "components.Discover.updatefailed": "Jokin meni pieleen tutustumisen mukautusasetusten päivityksessä.",
-  "components.DownloadBlock.estimatedtime": "Arvioitu {time}",
-  "components.DownloadBlock.formattedTitle": "{title}: Kausi {seasonNumber} Jakso {episodeNumber}",
-  "components.IssueDetails.IssueComment.areyousuredelete": "Haluatko varmasti poistaa kommentin?",
-  "components.IssueDetails.IssueComment.delete": "Poista kommentti",
-  "components.IssueDetails.IssueComment.postedby": "Lähetetty {relativeTime} käyttäjältä {username}",
-  "components.IssueDetails.IssueComment.validationComment": "Viesti on pakollinen",
-  "components.IssueDetails.IssueDescription.deleteissue": "Poista ongelma",
-  "components.IssueDetails.IssueDescription.description": "Kuvaus",
-  "components.IssueDetails.IssueDescription.edit": "Muokkaa Kuvausta",
-  "components.IssueDetails.allepisodes": "Kaikki jaksot",
-  "components.IssueDetails.allseasons": "Kaikki Kaudet",
-  "components.IssueDetails.closeissue": "Sulje Ongelma",
-  "components.IssueDetails.closeissueandcomment": "Sulje Kommentilla",
-  "components.IssueDetails.commentplaceholder": "Lisää kommentti…",
-  "components.IssueDetails.comments": "Kommentit",
-  "components.IssueDetails.deleteissue": "Poista Ongelma",
-  "components.IssueDetails.episode": "Jakso {episodeNumber}",
-  "components.IssueDetails.issuepagetitle": "Ongelma",
-  "components.IssueDetails.issuetype": "Tyyppi",
-  "components.IssueDetails.lastupdated": "Viimeksi Päivitetty",
-  "components.IssueDetails.leavecomment": "Kommentti",
-  "components.IssueDetails.nocomments": "Ei kommentteja.",
-  "components.IssueDetails.openedby": "#{issueId} avattiin{relativeTime} käyttäjältä {username}",
-  "components.IssueDetails.openin4karr": "Avaa 4K:na {arr}",
-  "components.IssueDetails.openinarr": "Avaa {arr}",
-  "components.IssueDetails.play4konplex": "Soita 4K:na laitteella {mediaServerName}",
-  "components.IssueDetails.playonplex": "Soita laitteella {mediaServerName}",
-  "components.IssueDetails.problemseason": "Liittyvä kausi",
-  "components.IssueDetails.reopenissue": "Avaa ongelma uudelleen",
-  "components.IssueDetails.reopenissueandcomment": "Avaa uudelleen kommentilla",
-  "components.IssueDetails.season": "Kausi {seasonNumber}",
-  "components.IssueDetails.toasteditdescriptionsuccess": "Ongelman kuvauksen muokkaus onnistui!",
-  "components.IssueDetails.toastissuedeleted": "Ongelma poistaminen onnistui!",
-  "components.IssueDetails.toastissuedeletefailed": "Jokin meni pieleen ongelmaa poistaessa.",
-  "components.IssueDetails.toaststatusupdated": "Ongelman tila päivitetty onnistuneesti!",
-  "components.IssueDetails.toaststatusupdatefailed": "Jokin meni pieleen päivittäessä ongelman tilaa.",
-  "components.IssueDetails.unknownissuetype": "Tuntematon",
-  "components.IssueList.IssueItem.issuestatus": "Tila",
-  "components.IssueList.IssueItem.issuetype": "Tyyppi",
-  "components.IssueList.IssueItem.opened": "Avattu",
-  "components.IssueList.IssueItem.openeduserdate": "{date} käyttäjältä {user}",
-  "components.IssueList.IssueItem.viewissue": "Näytä ongelma",
-  "components.IssueList.issues": "Ongelmat",
-  "components.IssueList.showallissues": "Näytä kaikki ongelmat",
-  "components.IssueList.sortAdded": "Viimeisin lisätty",
-  "components.IssueList.sortModified": "Viimeisin muokattu",
-  "components.IssueModal.CreateIssueModal.allepisodes": "Kaikki jaksot",
-  "components.IssueModal.CreateIssueModal.allseasons": "Kaikki kaudet",
-  "components.IssueModal.CreateIssueModal.extras": "Ekstrat",
-  "components.IssueModal.CreateIssueModal.problemepisode": "Liittyvä jakso",
-  "components.IssueModal.CreateIssueModal.problemseason": "Liittyvä kausi",
-  "components.IssueModal.CreateIssueModal.providedetail": "Selitä ongelma yksityiskohtaisesti.",
-  "components.IssueModal.CreateIssueModal.reportissue": "Ilmoita ongelma",
-  "components.IssueModal.CreateIssueModal.season": "Kausi {seasonNumber}",
-  "components.IssueModal.CreateIssueModal.submitissue": "Lähetä ongelma",
-  "components.IssueModal.CreateIssueModal.toastSuccessCreate": "Ongelma <strong>{title}</strong> lähetetty onnistuneesti!",
-  "components.IssueModal.CreateIssueModal.toastviewissue": "Näytä ongelma",
-  "components.IssueModal.CreateIssueModal.validationMessageRequired": "Kuvaus on pakollinen",
-  "components.IssueModal.CreateIssueModal.whatswrong": "Mikä vikana?",
-  "components.IssueModal.issueAudio": "Ääni",
-  "components.IssueModal.issueOther": "Muu",
-  "components.IssueModal.issueSubtitles": "Tekstitys",
-  "components.IssueModal.issueVideo": "Kuva",
-  "components.LanguageSelector.languageServerDefault": "Oletus ({language})",
-  "components.LanguageSelector.originalLanguageDefault": "Kaikki kielet",
-  "components.Layout.LanguagePicker.displaylanguage": "Näyttökieli",
-  "components.Layout.SearchInput.searchPlaceholder": "Etsi Elokuvia & Sarjoja",
-  "components.Layout.Sidebar.browsemovies": "Elokuvat",
-  "components.Layout.Sidebar.browsetv": "Sarjat",
-  "components.Layout.Sidebar.dashboard": "Tutustu",
-  "components.Layout.Sidebar.issues": "Ongelmat",
-  "components.Layout.Sidebar.settings": "Asetukset",
-  "components.Layout.Sidebar.users": "Käyttäjät",
-  "components.Layout.UserDropdown.MiniQuotaDisplay.movierequests": "Elokuvien Pyynnöt",
-  "components.Layout.UserDropdown.MiniQuotaDisplay.seriesrequests": "Sarjojen Pyynnöt",
-  "components.Layout.UserDropdown.myprofile": "Profiili",
-  "components.Layout.UserDropdown.requests": "Pyynnöt",
-  "components.Layout.UserDropdown.settings": "Asetukset",
-  "components.Layout.UserDropdown.signout": "Kirjaudu ulos",
-  "components.Layout.VersionStatus.outofdate": "Vanhentunut",
-  "components.Login.adminerror": "Sinun täytyy käyttää admin-tunnusta kirjautuaksesi sisään.",
-  "components.PermissionEdit.blacklistedItemsDescription": "Salli median estäminen.",
-  "components.PermissionEdit.manageblacklist": "Hallinnoi estolistaa",
-  "pages.somethingwentwrong": "Jokin meni pieleen",
-  "pages.serviceunavailable": "Palvelu ei saatavilla",
-  "pages.returnHome": "Palaa etusivulle",
-  "pages.pagenotfound": "Sivua ei löydy",
-  "pages.oops": "Hups",
-  "pages.internalservererror": "Sisäinen palvelimen virhe",
-  "pages.errormessagewithcode": "{statusCode} - {error}",
-  "i18n.retry": "Yritä uudelleen",
-  "i18n.resultsperpage": "Näytä {pageSize} tulosta per sivu",
-  "i18n.restartRequired": "Uudelleenkäynnistys vaaditaan",
-  "i18n.resolved": "Ratkaistu",
-  "i18n.requesting": "Pyydetään…",
-  "i18n.requested": "Pyydetty",
-  "i18n.request4k": "Pyydä 4K:na",
-  "i18n.request": "Pyydä"
+  "components.Discover.CreateSlider.providetmdbgenreid": "Anna TMDB Genre ID"
 }

src/i18n/locale/fr.json

@@ -60,7 +60,7 @@
   "components.Discover.DiscoverTvKeyword.keywordSeries": "{keywordTitle} Séries",
   "components.Discover.DiscoverTvLanguage.languageSeries": "Séries en {language}",
   "components.Discover.DiscoverWatchlist.discoverwatchlist": "Votre watchlist",
-  "components.Discover.DiscoverWatchlist.watchlist": "Liste de lecture Plex",
+  "components.Discover.DiscoverWatchlist.watchlist": "Watchlist Plex",
   "components.Discover.FilterSlideover.activefilters": "{count, plural, one {# Filtre actif} other {# Filtres actifs}}",
   "components.Discover.FilterSlideover.clearfilters": "Effacer les filtres actifs",
   "components.Discover.FilterSlideover.filters": "Filtres",
@@ -82,8 +82,8 @@
   "components.Discover.MovieGenreList.moviegenres": "Genres de films",
   "components.Discover.MovieGenreSlider.moviegenres": "Genres de films",
   "components.Discover.NetworkSlider.networks": "Diffuseurs",
-  "components.Discover.PlexWatchlistSlider.emptywatchlist": "Les médias ajoutés à votre <PlexWatchlistSupportLink>liste de lecture Plex</PlexWatchlistSupportLink> apparaîtront ici.",
-  "components.Discover.PlexWatchlistSlider.plexwatchlist": "Votre liste de lecture",
+  "components.Discover.PlexWatchlistSlider.emptywatchlist": "Les médias ajoutés à votre <PlexWatchlistSupportLink>watchlist Plex</PlexWatchlistSupportLink> apparaîtront ici.",
+  "components.Discover.PlexWatchlistSlider.plexwatchlist": "Votre watchlist Plex",
   "components.Discover.RecentlyAddedSlider.recentlyAdded": "Récemment ajoutés",
   "components.Discover.StudioSlider.studios": "Studios",
   "components.Discover.TvGenreList.seriesgenres": "Genres de séries",
@@ -91,10 +91,13 @@
   "components.Discover.createnewslider": "Créer un nouveau slider",
   "components.Discover.customizediscover": "Personnaliser Découvrir",
   "components.Discover.discover": "Découvrir",
-  "components.Discover.emptywatchlist": "Les médias ajoutés à votre <PlexWatchlistSupportLink>liste de lecture Plex</PlexWatchlistSupportLink> apparaîtront ici.",
+  "components.Discover.discovermovies": "Films populaires",
+  "components.Discover.discovertv": "Séries populaires",
+  "components.Discover.emptywatchlist": "Les médias ajoutés à votre <PlexWatchlistSupportLink>watchlist Plex</PlexWatchlistSupportLink> apparaîtront ici.",
   "components.Discover.moviegenres": "Genres de films",
   "components.Discover.networks": "Diffuseurs",
-  "components.Discover.plexwatchlist": "Votre liste de lecture",
+  "components.Discover.noRequests": "Aucune requête",
+  "components.Discover.plexwatchlist": "Votre watchlist Plex",
   "components.Discover.popularmovies": "Films populaires",
   "components.Discover.populartv": "Séries populaires",
   "components.Discover.recentlyAdded": "Ajouts récents",
@@ -141,6 +144,7 @@
   "components.RequestList.RequestItem.seasons": "{seasonCount, plural, one {Saison} other {Saisons}}",
   "components.RequestList.requests": "Demandes",
   "components.RequestModal.cancel": "Annuler la demande",
+  "components.RequestModal.extras": "Extras",
   "components.RequestModal.numberofepisodes": "Nombre d'épisodes",
   "components.RequestModal.pendingrequest": "Demande en attente",
   "components.RequestModal.requestCancel": "Demande pour <strong>{title}</strong> refusée.",
@@ -219,7 +223,7 @@
   "components.Settings.hostname": "Nom d'hôte ou adresse IP",
   "components.Settings.librariesRemaining": "Bibliothèques restantes : {count}",
   "components.Settings.manualscan": "Scan manuel des bibliothèques",
-  "components.Settings.manualscanDescription": "Normalement, le scan sera effectué une fois toutes les 24 heures seulement. Jellyseerr vérifiera les ajouts récents de votre serveur Plex de façon proactive. Si c'est la première fois que vous configurez Plex, un scan complet de la bibliothèque est recommandé!",
+  "components.Settings.manualscanDescription": "Normalement, le scan sera effectué une fois toutes les 24 heures seulement. Jellyseerr vérifiera les ajouts récents de votre serveur Plex de façon proactive. Si c'est la première fois que vous configurez Plex, un scan complet de la bibliothèque est recommandé !",
   "components.Settings.menuAbout": "À propos",
   "components.Settings.menuGeneralSettings": "Général",
   "components.Settings.menuJobs": "Tâches et cache",
@@ -230,7 +234,7 @@
   "components.Settings.notificationsettings": "Paramètres de notification",
   "components.Settings.notrunning": "Pas en exécution",
   "components.Settings.plexlibraries": "Bibliothèques Plex",
-  "components.Settings.plexlibrariesDescription": "Les bibliothèques Jellyseerr recherchent les titres. Configurez et sauvegardez vos paramètres de connexion Plex, puis cliquez sur le bouton ci-dessous si aucune bibliothèque n'est listée.",
+  "components.Settings.plexlibrariesDescription": "Les bibliothèques Jellyseerr recherchent les titres. Configurez et sauvegardez vos paramètres de connexion Plex, puis cliquez sur le bouton ci-dessous si aucune bibliothèque n'est répertoriée.",
   "components.Settings.plexsettings": "Paramètres Plex",
   "components.Settings.plexsettingsDescription": "Configurer les paramètres de votre serveur Plex. Jellyseerr scanne vos librairies Plex pour déterminer les contenus disponibles.",
   "components.Settings.port": "Port",
@@ -238,10 +242,12 @@
   "components.Settings.sonarrsettings": "Paramètres Sonarr",
   "components.Settings.ssl": "SSL",
   "components.Settings.startscan": "Commencer le scan",
+  "components.Setup.configureplex": "Configurer Plex",
   "components.Setup.configureservices": "Configurer les Services",
   "components.Setup.continue": "Continuer",
   "components.Setup.finish": "Finir la configuration",
   "components.Setup.finishing": "Finalisation…",
+  "components.Setup.loginwithplex": "Se connecter avec Plex",
   "components.Setup.signinMessage": "Commencez en vous connectant avec votre compte Plex",
   "components.Setup.welcome": "Bienvenue sur Jellyseerr",
   "components.TvDetails.cast": "Casting",
@@ -284,10 +290,11 @@
   "components.Settings.SettingsAbout.version": "Version",
   "components.Settings.SettingsAbout.totalrequests": "Total des demandes",
   "components.Settings.SettingsAbout.totalmedia": "Total des médias",
-  "components.Settings.SettingsAbout.overseerrinformation": "À propos de Jellyseerr",
+  "components.Settings.SettingsAbout.overseerrinformation": "À propos d'Jellyseerr",
   "components.Settings.SettingsAbout.githubdiscussions": "Discussions GitHub",
   "components.Settings.SettingsAbout.gettingsupport": "Obtenir de l'aide",
   "components.Settings.RadarrModal.validationNameRequired": "Vous devez fournir un nom de serveur",
+  "components.Setup.tip": "Astuce",
   "i18n.deleting": "Suppression…",
   "components.UserList.userdeleteerror": "Une erreur s'est produite lors de la suppression de l'utilisateur.",
   "components.UserList.userdeleted": "Utilisateur supprimé avec succès !",
@@ -308,7 +315,7 @@
   "components.Settings.SonarrModal.animerootfolder": "Dossier racine pour anime",
   "components.Settings.SonarrModal.animequalityprofile": "Profil qualité pour anime",
   "components.MovieDetails.studio": "{studioCount, plural, one {Studio} other {Studios}}",
-  "components.Settings.SettingsAbout.supportoverseerr": "Soutenez Overseerr",
+  "components.Settings.SettingsAbout.supportoverseerr": "Soutenez Jellyseerr",
   "i18n.close": "Fermer",
   "components.Settings.SettingsAbout.timezone": "Fuseau horaire",
   "components.Settings.SettingsAbout.helppaycoffee": "Aidez-nous à payer le café",
@@ -472,6 +479,8 @@
   "components.Settings.serverpreset": "Serveur",
   "components.Settings.serverRemote": "distant",
   "components.Settings.serverLocal": "local",
+  "components.TvDetails.playonplex": "Lire sur Plex",
+  "components.TvDetails.play4konplex": "Lire en 4K sur Plex",
   "components.Settings.SonarrModal.toastSonarrTestSuccess": "Connexion à Sonarr établie avec succès !",
   "components.Settings.SonarrModal.toastSonarrTestFailure": "Échec de la connexion à Sonarr.",
   "components.Settings.SonarrModal.syncEnabled": "Activer les scans",
@@ -480,6 +489,8 @@
   "components.Settings.RadarrModal.externalUrl": "URL externe",
   "components.MovieDetails.markavailable": "Marquer comme disponible",
   "components.MovieDetails.mark4kavailable": "Marquer comme disponible en 4K",
+  "components.MovieDetails.playonplex": "Lire sur Plex",
+  "components.MovieDetails.play4konplex": "Lire en 4K sur Plex",
   "components.Settings.SettingsJobsCache.jobsDescription": "Jellyseerr effectue certaines tâches de maintenance comme des tâches planifiées régulièrement, mais elles peuvent également être déclenchées manuellement ci-dessous. L'exécution manuelle d'une tâche ne modifiera pas sa planification.",
   "components.Settings.SettingsJobsCache.cachemisses": "Manqués",
   "components.Settings.SettingsJobsCache.runnow": "Exécuter",
@@ -511,7 +522,7 @@
   "components.RequestModal.AdvancedRequester.requestas": "Demander en tant que",
   "components.PermissionEdit.viewrequestsDescription": "Autorise à afficher les demandes des autres utilisateurs.",
   "components.PermissionEdit.viewrequests": "Voir les demandes",
-  "components.UserList.validationEmail": "Email requis",
+  "components.UserList.validationEmail": "Vous devez fournir un e-mail valide",
   "components.TvDetails.nextAirDate": "Prochaine diffusion",
   "components.Settings.SonarrModal.validationBaseUrlTrailingSlash": "L'URL de base ne doit pas se terminer par une barre oblique finale",
   "components.Settings.SonarrModal.validationBaseUrlLeadingSlash": "L'URL de base doit être précédée d'une barre oblique",
@@ -624,11 +635,12 @@
   "components.RequestList.RequestItem.modified": "Modifiée",
   "components.RequestList.RequestItem.requested": "Demandé",
   "components.RequestList.RequestItem.modifieduserdate": "{date} par {user}",
+  "components.Setup.scanbackground": "Le scan s'effectue en arrière-plan. Vous pouvez donc continuer le processus de configuration pendant ce temps.",
   "components.Settings.scanning": "Synchronisation en cours…",
   "components.Settings.scan": "Synchroniser les bibliothèques",
   "components.Settings.SettingsJobsCache.sonarr-scan": "Scan de Sonarr",
   "components.Settings.SettingsJobsCache.radarr-scan": "Scan de Radarr",
-  "components.Settings.SettingsJobsCache.plex-recently-added-scan": "Scan des ajouts récents Plex.",
+  "components.Settings.SettingsJobsCache.plex-recently-added-scan": "Scan des ajouts récents aux bibliothèques Plex.",
   "components.Settings.SettingsJobsCache.plex-full-scan": "Scan complet des bibliothèques Plex.",
   "components.Settings.Notifications.validationUrl": "Vous devez fournir une URL valide",
   "components.Settings.Notifications.botAvatarUrl": "L'URL de l'avatar de votre Bot",
@@ -839,7 +851,7 @@
   "components.Settings.Notifications.encryptionOpportunisticTls": "Toujours utiliser STARTTLS",
   "components.DownloadBlock.estimatedtime": "Estimation {time}",
   "components.Settings.Notifications.NotificationsPushover.userTokenTip": "Votre <UsersGroupsLink>identifiant d'utilisateur ou de groupe</UsersGroupsLink> de 30 caractères",
-  "components.Settings.Notifications.NotificationsPushover.accessTokenTip": "<ApplicationRegistrationLink>Enregistrer une application</ApplicationRegistrationLink> à utiliser avec Jellyseerr",
+  "components.Settings.Notifications.NotificationsPushover.accessTokenTip": "<ApplicationRegistrationLink>Enregistrer une application</ApplicationRegistrationLink> pour l'utiliser avec Jellyseerr",
   "components.RequestList.RequestItem.requesteddate": "Demandé",
   "components.RequestCard.failedretry": "Une erreur s'est produite lors du renvoi de la demande.",
   "components.UserProfile.UserSettings.UserNotificationSettings.webpushsettingssaved": "Paramètres de notification Web Push enregistrés avec succès !",
@@ -861,13 +873,14 @@
   "components.Settings.SettingsAbout.betawarning": "Ceci est un logiciel BÊTA. Les fonctionnalités peuvent être non opérationnelles ou instables. Veuillez signaler tout problème sur GitHub !",
   "components.UserProfile.UserSettings.UserNotificationSettings.webpushsettingsfailed": "Échec de l'enregistrement des paramètres de notification Web push.",
   "components.UserProfile.UserSettings.UserGeneralSettings.languageDefault": "Langage par défaut ({language})",
+  "components.UserList.displayName": "Nom affiché",
   "components.Settings.webAppUrlTip": "Dirigez éventuellement les utilisateurs vers l'application Web sur votre serveur au lieu de l'application Web « hébergée »",
   "components.Settings.webAppUrl": "URL <WebAppLink>Application Web</WebAppLink>",
   "components.Settings.noDefault4kServer": "Un serveur 4K {serverType} doit être marqué par défaut afin de permettre aux utilisateurs de soumettre des requêtes 4K {mediaType}.",
   "components.Settings.is4k": "4K",
-  "components.Settings.SettingsUsers.newPlexLoginTip": "Autoriser les utilisateurs de {mediaServerName} à se connecter sans être d'abord importés",
-  "components.Settings.SettingsUsers.newPlexLogin": "Autoriser nouvelle connexion {mediaServerName}",
-  "components.Settings.SettingsUsers.localLoginTip": "Autoriser les utilisateurs à se connecter en utilisant leur adresse e-mail et leur mot de passe, au lieu de {mediaServerName} OAuth",
+  "components.Settings.SettingsUsers.newPlexLoginTip": "Autoriser les utilisateurs de Plex à se connecter sans être d'abord importés",
+  "components.Settings.SettingsUsers.newPlexLogin": "Autoriser nouvelle connexion Plex",
+  "components.Settings.SettingsUsers.localLoginTip": "Autoriser les utilisateurs à se connecter en utilisant leur adresse e-mail et leur mot de passe, au lieu de Plex OAuth",
   "components.Settings.SettingsUsers.defaultPermissionsTip": "Autorisations par défaut attribuées aux nouveaux utilisateurs",
   "components.Settings.Notifications.webhookUrlTip": "Créez une <DiscordWebhookLink>intégration de webhook</DiscordWebhookLink> dans votre serveur",
   "components.Settings.Notifications.validationTypes": "Vous devez sélectionner au moins un type de notification",
@@ -907,7 +920,7 @@
   "components.IssueDetails.IssueComment.edit": "Éditer le commentaire",
   "components.IssueDetails.IssueComment.postedby": "Ajouté {relativeTime} par {username}",
   "components.IssueDetails.IssueComment.postedbyedited": "Ajouté {relativeTime} par {username} (Édité)",
-  "components.IssueDetails.IssueComment.validationComment": "Vous devez écrire un message",
+  "components.IssueDetails.IssueComment.validationComment": "Vous devez écrire un message.",
   "components.IssueDetails.IssueDescription.deleteissue": "Supprimer le problème",
   "components.IssueDetails.IssueDescription.description": "Description",
   "components.IssueDetails.IssueDescription.edit": "Éditer la description",
@@ -928,8 +941,8 @@
   "components.IssueDetails.openedby": "#{issueId} ouvert {relativeTime} par {username}",
   "components.IssueDetails.openin4karr": "Ouvrir dans {arr} 4K",
   "components.IssueDetails.openinarr": "Ouvrir dans {arr}",
-  "components.IssueDetails.play4konplex": "Lire en 4K sur {mediaServerName}",
-  "components.IssueDetails.playonplex": "Lire sur {mediaServerName}",
+  "components.IssueDetails.play4konplex": "Lire en 4K sur Plex",
+  "components.IssueDetails.playonplex": "Lire sur Plex",
   "components.IssueDetails.problemepisode": "Épisode concerné",
   "components.IssueDetails.problemseason": "Saison concernée",
   "components.IssueDetails.reopenissue": "Rouvrir le problème",
@@ -986,14 +999,14 @@
   "components.ManageSlideOver.manageModalClearMedia": "Effacer les données",
   "components.ManageSlideOver.movie": "film",
   "components.IssueModal.CreateIssueModal.season": "Saison {seasonNumber}",
-  "components.IssueModal.CreateIssueModal.validationMessageRequired": "Vous devez fournir une description",
+  "components.IssueModal.CreateIssueModal.validationMessageRequired": "Vous devez fournir une description.",
   "components.IssueModal.CreateIssueModal.reportissue": "Signaler un problème",
   "components.IssueModal.CreateIssueModal.submitissue": "Soumettre le problème",
   "components.IssueModal.issueAudio": "Audio",
   "components.IssueModal.issueOther": "Autre",
   "components.ManageSlideOver.mark4kavailable": "Marquer comme disponible en 4K",
   "components.ManageSlideOver.markavailable": "Marquer comme disponible",
-  "components.Settings.SettingsAbout.runningDevelop": "Vous utilisez la branche <code>develop</code> de Jellyseerr, qui n'est recommandée que pour ceux qui contribuent au développement ou qui aident aux tests et correctifs.",
+  "components.Settings.SettingsAbout.runningDevelop": "Vous utilisez la branche <code>develop</code> d'Jellyseerr, qui n'est recommandée que pour ceux qui contribuent au développement ou qui aident aux tests et correctifs.",
   "components.ManageSlideOver.openarr": "Ouvrir dans {arr}",
   "components.NotificationTypeSelector.adminissuecommentDescription": "Être averti(e) lorsque d'autres utilisateurs commentent sur un problème.",
   "components.NotificationTypeSelector.issuecommentDescription": "Envoyer des notifications lorsqu'un problème reçoit de nouveaux commentaires.",
@@ -1007,7 +1020,7 @@
   "components.Settings.SettingsJobsCache.editJobSchedule": "Modifier la tâche",
   "components.NotificationTypeSelector.userissuecreatedDescription": "Être averti(e) lorsque d’autres utilisateurs signalent des problèmes.",
   "components.PermissionEdit.manageissuesDescription": "Autorise à gérer les problèmes liés aux médias.",
-  "components.Settings.SettingsJobsCache.jobScheduleEditFailed": "Un problème est survenu lors de l'enregistrement de la tâche.",
+  "components.Settings.SettingsJobsCache.jobScheduleEditFailed": "Un problème est survenu lors de l'enregistrement de la tâche",
   "components.Settings.SettingsJobsCache.editJobScheduleSelectorMinutes": "Toutes les {jobScheduleMinutes, plural, one {minute} other {{jobScheduleMinutes} minutes}}",
   "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletAccessToken": "Jeton d'accès",
   "components.NotificationTypeSelector.adminissuereopenedDescription": "Être averti(e) lorsqu'un problème est ré-ouvert par d'autres utilisateurs.",
@@ -1096,8 +1109,8 @@
   "components.RequestList.RequestItem.tmdbid": "TMDB ID",
   "components.RequestList.RequestItem.tvdbid": "ID TheTVDB",
   "components.NotificationTypeSelector.mediaautorequested": "Demande soumise automatiquement",
-  "components.PermissionEdit.autorequestMoviesDescription": "Autorise l'envoi de demande automatique pour les vidéos non-4K via la liste de lecture Plex.",
-  "components.PermissionEdit.autorequestSeriesDescription": "Autorise l'envoi de demande automatique pour les séries non-4K via la liste de lecture Plex.",
+  "components.PermissionEdit.autorequestMoviesDescription": "Autorise l'envoi de demande automatique pour les médias non-4K via la liste de visionnage(s) Plex.",
+  "components.PermissionEdit.autorequestSeriesDescription": "Autorise l'envoi de demande automatique pour les médias non-4K via liste de visionnage(s) Plex.",
   "components.StatusChecker.appUpdatedDescription": "Veuillez cliquer sur le bouton ci-dessous pour recharger l'application.",
   "components.StatusChecker.restartRequiredDescription": "Veuillez redémarrer le serveur pour appliquer les paramètres mis à jour.",
   "components.TitleCard.cleardata": "Effacer les données",
@@ -1106,19 +1119,19 @@
   "components.TitleCard.tvdbid": "ID TheTVDB",
   "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncmovies": "Demander automatiquement les films",
   "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncseries": "Demander automatiquement les Séries",
-  "components.PermissionEdit.autorequestDescription": "Autorise l'envoi de demande automatique pour les médias non-4K via la liste de lecture Plex.",
+  "components.PermissionEdit.autorequestDescription": "Autorise l'envoi de demande automatique pour les médias non-4K via la liste de visionnage(s) Plex.",
   "components.PermissionEdit.autorequestMovies": "Demander automatiquement les Films",
   "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncseriestip": "Demande automatiquement les séries de votre <PlexWatchlistSupportLink>Watchlist Plex</PlexWatchlistSupportLink>",
   "components.PermissionEdit.autorequestSeries": "Demander automatiquement les Séries",
-  "components.Settings.SettingsJobsCache.plex-watchlist-sync": "Synchronisation de la liste de lecture Plex",
+  "components.Settings.SettingsJobsCache.plex-watchlist-sync": "Synchronisation de la liste de visionnage(s) Plex",
   "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncmoviestip": "Demande automatiquement les films sur votre <PlexWatchlistSupportLink>Watchlist Plex</PlexWatchlistSupportLink>",
-  "components.NotificationTypeSelector.mediaautorequestedDescription": "Recevez une notification lorsque de nouvelles demandes de médias sont automatiquement soumises pour des éléments de votre liste de lecture.",
+  "components.NotificationTypeSelector.mediaautorequestedDescription": "Recevez une notification lorsque de nouvelles demandes de médias sont automatiquement soumises pour des éléments de votre liste de visionnage(s) Plex.",
   "components.StatusChecker.restartRequired": "Redémarrage du serveur requis",
   "components.StatusChecker.appUpdated": "{applicationTitle} mis à jour",
   "components.Settings.SettingsLogs.viewdetails": "Voir les détails",
   "components.Settings.advancedTooltip": "Une configuration incorrecte de ce paramètre peut entraîner un dysfonctionnement",
   "components.Settings.experimentalTooltip": "L'activation de ce paramètre peut entraîner un comportement inattendu de l'application",
-  "components.PermissionEdit.viewwatchlists": "Voir les listes de lecture {mediaServerName}",
+  "components.PermissionEdit.viewwatchlists": "Voir la liste de visionnage(s) Plex",
   "components.TvDetails.reportissue": "Signaler un problème",
   "components.Layout.UserDropdown.MiniQuotaDisplay.movierequests": "Demandes de films",
   "components.Layout.UserDropdown.MiniQuotaDisplay.seriesrequests": "Demandes de séries",
@@ -1128,6 +1141,7 @@
   "components.Layout.UserWarnings.passwordRequired": "Un mot de passe est requis.",
   "components.Login.credentialerror": "Le nom d’utilisateur ou le mot de passe est incorrect.",
   "components.Login.description": "Comme il s’agit de votre première connexion à {applicationName}, vous devez ajouter une adresse courrielle valide.",
+  "components.Login.host": "{mediaServerName} URL",
   "components.Login.initialsignin": "Connexion",
   "components.Login.initialsigningin": "Connexion en cours…",
   "components.Login.save": "Ajouter",
@@ -1155,7 +1169,9 @@
   "components.MovieDetails.rtaudiencescore": "Score d’audience de Rotten Tomatoes",
   "components.MovieDetails.rtcriticsscore": "Rotten Tomatoes Tomatomètre",
   "components.MovieDetails.tmdbuserscore": "Note des utilisateurs TMDB",
-  "components.PermissionEdit.viewwatchlistsDescription": "Autorise à voir les listes de lecture {mediaServerName} des autres utilisateurs.",
+  "components.PermissionEdit.settings": "Gérer les réglages",
+  "components.PermissionEdit.settingsDescription": "Autorise à modifier les réglages globaux. Un utilisateur doit avoir cette autorisation pour l'accorder à d'autres.",
+  "components.PermissionEdit.viewwatchlistsDescription": "Autorise à voir la liste de visionnage(s) Plex des autres utilisateurs.",
   "components.RequestBlock.approve": "Approuver la demande",
   "components.RequestBlock.decline": "Refuser la demande",
   "components.RequestBlock.delete": "Supprimer la demande",
@@ -1192,12 +1208,14 @@
   "components.Settings.SettingsMain.toastApiKeyFailure": "Un problème est survenu lors de la génération de la nouvelle clé d'API.",
   "components.Settings.SettingsMain.validationApplicationUrlTrailingSlash": "L'URL ne doit pas se terminer par une barre oblique",
   "components.Settings.SettingsJobsCache.imagecachesize": "Taille totale du cache",
+  "components.Settings.SettingsJobsCache.jellyfin-full-sync": "Scan complet de la bibliothèque Jellyfin",
+  "components.Settings.SettingsJobsCache.jellyfin-recently-added-sync": "Scan des ajouts récents Jellyfin",
   "components.Settings.SettingsMain.apikey": "Clé d'API",
   "components.Settings.SettingsMain.applicationTitle": "Nom de l'application",
   "components.Settings.SettingsMain.applicationurl": "URL de l'application",
   "components.Settings.SettingsMain.cacheImages": "Activer la mise en cache d'image",
   "components.Settings.SettingsMain.cacheImagesTip": "Met en cache localement et utilise des images optimisées (nécessite une quantité considérable d'espace disque)",
-  "components.Settings.SettingsMain.csrfProtectionTip": "Mettre l'accès à l'API externe en lecture seule (nécessite HTTPS)",
+  "components.Settings.SettingsMain.csrfProtectionTip": "Définir l'accès à l'API externe en lecture seule (nécessite HTTPS)",
   "components.Settings.SettingsMain.general": "Général",
   "components.Settings.SettingsMain.generalsettings": "Paramètres généraux",
   "components.Settings.SettingsMain.toastSettingsSuccess": "Paramètres sauvegardés avec succès !",
@@ -1217,8 +1235,10 @@
   "components.Selector.searchStudios": "Recherchez un ou plusieurs studios…",
   "components.Settings.SettingsMain.generalsettingsDescription": "Configurer les paramètres généraux et par défaut pour Jellyseerr.",
   "components.Settings.SettingsMain.originallanguage": "Langue à découvrir",
+  "components.Settings.SettingsMain.region": "Région à découvrir",
+  "components.Settings.SettingsMain.regionTip": "Filtrer le contenu par disponibilité régionale",
   "components.Settings.SettingsMain.trustProxy": "Activer la prise en charge proxy",
-  "components.Settings.SettingsMain.trustProxyTip": "Permettre à Jellyseerr d'enregistrer correctement les adresses IP des clients derrière un proxy",
+  "components.Settings.SettingsMain.trustProxyTip": "Permettre Jellyseerr à enregistrer correctement les adresses IP des clients derrière un proxy",
   "components.Settings.SettingsMain.partialRequestsEnabled": "Permettre les demandes partielles des séries",
   "components.Selector.nooptions": "Aucun résultat.",
   "components.Layout.Sidebar.browsetv": "Séries",
@@ -1238,7 +1258,7 @@
   "components.Settings.jellyfinSettingsFailure": "Une erreur est survenue lors de l'enregistrement des paramètres pour {mediaServerName}.",
   "components.Settings.jellyfinSettingsSuccess": "Les paramètres pour {mediaServerName} ont été enregistrés avec succès !",
   "components.Settings.jellyfinlibraries": "Bibliothèques {mediaServerName}",
-  "components.Settings.jellyfinlibrariesDescription": "Les bibliothèques de {mediaServerName} sont en cours d'analyse. Cliquez sur le bouton ci-dessous si aucune bibliothèque n'est répertoriée.",
+  "components.Settings.jellyfinlibrariesDescription": "Les bibliothèques de {mediaServerName} sont en cours d'analyze. Cliquez sur le bouton ci-dessous si aucune bibliothèque n'est répertoriée.",
   "components.Settings.jellyfinsettings": "Paramètres pour {mediaServerName}",
   "components.Settings.manualscanJellyfin": "Analyse manuelle de la bibliothèque",
   "components.Settings.menuJellyfinSettings": "{mediaServerName}",
@@ -1246,7 +1266,7 @@
   "components.Settings.saving": "Sauvegarde en cours…",
   "components.Settings.syncing": "Synchronisation en cours",
   "components.Setup.signin": "Se connecter",
-  "components.Setup.signinWithPlex": "Renseigner vos informations d'identification de Plex",
+  "components.Setup.signinWithPlex": "Utilisez votre compte Plex",
   "components.StatusBadge.managemedia": "Gérer {mediaType}",
   "components.StatusBadge.openinarr": "Ouvrir dans {arr}",
   "components.StatusBadge.playonplex": "Lire sur {mediaServerName}",
@@ -1280,14 +1300,15 @@
   "components.Settings.SettingsJobsCache.jellyfin-recently-added-scan": "Scan des ajouts récents aux bibliothèques Jellyfin",
   "components.Settings.SonarrModal.animeSeriesType": "Type de série anime",
   "components.Settings.SonarrModal.seriesType": "Type de série",
+  "components.Settings.internalUrl": "URL interne",
   "components.Settings.jellyfinsettingsDescription": "Configurez les paramètres de votre serveur {mediaServerName}. {mediaServerName} analyse vos bibliothèques {mediaServerName} pour voir quel contenu est disponible.",
   "components.Settings.jellyfinSettingsDescription": "Configurez facultativement les URL internes et externes pour votre serveur {mediaServerName}. Dans la plupart des cas, l'URL externe est différente de l'URL interne. Vous pouvez également définir une URL de réinitialisation de mot de passe personnalisée pour la connexion à {mediaServerName}, au cas où vous souhaiteriez rediriger vers une page de réinitialisation de mot de passe différente.",
   "components.Settings.manualscanDescriptionJellyfin": "Normalement, cette tâche est executée qu'une fois toutes les 24 heures. Jellyseerr vérifiera plus agressivement les éléments récemment ajoutés à votre serveur {mediaServerName}. Si c'est la première fois que vous configurez Jellyseerr, une analyse complète manuelle de la bibliothèque est recommandée !",
   "components.Settings.timeout": "Temps écoulé",
   "components.Setup.configuremediaserver": "Configurer le serveur multimédia",
   "components.TvDetails.rtaudiencescore": "Score de l'audience sur Rotten Tomatoes",
-  "components.UserProfile.UserSettings.UserGeneralSettings.mediaServerUser": "Utilisateur {mediaServerName}",
-  "components.Setup.signinWithJellyfin": "Renseigner vos informations d'identification de Jellyfin",
+  "components.UserProfile.UserSettings.UserGeneralSettings.mediaServerUser": "Utilisateur pour {mediaServerName}",
+  "components.Setup.signinWithJellyfin": "Utilisez votre compte {mediaServerName}",
   "components.UserList.mediaServerUser": "Utilisateur de {mediaServerName}",
   "components.TvDetails.episodeCount": "{episodeCount, plural, one {# Épisode} other {# Épisodes}}",
   "components.UserList.newJellyfinsigninenabled": "Le paramètre <strong>Activer la nouvelle connexion à {mediaServerName}</strong> est actuellement activé. Les utilisateurs de {mediaServerName} avec accès à la bibliothèque n'ont pas besoin d'être importés pour se connecter.",
@@ -1296,67 +1317,5 @@
   "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Appareil par défaut",
   "components.UserList.importedfromJellyfin": "<strong>{userCount}</strong> {mediaServerName} {userCount, plural, one {user} other {users}} importé(s) avec succès !",
   "components.UserProfile.UserSettings.UserNotificationSettings.sound": "Son de notification",
-  "components.UserProfile.localWatchlist": "Liste de lecture de {username}",
-  "components.Login.invalidurlerror": "Impossible de se connecter au serveur {mediaServerName}.",
-  "components.MovieDetails.removefromwatchlist": "Supprimer de la liste de surveillance",
-  "components.Login.adminerror": "Vous devez utiliser un compte administrateur pour vous connecter.",
-  "components.MovieDetails.addtowatchlist": "Ajouter à la liste de surveillance",
-  "components.MovieDetails.watchlistDeleted": "<strong>{title}</strong> Supprimé de la liste de surveillance avec succès!",
-  "components.Login.validationUrlBaseTrailingSlash": "L'URL de base ne doit pas se terminer par une barre oblique finale",
-  "components.RequestList.RequestItem.profileName": "Profil",
-  "components.UserProfile.UserSettings.UserGeneralSettings.validationemailformat": "Email valide requis",
-  "components.TvDetails.watchlistDeleted": "<strong>{title}</strong> Supprimé de la liste de surveillance avec succès!",
-  "components.TvDetails.addtowatchlist": "Ajouter à la liste de surveillance",
-  "components.Login.enablessl": "Utilise SSL",
-  "components.Login.hostname": "URL de {mediaServerName}",
-  "components.Login.port": "Port",
-  "components.Login.urlBase": "URL de base",
-  "components.Login.validationHostnameRequired": "Vous devez fournir un nom d'hôte ou une adresse IP valide",
-  "components.Login.validationPortRequired": "Vous devez fournir un numéro de port valide",
-  "components.Login.validationUrlBaseLeadingSlash": "L'URL de base doit avoir une barre oblique initiale",
-  "components.Login.validationUrlTrailingSlash": "L'URL ne doit pas se terminer par une barre oblique finale",
-  "components.MovieDetails.watchlistError": "Une erreur s'est produite, réessayez.",
-  "components.MovieDetails.watchlistSuccess": "<strong>{title}</strong> a été ajouté à la liste de surveillance avec succès!",
-  "components.Settings.invalidurlerror": "Impossible de se connecter au serveur {mediaServerName}.",
-  "components.Settings.jellyfinForgotPasswordUrl": "URL de mot de passe oublié",
-  "components.Settings.jellyfinSyncFailedAutomaticGroupedFolders": "L'authentification personnalisée avec le regroupement automatique de bibliothèques n'est pas prise en charge",
-  "components.Settings.jellyfinSyncFailedGenericError": "Une erreur s'est produite lors de la synchronisation des bibliothèques",
-  "components.Settings.jellyfinSyncFailedNoLibrariesFound": "Aucune bibliothèque n'a été trouvée",
-  "components.TvDetails.removefromwatchlist": "Supprimer de la liste de surveillance",
-  "components.TvDetails.watchlistError": "Une erreur s'est produite, réessayez.",
-  "components.TvDetails.watchlistSuccess": "<strong>{title}</strong> a été ajouté à la liste de surveillance avec succès!",
-  "components.UserList.username": "Nom d'utilisateur",
-  "components.UserList.validationUsername": "Vous devez fournir un nom d'utilisateur",
-  "components.UserProfile.UserSettings.UserGeneralSettings.validationemailrequired": "Email requis",
-  "components.Login.validationservertyperequired": "Merci de sélectionner un type de serveur",
-  "components.Setup.servertype": "Choisir le type de serveur",
-  "components.Login.back": "Retourner en arrière",
-  "components.Login.servertype": "Type de serveur",
-  "components.Selector.canceled": "Annulé(e)",
-  "components.Selector.ended": "Terminé(e)",
-  "components.Selector.inProduction": "En production",
-  "components.Selector.pilot": "Pilote",
-  "components.Selector.planned": "Planifié(e)",
-  "components.Selector.returningSeries": "Séries de retour",
-  "components.Selector.searchStatus": "Sélectionner statut...",
-  "components.Setup.back": "Retourner en arrière",
-  "components.Setup.configemby": "Configurer Emby",
-  "components.Setup.configjellyfin": "Configurer Jellyfin",
-  "components.Setup.configplex": "Configurer Plex",
-  "components.Setup.signinWithEmby": "Renseigner vos informations d'identification d'Emby",
-  "components.Setup.subtitle": "Commencez par choisir votre serveur multimédia",
-  "components.StatusBadge.seasonnumber": "S{seasonNumber}",
-  "components.Discover.FilterSlideover.status": "Statut",
-  "components.Blacklist.mediaType": "Type",
-  "components.Blacklist.mediaTmdbId": "tmdb Id",
-  "components.Blacklist.blacklistdate": "date",
-  "components.Blacklist.blacklistedby": "{date} par {user}",
-  "components.Blacklist.mediaName": "Nom",
-  "component.BlacklistBlock.blacklistdate": "Date de mise en liste noire",
-  "component.BlacklistBlock.blacklistedby": "Mis en liste noire par",
-  "component.BlacklistModal.blacklisting": "Ajout en liste noire",
-  "components.Blacklist.blacklistNotFoundError": "<strong>{title}</strong> n'est pas en liste noire.",
-  "components.Blacklist.blacklistSettingsDescription": "Gérer le contenu en liste noire",
-  "components.Blacklist.blacklistsettings": "Paramètres de la liste noire",
-  "components.Layout.Sidebar.blacklist": "Liste noir"
+  "components.UserProfile.localWatchlist": "Watchlist de {username}"
 }