Merge branch 'development' into main

.github/workflows/backend-test.yml

@@ -5,39 +5,33 @@ permissions:
 
 on:
   pull_request:
-    paths:
-      - 'backend/server/**'
-      - '.github/workflows/backend-test.yml'
   push:
-    paths:
-      - 'backend/server/**'
-      - '.github/workflows/backend-test.yml'
 
 jobs:
   build:
+    name: Build and Test Backend
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
 
       - name: set up python 3.12
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: "3.12"
 
       - name: install dependencies
         run: |
           sudo apt update -q
-          sudo apt install -y -q \
-            python3-gdal
+          sudo apt install -y -q python3-gdal
 
       - name: start database
         run: |
           docker compose -f .github/.docker-compose-database.yml up -d
 
-      - name: install python libreries
+      - name: install python libraries
         working-directory: backend/server
-        run: |
-          pip install -r requirements.txt
+        run: pip install -r requirements.txt
 
       - name: run server
         working-directory: backend/server

.github/workflows/frontend-test.yml

@@ -5,17 +5,13 @@ permissions:
 
 on:
   pull_request:
-    paths:
-      - "frontend/**"
-      - ".github/workflows/frontend-test.yml"
   push:
-    paths:
-      - "frontend/**"
-      - ".github/workflows/frontend-test.yml"
 
 jobs:
   build:
+    name: Build and Test Frontend
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/trivy_security_scans.yml

@@ -0,0 +1,75 @@
+name: Trivy Security Scans
+
+on:
+  push:
+    branches:
+      - main
+      - development
+  pull_request:
+    branches:
+      - main
+      - development
+  schedule:
+    - cron: "0 8 * * 1" # Weekly scan on Mondays at 8 AM UTC
+
+jobs:
+  filesystem-scan:
+    name: Trivy Filesystem Scan (Source Code)
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Scan source code (Filesystem) with Trivy
+        uses: aquasecurity/trivy-action@master
+        with:
+          scan-type: fs
+          scan-ref: .
+          format: table
+          exit-code: 1
+          ignore-unfixed: true
+          severity: CRITICAL,HIGH
+
+  image-scan:
+    name: Trivy Docker Image Scan (Backend & Frontend)
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # Optional login step (remove if you're not pushing images to GHCR)
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build backend Docker image
+        run: docker build -t adventurelog-backend ./backend
+
+      - name: Build frontend Docker image
+        run: docker build -t adventurelog-frontend ./frontend
+
+      - name: Scan backend Docker image with Trivy
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: adventurelog-backend
+          format: table
+          exit-code: 1
+          ignore-unfixed: true
+          severity: CRITICAL,HIGH
+
+      - name: Scan frontend Docker image with Trivy
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: adventurelog-frontend
+          format: table
+          exit-code: 1
+          ignore-unfixed: true
+          severity: CRITICAL,HIGH

backend/server/adventures/management/commands/image_cleanup.py

@@ -0,0 +1,94 @@
+import os
+from django.core.management.base import BaseCommand
+from django.conf import settings
+from adventures.models import AdventureImage, Attachment
+from users.models import CustomUser
+
+
+class Command(BaseCommand):
+	help = 'Find and prompt for deletion of unused image files and attachments in filesystem'
+
+	def add_arguments(self, parser):
+		parser.add_argument(
+			'--dry-run',
+			action='store_true',
+			help='Show files that would be deleted without actually deleting them',
+		)
+
+	def handle(self, **options):
+		dry_run = options['dry_run']
+		
+		# Get all image and attachment file paths from database
+		used_files = set()
+		
+		# Get AdventureImage file paths
+		for img in AdventureImage.objects.all():
+			if img.image and img.image.name:
+				used_files.add(os.path.join(settings.MEDIA_ROOT, img.image.name))
+		
+		# Get Attachment file paths
+		for attachment in Attachment.objects.all():
+			if attachment.file and attachment.file.name:
+				used_files.add(os.path.join(settings.MEDIA_ROOT, attachment.file.name))
+		
+		# Get user profile picture file paths
+		for user in CustomUser.objects.all():
+			if user.profile_pic and user.profile_pic.name:
+				used_files.add(os.path.join(settings.MEDIA_ROOT, user.profile_pic.name))
+		
+		# Find all files in media/images and media/attachments directories
+		media_root = settings.MEDIA_ROOT
+		all_files = []
+		
+		# Scan images directory
+		images_dir = os.path.join(media_root, 'images')
+		# Scan attachments directory
+		attachments_dir = os.path.join(media_root, 'attachments')
+		if os.path.exists(attachments_dir):
+			for root, _, files in os.walk(attachments_dir):
+				for file in files:
+					all_files.append(os.path.join(root, file))
+		
+		# Scan profile-pics directory
+		profile_pics_dir = os.path.join(media_root, 'profile-pics')
+		if os.path.exists(profile_pics_dir):
+			for root, _, files in os.walk(profile_pics_dir):
+				for file in files:
+					all_files.append(os.path.join(root, file))
+		attachments_dir = os.path.join(media_root, 'attachments')
+		if os.path.exists(attachments_dir):
+			for root, _, files in os.walk(attachments_dir):
+				for file in files:
+					all_files.append(os.path.join(root, file))
+		
+		# Find unused files
+		unused_files = [f for f in all_files if f not in used_files]
+		
+		if not unused_files:
+			self.stdout.write(self.style.SUCCESS('No unused files found.'))
+			return
+		
+		self.stdout.write(f'Found {len(unused_files)} unused files:')
+		for file_path in unused_files:
+			self.stdout.write(f'  {file_path}')
+		
+		if dry_run:
+			self.stdout.write(self.style.WARNING('Dry run mode - no files were deleted.'))
+			return
+		
+		# Prompt for deletion
+		confirm = input('\nDo you want to delete these files? (yes/no): ')
+		if confirm.lower() in ['yes', 'y']:
+			deleted_count = 0
+			for file_path in unused_files:
+				try:
+					os.remove(file_path)
+					self.stdout.write(f'Deleted: {file_path}')
+					deleted_count += 1
+				except OSError as e:
+					self.stdout.write(self.style.ERROR(f'Error deleting {file_path}: {e}'))
+			
+			self.stdout.write(self.style.SUCCESS(f'Successfully deleted {deleted_count} files.'))
+		else:
+			self.stdout.write('Operation cancelled.')
+

backend/server/adventures/models.py

@@ -656,6 +656,15 @@ class Adventure(models.Model):
 
         return result
 
+    def delete(self, *args, **kwargs):
+        # Delete all associated AdventureImages first to trigger their filesystem cleanup
+        for image in self.images.all():
+            image.delete()
+        # Delete all associated Attachment files first to trigger their filesystem cleanup
+        for attachment in self.attachments.all():
+            attachment.delete()
+        super().delete(*args, **kwargs)
+
     def __str__(self):
         return self.name
 
@@ -838,6 +847,12 @@ class AdventureImage(models.Model):
         self.full_clean()  # This calls clean() method
         super().save(*args, **kwargs)
 
+    def delete(self, *args, **kwargs):
+        # Remove file from disk when deleting AdventureImage
+        if self.image and os.path.isfile(self.image.path):
+            os.remove(self.image.path)
+        super().delete(*args, **kwargs)
+
     def __str__(self):
         return self.image.url if self.image else f"Immich ID: {self.immich_id or 'No image'}"
     
@@ -849,6 +864,11 @@ class Attachment(models.Model):
     adventure = models.ForeignKey(Adventure, related_name='attachments', on_delete=models.CASCADE)
     name = models.CharField(max_length=200, null=True, blank=True)
 
+    def delete(self, *args, **kwargs):
+        if self.file and os.path.isfile(self.file.path):
+            os.remove(self.file.path)
+        super().delete(*args, **kwargs)
+
     def __str__(self):
         return self.file.url
 

backend/server/adventures/views/adventure_image_view.py

@@ -9,6 +9,7 @@ from adventures.serializers import AdventureImageSerializer
 from integrations.models import ImmichIntegration
 import uuid
 import requests
+import os
 
 class AdventureImageViewSet(viewsets.ModelViewSet):
     serializer_class = AdventureImageSerializer
@@ -155,7 +156,6 @@ class AdventureImageViewSet(viewsets.ModelViewSet):
         return super().update(request, *args, **kwargs)
     
     def perform_destroy(self, instance):
-        print("perform_destroy")
         return super().perform_destroy(instance)
 
     def destroy(self, request, *args, **kwargs):

backend/server/requirements.txt

@@ -1,4 +1,4 @@
-Django==5.2.1
+Django==5.2.2
 djangorestframework>=3.15.2
 django-allauth==0.63.3
 drf-yasg==1.21.4

frontend/package.json

@@ -50,5 +50,13 @@
 		"qrcode": "^1.5.4",
 		"svelte-i18n": "^4.0.1",
 		"svelte-maplibre": "^0.9.8"
+	},
+	"overrides": {
+		"esbuild": "^0.25.0"
+	},
+	"pnpm": {
+		"overrides": {
+			"esbuild": "^0.25.0"
+		}
 	}
 }

frontend/pnpm-lock.yaml

@@ -4,6 +4,9 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+overrides:
+  esbuild: ^0.25.0
+
 importers:
 
   .:
@@ -137,428 +140,152 @@ packages:
   '@antfu/utils@8.1.1':
     resolution: {integrity: sha512-Mex9nXf9vR6AhcXmMrlz/HVgYYZpVGJ6YlPgwl7UnaFpnshXs6EK/oa5Gpf3CzENMjkvEx2tQtntGnb7UtSTOQ==}
 
-  '@esbuild/aix-ppc64@0.19.12':
-    resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [aix]
-
-  '@esbuild/aix-ppc64@0.21.5':
-    resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [aix]
-
-  '@esbuild/aix-ppc64@0.24.2':
-    resolution: {integrity: sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==}
+  '@esbuild/aix-ppc64@0.25.5':
+    resolution: {integrity: sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/android-arm64@0.19.12':
-    resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-
-  '@esbuild/android-arm64@0.21.5':
-    resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-
-  '@esbuild/android-arm64@0.24.2':
-    resolution: {integrity: sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==}
+  '@esbuild/android-arm64@0.25.5':
+    resolution: {integrity: sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm@0.19.12':
-    resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-
-  '@esbuild/android-arm@0.21.5':
-    resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-
-  '@esbuild/android-arm@0.24.2':
-    resolution: {integrity: sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==}
+  '@esbuild/android-arm@0.25.5':
+    resolution: {integrity: sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-x64@0.19.12':
-    resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-
-  '@esbuild/android-x64@0.21.5':
-    resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-
-  '@esbuild/android-x64@0.24.2':
-    resolution: {integrity: sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==}
+  '@esbuild/android-x64@0.25.5':
+    resolution: {integrity: sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
 
-  '@esbuild/darwin-arm64@0.19.12':
-    resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@esbuild/darwin-arm64@0.21.5':
-    resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@esbuild/darwin-arm64@0.24.2':
-    resolution: {integrity: sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==}
+  '@esbuild/darwin-arm64@0.25.5':
+    resolution: {integrity: sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.19.12':
-    resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@esbuild/darwin-x64@0.21.5':
-    resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@esbuild/darwin-x64@0.24.2':
-    resolution: {integrity: sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==}
+  '@esbuild/darwin-x64@0.25.5':
+    resolution: {integrity: sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/freebsd-arm64@0.19.12':
-    resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-arm64@0.21.5':
-    resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-arm64@0.24.2':
-    resolution: {integrity: sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==}
+  '@esbuild/freebsd-arm64@0.25.5':
+    resolution: {integrity: sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.19.12':
-    resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-x64@0.21.5':
-    resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-x64@0.24.2':
-    resolution: {integrity: sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==}
+  '@esbuild/freebsd-x64@0.25.5':
+    resolution: {integrity: sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/linux-arm64@0.19.12':
-    resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@esbuild/linux-arm64@0.21.5':
-    resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@esbuild/linux-arm64@0.24.2':
-    resolution: {integrity: sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==}
+  '@esbuild/linux-arm64@0.25.5':
+    resolution: {integrity: sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm@0.19.12':
-    resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-
-  '@esbuild/linux-arm@0.21.5':
-    resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-
-  '@esbuild/linux-arm@0.24.2':
-    resolution: {integrity: sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==}
+  '@esbuild/linux-arm@0.25.5':
+    resolution: {integrity: sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.19.12':
-    resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-
-  '@esbuild/linux-ia32@0.21.5':
-    resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-
-  '@esbuild/linux-ia32@0.24.2':
-    resolution: {integrity: sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==}
+  '@esbuild/linux-ia32@0.25.5':
+    resolution: {integrity: sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.19.12':
-    resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-
-  '@esbuild/linux-loong64@0.21.5':
-    resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-
-  '@esbuild/linux-loong64@0.24.2':
-    resolution: {integrity: sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==}
+  '@esbuild/linux-loong64@0.25.5':
+    resolution: {integrity: sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==}
     engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.19.12':
-    resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-
-  '@esbuild/linux-mips64el@0.21.5':
-    resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-
-  '@esbuild/linux-mips64el@0.24.2':
-    resolution: {integrity: sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==}
+  '@esbuild/linux-mips64el@0.25.5':
+    resolution: {integrity: sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==}
     engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.19.12':
-    resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-
-  '@esbuild/linux-ppc64@0.21.5':
-    resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-
-  '@esbuild/linux-ppc64@0.24.2':
-    resolution: {integrity: sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==}
+  '@esbuild/linux-ppc64@0.25.5':
+    resolution: {integrity: sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.19.12':
-    resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-
-  '@esbuild/linux-riscv64@0.21.5':
-    resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-
-  '@esbuild/linux-riscv64@0.24.2':
-    resolution: {integrity: sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==}
+  '@esbuild/linux-riscv64@0.25.5':
+    resolution: {integrity: sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==}
     engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.19.12':
-    resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-
-  '@esbuild/linux-s390x@0.21.5':
-    resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-
-  '@esbuild/linux-s390x@0.24.2':
-    resolution: {integrity: sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==}
+  '@esbuild/linux-s390x@0.25.5':
+    resolution: {integrity: sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==}
     engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-x64@0.19.12':
-    resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-
-  '@esbuild/linux-x64@0.21.5':
-    resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-
-  '@esbuild/linux-x64@0.24.2':
-    resolution: {integrity: sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==}
+  '@esbuild/linux-x64@0.25.5':
+    resolution: {integrity: sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/netbsd-arm64@0.24.2':
-    resolution: {integrity: sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==}
+  '@esbuild/netbsd-arm64@0.25.5':
+    resolution: {integrity: sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.19.12':
-    resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-
-  '@esbuild/netbsd-x64@0.21.5':
-    resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-
-  '@esbuild/netbsd-x64@0.24.2':
-    resolution: {integrity: sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==}
+  '@esbuild/netbsd-x64@0.25.5':
+    resolution: {integrity: sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/openbsd-arm64@0.24.2':
-    resolution: {integrity: sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==}
+  '@esbuild/openbsd-arm64@0.25.5':
+    resolution: {integrity: sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.19.12':
-    resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-
-  '@esbuild/openbsd-x64@0.21.5':
-    resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-
-  '@esbuild/openbsd-x64@0.24.2':
-    resolution: {integrity: sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==}
+  '@esbuild/openbsd-x64@0.25.5':
+    resolution: {integrity: sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/sunos-x64@0.19.12':
-    resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-
-  '@esbuild/sunos-x64@0.21.5':
-    resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-
-  '@esbuild/sunos-x64@0.24.2':
-    resolution: {integrity: sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==}
+  '@esbuild/sunos-x64@0.25.5':
+    resolution: {integrity: sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/win32-arm64@0.19.12':
-    resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@esbuild/win32-arm64@0.21.5':
-    resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@esbuild/win32-arm64@0.24.2':
-    resolution: {integrity: sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==}
+  '@esbuild/win32-arm64@0.25.5':
+    resolution: {integrity: sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.19.12':
-    resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-
-  '@esbuild/win32-ia32@0.21.5':
-    resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-
-  '@esbuild/win32-ia32@0.24.2':
-    resolution: {integrity: sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==}
+  '@esbuild/win32-ia32@0.25.5':
+    resolution: {integrity: sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-x64@0.19.12':
-    resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-
-  '@esbuild/win32-x64@0.21.5':
-    resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-
-  '@esbuild/win32-x64@0.24.2':
-    resolution: {integrity: sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==}
+  '@esbuild/win32-x64@0.25.5':
+    resolution: {integrity: sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
@@ -1188,18 +915,8 @@ packages:
   es6-weak-map@2.0.3:
     resolution: {integrity: sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==}
 
-  esbuild@0.19.12:
-    resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==}
-    engines: {node: '>=12'}
-    hasBin: true
-
-  esbuild@0.21.5:
-    resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
-    engines: {node: '>=12'}
-    hasBin: true
-
-  esbuild@0.24.2:
-    resolution: {integrity: sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==}
+  esbuild@0.25.5:
+    resolution: {integrity: sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -2189,217 +1906,79 @@ snapshots:
 
   '@antfu/utils@8.1.1': {}
 
-  '@esbuild/aix-ppc64@0.19.12':
+  '@esbuild/aix-ppc64@0.25.5':
     optional: true
 
-  '@esbuild/aix-ppc64@0.21.5':
+  '@esbuild/android-arm64@0.25.5':
     optional: true
 
-  '@esbuild/aix-ppc64@0.24.2':
+  '@esbuild/android-arm@0.25.5':
     optional: true
 
-  '@esbuild/android-arm64@0.19.12':
+  '@esbuild/android-x64@0.25.5':
     optional: true
 
-  '@esbuild/android-arm64@0.21.5':
+  '@esbuild/darwin-arm64@0.25.5':
     optional: true
 
-  '@esbuild/android-arm64@0.24.2':
+  '@esbuild/darwin-x64@0.25.5':
     optional: true
 
-  '@esbuild/android-arm@0.19.12':
+  '@esbuild/freebsd-arm64@0.25.5':
     optional: true
 
-  '@esbuild/android-arm@0.21.5':
+  '@esbuild/freebsd-x64@0.25.5':
     optional: true
 
-  '@esbuild/android-arm@0.24.2':
+  '@esbuild/linux-arm64@0.25.5':
     optional: true
 
-  '@esbuild/android-x64@0.19.12':
+  '@esbuild/linux-arm@0.25.5':
     optional: true
 
-  '@esbuild/android-x64@0.21.5':
+  '@esbuild/linux-ia32@0.25.5':
     optional: true
 
-  '@esbuild/android-x64@0.24.2':
+  '@esbuild/linux-loong64@0.25.5':
     optional: true
 
-  '@esbuild/darwin-arm64@0.19.12':
+  '@esbuild/linux-mips64el@0.25.5':
     optional: true
 
-  '@esbuild/darwin-arm64@0.21.5':
+  '@esbuild/linux-ppc64@0.25.5':
     optional: true
 
-  '@esbuild/darwin-arm64@0.24.2':
+  '@esbuild/linux-riscv64@0.25.5':
     optional: true
 
-  '@esbuild/darwin-x64@0.19.12':
+  '@esbuild/linux-s390x@0.25.5':
     optional: true
 
-  '@esbuild/darwin-x64@0.21.5':
+  '@esbuild/linux-x64@0.25.5':
     optional: true
 
-  '@esbuild/darwin-x64@0.24.2':
+  '@esbuild/netbsd-arm64@0.25.5':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.19.12':
+  '@esbuild/netbsd-x64@0.25.5':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.21.5':
+  '@esbuild/openbsd-arm64@0.25.5':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.24.2':
+  '@esbuild/openbsd-x64@0.25.5':
     optional: true
 
-  '@esbuild/freebsd-x64@0.19.12':
+  '@esbuild/sunos-x64@0.25.5':
     optional: true
 
-  '@esbuild/freebsd-x64@0.21.5':
+  '@esbuild/win32-arm64@0.25.5':
     optional: true
 
-  '@esbuild/freebsd-x64@0.24.2':
+  '@esbuild/win32-ia32@0.25.5':
     optional: true
 
-  '@esbuild/linux-arm64@0.19.12':
-    optional: true
-
-  '@esbuild/linux-arm64@0.21.5':
-    optional: true
-
-  '@esbuild/linux-arm64@0.24.2':
-    optional: true
-
-  '@esbuild/linux-arm@0.19.12':
-    optional: true
-
-  '@esbuild/linux-arm@0.21.5':
-    optional: true
-
-  '@esbuild/linux-arm@0.24.2':
-    optional: true
-
-  '@esbuild/linux-ia32@0.19.12':
-    optional: true
-
-  '@esbuild/linux-ia32@0.21.5':
-    optional: true
-
-  '@esbuild/linux-ia32@0.24.2':
-    optional: true
-
-  '@esbuild/linux-loong64@0.19.12':
-    optional: true
-
-  '@esbuild/linux-loong64@0.21.5':
-    optional: true
-
-  '@esbuild/linux-loong64@0.24.2':
-    optional: true
-
-  '@esbuild/linux-mips64el@0.19.12':
-    optional: true
-
-  '@esbuild/linux-mips64el@0.21.5':
-    optional: true
-
-  '@esbuild/linux-mips64el@0.24.2':
-    optional: true
-
-  '@esbuild/linux-ppc64@0.19.12':
-    optional: true
-
-  '@esbuild/linux-ppc64@0.21.5':
-    optional: true
-
-  '@esbuild/linux-ppc64@0.24.2':
-    optional: true
-
-  '@esbuild/linux-riscv64@0.19.12':
-    optional: true
-
-  '@esbuild/linux-riscv64@0.21.5':
-    optional: true
-
-  '@esbuild/linux-riscv64@0.24.2':
-    optional: true
-
-  '@esbuild/linux-s390x@0.19.12':
-    optional: true
-
-  '@esbuild/linux-s390x@0.21.5':
-    optional: true
-
-  '@esbuild/linux-s390x@0.24.2':
-    optional: true
-
-  '@esbuild/linux-x64@0.19.12':
-    optional: true
-
-  '@esbuild/linux-x64@0.21.5':
-    optional: true
-
-  '@esbuild/linux-x64@0.24.2':
-    optional: true
-
-  '@esbuild/netbsd-arm64@0.24.2':
-    optional: true
-
-  '@esbuild/netbsd-x64@0.19.12':
-    optional: true
-
-  '@esbuild/netbsd-x64@0.21.5':
-    optional: true
-
-  '@esbuild/netbsd-x64@0.24.2':
-    optional: true
-
-  '@esbuild/openbsd-arm64@0.24.2':
-    optional: true
-
-  '@esbuild/openbsd-x64@0.19.12':
-    optional: true
-
-  '@esbuild/openbsd-x64@0.21.5':
-    optional: true
-
-  '@esbuild/openbsd-x64@0.24.2':
-    optional: true
-
-  '@esbuild/sunos-x64@0.19.12':
-    optional: true
-
-  '@esbuild/sunos-x64@0.21.5':
-    optional: true
-
-  '@esbuild/sunos-x64@0.24.2':
-    optional: true
-
-  '@esbuild/win32-arm64@0.19.12':
-    optional: true
-
-  '@esbuild/win32-arm64@0.21.5':
-    optional: true
-
-  '@esbuild/win32-arm64@0.24.2':
-    optional: true
-
-  '@esbuild/win32-ia32@0.19.12':
-    optional: true
-
-  '@esbuild/win32-ia32@0.21.5':
-    optional: true
-
-  '@esbuild/win32-ia32@0.24.2':
-    optional: true
-
-  '@esbuild/win32-x64@0.19.12':
-    optional: true
-
-  '@esbuild/win32-x64@0.21.5':
-    optional: true
-
-  '@esbuild/win32-x64@0.24.2':
+  '@esbuild/win32-x64@0.25.5':
     optional: true
 
   '@event-calendar/core@3.12.0':
@@ -2673,7 +2252,7 @@ snapshots:
     dependencies:
       '@sveltejs/kit': 2.20.7(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.19(@types/node@22.15.2)))(svelte@4.2.19)(vite@5.4.19(@types/node@22.15.2))
       '@vercel/nft': 0.29.2(rollup@4.40.2)
-      esbuild: 0.24.2
+      esbuild: 0.25.5
     transitivePeerDependencies:
       - encoding
       - rollup
@@ -3046,85 +2625,33 @@ snapshots:
       es6-iterator: 2.0.3
       es6-symbol: 3.1.4
 
-  esbuild@0.19.12:
+  esbuild@0.25.5:
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.19.12
-      '@esbuild/android-arm': 0.19.12
-      '@esbuild/android-arm64': 0.19.12
-      '@esbuild/android-x64': 0.19.12
-      '@esbuild/darwin-arm64': 0.19.12
-      '@esbuild/darwin-x64': 0.19.12
-      '@esbuild/freebsd-arm64': 0.19.12
-      '@esbuild/freebsd-x64': 0.19.12
-      '@esbuild/linux-arm': 0.19.12
-      '@esbuild/linux-arm64': 0.19.12
-      '@esbuild/linux-ia32': 0.19.12
-      '@esbuild/linux-loong64': 0.19.12
-      '@esbuild/linux-mips64el': 0.19.12
-      '@esbuild/linux-ppc64': 0.19.12
-      '@esbuild/linux-riscv64': 0.19.12
-      '@esbuild/linux-s390x': 0.19.12
-      '@esbuild/linux-x64': 0.19.12
-      '@esbuild/netbsd-x64': 0.19.12
-      '@esbuild/openbsd-x64': 0.19.12
-      '@esbuild/sunos-x64': 0.19.12
-      '@esbuild/win32-arm64': 0.19.12
-      '@esbuild/win32-ia32': 0.19.12
-      '@esbuild/win32-x64': 0.19.12
-
-  esbuild@0.21.5:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.21.5
-      '@esbuild/android-arm': 0.21.5
-      '@esbuild/android-arm64': 0.21.5
-      '@esbuild/android-x64': 0.21.5
-      '@esbuild/darwin-arm64': 0.21.5
-      '@esbuild/darwin-x64': 0.21.5
-      '@esbuild/freebsd-arm64': 0.21.5
-      '@esbuild/freebsd-x64': 0.21.5
-      '@esbuild/linux-arm': 0.21.5
-      '@esbuild/linux-arm64': 0.21.5
-      '@esbuild/linux-ia32': 0.21.5
-      '@esbuild/linux-loong64': 0.21.5
-      '@esbuild/linux-mips64el': 0.21.5
-      '@esbuild/linux-ppc64': 0.21.5
-      '@esbuild/linux-riscv64': 0.21.5
-      '@esbuild/linux-s390x': 0.21.5
-      '@esbuild/linux-x64': 0.21.5
-      '@esbuild/netbsd-x64': 0.21.5
-      '@esbuild/openbsd-x64': 0.21.5
-      '@esbuild/sunos-x64': 0.21.5
-      '@esbuild/win32-arm64': 0.21.5
-      '@esbuild/win32-ia32': 0.21.5
-      '@esbuild/win32-x64': 0.21.5
-
-  esbuild@0.24.2:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.24.2
-      '@esbuild/android-arm': 0.24.2
-      '@esbuild/android-arm64': 0.24.2
-      '@esbuild/android-x64': 0.24.2
-      '@esbuild/darwin-arm64': 0.24.2
-      '@esbuild/darwin-x64': 0.24.2
-      '@esbuild/freebsd-arm64': 0.24.2
-      '@esbuild/freebsd-x64': 0.24.2
-      '@esbuild/linux-arm': 0.24.2
-      '@esbuild/linux-arm64': 0.24.2
-      '@esbuild/linux-ia32': 0.24.2
-      '@esbuild/linux-loong64': 0.24.2
-      '@esbuild/linux-mips64el': 0.24.2
-      '@esbuild/linux-ppc64': 0.24.2
-      '@esbuild/linux-riscv64': 0.24.2
-      '@esbuild/linux-s390x': 0.24.2
-      '@esbuild/linux-x64': 0.24.2
-      '@esbuild/netbsd-arm64': 0.24.2
-      '@esbuild/netbsd-x64': 0.24.2
-      '@esbuild/openbsd-arm64': 0.24.2
-      '@esbuild/openbsd-x64': 0.24.2
-      '@esbuild/sunos-x64': 0.24.2
-      '@esbuild/win32-arm64': 0.24.2
-      '@esbuild/win32-ia32': 0.24.2
-      '@esbuild/win32-x64': 0.24.2
+      '@esbuild/aix-ppc64': 0.25.5
+      '@esbuild/android-arm': 0.25.5
+      '@esbuild/android-arm64': 0.25.5
+      '@esbuild/android-x64': 0.25.5
+      '@esbuild/darwin-arm64': 0.25.5
+      '@esbuild/darwin-x64': 0.25.5
+      '@esbuild/freebsd-arm64': 0.25.5
+      '@esbuild/freebsd-x64': 0.25.5
+      '@esbuild/linux-arm': 0.25.5
+      '@esbuild/linux-arm64': 0.25.5
+      '@esbuild/linux-ia32': 0.25.5
+      '@esbuild/linux-loong64': 0.25.5
+      '@esbuild/linux-mips64el': 0.25.5
+      '@esbuild/linux-ppc64': 0.25.5
+      '@esbuild/linux-riscv64': 0.25.5
+      '@esbuild/linux-s390x': 0.25.5
+      '@esbuild/linux-x64': 0.25.5
+      '@esbuild/netbsd-arm64': 0.25.5
+      '@esbuild/netbsd-x64': 0.25.5
+      '@esbuild/openbsd-arm64': 0.25.5
+      '@esbuild/openbsd-x64': 0.25.5
+      '@esbuild/sunos-x64': 0.25.5
+      '@esbuild/win32-arm64': 0.25.5
+      '@esbuild/win32-ia32': 0.25.5
+      '@esbuild/win32-x64': 0.25.5
 
   escalade@3.2.0: {}
 
@@ -3827,7 +3354,7 @@ snapshots:
     dependencies:
       cli-color: 2.0.4
       deepmerge: 4.3.1
-      esbuild: 0.19.12
+      esbuild: 0.25.5
       estree-walker: 2.0.2
       intl-messageformat: 10.7.16
       sade: 1.8.1
@@ -3981,7 +3508,7 @@ snapshots:
 
   vite@5.4.19(@types/node@22.15.2):
     dependencies:
-      esbuild: 0.21.5
+      esbuild: 0.25.5
       postcss: 8.5.3
       rollup: 4.40.2
     optionalDependencies:

frontend/src/locales/es.json

@@ -297,8 +297,8 @@
 		"loading_adventures": "Cargando aventuras ...",
 		"name_location": "Nombre, ubicación",
 		"collection_contents": "Contenido de la colección",
-    "check_in": "Registrarse",
-    "check_out": "Verificar"
+		"check_in": "Entrada",
+		"check_out": "Salida"
 	},
 	"worldtravel": {
 		"all": "Todo",

frontend/src/locales/nl.json

@@ -23,7 +23,7 @@
     "ascending": "Oplopend",
     "cancel": "Annuleren",
     "category_filter": "Categoriefilter",
-    "clear": "Leeg maken",
+    "clear": "Leegmaken",
     "collection": "Collectie",
     "collection_adventures": "Inclusief collectie-avonturen",
     "collection_link_error": "Fout bij het koppelen van dit avontuur aan de collectie",
@@ -31,7 +31,7 @@
     "collection_remove_error": "Fout bij verwijderen van dit avontuur uit de collectie",
     "collection_remove_success": "Avontuur is succesvol uit de collectie verwijderd!",
     "count_txt": "resultaten die overeenkomen met uw zoekopdracht",
-    "create_new": "Maak nieuwe...",
+    "create_new": "Maak nieuw...",
     "date": "Datum",
     "delete": "Verwijderen",
     "delete_collection": "Collectie verwijderen",
@@ -41,8 +41,8 @@
     "edit_collection": "Collectie bewerken",
     "filter": "Filter",
     "homepage": "Startpagina",
-    "latitude": "Breedte",
-    "longitude": "Lengte",
+    "latitude": "Breedtegraad",
+    "longitude": "Lengtegraad",
     "my_collections": "Mijn collecties",
     "name": "Naam",
     "no_image_found": "Geen afbeelding gevonden",
@@ -131,10 +131,10 @@
     "update_visited_regions": "Werk bezochte regio's bij",
     "update_visited_regions_disclaimer": "Dit kan even duren, afhankelijk van het aantal avondturen dat je hebt beleefd.",
     "visited_region_check": "Controleer bezochte regio's",
-    "visited_region_check_desc": "Door dit te selecteren, controleert de server alle avonturen die je beleefde en markeert hun regio's als bezocht in de wereldreizen.",
+    "visited_region_check_desc": "Door dit te selecteren, controleert de server alle avonturen die je hebt beleefd en markeert hun regio's als bezocht in de wereldreizen.",
     "add_new": "Nieuw toevoegen...",
-    "checklist": "Controlelijst",
-    "checklists": "Controlelijsten",
+    "checklist": "Checklist",
+    "checklists": "Checklists",
     "collection_archived": "Deze collectie is gearchiveerd.",
     "collection_completed": "Je hebt deze collectie voltooid!",
     "collection_stats": "Collectiestatistieken",
@@ -167,7 +167,7 @@
     "checklist_delete_confirm": "Weet u zeker dat u deze checklist wilt verwijderen? \nDeze actie kan niet ongedaan worden gemaakt.",
     "clear_location": "Locatie wissen",
     "date_information": "Datuminformatie",
-    "delete_checklist": "Controlelijst verwijderen",
+    "delete_checklist": "Checklist verwijderen",
     "delete_note": "Notitie verwijderen",
     "delete_transportation": "Transport verwijderen",
     "end": "Einde",
@@ -201,18 +201,18 @@
     "delete_lodging": "Verwijder accommodatie",
     "display_name": "Weergavenaam",
     "location_details": "Locatiegegevens",
-    "lodging": "Onderdak",
+    "lodging": "Accomodatie",
     "reservation_number": "Reserveringsnummer",
-    "lodging_delete_confirm": "Weet u zeker dat u deze accommodatielocatie wilt verwijderen? \nDeze actie kan niet ongedaan worden gemaakt.",
-    "lodging_information": "Informatie overliggen",
+    "lodging_delete_confirm": "Weet u zeker dat u deze accommodatie wilt verwijderen? \nDeze actie kan niet ongedaan worden gemaakt.",
+    "lodging_information": "Accomodatie-informatie",
     "price": "Prijs",
     "region": "Regio",
     "open_in_maps": "Open in kaarten",
     "all_day": "De hele dag",
     "collection_no_start_end_date": "Als u een start- en einddatum aan de collectie toevoegt, ontgrendelt u de functies van de planning van de route ontgrendelen in de verzamelpagina.",
-    "date_itinerary": "Datumroute",
-    "no_ordered_items": "Voeg items toe met datums aan de collectie om ze hier te zien.",
-    "ordered_itinerary": "Besteld reisschema",
+    "date_itinerary": "Datum reisschema",
+    "no_ordered_items": "Voeg items met datums toe aan de collectie om ze hier te zien.",
+    "ordered_itinerary": "Geordend reisschema",
     "invalid_date_range": "Ongeldige datumbereik",
     "timezone": "Tijdzone",
     "no_visits": "Geen bezoeken",
@@ -220,7 +220,7 @@
     "departure_timezone": "Vertrektijdzone",
     "arrival_date": "Aankomstdatum",
     "departure_date": "Vertrekdatum",
-    "coordinates": "Coördineert",
+    "coordinates": "Coördinaten",
     "copy_coordinates": "Kopieer coördinaten",
     "sun_times": "Zonnetijden",
     "sunrise": "Zonsopgang",
@@ -232,9 +232,9 @@
     "joined": "Samengevoegd",
     "view_profile": "Bekijk profiel",
     "share_collection": "Deel deze collectie!",
-    "filters_and_sort": "Filters",
-    "filters_and_stats": "Filters",
-    "no_adventures_message": "Begin met het documenteren van uw avonturen en het plannen van nieuwe. \nElke reis heeft een verhaal dat het vertellen waard is.",
+    "filters_and_sort": "Filters & Sorteren",
+    "filters_and_stats": "Filters & Statistieken",
+    "no_adventures_message": "Begin met het documenteren van uw avonturen en het plannen van nieuwe avonturen. \nElke reis heeft een verhaal dat het vertellen waard is.",
     "travel_progress": "Reisvoortgang",
     "adventures_available": "Avonturen beschikbaar",
     "all_adventures_already_linked": "Alle avonturen zijn al gekoppeld aan deze collectie.",
@@ -242,9 +242,9 @@
     "create_collection_first": "Maak eerst een collectie om je avonturen en herinneringen te organiseren.",
     "delete_collection_warning": "Weet u zeker dat u deze collectie wilt verwijderen? \nDeze actie kan niet ongedaan worden gemaakt.",
     "done": "Klaar",
-    "loading_adventures": "Adventuren laden ...",
+    "loading_adventures": "Avonturen laden ...",
     "name_location": "naam, locatie",
-    "collection_contents": "Verzamelingsinhoud",
+    "collection_contents": "Collectie-inhoud",
     "check_in": "Inchecken",
     "check_out": "Uitchecken"
   },
@@ -285,7 +285,7 @@
       "aestheticLight": "Esthetisch licht",
       "aqua": "Aqua",
       "dark": "Donker",
-      "dim": "Vaag",
+      "dim": "Duister",
       "forest": "Woud",
       "light": "Licht",
       "night": "Nacht",
@@ -349,9 +349,9 @@
     "all_regions": "Alle regio's",
     "available_to_explore": "Beschikbaar om te verkennen",
     "cities_in": "Steden in",
-    "clear_all": "Duidelijk alles duidelijk",
+    "clear_all": "Alles wissen",
     "clear_all_filters": "Wis alle filters",
-    "clear_filters": "Duidelijke filters duiden",
+    "clear_filters": "Filters wissen",
     "complete": "Compleet",
     "countries": "landen",
     "country_completed": "Voltooid land",
@@ -367,9 +367,9 @@
     "of": "van",
     "partial": "Gedeeltelijk",
     "progress": "Voortgang",
-    "progress_and_stats": "Voortgang",
+    "progress_and_stats": "Voortgang & Statistieken",
     "region_completed": "Regio voltooid",
-    "remaining": "Overig",
+    "remaining": "Resterende",
     "show_map": "Toon kaart",
     "show_map_labels": "Toon kaartlabels",
     "total_cities": "Totale steden",
@@ -398,7 +398,7 @@
     "reset_password": "Wachtwoord opnieuw instellen",
     "about_this_background": "Over deze achtergrond",
     "join_discord": "Sluit je aan bij Discord",
-    "join_discord_desc": "om uw eigen foto's te delen. \nPlaats ze in de",
+    "join_discord_desc": "om uw eigen foto's te delen, Plaats ze in het #travel-share kanaal",
     "photo_by": "Foto door",
     "current_password": "Huidig wachtwoord",
     "password_change_lopout_warning": "Na het wijzigen van uw wachtwoord wordt u uitgelogd.",
@@ -444,10 +444,10 @@
     "password_enabled": "Wachtwoordverificatie ingeschakeld",
     "password_enabled_error": "Fout bij het inschakelen van wachtwoordverificatie.",
     "access_restricted": "Toegang beperkt",
-    "access_restricted_desc": "Yadministratieve functies zijn alleen beschikbaar voor personeelsleden.",
-    "add_new_email": "Voeg nieuwe e -mail toe",
-    "add_new_email_address": "Voeg nieuw e -mailadres toe",
-    "admin": "Beheersing",
+    "access_restricted_desc": "administratieve functies zijn alleen beschikbaar voor administrators.",
+    "add_new_email": "Voeg nieuwe e-mail toe",
+    "add_new_email_address": "Voeg nieuw e-mailadres toe",
+    "admin": "Administrator",
     "admin_panel_desc": "Toegang tot de volledige beheerinterface",
     "administration": "Administratie",
     "administration_desc": "Administratieve tools en instellingen",
@@ -457,16 +457,16 @@
     "all_rights_reserved": "Alle rechten voorbehouden.",
     "app_version": "App -versie",
     "debug_information": "Debug -informatie",
-    "disabled": "Gehandicapt",
+    "disabled": "Uitgeschakeld",
     "disconnected": "Losgekoppeld",
-    "email_management": "E -mailbeheer",
-    "email_management_desc": "Beheer uw e -mailadressen en verificatiestatus",
-    "emails": "E -mails",
+    "email_management": "E-mailbeheer",
+    "email_management_desc": "Beheer uw e-mailadressen en verificatiestatus",
+    "emails": "E-mails",
     "enabled": "Ingeschakeld",
     "enter_current_password": "Voer het huidige wachtwoord in",
     "enter_first_name": "Voer uw voornaam in",
     "enter_last_name": "Voer uw achternaam in",
-    "enter_new_email": "Voer een nieuw e -mailadres in",
+    "enter_new_email": "Voer een nieuw e-mailadres in",
     "enter_new_password": "Voer een nieuw wachtwoord in",
     "enter_username": "Voer uw gebruikersnaam in",
     "integrations": "Integratie",
@@ -476,36 +476,36 @@
     "mfa_is_enabled": "MFA is ingeschakeld",
     "pass_change_desc": "Werk uw accountwachtwoord bij voor een betere beveiliging",
     "password_auth": "Wachtwoordverificatie",
-    "password_login_disabled": "Wachtwoord Aanmelding Uitgeschakeld",
-    "password_login_enabled": "Wachtwoordaanmelding ingeschakeld",
+    "password_login_disabled": "Wachtwoord aanmelding uitgeschakeld",
+    "password_login_enabled": "Wachtwoord aanmelding ingeschakeld",
     "profile_info": "Profielinformatie",
     "profile_info_desc": "Werk uw persoonlijke gegevens en profielfoto bij",
     "public_profile_desc": "Maak uw profiel zichtbaar voor andere gebruikers",
     "quick_actions": "Snelle acties",
-    "region_updates": "Regio -updates",
+    "region_updates": "Regio updates",
     "region_updates_desc": "Update bezochte regio's en steden",
     "regular_user": "Gewone gebruiker",
     "security": "Beveiliging",
     "settings_menu": "Instellingenmenu",
     "social_auth": "Sociale authenticatie",
     "social_auth_desc_1": "Beheer sociale inlogopties en wachtwoordinstellingen",
-    "social_auth_setup": "Sociale authenticatie -opstelling",
+    "social_auth_setup": "Sociale authenticatie opstelling",
     "staff_status": "Status",
     "staff_user": "Personeelsgebruiker",
     "connected": "Aangesloten",
     "invalid_credentials": "Ongeldige referenties"
   },
   "checklist": {
-    "checklist_delete_error": "Fout bij het verwijderen van de controlelijst",
-    "checklist_deleted": "Controlelijst succesvol verwijderd!",
-    "checklist_editor": "Controlelijsten bewerken",
-    "checklist_public": "Deze controlelijst is openbaar omdat deze zich in een openbare collectie bevindt.",
+    "checklist_delete_error": "Fout bij het verwijderen van de checklist",
+    "checklist_deleted": "Checklist succesvol verwijderd!",
+    "checklist_editor": "Checklists bewerken",
+    "checklist_public": "Deze checklist is openbaar omdat deze zich in een openbare collectie bevindt.",
     "item": "Artikel",
     "item_already_exists": "Artikel bestaat al",
     "item_cannot_be_empty": "Artikel mag niet leeg zijn",
     "items": "Artikelen",
     "new_item": "Nieuw artikel",
-    "new_checklist": "Nieuwe controlelijst"
+    "new_checklist": "Nieuwe checklist"
   },
   "collection": {
     "collection_created": "Collectie succesvol aangemaakt!",
@@ -525,7 +525,7 @@
     "shared_collections": "Gedeelde collecties",
     "available": "Beschikbaar",
     "linked": "Gekoppeld",
-    "try_different_search": "Probeer een ander zoek of filter."
+    "try_different_search": "Probeer een andere zoekopdracht of filter."
   },
   "notes": {
     "add_a_link": "Voeg een link toe",
@@ -561,27 +561,27 @@
     "new_transportation": "Nieuw vervoer",
     "transportation_delete_error": "Fout bij verwijderen vervoer",
     "transportation_deleted": "Vervoer succesvol verwijderd!",
-    "ending_airport_desc": "Voer eindigende luchthavencode in (bijv. LAX)",
-    "fetch_location_information": "Locatie -informatie ophalen",
-    "starting_airport_desc": "Voer de startende luchthavencode in (bijv. JFK)"
+    "ending_airport_desc": "Voer aankomst luchthavencode in (bijv. LAX)",
+    "fetch_location_information": "Locatie-informatie ophalen",
+    "starting_airport_desc": "Voer de vertrek luchthavencode in (bijv. JFK)"
   },
   "search": {
-    "adventurelog_results": "AdventureLog-resultaten",
+    "adventurelog_results": "AdventureLog resultaten",
     "online_results": "Online resultaten",
     "public_adventures": "Openbare avonturen"
   },
   "map": {
     "add_adventure": "Voeg nieuw avontuur toe",
-    "add_adventure_at_marker": "Voeg een nieuw avontuur toe bij het markeerpunt",
+    "add_adventure_at_marker": "Voeg een nieuw avontuur toe bij de marker",
     "adventure_map": "Avonturenkaart",
-    "clear_marker": "Verwijder markeerpunt",
+    "clear_marker": "Verwijder marker",
     "map_options": "Kaartopties",
     "show_visited_regions": "Toon bezochte regio's",
     "view_details": "Details bekijken",
     "adventure_stats": "Avontuurstatistieken",
     "adventures_shown": "Avonturen getoond",
     "completion": "Voltooiing",
-    "display_options": "Display -opties",
+    "display_options": "Displayopties",
     "map_controls": "Kaartbesturing",
     "marker_placed_on_map": "Marker geplaatst op kaart",
     "place_marker_desc": "Klik op de kaart om een ​​marker te plaatsen of voeg een avontuur toe zonder locatie.",
@@ -635,7 +635,7 @@
     "total_visited_regions": "Totaal bezochte regio's",
     "welcome_back": "Welkom terug",
     "total_visited_cities": "Totaal bezochte steden",
-    "document_some_adventures": "Begin met het documenteren van uw reizen en bouw uw persoonlijke avontuurlijke kaart!",
+    "document_some_adventures": "Begin met het documenteren van uw reizen en bouw uw persoonlijke avonturen kaart!",
     "view_all": "Bekijk alles",
     "welcome_text_1": "Je bent op",
     "welcome_text_2": "Avonturen tot nu toe",
@@ -647,31 +647,31 @@
     "disable": "Uitzetten",
     "immich": "Immich",
     "immich_disabled": "Immich-integratie succesvol uitgeschakeld!",
-    "immich_error": "Fout bij updaten van Immich-integratie",
+    "immich_error": "Fout bij updaten van Immich integratie",
     "integration_fetch_error": "Fout bij het ophalen van gegevens uit de Immich-integratie",
     "load_more": "Laad meer",
     "no_items_found": "Geen artikelen gevonden",
-    "server_url": "Immich-server-URL",
+    "server_url": "Immich server URL",
     "update_integration": "Integratie bijwerken",
     "localhost_note": "Opmerking: localhost zal hoogstwaarschijnlijk niet werken tenzij dit bewust zo geconfigureerd is in het docker-netwerk. \nHet is aanbevolen om het IP-adres van de server of de domeinnaam te gebruiken.",
-    "api_key_placeholder": "Voer uw Immich API -sleutel in",
+    "api_key_placeholder": "Voer uw Immich API-sleutel in",
     "enable_integration": "Integratie inschakelen",
     "immich_integration_desc": "Verbind uw Immich Photo Management Server",
     "need_help": "Hulp nodig bij het opzetten van dit? \nBekijk de",
-    "connection_error": "Error verbinding maken met Immich Server",
+    "connection_error": "Fout bij verbinding maken met de Immich Server",
     "copy_locally": "Kopieer afbeeldingen lokaal",
     "copy_locally_desc": "Kopieer afbeeldingen naar de server voor offline toegang. \nGebruikt meer schijfruimte.",
     "error_saving_image": "Foutopslagafbeelding",
-    "integration_already_exists": "Er bestaat al een Immich -integratie. \nU kunt maar één integratie tegelijk hebben.",
-    "integration_not_found": "Immich -integratie niet gevonden. \nMaak een nieuwe integratie.",
-    "network_error": "Netwerkfout terwijl u verbinding maakt met de Immich -server. \nControleer uw verbinding en probeer het opnieuw.",
-    "validation_error": "Er is een fout opgetreden bij het valideren van de Immich -integratie. \nControleer uw server -URL en API -toets."
+    "integration_already_exists": "Er bestaat al een Immich integratie. \nU kunt maar één integratie tegelijk hebben.",
+    "integration_not_found": "Immich integratie niet gevonden. \nMaak een nieuwe integratie.",
+    "network_error": "Netwerkfout terwijl u verbinding maakt met de Immich server. \nControleer uw verbinding en probeer het opnieuw.",
+    "validation_error": "Er is een fout opgetreden bij het valideren van de Immich integratie. \nControleer uw server-URL en API-toets."
   },
   "recomendations": {
     "recommendation": "Aanbeveling",
     "recommendations": "Aanbevelingen",
     "adventure_recommendations": "Avontuuraanbevelingen",
-    "food": "Voedsel",
+    "food": "Eten",
     "tourism": "Toerisme"
   },
   "lodging": {
@@ -680,7 +680,7 @@
     "cabin": "Cabine",
     "campground": "Camping",
     "edit": "Bewerking",
-    "edit_lodging": "Bewerkingen bewerken",
+    "edit_lodging": "Bewerk accomodatie",
     "hostel": "Hostel",
     "hotel": "Hotel",
     "house": "Huis",
@@ -688,7 +688,7 @@
     "new_lodging": "Nieuwe accommodatie",
     "other": "Ander",
     "reservation_number": "Reserveringsnummer",
-    "resort": "Toevlucht",
+    "resort": "Vakantiepark",
     "villa": "Villa"
   },
   "google_maps": {
@@ -696,7 +696,7 @@
   },
   "calendar": {
     "all_categories": "Alle categorieën",
-    "all_day_event": "De hele dag evenement",
+    "all_day_event": "Evenement dat de hele dag duurt",
     "calendar_overview": "Kalenderoverzicht",
     "categories": "Categorieën",
     "day": "Dag",