Merge pull request #672 from mauriceboe/feature/uncategorized-filter

feat: add uncategorized filter to category dropdown and more
fix: update ReservationModal test for check-in time range fields
2026-06-23 15:21:46 +00:00 · 2026-04-16 00:34:28 +02:00 · 2026-04-16 00:29:25 +02:00 · 2026-04-16 00:23:00 +02:00 · 2026-04-16 00:12:06 +02:00 · 2026-04-16 00:04:14 +02:00
71 changed files with 4895 additions and 399 deletions
@@ -1,11 +1,6 @@
 name: Build & Push Docker Image (Prerelease)

 on:
-  push:
-    branches: [dev]
-    paths-ignore:
-      - 'docs/**'
-      - '**/*.md'
  workflow_dispatch:
    inputs:
      bump:
@@ -86,7 +86,7 @@
 ### Customization & Admin
 - **Dashboard Views** — Toggle between card grid and compact list view on the My Trips page
 - **Dark Mode** — Full light and dark theme with dynamic status bar color matching
- **Multilingual** — English, German, Spanish, French, Russian, Chinese (Simplified), Dutch, Arabic (with RTL support)
+- **Multilingual** — English, German, Spanish, French, Russian, Chinese (Simplified), Dutch, Indonesian, Arabic (with RTL support)
 - **Admin Panel** — User management, invite links, packing templates, global categories, addon management, API keys, backups, and GitHub release history
 - **Auto-Backups** — Scheduled backups with configurable interval and retention
 - **Customizable** — Temperature units, time format (12h/24h), map tile sources, default coordinates
@@ -1,5 +1,5 @@
 apiVersion: v2
 name: trek
-version: 2.9.13
+version: 2.9.14
 description: Minimal Helm chart for TREK app
-appVersion: "2.9.13"
+appVersion: "2.9.14"
@@ -1,12 +1,12 @@
 {
  "name": "trek-client",
-  "version": "2.9.13",
+  "version": "2.9.14",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "trek-client",
-      "version": "2.9.13",
+      "version": "2.9.14",
      "dependencies": {
        "@react-pdf/renderer": "^4.3.2",
        "axios": "^1.6.7",
@@ -1,6 +1,6 @@
 {
  "name": "trek-client",
-  "version": "2.9.13",
+  "version": "2.9.14",
  "private": true,
  "type": "module",
  "scripts": {
@@ -272,6 +272,8 @@ export const adminApi = {
  checkVersion: () => apiClient.get('/admin/version-check').then(r => r.data),
  getBagTracking: () => apiClient.get('/admin/bag-tracking').then(r => r.data),
  updateBagTracking: (enabled: boolean) => apiClient.put('/admin/bag-tracking', { enabled }).then(r => r.data),
+  getCollabFeatures: () => apiClient.get('/admin/collab-features').then(r => r.data),
+  updateCollabFeatures: (features: Record<string, boolean>) => apiClient.put('/admin/collab-features', features).then(r => r.data),
  packingTemplates: () => apiClient.get('/admin/packing-templates').then(r => r.data),
  getPackingTemplate: (id: number) => apiClient.get(`/admin/packing-templates/${id}`).then(r => r.data),
  createPackingTemplate: (data: { name: string }) => apiClient.post('/admin/packing-templates', data).then(r => r.data),
@@ -299,6 +301,8 @@ export const adminApi = {
    apiClient.post('/admin/dev/test-notification', data).then(r => r.data),
  getNotificationPreferences: () => apiClient.get('/admin/notification-preferences').then(r => r.data),
  updateNotificationPreferences: (prefs: Record<string, Record<string, boolean>>) => apiClient.put('/admin/notification-preferences', prefs).then(r => r.data),
+  getDefaultUserSettings: () => apiClient.get('/admin/default-user-settings').then(r => r.data),
+  updateDefaultUserSettings: (settings: Record<string, unknown>) => apiClient.put('/admin/default-user-settings', settings).then(r => r.data),
 }

 export const addonsApi = {
@@ -486,6 +490,7 @@ export const notificationsApi = {
  updatePreferences: (prefs: Record<string, Record<string, boolean>>) => apiClient.put('/notifications/preferences', prefs).then(r => r.data),
  testSmtp: (email?: string) => apiClient.post('/notifications/test-smtp', { email }).then(r => r.data),
  testWebhook: (url?: string) => apiClient.post('/notifications/test-webhook', { url }).then(r => r.data),
+  testNtfy: (payload: { topic?: string; server?: string | null; token?: string | null }) => apiClient.post('/notifications/test-ntfy', payload).then(r => r.data),
 }

 export const inAppNotificationsApi = {
@@ -4,12 +4,33 @@ import { useTranslation } from '../../i18n'
 import { useSettingsStore } from '../../store/settingsStore'
 import { useAddonStore } from '../../store/addonStore'
 import { useToast } from '../shared/Toast'
-import { Puzzle, ListChecks, Wallet, FileText, CalendarDays, Globe, Briefcase, Image, Terminal, Link2, Compass, BookOpen } from 'lucide-react'
+import { Puzzle, ListChecks, Wallet, FileText, CalendarDays, Globe, Briefcase, Image, Terminal, Link2, Compass, BookOpen, MessageCircle, StickyNote, BarChart3, Sparkles, Luggage } from 'lucide-react'

 const ICON_MAP = {
  ListChecks, Wallet, FileText, CalendarDays, Puzzle, Globe, Briefcase, Image, Terminal, Link2, Compass, BookOpen,
 }

+function ImmichIcon({ size = 14 }: { size?: number }) {
+  return (
+    <svg viewBox="0 0 24 24" width={size} height={size} style={{ flexShrink: 0 }}>
+      <path d="M11.986.27c-2.409 0-5.207 1.09-5.207 3.894v.152c1.343.597 2.935 1.663 4.412 2.971 1.571 1.391 2.838 2.882 3.653 4.287 1.4-2.503 2.336-5.478 2.347-7.373V4.164c0-2.803-2.796-3.894-5.205-3.894m7.512 4.49c-.378-.008-.775.05-1.192.186l-.144.047c-.153 1.461-.676 3.304-1.463 5.113-.837 1.924-1.863 3.59-2.947 4.799 2.813.558 5.93.527 7.736-.047l.035-.01c2.667-.866 2.84-3.863 2.096-6.154-.628-1.933-2.081-3.89-4.121-3.934m-14.996.04c-2.04.043-3.493 1.997-4.121 3.93-.744 2.291-.571 5.288 2.096 6.155l.144.046c.982-1.092 2.488-2.276 4.188-3.277 1.809-1.065 3.619-1.808 5.207-2.148-1.949-2.105-4.489-3.914-6.287-4.51l-.036-.012c-.416-.135-.813-.193-1.191-.185m4.672 6.758c-2.604 1.202-5.109 3.06-6.233 4.586l-.021.029c-1.648 2.268-.027 4.795 1.922 6.211 1.949 1.416 4.852 2.177 6.5-.092.023-.031.054-.07.09-.121-.736-1.272-1.396-3.072-1.822-4.998-.454-2.05-.603-4-.436-5.615m1.072 3.338c.339 2.848 1.332 5.804 2.436 7.344l.021.029c1.648 2.268 4.551 1.508 6.5.092 1.949-1.416 3.57-3.943 1.922-6.211-.023-.031-.052-.073-.088-.123-1.437.307-3.352.38-5.316.19-2.089-.202-3.99-.663-5.475-1.321" fill="currentColor" />
+    </svg>
+  )
+}
+
+function SynologyIcon({ size = 14 }: { size?: number }) {
+  return (
+    <svg viewBox="0 0 24 24" width={size} height={size} style={{ flexShrink: 0 }}>
+      <path d="M17.895 11.927a3.196 3.196 0 0 1 .394-1.53l-.008.017a2.677 2.677 0 0 1 1.075-1.108l.014-.007a3.181 3.181 0 0 1 1.523-.382h.05-.003q1.346 0 2.2.871.854.871.86 2.203c0 .895-.29 1.635-.867 2.226s-1.306.886-2.183.886c-.566 0-1.1-.137-1.571-.379l.019.009a2.535 2.535 0 0 1-1.115-1.067l-.007-.013q-.38-.708-.381-1.726zm1.593.083c0 .591.138 1.043.42 1.349a1.365 1.365 0 0 0 2.066.002l.001-.002c.275-.307.413-.764.413-1.357s-.138-1.033-.413-1.342a1.371 1.371 0 0 0-2.066-.001l-.001.002c-.281.306-.42.758-.42 1.345zm-1.602 2.941H16.33v-3.015c0-.635-.032-1.044-.101-1.234a.876.876 0 0 0-.328-.435l-.003-.002a.938.938 0 0 0-.521-.156h-.027.001-.012c-.27 0-.521.084-.727.228l.004-.003a1.115 1.115 0 0 0-.444.576l-.002.008c-.083.248-.121.696-.121 1.359v2.673H12.5V9.027h1.439v.867c.518-.656 1.167-.98 1.952-.98h.021c.335 0 .655.067.946.189l-.016-.006c.261.105.48.268.648.475l.002.003c.141.185.247.404.304.643l.002.012c.057.278.089.597.089.924l-.002.135v-.007zM6.413 9.028h1.654l1.412 4.204 1.376-4.204h1.611l-2.067 5.693-.38 1.038a4.158 4.158 0 0 1-.4.807l.01-.017a1.637 1.637 0 0 1-.422.443l-.005.003c-.17.113-.367.203-.578.26l-.014.003c-.232.064-.499.1-.774.1h-.025.001a4.13 4.13 0 0 1-.911-.105l.028.005-.129-1.229c.198.046.426.074.659.077h.002c.36 0 .628-.106.8-.318a2.27 2.27 0 0 0 .395-.807l.004-.016zM0 12.29l1.592-.149q.147.802.586 1.181.439.379 1.192.375c.528 0 .927-.113 1.197-.335.27-.222.4-.486.4-.782v-.024a.751.751 0 0 0-.167-.474l.001.001c-.113-.132-.309-.252-.59-.347-.193-.074-.631-.191-1.312-.365-.882-.216-1.496-.486-1.85-.804A2.147 2.147 0 0 1 .3 8.936v-.019V8.908c0-.431.132-.831.358-1.163l-.005.007a2.226 2.226 0 0 1 1.003-.826l.015-.005c.442-.184.973-.281 1.602-.281q1.529 0 2.304.676c.516.457.785 1.057.811 1.809l-1.649.055c-.073-.413-.219-.714-.452-.899-.233-.185-.579-.276-1.034-.276-.476 0-.85.098-1.118.298a.59.59 0 0 0-.261.49v.011-.001.002c0 .201.095.379.242.493l.001.001c.205.179.709.36 1.507.546.798.186 1.388.387 1.769.59.374.196.678.48.893.825l.006.01c.214.345.326.786.326 1.305 0 .489-.146.944-.396 1.325l.006-.009c-.264.408-.64.724-1.084.908l-.016.006c-.475.194-1.065.298-1.772.298-1.029 0-1.819-.241-2.373-.722-.554-.481-.879-1.177-.986-2.091z" fill="currentColor" />
+    </svg>
+  )
+}
+
+const PROVIDER_ICONS: Record<string, React.FC<{ size?: number }>> = {
+  immich: ImmichIcon,
+  synologyphotos: SynologyIcon,
+}
+
 interface Addon {
  id: string
  name: string
@@ -38,7 +59,16 @@ function AddonIcon({ name, size = 20 }: AddonIconProps) {
  return <Icon size={size} />
 }

-export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking }: { bagTrackingEnabled?: boolean; onToggleBagTracking?: () => void }) {
+interface CollabFeatures { chat: boolean; notes: boolean; polls: boolean; whatsnext: boolean }
+
+const COLLAB_SUB_FEATURES = [
+  { key: 'chat', icon: MessageCircle, titleKey: 'admin.collab.chat.title', subtitleKey: 'admin.collab.chat.subtitle' },
+  { key: 'notes', icon: StickyNote, titleKey: 'admin.collab.notes.title', subtitleKey: 'admin.collab.notes.subtitle' },
+  { key: 'polls', icon: BarChart3, titleKey: 'admin.collab.polls.title', subtitleKey: 'admin.collab.polls.subtitle' },
+  { key: 'whatsnext', icon: Sparkles, titleKey: 'admin.collab.whatsnext.title', subtitleKey: 'admin.collab.whatsnext.subtitle' },
+] as const
+
+export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking, collabFeatures, onToggleCollabFeature }: { bagTrackingEnabled?: boolean; onToggleBagTracking?: () => void; collabFeatures?: CollabFeatures; onToggleCollabFeature?: (key: string) => void }) {
  const { t } = useTranslation()
  const dm = useSettingsStore(s => s.settings.dark_mode)
  const dark = dm === true || dm === 'dark' || (dm === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches)
@@ -156,6 +186,7 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking }
                    <AddonRow addon={addon} onToggle={handleToggle} t={t} />
                    {addon.id === 'packing' && addon.enabled && onToggleBagTracking && (
                      <div className="flex items-center gap-4 px-6 py-3 border-b" style={{ borderColor: 'var(--border-secondary)', background: 'var(--bg-secondary)', paddingLeft: 70 }}>
+                        <Luggage size={14} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
                        <div style={{ flex: 1, minWidth: 0 }}>
                          <div className="text-sm font-medium" style={{ color: 'var(--text-secondary)' }}>{t('admin.bagTracking.title')}</div>
                          <div className="text-xs mt-0.5" style={{ color: 'var(--text-faint)' }}>{t('admin.bagTracking.subtitle')}</div>
@@ -173,6 +204,36 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking }
                        </div>
                      </div>
                    )}
+                    {addon.id === 'collab' && addon.enabled && collabFeatures && onToggleCollabFeature && (
+                      <div className="px-6 py-3 border-b" style={{ borderColor: 'var(--border-secondary)', background: 'var(--bg-secondary)', paddingLeft: 70 }}>
+                        <div className="space-y-2">
+                          {COLLAB_SUB_FEATURES.map(feat => {
+                            const enabled = collabFeatures[feat.key]
+                            const Icon = feat.icon
+                            return (
+                              <div key={feat.key} className="flex items-center gap-4" style={{ minHeight: 32 }}>
+                                <Icon size={14} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
+                                <div style={{ flex: 1, minWidth: 0 }}>
+                                  <div className="text-sm font-medium" style={{ color: 'var(--text-secondary)' }}>{t(feat.titleKey)}</div>
+                                  <div className="text-xs mt-0.5" style={{ color: 'var(--text-faint)' }}>{t(feat.subtitleKey)}</div>
+                                </div>
+                                <div className="flex items-center gap-2 shrink-0">
+                                  <span className="hidden sm:inline text-xs font-medium" style={{ color: enabled ? 'var(--text-primary)' : 'var(--text-faint)' }}>
+                                    {enabled ? t('admin.addons.enabled') : t('admin.addons.disabled')}
+                                  </span>
+                                  <button onClick={() => onToggleCollabFeature(feat.key)}
+                                    className="relative inline-flex h-6 w-11 items-center rounded-full transition-colors"
+                                    style={{ background: enabled ? 'var(--text-primary)' : 'var(--border-primary)' }}>
+                                    <span className="absolute left-0.5 h-5 w-5 rounded-full bg-white transition-transform duration-200"
+                                      style={{ transform: enabled ? 'translateX(20px)' : 'translateX(0)' }} />
+                                  </button>
+                                </div>
+                              </div>
+                            )
+                          })}
+                        </div>
+                      </div>
+                    )}
                  </div>
                ))}
              </div>
@@ -194,8 +255,11 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking }
                    {addon.id === 'journey' && providerOptions.length > 0 && (
                      <div className="px-6 py-3 border-b" style={{ borderColor: 'var(--border-secondary)', background: 'var(--bg-secondary)', paddingLeft: 70 }}>
                        <div className="space-y-2">
-                          {providerOptions.map(provider => (
+                          {providerOptions.map(provider => {
+                            const ProviderIcon = PROVIDER_ICONS[provider.key]
+                            return (
                            <div key={provider.key} className="flex items-center gap-4" style={{ minHeight: 32 }}>
+                              {ProviderIcon && <span style={{ color: 'var(--text-faint)' }}><ProviderIcon size={14} /></span>}
                              <div style={{ flex: 1, minWidth: 0 }}>
                                <div className="text-sm font-medium" style={{ color: 'var(--text-secondary)' }}>{provider.label}</div>
                                <div className="text-xs mt-0.5" style={{ color: 'var(--text-faint)' }}>{provider.description}</div>
@@ -214,7 +278,8 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking }
                                </button>
                              </div>
                            </div>
-                          ))}
+                            )
+                          })}
                        </div>
                      </div>
                    )}
@@ -0,0 +1,290 @@
+import React, { useEffect, useMemo, useState } from 'react'
+import { Settings2 } from 'lucide-react'
+import { adminApi } from '../../api/client'
+import { useTranslation } from '../../i18n'
+import { useToast } from '../shared/Toast'
+import Section from '../Settings/Section'
+import CustomSelect from '../shared/CustomSelect'
+import { MapView } from '../Map/MapView'
+import type { Place } from '../../types'
+
+const MAP_PRESETS = [
+  { name: 'OpenStreetMap', url: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png' },
+  { name: 'OpenStreetMap DE', url: 'https://tile.openstreetmap.de/{z}/{x}/{y}.png' },
+  { name: 'CartoDB Light', url: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png' },
+  { name: 'CartoDB Dark', url: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png' },
+  { name: 'Stadia Smooth', url: 'https://tiles.stadiamaps.com/tiles/alidade_smooth/{z}/{x}/{y}{r}.png' },
+]
+
+type Defaults = {
+  temperature_unit?: string
+  dark_mode?: string | boolean
+  time_format?: string
+  route_calculation?: boolean
+  blur_booking_codes?: boolean
+  map_tile_url?: string
+}
+
+function OptionRow({
+  label,
+  hint,
+  children,
+}: {
+  label: React.ReactNode
+  hint?: string
+  children: React.ReactNode
+}) {
+  return (
+    <div>
+      <label className="block text-sm font-medium mb-2" style={{ color: 'var(--text-secondary)' }}>
+        {label}
+      </label>
+      {hint && <p className="text-xs mb-2" style={{ color: 'var(--text-faint)' }}>{hint}</p>}
+      <div className="flex gap-3 flex-wrap">{children}</div>
+    </div>
+  )
+}
+
+function OptionButton({
+  active,
+  onClick,
+  children,
+}: {
+  active: boolean
+  onClick: () => void
+  children: React.ReactNode
+}) {
+  return (
+    <button
+      onClick={onClick}
+      style={{
+        display: 'flex', alignItems: 'center', gap: 8,
+        padding: '10px 20px', borderRadius: 10, cursor: 'pointer',
+        fontFamily: 'inherit', fontSize: 14, fontWeight: 500,
+        border: active ? '2px solid var(--text-primary)' : '2px solid var(--border-primary)',
+        background: active ? 'var(--bg-hover)' : 'var(--bg-card)',
+        color: 'var(--text-primary)',
+        transition: 'all 0.15s',
+      }}
+    >
+      {children}
+    </button>
+  )
+}
+
+export default function DefaultUserSettingsTab(): React.ReactElement {
+  const { t } = useTranslation()
+  const toast = useToast()
+  const [defaults, setDefaults] = useState<Defaults>({})
+  const [loaded, setLoaded] = useState(false)
+  const [mapTileUrl, setMapTileUrl] = useState('')
+
+  useEffect(() => {
+    adminApi.getDefaultUserSettings().then((data: Defaults) => {
+      setDefaults(data)
+      setMapTileUrl(data.map_tile_url || '')
+      setLoaded(true)
+    }).catch(() => setLoaded(true))
+  }, [])
+
+  const save = async (patch: Partial<Defaults>) => {
+    try {
+      const updated = await adminApi.updateDefaultUserSettings(patch as Record<string, unknown>)
+      setDefaults(updated)
+      toast.success(t('admin.defaultSettings.saved'))
+    } catch (err: unknown) {
+      toast.error(err instanceof Error ? err.message : t('common.error'))
+    }
+  }
+
+  const reset = async (key: keyof Defaults) => {
+    try {
+      const updated = await adminApi.updateDefaultUserSettings({ [key]: null })
+      setDefaults(updated)
+      if (key === 'map_tile_url') setMapTileUrl('')
+      toast.success(t('admin.defaultSettings.reset'))
+    } catch (err: unknown) {
+      toast.error(err instanceof Error ? err.message : t('common.error'))
+    }
+  }
+
+  const isSet = (key: keyof Defaults) => defaults[key] !== undefined
+
+  const ResetButton = ({ field }: { field: keyof Defaults }) =>
+    isSet(field) ? (
+      <button
+        onClick={() => reset(field)}
+        className="text-xs ml-2"
+        style={{ color: 'var(--text-faint)', textDecoration: 'underline', background: 'none', border: 'none', cursor: 'pointer' }}
+      >
+        {t('admin.defaultSettings.resetToBuiltIn')}
+      </button>
+    ) : null
+
+  const mapPreviewPlaces = useMemo((): Place[] => [{
+    id: 1,
+    trip_id: 1,
+    name: 'Preview center',
+    description: null,
+    notes: null,
+    lat: 48.8566,
+    lng: 2.3522,
+    address: null,
+    category_id: null,
+    icon: null,
+    price: null,
+    currency: null,
+    image_url: null,
+    google_place_id: null,
+    osm_id: null,
+    route_geometry: null,
+    place_time: null,
+    end_time: null,
+    duration_minutes: null,
+    transport_mode: null,
+    website: null,
+    phone: null,
+    created_at: Date(),
+  }], [])
+
+  if (!loaded) {
+    return <p style={{ fontSize: 12, color: 'var(--text-faint)', fontStyle: 'italic', padding: 16 }}>Loading…</p>
+  }
+
+  const darkMode = defaults.dark_mode
+
+  return (
+    <Section title={t('admin.defaultSettings.title')} icon={Settings2}>
+      <p className="text-sm" style={{ color: 'var(--text-faint)', marginTop: -8 }}>
+        {t('admin.defaultSettings.description')}
+      </p>
+
+      {/* Color Mode */}
+      <OptionRow label={<>{t('settings.colorMode')} <ResetButton field="dark_mode" /></>}>
+        {([
+          { value: 'light', label: t('settings.light') },
+          { value: 'dark', label: t('settings.dark') },
+          { value: 'auto', label: t('settings.auto') },
+        ] as const).map(opt => (
+          <OptionButton
+            key={opt.value}
+            active={darkMode === opt.value || (opt.value === 'light' && darkMode === false) || (opt.value === 'dark' && darkMode === true)}
+            onClick={() => save({ dark_mode: opt.value })}
+          >
+            {opt.label}
+          </OptionButton>
+        ))}
+      </OptionRow>
+
+      {/* Temperature */}
+      <OptionRow label={<>{t('settings.temperature')} <ResetButton field="temperature_unit" /></>}>
+        {([
+          { value: 'celsius', label: '°C Celsius' },
+          { value: 'fahrenheit', label: '°F Fahrenheit' },
+        ] as const).map(opt => (
+          <OptionButton
+            key={opt.value}
+            active={defaults.temperature_unit === opt.value}
+            onClick={() => save({ temperature_unit: opt.value })}
+          >
+            {opt.label}
+          </OptionButton>
+        ))}
+      </OptionRow>
+
+      {/* Time Format */}
+      <OptionRow label={<>{t('settings.timeFormat')} <ResetButton field="time_format" /></>}>
+        {([
+          { value: '24h', label: '24h (14:30)' },
+          { value: '12h', label: '12h (2:30 PM)' },
+        ] as const).map(opt => (
+          <OptionButton
+            key={opt.value}
+            active={defaults.time_format === opt.value}
+            onClick={() => save({ time_format: opt.value })}
+          >
+            {opt.label}
+          </OptionButton>
+        ))}
+      </OptionRow>
+
+      {/* Route Calculation */}
+      <OptionRow label={<>{t('settings.routeCalculation')} <ResetButton field="route_calculation" /></>}>
+        {([
+          { value: true, label: t('settings.on') || 'On' },
+          { value: false, label: t('settings.off') || 'Off' },
+        ] as const).map(opt => (
+          <OptionButton
+            key={String(opt.value)}
+            active={defaults.route_calculation === opt.value}
+            onClick={() => save({ route_calculation: opt.value })}
+          >
+            {opt.label}
+          </OptionButton>
+        ))}
+      </OptionRow>
+
+      {/* Blur Booking Codes */}
+      <OptionRow label={<>{t('settings.blurBookingCodes')} <ResetButton field="blur_booking_codes" /></>}>
+        {([
+          { value: true, label: t('settings.on') || 'On' },
+          { value: false, label: t('settings.off') || 'Off' },
+        ] as const).map(opt => (
+          <OptionButton
+            key={String(opt.value)}
+            active={defaults.blur_booking_codes === opt.value}
+            onClick={() => save({ blur_booking_codes: opt.value })}
+          >
+            {opt.label}
+          </OptionButton>
+        ))}
+      </OptionRow>
+
+      {/* Map Tile URL */}
+      <div>
+        <label className="block text-sm font-medium mb-1.5" style={{ color: 'var(--text-secondary)' }}>
+          {t('settings.mapTemplate')}
+          <ResetButton field="map_tile_url" />
+        </label>
+        <CustomSelect
+          value={mapTileUrl}
+          onChange={(value: string) => { if (value) { setMapTileUrl(value); save({ map_tile_url: value }) } }}
+          placeholder={t('settings.mapTemplatePlaceholder.select')}
+          options={MAP_PRESETS.map(p => ({ value: p.url, label: p.name }))}
+          size="sm"
+          style={{ marginBottom: 8 }}
+        />
+        <input
+          type="text"
+          value={mapTileUrl}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setMapTileUrl(e.target.value)}
+          onBlur={() => save({ map_tile_url: mapTileUrl })}
+          placeholder="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+          className="w-full px-3 py-2 border border-slate-300 rounded-lg text-sm focus:ring-2 focus:ring-slate-400 focus:border-transparent"
+        />
+        <p className="text-xs mt-1" style={{ color: 'var(--text-faint)' }}>{t('settings.mapDefaultHint')}</p>
+        <div style={{ position: 'relative', height: '200px', width: '100%', marginTop: 12 }}>
+          {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
+          {React.createElement(MapView as any, {
+            places: mapPreviewPlaces,
+            dayPlaces: [],
+            route: null,
+            routeSegments: null,
+            selectedPlaceId: null,
+            onMarkerClick: null,
+            onMapClick: null,
+            onMapContextMenu: null,
+            center: [48.8566, 2.3522],
+            zoom: 10,
+            tileUrl: mapTileUrl,
+            fitKey: null,
+            dayOrderMap: [],
+            leftWidth: 0,
+            rightWidth: 0,
+            hasInspector: false,
+          })}
+        </div>
+      </div>
+    </Section>
+  )
+}
@@ -68,7 +68,7 @@ describe('GitHubPanel', () => {
    expect(bmc).toHaveAttribute('rel', 'noopener noreferrer');

    const discord = screen.getByText('Discord').closest('a')!;
-    expect(discord).toHaveAttribute('href', 'https://discord.gg/nSdKaXgN');
+    expect(discord).toHaveAttribute('href', 'https://discord.gg/NhZBDSd4qW');
    expect(discord).toHaveAttribute('target', '_blank');
    expect(discord).toHaveAttribute('rel', 'noopener noreferrer');
  });
@@ -163,7 +163,7 @@ export default function GitHubPanel({ isPrerelease = false }: { isPrerelease?: b
          <ExternalLink size={14} className="ml-auto flex-shrink-0" style={{ color: 'var(--text-faint)' }} />
        </a>
        <a
-          href="https://discord.gg/nSdKaXgN"
+          href="https://discord.gg/NhZBDSd4qW"
          target="_blank"
          rel="noopener noreferrer"
          className="rounded-xl border overflow-hidden flex items-center gap-4 px-5 py-4 transition-all"
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useMemo } from 'react'
 import { useAuthStore } from '../../store/authStore'
 import { useTranslation } from '../../i18n'
 import { MessageCircle, StickyNote, BarChart3, Sparkles } from 'lucide-react'
@@ -29,54 +29,142 @@ interface TripMember {
  avatar_url?: string | null
 }

+interface CollabFeatures {
+  chat: boolean
+  notes: boolean
+  polls: boolean
+  whatsnext: boolean
+}
+
 interface CollabPanelProps {
  tripId: number
  tripMembers?: TripMember[]
+  collabFeatures?: CollabFeatures
 }

-export default function CollabPanel({ tripId, tripMembers = [] }: CollabPanelProps) {
+const ALL_TABS = [
+  { id: 'chat', featureKey: 'chat' as const, labelKey: 'collab.tabs.chat', fallback: 'Chat', icon: MessageCircle },
+  { id: 'notes', featureKey: 'notes' as const, labelKey: 'collab.tabs.notes', fallback: 'Notes', icon: StickyNote },
+  { id: 'polls', featureKey: 'polls' as const, labelKey: 'collab.tabs.polls', fallback: 'Polls', icon: BarChart3 },
+  { id: 'next', featureKey: 'whatsnext' as const, labelKey: 'collab.whatsNext.title', fallback: "What's Next", icon: Sparkles },
+]
+
+export default function CollabPanel({ tripId, tripMembers = [], collabFeatures }: CollabPanelProps) {
  const { user } = useAuthStore()
  const { t } = useTranslation()
-  const [mobileTab, setMobileTab] = useState('chat')
  const isDesktop = useIsDesktop()

-  const tabs = [
-    { id: 'chat', label: t('collab.tabs.chat') || 'Chat', icon: MessageCircle },
-    { id: 'notes', label: t('collab.tabs.notes') || 'Notes', icon: StickyNote },
-    { id: 'polls', label: t('collab.tabs.polls') || 'Polls', icon: BarChart3 },
-    { id: 'next', label: t('collab.whatsNext.title') || "What's Next", icon: Sparkles },
-  ]
+  const features = collabFeatures || { chat: true, notes: true, polls: true, whatsnext: true }
+
+  const tabs = useMemo(() =>
+    ALL_TABS.filter(tab => features[tab.featureKey]).map(tab => ({
+      ...tab,
+      label: t(tab.labelKey) || tab.fallback,
+    })),
+  [features, t])
+
+  const [mobileTab, setMobileTab] = useState(() => tabs[0]?.id || 'chat')
+
+  // If active tab gets disabled, switch to first available
+  useEffect(() => {
+    if (tabs.length > 0 && !tabs.some(t => t.id === mobileTab)) {
+      setMobileTab(tabs[0].id)
+    }
+  }, [tabs, mobileTab])
+
+  const chatOn = features.chat
+  const rightPanels = [
+    features.notes && 'notes',
+    features.polls && 'polls',
+    features.whatsnext && 'whatsnext',
+  ].filter(Boolean) as string[]
+
+  if (tabs.length === 0) return null

  if (isDesktop) {
+    // Chat always 380px fixed when on. Right panels share remaining space.
+    // If chat off, all panels share full width equally.
+    if (chatOn && rightPanels.length === 0) {
+      // Only chat
+      return (
+        <div style={{ height: '100%', display: 'flex', gap: 12, padding: 12, overflow: 'hidden', minHeight: 0 }}>
+          <div style={{ ...card, flex: 1 }}>
+            <CollabChat tripId={tripId} currentUser={user} />
+          </div>
+        </div>
+      )
+    }
+
+    if (chatOn) {
+      // Chat left (380px) + right panels
+      return (
+        <div style={{ height: '100%', display: 'flex', gap: 12, padding: 12, overflow: 'hidden', minHeight: 0 }}>
+          <div style={{ ...card, flex: '0 0 380px' }}>
+            <CollabChat tripId={tripId} currentUser={user} />
+          </div>
+          <div style={{ flex: 1, display: 'flex', flexDirection: 'column', gap: 12, overflow: 'hidden', minHeight: 0 }}>
+            {rightPanels.length === 1 && (
+              <div style={{ ...card, flex: 1 }}>
+                {rightPanels[0] === 'notes' && <CollabNotes tripId={tripId} currentUser={user} />}
+                {rightPanels[0] === 'polls' && <CollabPolls tripId={tripId} currentUser={user} />}
+                {rightPanels[0] === 'whatsnext' && <WhatsNextWidget tripMembers={tripMembers} />}
+              </div>
+            )}
+            {rightPanels.length === 2 && rightPanels.map(p => (
+              <div key={p} style={{ ...card, flex: 1 }}>
+                {p === 'notes' && <CollabNotes tripId={tripId} currentUser={user} />}
+                {p === 'polls' && <CollabPolls tripId={tripId} currentUser={user} />}
+                {p === 'whatsnext' && <WhatsNextWidget tripMembers={tripMembers} />}
+              </div>
+            ))}
+            {rightPanels.length === 3 && (
+              <>
+                <div style={{ ...card, flex: 1 }}>
+                  <CollabNotes tripId={tripId} currentUser={user} />
+                </div>
+                <div style={{ flex: 1, display: 'flex', gap: 12, overflow: 'hidden', minHeight: 0 }}>
+                  <div style={{ ...card, flex: 1 }}>
+                    <CollabPolls tripId={tripId} currentUser={user} />
+                  </div>
+                  <div style={{ ...card, flex: 1 }}>
+                    <WhatsNextWidget tripMembers={tripMembers} />
+                  </div>
+                </div>
+              </>
+            )}
+          </div>
+        </div>
+      )
+    }
+
+    // Chat off — remaining panels share full width
+    const panels = rightPanels
+    if (panels.length === 1) {
+      return (
+        <div style={{ height: '100%', display: 'flex', gap: 12, padding: 12, overflow: 'hidden', minHeight: 0 }}>
+          <div style={{ ...card, flex: 1 }}>
+            {panels[0] === 'notes' && <CollabNotes tripId={tripId} currentUser={user} />}
+            {panels[0] === 'polls' && <CollabPolls tripId={tripId} currentUser={user} />}
+            {panels[0] === 'whatsnext' && <WhatsNextWidget tripMembers={tripMembers} />}
+          </div>
+        </div>
+      )
+    }
+
    return (
      <div style={{ height: '100%', display: 'flex', gap: 12, padding: 12, overflow: 'hidden', minHeight: 0 }}>
-        {/* Chat — left, fixed width */}
-        <div style={{ ...card, flex: '0 0 380px' }}>
-          <CollabChat tripId={tripId} currentUser={user} />
-        </div>
-
-        {/* Right column: Notes top, Polls + What's Next bottom */}
-        <div style={{ flex: 1, display: 'flex', flexDirection: 'column', gap: 12, overflow: 'hidden', minHeight: 0 }}>
-          {/* Notes — top */}
-          <div style={{ ...card, flex: 1 }}>
-            <CollabNotes tripId={tripId} currentUser={user} />
+        {panels.map(p => (
+          <div key={p} style={{ ...card, flex: 1 }}>
+            {p === 'notes' && <CollabNotes tripId={tripId} currentUser={user} />}
+            {p === 'polls' && <CollabPolls tripId={tripId} currentUser={user} />}
+            {p === 'whatsnext' && <WhatsNextWidget tripMembers={tripMembers} />}
          </div>
-
-          {/* Polls + What's Next — bottom row */}
-          <div style={{ flex: 1, display: 'flex', gap: 12, overflow: 'hidden', minHeight: 0 }}>
-            <div style={{ ...card, flex: 1 }}>
-              <CollabPolls tripId={tripId} currentUser={user} />
-            </div>
-            <div style={{ ...card, flex: 1 }}>
-              <WhatsNextWidget tripMembers={tripMembers} />
-            </div>
-          </div>
-        </div>
+        ))}
      </div>
    )
  }

-  // Mobile: tab bar + single panel
+  // Mobile: tab bar + single panel (only enabled tabs)
  return (
    <div style={{ height: '100%', display: 'flex', flexDirection: 'column', overflow: 'hidden', position: 'absolute', inset: 0 }}>
      <div style={{
@@ -84,7 +172,6 @@ export default function CollabPanel({ tripId, tripMembers = [] }: CollabPanelPro
        background: 'var(--bg-card)', flexShrink: 0,
      }}>
        {tabs.map(tab => {
-          const Icon = tab.icon
          const active = mobileTab === tab.id
          return (
            <button key={tab.id} onClick={() => setMobileTab(tab.id)} style={{
@@ -102,10 +189,10 @@ export default function CollabPanel({ tripId, tripMembers = [] }: CollabPanelPro
      </div>

      <div style={{ flex: 1, overflow: 'hidden', minHeight: 0 }}>
-        {mobileTab === 'chat' && <CollabChat tripId={tripId} currentUser={user} />}
-        {mobileTab === 'notes' && <CollabNotes tripId={tripId} currentUser={user} />}
-        {mobileTab === 'polls' && <CollabPolls tripId={tripId} currentUser={user} />}
-        {mobileTab === 'next' && <WhatsNextWidget tripMembers={tripMembers} />}
+        {mobileTab === 'chat' && features.chat && <CollabChat tripId={tripId} currentUser={user} />}
+        {mobileTab === 'notes' && features.notes && <CollabNotes tripId={tripId} currentUser={user} />}
+        {mobileTab === 'polls' && features.polls && <CollabPolls tripId={tripId} currentUser={user} />}
+        {mobileTab === 'next' && features.whatsnext && <WhatsNextWidget tripMembers={tripMembers} />}
      </div>
    </div>
  )
@@ -214,6 +214,38 @@ const texts: Record<string, DemoTexts> = {
    selfHostLink: 'استضفه بنفسك',
    close: 'فهمت',
  },
+  id: {
+    titleBefore: 'Selamat datang di ',
+    titleAfter: '',
+    title: 'Selamat datang di Demo TREK',
+    description: 'Anda dapat melihat, mengedit, dan membuat perjalanan. Semua perubahan akan diatur ulang secara otomatis setiap jam.',
+    resetIn: 'Atur ulang berikutnya dalam',
+    minutes: 'menit',
+    uploadNote: 'Unggah file (foto, dokumen, sampul) dinonaktifkan dalam mode demo.',
+    fullVersionTitle: 'Selain itu dalam versi lengkap:',
+    features: [
+      'Unggah file (foto, dokumen, sampul)',
+      'Manajemen kunci API (Google Maps, Cuaca)',
+      'Manajemen pengguna & izin',
+      'Pencadangan otomatis',
+      'Manajemen Addon (aktifkan/nonaktifkan)',
+      'OIDC / SSO single sign-on',
+    ],
+    addonsTitle: 'Addon Modular (dapat dinonaktifkan di versi lengkap)',
+    addons: [
+      ['Vacay', 'Perencana liburan dengan kalender, hari libur & penggabungan pengguna'],
+      ['Atlas', 'Peta dunia dengan negara yang dikunjungi & statistik perjalanan'],
+      ['Pengepakan', 'Daftar periksa per perjalanan'],
+      ['Anggaran', 'Pelacakan pengeluaran dengan pemisahan tagihan'],
+      ['Dokumen', 'Lampirkan file ke perjalanan'],
+      ['Widget', 'Konverter mata uang & zona waktu'],
+    ],
+    whatIs: 'Apa itu TREK?',
+    whatIsDesc: 'Perencana perjalanan yang di-host sendiri dengan kolaborasi real-time, peta interaktif, login OIDC, dan mode gelap.',
+    selfHost: 'Buka sumber — ',
+    selfHostLink: 'host mandiri',
+    close: 'Mengerti',
+  },
 }

 const featureIcons = [Upload, Key, Users, Database, Puzzle, Shield]
@@ -242,7 +242,7 @@ export default function Navbar({ tripTitle, tripId, onBack, showBack, onShare }:
                          <img src={dark ? '/text-light.svg' : '/text-dark.svg'} alt="TREK" style={{ height: 10, opacity: 0.5 }} />
                          <span style={{ fontSize: 10, fontWeight: 600, color: 'var(--text-faint)' }}>v{appVersion}</span>
                        </div>
-                        <a href="https://discord.gg/nSdKaXgN" target="_blank" rel="noopener noreferrer"
+                        <a href="https://discord.gg/NhZBDSd4qW" target="_blank" rel="noopener noreferrer"
                          style={{ display: 'inline-flex', alignItems: 'center', justifyContent: 'center', width: 24, height: 24, borderRadius: 99, background: 'var(--bg-tertiary)', transition: 'background 0.15s' }}
                          onMouseEnter={e => e.currentTarget.style.background = '#5865F220'}
                          onMouseLeave={e => e.currentTarget.style.background = 'var(--bg-tertiary)'}
@@ -78,7 +78,7 @@ export default function DayDetailPanel({ day, days, places, categories = [], tri
  const [showHotelPicker, setShowHotelPicker] = useState(false)
  const [hotelDayRange, setHotelDayRange] = useState({ start: day?.id, end: day?.id })
  const [hotelCategoryFilter, setHotelCategoryFilter] = useState('')
-  const [hotelForm, setHotelForm] = useState({ check_in: '', check_out: '', confirmation: '', place_id: null })
+  const [hotelForm, setHotelForm] = useState({ check_in: '', check_in_end: '', check_out: '', confirmation: '', place_id: null })

  useEffect(() => {
    if (!day?.date || !lat || !lng) { setWeather(null); return }
@@ -117,6 +117,7 @@ export default function DayDetailPanel({ day, days, places, categories = [], tri
        start_day_id: hotelDayRange.start,
        end_day_id: hotelDayRange.end,
        check_in: hotelForm.check_in || null,
+        check_in_end: hotelForm.check_in_end || null,
        check_out: hotelForm.check_out || null,
        confirmation: hotelForm.confirmation || null,
      })
@@ -128,7 +129,7 @@ export default function DayDetailPanel({ day, days, places, categories = [], tri
        days.some(d => d.id >= a.start_day_id && d.id <= a.end_day_id && d.id === day?.id)
      ))
      setShowHotelPicker(false)
-      setHotelForm({ check_in: '', check_out: '', confirmation: '', place_id: null })
+      setHotelForm({ check_in: '', check_in_end: '', check_out: '', confirmation: '', place_id: null })
      onAccommodationChange?.()
    } catch {}
  }
@@ -356,7 +357,7 @@ export default function DayDetailPanel({ day, days, places, categories = [], tri
                          <div style={{ fontSize: 13, fontWeight: 600, color: 'var(--text-primary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{acc.place_name}</div>
                          {acc.place_address && <div style={{ fontSize: 10, color: 'var(--text-faint)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{acc.place_address}</div>}
                        </div>
-                        {canEditDays && <button onClick={() => { setAccommodation(acc); setHotelForm({ check_in: acc.check_in || '', check_out: acc.check_out || '', confirmation: acc.confirmation || '', place_id: acc.place_id }); setHotelDayRange({ start: acc.start_day_id, end: acc.end_day_id }); setShowHotelPicker('edit') }}
+                        {canEditDays && <button onClick={() => { setAccommodation(acc); setHotelForm({ check_in: acc.check_in || '', check_in_end: acc.check_in_end || '', check_out: acc.check_out || '', confirmation: acc.confirmation || '', place_id: acc.place_id }); setHotelDayRange({ start: acc.start_day_id, end: acc.end_day_id }); setShowHotelPicker('edit') }}
                          style={{ background: 'none', border: 'none', cursor: 'pointer', padding: 3, flexShrink: 0 }}>
                          <Pencil size={12} style={{ color: 'var(--text-faint)' }} />
                        </button>}
@@ -368,7 +369,9 @@ export default function DayDetailPanel({ day, days, places, categories = [], tri
                      <div style={{ display: 'flex', gap: 0, margin: '0 12px 8px', borderRadius: 10, overflow: 'hidden', border: '1px solid var(--border-faint)' }}>
                        {acc.check_in && (
                          <div style={{ flex: 1, padding: '8px 10px', borderRight: '1px solid var(--border-faint)', textAlign: 'center' }}>
-                            <div style={{ fontSize: 12, fontWeight: 700, color: 'var(--text-primary)', lineHeight: 1.2 }}>{fmtTime(acc.check_in)}</div>
+                            <div style={{ fontSize: 12, fontWeight: 700, color: 'var(--text-primary)', lineHeight: 1.2 }}>
+                              {fmtTime(acc.check_in)}{acc.check_in_end ? ` – ${fmtTime(acc.check_in_end)}` : ''}
+                            </div>
                            <div style={{ fontSize: 9, color: 'var(--text-faint)', fontWeight: 500, marginTop: 2, display: 'flex', alignItems: 'center', justifyContent: 'center', gap: 3 }}>
                              <LogIn size={8} /> {t('day.checkIn')}
                            </div>
@@ -488,11 +491,15 @@ export default function DayDetailPanel({ day, days, places, categories = [], tri

                  {/* Check-in / Check-out / Confirmation */}
                  <div style={{ padding: '10px 18px', borderBottom: '1px solid var(--border-faint)', display: 'flex', gap: 8, flexWrap: 'wrap' }}>
-                    <div style={{ flex: 1, minWidth: 100 }}>
+                    <div style={{ flex: 1, minWidth: 80 }}>
                      <label style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.04em', display: 'block', marginBottom: 3 }}>{t('day.checkIn')}</label>
                      <CustomTimePicker value={hotelForm.check_in} onChange={v => setHotelForm(f => ({ ...f, check_in: v }))} placeholder="14:00" />
                    </div>
-                    <div style={{ flex: 1, minWidth: 100 }}>
+                    <div style={{ flex: 1, minWidth: 80 }}>
+                      <label style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.04em', display: 'block', marginBottom: 3 }}>{t('day.checkInUntil')}</label>
+                      <CustomTimePicker value={hotelForm.check_in_end} onChange={v => setHotelForm(f => ({ ...f, check_in_end: v }))} placeholder="22:00" />
+                    </div>
+                    <div style={{ flex: 1, minWidth: 80 }}>
                      <label style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.04em', display: 'block', marginBottom: 3 }}>{t('day.checkOut')}</label>
                      <CustomTimePicker value={hotelForm.check_out} onChange={v => setHotelForm(f => ({ ...f, check_out: v }))} placeholder="11:00" />
                    </div>
@@ -570,11 +577,12 @@ export default function DayDetailPanel({ day, days, places, categories = [], tri
                        start_day_id: hotelDayRange.start,
                        end_day_id: hotelDayRange.end,
                        check_in: hotelForm.check_in || null,
+                        check_in_end: hotelForm.check_in_end || null,
                        check_out: hotelForm.check_out || null,
                        confirmation: hotelForm.confirmation || null,
                      })
                      setShowHotelPicker(false)
-                      setHotelForm({ check_in: '', check_out: '', confirmation: '', place_id: null })
+                      setHotelForm({ check_in: '', check_in_end: '', check_out: '', confirmation: '', place_id: null })
                      // Reload
                      accommodationsApi.list(tripId).then(d => {
                        const all = d.accommodations || []
@@ -473,14 +473,14 @@ describe('Google Maps list import', () => {
  it('FE-PLANNER-SIDEBAR-040: "Google List" button opens the URL dialog', async () => {
    const user = userEvent.setup();
    render(<PlacesSidebar {...defaultProps} />);
-    await user.click(screen.getByText(/Google List/i));
+    await user.click(screen.getByText(/List Import/i));
    expect(await screen.findByPlaceholderText(/maps\.app\.goo\.gl/i)).toBeInTheDocument();
  });

  it('FE-PLANNER-SIDEBAR-041: import button disabled when URL input is empty', async () => {
    const user = userEvent.setup();
    render(<PlacesSidebar {...defaultProps} />);
-    await user.click(screen.getByText(/Google List/i));
+    await user.click(screen.getByText(/List Import/i));
    await screen.findByPlaceholderText(/maps\.app\.goo\.gl/i);
    const importBtn = screen.getByRole('button', { name: /^Import$/i });
    expect(importBtn).toBeDisabled();
@@ -498,7 +498,7 @@ describe('Google Maps list import', () => {
    (window as any).__addToast = addToast;
    const user = userEvent.setup();
    render(<PlacesSidebar {...defaultProps} pushUndo={vi.fn()} />);
-    await user.click(screen.getByText(/Google List/i));
+    await user.click(screen.getByText(/List Import/i));
    const urlInput = await screen.findByPlaceholderText(/maps\.app\.goo\.gl/i);
    await user.type(urlInput, 'https://maps.app.goo.gl/abc123');
    await user.click(screen.getByRole('button', { name: /^Import$/i }));
@@ -527,7 +527,7 @@ describe('Google Maps list import', () => {
    (window as any).__addToast = addToast;
    const user = userEvent.setup();
    render(<PlacesSidebar {...defaultProps} pushUndo={vi.fn()} />);
-    await user.click(screen.getByText(/Google List/i));
+    await user.click(screen.getByText(/List Import/i));
    const urlInput = await screen.findByPlaceholderText(/maps\.app\.goo\.gl/i);
    await user.type(urlInput, 'https://maps.app.goo.gl/xyz{Enter}');
    await waitFor(() => {
@@ -10,7 +10,6 @@ import { useContextMenu, ContextMenu } from '../shared/ContextMenu'
 import { placesApi } from '../../api/client'
 import { useTripStore } from '../../store/tripStore'
 import { useCanDo } from '../../store/permissionsStore'
-import { useAddonStore } from '../../store/addonStore'
 import type { Place, Category, Day, AssignmentsMap } from '../../types'
 import FileImportModal from './FileImportModal'

@@ -44,7 +43,7 @@ const PlacesSidebar = React.memo(function PlacesSidebar({
  const loadTrip = useTripStore((s) => s.loadTrip)
  const can = useCanDo()
  const canEditPlaces = can('place_edit', trip)
-  const isNaverListImportEnabled = useAddonStore((s) => s.isEnabled('naver_list_import'))
+  const isNaverListImportEnabled = true

  const [fileImportOpen, setFileImportOpen] = useState(false)
  const [sidebarDropFile, setSidebarDropFile] = useState<File | null>(null)
@@ -147,7 +146,11 @@ const PlacesSidebar = React.memo(function PlacesSidebar({

  const filtered = useMemo(() => places.filter(p => {
    if (filter === 'unplanned' && plannedIds.has(p.id)) return false
-    if (categoryFilters.size > 0 && !categoryFilters.has(String(p.category_id))) return false
+    if (categoryFilters.size > 0) {
+      if (p.category_id == null) {
+        if (!categoryFilters.has('uncategorized')) return false
+      } else if (!categoryFilters.has(String(p.category_id))) return false
+    }
    if (search && !p.name.toLowerCase().includes(search.toLowerCase()) &&
        !(p.address || '').toLowerCase().includes(search.toLowerCase())) return false
    return true
@@ -257,7 +260,7 @@ const PlacesSidebar = React.memo(function PlacesSidebar({
          const label = categoryFilters.size === 0
            ? t('places.allCategories')
            : categoryFilters.size === 1
-              ? categories.find(c => categoryFilters.has(String(c.id)))?.name || t('places.allCategories')
+              ? (categoryFilters.has('uncategorized') ? t('places.noCategory') : categories.find(c => categoryFilters.has(String(c.id)))?.name || t('places.allCategories'))
              : `${categoryFilters.size} ${t('places.categoriesSelected')}`
          return (
            <div style={{ marginTop: 6, position: 'relative' }}>
@@ -300,6 +303,29 @@ const PlacesSidebar = React.memo(function PlacesSidebar({
                      </button>
                    )
                  })}
+                  {places.some(p => p.category_id == null) && (() => {
+                    const active = categoryFilters.has('uncategorized')
+                    return (
+                      <button onClick={() => toggleCategoryFilter('uncategorized')} style={{
+                        display: 'flex', alignItems: 'center', gap: 8, width: '100%',
+                        padding: '6px 10px', borderRadius: 6, border: 'none', cursor: 'pointer',
+                        background: active ? 'var(--bg-hover)' : 'transparent',
+                        fontFamily: 'inherit', fontSize: 12, color: 'var(--text-muted)',
+                        textAlign: 'left', borderTop: '1px solid var(--border-faint)', marginTop: 2,
+                      }}>
+                        <div style={{
+                          width: 16, height: 16, borderRadius: 4, flexShrink: 0,
+                          border: active ? 'none' : '1.5px solid var(--border-primary)',
+                          background: active ? 'var(--text-faint)' : 'transparent',
+                          display: 'flex', alignItems: 'center', justifyContent: 'center',
+                        }}>
+                          {active && <Check size={10} strokeWidth={3} color="white" />}
+                        </div>
+                        <MapPin size={12} strokeWidth={2} color="var(--text-faint)" />
+                        <span style={{ flex: 1 }}>{t('places.noCategory')}</span>
+                      </button>
+                    )
+                  })()}
                  {categoryFilters.size > 0 && (
                    <button onClick={() => { setCategoryFiltersLocal(new Set()); onCategoryFilterChange?.(new Set()) }} style={{
                      display: 'flex', alignItems: 'center', justifyContent: 'center', gap: 4,
@@ -134,7 +134,8 @@ describe('ReservationModal', () => {
  it('FE-PLANNER-RESMODAL-008: hotel type shows check-in/check-out time fields', async () => {
    render(<ReservationModal {...defaultProps} />);
    await userEvent.click(screen.getByRole('button', { name: /Accommodation/i }));
-    expect(screen.getByText(/Check-in/i)).toBeInTheDocument();
+    const checkInLabels = screen.getAllByText(/Check-in/i);
+    expect(checkInLabels.length).toBeGreaterThanOrEqual(1);
    expect(screen.getByText(/Check-out/i)).toBeInTheDocument();
  });

@@ -89,7 +89,7 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
    meta_airline: '', meta_flight_number: '', meta_departure_airport: '', meta_arrival_airport: '',
    meta_departure_timezone: '', meta_arrival_timezone: '',
    meta_train_number: '', meta_platform: '', meta_seat: '',
-    meta_check_in_time: '', meta_check_out_time: '',
+    meta_check_in_time: '', meta_check_in_end_time: '', meta_check_out_time: '',
    hotel_place_id: '', hotel_start_day: '', hotel_end_day: '',
  })
  const [isSaving, setIsSaving] = useState(false)
@@ -140,6 +140,7 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
        meta_platform: meta.platform || '',
        meta_seat: meta.seat || '',
        meta_check_in_time: meta.check_in_time || '',
+        meta_check_in_end_time: meta.check_in_end_time || '',
        meta_check_out_time: meta.check_out_time || '',
        hotel_place_id: (() => { const acc = accommodations.find(a => a.id == reservation.accommodation_id); return acc?.place_id || '' })(),
        hotel_start_day: (() => { const acc = accommodations.find(a => a.id == reservation.accommodation_id); return acc?.start_day_id || '' })(),
@@ -156,7 +157,7 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
        meta_airline: '', meta_flight_number: '', meta_departure_airport: '', meta_arrival_airport: '',
        meta_departure_timezone: '', meta_arrival_timezone: '',
        meta_train_number: '', meta_platform: '', meta_seat: '',
-        meta_check_in_time: '', meta_check_out_time: '',
+        meta_check_in_time: '', meta_check_in_end_time: '', meta_check_out_time: '',
      })
      setPendingFiles([])
    }
@@ -207,6 +208,7 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
        if (form.meta_arrival_timezone) metadata.arrival_timezone = form.meta_arrival_timezone
      } else if (form.type === 'hotel') {
        if (form.meta_check_in_time) metadata.check_in_time = form.meta_check_in_time
+        if (form.meta_check_in_end_time) metadata.check_in_end_time = form.meta_check_in_end_time
        if (form.meta_check_out_time) metadata.check_out_time = form.meta_check_out_time
      } else if (form.type === 'train') {
        if (form.meta_train_number) metadata.train_number = form.meta_train_number
@@ -245,6 +247,7 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
          start_day_id: form.hotel_start_day,
          end_day_id: form.hotel_end_day,
          check_in: form.meta_check_in_time || null,
+          check_in_end: form.meta_check_in_end_time || null,
          check_out: form.meta_check_out_time || null,
          confirmation: form.confirmation_number || null,
        }
@@ -526,11 +529,15 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
              </div>
            </div>
            {/* Check-in/out times + Status */}
-            <div className="grid grid-cols-3 gap-3">
+            <div className="grid grid-cols-2 sm:grid-cols-4 gap-3">
              <div>
                <label style={labelStyle}>{t('reservations.meta.checkIn')}</label>
                <CustomTimePicker value={form.meta_check_in_time} onChange={v => set('meta_check_in_time', v)} />
              </div>
+              <div>
+                <label style={labelStyle}>{t('reservations.meta.checkInUntil')}</label>
+                <CustomTimePicker value={form.meta_check_in_end_time} onChange={v => set('meta_check_in_end_time', v)} />
+              </div>
              <div>
                <label style={labelStyle}>{t('reservations.meta.checkOut')}</label>
                <CustomTimePicker value={form.meta_check_out_time} onChange={v => set('meta_check_out_time', v)} />
@@ -91,12 +91,12 @@ describe('ReservationsPanel', () => {
    expect(els.length).toBeGreaterThan(0);
  });

-  it('FE-COMP-RES-010: shows summary text with confirmed and pending counts', () => {
-    const r1 = buildReservation({ title: 'Flight', type: 'flight', status: 'confirmed' });
-    const r2 = buildReservation({ title: 'Hotel', type: 'hotel', status: 'pending' });
+  it('FE-COMP-RES-010: shows reservations title and cards', () => {
+    const r1 = buildReservation({ title: 'My Flight Booking', type: 'flight', status: 'confirmed' });
+    const r2 = buildReservation({ title: 'Grand Hotel', type: 'hotel', status: 'pending' });
    render(<ReservationsPanel {...defaultProps} reservations={[r1, r2]} />);
-    // reservations.summary = "{confirmed} confirmed, {pending} pending"
-    expect(screen.getByText(/1 confirmed, 1 pending/i)).toBeInTheDocument();
+    expect(screen.getByText('My Flight Booking')).toBeInTheDocument();
+    expect(screen.getByText('Grand Hotel')).toBeInTheDocument();
  });

  it('FE-COMP-RES-011: hotel reservation renders', () => {
@@ -288,27 +288,14 @@ describe('ReservationsPanel', () => {

  // ── Status toggle (canEdit=true) ────────────────────────────────────────────

-  it('FE-PLANNER-RESP-030: status label is a button when canEdit=true', () => {
-    // Default: permissions empty → canEdit=true
+  it('FE-PLANNER-RESP-030: status label is always a span (not clickable)', () => {
    const res = buildReservation({ title: 'My Booking', status: 'pending' });
    render(<ReservationsPanel {...defaultProps} reservations={[res]} />);
-    // Status badge in card header is a button
    const pendingEls = screen.getAllByText('Pending');
+    const statusSpan = pendingEls.find(el => el.tagName === 'SPAN');
+    expect(statusSpan).toBeDefined();
    const statusBtn = pendingEls.find(el => el.tagName === 'BUTTON');
-    expect(statusBtn).toBeDefined();
-  });
-
-  it('FE-PLANNER-RESP-031: clicking status button calls toggleReservationStatus', async () => {
-    const user = userEvent.setup();
-    const toggleReservationStatus = vi.fn().mockResolvedValue(undefined);
-    // Seed the store with a mock toggleReservationStatus function
-    useTripStore.setState({ toggleReservationStatus } as any);
-    const res = buildReservation({ id: 42, title: 'Toggle Me', status: 'pending' });
-    render(<ReservationsPanel {...defaultProps} tripId={1} reservations={[res]} />);
-    const pendingEls = screen.getAllByText('Pending');
-    const statusBtn = pendingEls.find(el => el.tagName === 'BUTTON');
-    await user.click(statusBtn!);
-    await waitFor(() => expect(toggleReservationStatus).toHaveBeenCalledWith(1, 42));
+    expect(statusBtn).toBeUndefined();
  });

  // ── Status (canEdit=false) ──────────────────────────────────────────────────
@@ -50,6 +50,16 @@ function buildAssignmentLookup(days, assignments) {
  return map
 }

+/* ── Shared field label style ── */
+const fieldLabelStyle: React.CSSProperties = {
+  fontSize: 10, fontWeight: 600, textTransform: 'uppercase', letterSpacing: '0.08em',
+  color: 'var(--text-faint)', marginBottom: 5,
+}
+const fieldValueStyle: React.CSSProperties = {
+  fontSize: 13, fontWeight: 500, color: 'var(--text-primary)',
+  padding: '8px 10px', background: 'var(--bg-tertiary)', borderRadius: 10,
+}
+
 interface ReservationCardProps {
  r: Reservation
  tripId: number
@@ -84,184 +94,214 @@ function ReservationCard({ r, tripId, onEdit, onDelete, files = [], onNavigateTo
    try { await onDelete(r.id) } catch { toast.error(t('reservations.toast.deleteError')) }
  }

+  const isMobile = typeof window !== 'undefined' && window.innerWidth < 768
  const fmtDate = (str) => {
    const dateOnly = str.includes('T') ? str.split('T')[0] : str
-    return new Date(dateOnly + 'T00:00:00Z').toLocaleDateString(locale, { weekday: 'short', day: 'numeric', month: 'short', timeZone: 'UTC' })
+    return new Date(dateOnly + 'T00:00:00Z').toLocaleDateString(locale, { ...(isMobile ? {} : { weekday: 'short' }), day: 'numeric', month: 'short', timeZone: 'UTC' })
  }
  const fmtTime = (str) => {
    const d = new Date(str)
    return d.toLocaleTimeString(locale, { hour: '2-digit', minute: '2-digit', hour12: timeFormat === '12h' })
  }

+  const hasDate = !!r.reservation_time
+  const hasTime = r.reservation_time?.includes('T')
+  const hasCode = !!r.confirmation_number
+  const dateCols = [hasDate, hasTime, hasCode].filter(Boolean).length
+
  return (
-    <div style={{ borderRadius: 12, overflow: 'hidden', border: `1px solid ${confirmed ? 'rgba(22,163,74,0.2)' : 'rgba(217,119,6,0.2)'}` }}>
-      {/* Header bar */}
-      <div style={{ display: 'flex', alignItems: 'center', gap: 8, padding: '8px 12px', background: confirmed ? 'rgba(22,163,74,0.06)' : 'rgba(217,119,6,0.06)' }}>
-        <div style={{ width: 7, height: 7, borderRadius: '50%', flexShrink: 0, background: confirmed ? '#16a34a' : '#d97706' }} />
-        {canEdit ? (
-          <button onClick={handleToggle} style={{ fontSize: 10, fontWeight: 700, color: confirmed ? '#16a34a' : '#d97706', background: 'none', border: 'none', cursor: 'pointer', padding: 0, fontFamily: 'inherit' }}>
-            {confirmed ? t('reservations.confirmed') : t('reservations.pending')}
-          </button>
-        ) : (
-          <span style={{ fontSize: 10, fontWeight: 700, color: confirmed ? '#16a34a' : '#d97706', padding: 0 }}>
+    <div style={{
+      borderRadius: 12, overflow: 'hidden', display: 'flex', flexDirection: 'column',
+      border: `1px solid ${confirmed ? 'rgba(22,163,74,0.25)' : 'rgba(217,119,6,0.25)'}`,
+      background: 'var(--bg-card)',
+      transition: 'box-shadow 0.15s ease',
+    }}
+      onMouseEnter={e => e.currentTarget.style.boxShadow = '0 2px 12px rgba(0,0,0,0.06)'}
+      onMouseLeave={e => e.currentTarget.style.boxShadow = 'none'}
+    >
+      {/* Header */}
+      <div style={{
+        display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 12,
+        padding: '12px 14px',
+        background: confirmed ? 'rgba(22,163,74,0.06)' : 'rgba(217,119,6,0.06)',
+      }}>
+        <div style={{ display: 'inline-flex', alignItems: 'center', gap: 10, minWidth: 0 }}>
+          <span style={{
+            display: 'inline-flex', alignItems: 'center', gap: 6,
+            fontSize: 12, fontWeight: 600, color: confirmed ? '#16a34a' : '#d97706',
+          }}>
+            <span style={{ width: 7, height: 7, borderRadius: '50%', flexShrink: 0, background: confirmed ? '#16a34a' : '#d97706' }} />
            {confirmed ? t('reservations.confirmed') : t('reservations.pending')}
          </span>
+          <span style={{
+            display: 'inline-flex', alignItems: 'center', gap: 5,
+            fontSize: 12, color: 'var(--text-muted)',
+            padding: '3px 8px', borderRadius: 6,
+            background: 'var(--bg-secondary)',
+          }}>
+            <TypeIcon size={12} style={{ color: typeInfo.color }} />
+            {t(typeInfo.labelKey)}
+          </span>
+        </div>
+        <div style={{ display: 'flex', alignItems: 'center', gap: 2 }}>
+          <span style={{
+            fontSize: 13, fontWeight: 600, color: 'var(--text-primary)', marginRight: 6,
+            maxWidth: 140, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis',
+          }}>{r.title}</span>
+          {canEdit && (
+            <button onClick={() => onEdit(r)} title={t('common.edit')} style={{
+              appearance: 'none', border: 'none', background: 'transparent',
+              width: 26, height: 26, borderRadius: 6, display: 'grid', placeItems: 'center',
+              cursor: 'pointer', color: 'var(--text-faint)', flexShrink: 0,
+            }}
+              onMouseEnter={e => { e.currentTarget.style.background = 'rgba(0,0,0,0.05)'; e.currentTarget.style.color = 'var(--text-primary)' }}
+              onMouseLeave={e => { e.currentTarget.style.background = 'transparent'; e.currentTarget.style.color = 'var(--text-faint)' }}>
+              <Pencil size={13} />
+            </button>
+          )}
+          {canEdit && (
+            <button onClick={() => setShowDeleteConfirm(true)} title={t('common.delete')} style={{
+              appearance: 'none', border: 'none', background: 'transparent',
+              width: 26, height: 26, borderRadius: 6, display: 'grid', placeItems: 'center',
+              cursor: 'pointer', color: 'var(--text-faint)', flexShrink: 0,
+            }}
+              onMouseEnter={e => { e.currentTarget.style.background = 'rgba(239,68,68,0.08)'; e.currentTarget.style.color = '#ef4444' }}
+              onMouseLeave={e => { e.currentTarget.style.background = 'transparent'; e.currentTarget.style.color = 'var(--text-faint)' }}>
+              <Trash2 size={13} />
+            </button>
+          )}
+        </div>
+      </div>
+
+      {/* Body */}
+      <div style={{ padding: 14, display: 'flex', flexDirection: 'column', gap: 12, flex: 1 }}>
+        {/* Date / Time row */}
+        {hasDate && (
+          <div style={{ display: 'grid', gap: 10, gridTemplateColumns: hasTime ? '1fr 1fr' : '1fr' }}>
+            <div>
+              <div style={fieldLabelStyle}>{t('reservations.date')}</div>
+              <div style={{ ...fieldValueStyle, textAlign: 'center' }}>
+                {fmtDate(r.reservation_time)}
+                {r.reservation_end_time && (r.reservation_end_time.includes('T') ? r.reservation_end_time.split('T')[0] : r.reservation_end_time) !== r.reservation_time.split('T')[0] && (
+                  <> – {fmtDate(r.reservation_end_time)}</>
+                )}
+              </div>
+            </div>
+            {hasTime && (
+              <div>
+                <div style={fieldLabelStyle}>{t('reservations.time')}</div>
+                <div style={{ ...fieldValueStyle, textAlign: 'center' }}>
+                  {fmtTime(r.reservation_time)}{r.reservation_end_time ? ` – ${r.reservation_end_time.includes('T') ? fmtTime(r.reservation_end_time) : fmtTime(r.reservation_time.split('T')[0] + 'T' + r.reservation_end_time)}` : ''}
+                </div>
+              </div>
+            )}
+          </div>
        )}
-        <div style={{ width: 1, height: 10, background: 'var(--border-faint)' }} />
-        <TypeIcon size={11} style={{ color: typeInfo.color, flexShrink: 0 }} />
-        <span style={{ fontSize: 10, color: 'var(--text-faint)' }}>{t(typeInfo.labelKey)}</span>
-        <span style={{ flex: 1 }} />
-        <span style={{ fontSize: 12, fontWeight: 700, color: 'var(--text-primary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{r.title}</span>
-        {canEdit && (
-          <button onClick={() => onEdit(r)} title={t('common.edit')} style={{ padding: 3, background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-faint)', display: 'flex', flexShrink: 0 }}
-            onMouseEnter={e => e.currentTarget.style.color = 'var(--text-primary)'}
-            onMouseLeave={e => e.currentTarget.style.color = 'var(--text-faint)'}>
-            <Pencil size={11} />
-          </button>
+        {/* Booking code */}
+        {hasCode && (
+          <div>
+            <div style={fieldLabelStyle}>{t('reservations.confirmationCode')}</div>
+            <div
+              onMouseEnter={() => blurCodes && setCodeRevealed(true)}
+              onMouseLeave={() => blurCodes && setCodeRevealed(false)}
+              onClick={() => blurCodes && setCodeRevealed(v => !v)}
+              style={{
+                ...fieldValueStyle, textAlign: 'center',
+                fontFamily: '"SF Mono", "JetBrains Mono", Menlo, monospace', fontSize: 12.5,
+                filter: blurCodes && !codeRevealed ? 'blur(5px)' : 'none',
+                cursor: blurCodes ? 'pointer' : 'default',
+                transition: 'filter 0.2s',
+              }}
+            >
+              {r.confirmation_number}
+            </div>
+          </div>
        )}
-        {canEdit && (
-          <button onClick={() => setShowDeleteConfirm(true)} title={t('common.delete')} style={{ padding: 3, background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-faint)', display: 'flex', flexShrink: 0 }}
-            onMouseEnter={e => e.currentTarget.style.color = '#ef4444'}
-            onMouseLeave={e => e.currentTarget.style.color = 'var(--text-faint)'}>
-            <Trash2 size={11} />
-          </button>
+
+        {/* Type-specific metadata */}
+        {(() => {
+          const meta = typeof r.metadata === 'string' ? JSON.parse(r.metadata || '{}') : (r.metadata || {})
+          if (!meta || Object.keys(meta).length === 0) return null
+          const cells: { label: string; value: string }[] = []
+          if (meta.airline) cells.push({ label: t('reservations.meta.airline'), value: meta.airline })
+          if (meta.flight_number) cells.push({ label: t('reservations.meta.flightNumber'), value: meta.flight_number })
+          if (meta.departure_airport) cells.push({ label: t('reservations.meta.from'), value: meta.departure_airport })
+          if (meta.arrival_airport) cells.push({ label: t('reservations.meta.to'), value: meta.arrival_airport })
+          if (meta.train_number) cells.push({ label: t('reservations.meta.trainNumber'), value: meta.train_number })
+          if (meta.platform) cells.push({ label: t('reservations.meta.platform'), value: meta.platform })
+          if (meta.seat) cells.push({ label: t('reservations.meta.seat'), value: meta.seat })
+          if (meta.check_in_time) cells.push({ label: t('reservations.meta.checkIn'), value: fmtTime('2000-01-01T' + meta.check_in_time) + (meta.check_in_end_time ? ` – ${fmtTime('2000-01-01T' + meta.check_in_end_time)}` : '') })
+          if (meta.check_out_time) cells.push({ label: t('reservations.meta.checkOut'), value: fmtTime('2000-01-01T' + meta.check_out_time) })
+          if (cells.length === 0) return null
+          return (
+            <div style={{ display: 'grid', gap: 10, gridTemplateColumns: cells.length > 1 ? `repeat(${Math.min(cells.length, 3)}, 1fr)` : '1fr' }}>
+              {cells.map((c, i) => (
+                <div key={i}>
+                  <div style={fieldLabelStyle}>{c.label}</div>
+                  <div style={{ ...fieldValueStyle, textAlign: 'center' }}>{c.value}</div>
+                </div>
+              ))}
+            </div>
+          )
+        })()}
+
+        {/* Location / Accommodation / Assignment */}
+        {r.location && (
+          <div>
+            <div style={fieldLabelStyle}>{t('reservations.locationAddress')}</div>
+            <div style={{ ...fieldValueStyle, display: 'flex', alignItems: 'center', gap: 6, fontWeight: 400 }}>
+              <MapPin size={13} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
+              <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{r.location}</span>
+            </div>
+          </div>
+        )}
+        {r.accommodation_name && (
+          <div>
+            <div style={fieldLabelStyle}>{t('reservations.meta.linkAccommodation')}</div>
+            <div style={{ ...fieldValueStyle, display: 'flex', alignItems: 'center', gap: 6, fontWeight: 400 }}>
+              <Hotel size={13} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
+              <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{r.accommodation_name}</span>
+            </div>
+          </div>
+        )}
+        {linked && (
+          <div>
+            <div style={fieldLabelStyle}>{t('reservations.linkAssignment')}</div>
+            <div style={{ ...fieldValueStyle, display: 'flex', alignItems: 'center', gap: 6, fontWeight: 400 }}>
+              <Link2 size={13} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
+              <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+                {linked.dayTitle || t('dayplan.dayN', { n: linked.dayNumber })} — {linked.placeName}
+                {linked.startTime ? ` · ${linked.startTime}${linked.endTime ? ' – ' + linked.endTime : ''}` : ''}
+              </span>
+            </div>
+          </div>
+        )}
+
+        {/* Notes */}
+        {r.notes && (
+          <div>
+            <div style={fieldLabelStyle}>{t('reservations.notes')}</div>
+            <div style={{ ...fieldValueStyle, fontWeight: 400, lineHeight: 1.5 }}>{r.notes}</div>
+          </div>
+        )}
+
+        {/* Files */}
+        {attachedFiles.length > 0 && (
+          <div>
+            <div style={fieldLabelStyle}>{t('files.title')}</div>
+            <div style={{ ...fieldValueStyle, display: 'flex', flexDirection: 'column', gap: 4, padding: '6px 10px' }}>
+              {attachedFiles.map(f => (
+                <a key={f.id} href="#" onClick={(e) => { e.preventDefault(); openFile(f.url).catch(() => {}) }} style={{ display: 'flex', alignItems: 'center', gap: 5, textDecoration: 'none', cursor: 'pointer' }}>
+                  <FileText size={11} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
+                  <span style={{ fontSize: 12, color: 'var(--text-muted)', flex: 1, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{f.original_name}</span>
+                </a>
+              ))}
+            </div>
+          </div>
        )}
      </div>

-      {/* Details */}
-      {(r.reservation_time || r.confirmation_number || r.location || linked || r.metadata) && (
-        <div style={{ padding: '8px 12px', display: 'flex', flexDirection: 'column', gap: 6 }}>
-          {/* Row 1: Date, Time, Code */}
-          {(r.reservation_time || r.confirmation_number) && (
-            <div style={{ display: 'flex', gap: 0, borderRadius: 8, overflow: 'hidden', background: 'var(--bg-secondary)', boxShadow: '0 1px 6px rgba(0,0,0,0.08)' }}>
-              {r.reservation_time && (
-                <div style={{ flex: 1, padding: '5px 10px', textAlign: 'center', borderRight: '1px solid var(--border-faint)' }}>
-                  <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{t('reservations.date')}</div>
-                  <div style={{ fontSize: 11, fontWeight: 600, color: 'var(--text-primary)', marginTop: 1 }}>
-                    {fmtDate(r.reservation_time)}
-                    {r.reservation_end_time && (r.reservation_end_time.includes('T') ? r.reservation_end_time.split('T')[0] : r.reservation_end_time) !== r.reservation_time.split('T')[0] && (
-                      <> – {fmtDate(r.reservation_end_time)}</>
-                    )}
-                  </div>
-                </div>
-              )}
-              {r.reservation_time?.includes('T') && (
-                <div style={{ flex: 1, padding: '5px 10px', textAlign: 'center', borderRight: '1px solid var(--border-faint)' }}>
-                  <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{t('reservations.time')}</div>
-                  <div style={{ fontSize: 11, fontWeight: 600, color: 'var(--text-primary)', marginTop: 1 }}>
-                    {fmtTime(r.reservation_time)}{r.reservation_end_time ? ` – ${r.reservation_end_time.includes('T') ? fmtTime(r.reservation_end_time) : fmtTime(r.reservation_time.split('T')[0] + 'T' + r.reservation_end_time)}` : ''}
-                  </div>
-                </div>
-              )}
-              {r.confirmation_number && (
-                <div style={{ flex: 1, padding: '5px 10px', textAlign: 'center' }}>
-                  <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{t('reservations.confirmationCode')}</div>
-                  <div
-                    onMouseEnter={() => blurCodes && setCodeRevealed(true)}
-                    onMouseLeave={() => blurCodes && setCodeRevealed(false)}
-                    onClick={() => blurCodes && setCodeRevealed(v => !v)}
-                    style={{
-                      fontSize: 11, fontWeight: 600, color: 'var(--text-primary)', marginTop: 1,
-                      filter: blurCodes && !codeRevealed ? 'blur(5px)' : 'none',
-                      cursor: blurCodes ? 'pointer' : 'default',
-                      transition: 'filter 0.2s',
-                    }}
-                  >
-                    {r.confirmation_number}
-                  </div>
-                </div>
-              )}
-            </div>
-          )}
-          {/* Row 1b: Type-specific metadata */}
-          {(() => {
-            const meta = typeof r.metadata === 'string' ? JSON.parse(r.metadata || '{}') : (r.metadata || {})
-            if (!meta || Object.keys(meta).length === 0) return null
-            const cells: { label: string; value: string }[] = []
-            if (meta.airline) cells.push({ label: t('reservations.meta.airline'), value: meta.airline })
-            if (meta.flight_number) cells.push({ label: t('reservations.meta.flightNumber'), value: meta.flight_number })
-            if (meta.departure_airport) cells.push({ label: t('reservations.meta.from'), value: meta.departure_airport })
-            if (meta.arrival_airport) cells.push({ label: t('reservations.meta.to'), value: meta.arrival_airport })
-            if (meta.train_number) cells.push({ label: t('reservations.meta.trainNumber'), value: meta.train_number })
-            if (meta.platform) cells.push({ label: t('reservations.meta.platform'), value: meta.platform })
-            if (meta.seat) cells.push({ label: t('reservations.meta.seat'), value: meta.seat })
-            if (meta.check_in_time) cells.push({ label: t('reservations.meta.checkIn'), value: fmtTime('2000-01-01T' + meta.check_in_time) })
-            if (meta.check_out_time) cells.push({ label: t('reservations.meta.checkOut'), value: fmtTime('2000-01-01T' + meta.check_out_time) })
-            if (cells.length === 0) return null
-            return (
-              <div style={{ display: 'flex', gap: 0, borderRadius: 8, overflow: 'hidden', background: 'var(--bg-secondary)', boxShadow: '0 1px 6px rgba(0,0,0,0.08)' }}>
-                {cells.map((c, i) => (
-                  <div key={i} style={{ flex: 1, padding: '5px 10px', textAlign: 'center', borderRight: i < cells.length - 1 ? '1px solid var(--border-faint)' : 'none' }}>
-                    <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{c.label}</div>
-                    <div style={{ fontSize: 11, fontWeight: 600, color: 'var(--text-primary)', marginTop: 1 }}>{c.value}</div>
-                  </div>
-                ))}
-              </div>
-            )
-          })()}
-          {/* Row 2: Location + Assignment */}
-          {(r.location || linked || r.accommodation_name) && (
-            <div className={`grid grid-cols-1 ${r.location && linked ? 'sm:grid-cols-2' : ''} gap-2`} style={{ paddingTop: 6, borderTop: '1px solid var(--border-faint)' }}>
-              {r.location && (
-                <div>
-                  <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em', marginBottom: 3 }}>{t('reservations.locationAddress')}</div>
-                  <div style={{ display: 'flex', alignItems: 'center', gap: 5, padding: '4px 8px', borderRadius: 7, background: 'var(--bg-secondary)', fontSize: 11, color: 'var(--text-muted)' }}>
-                    <MapPin size={10} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
-                    <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{r.location}</span>
-                  </div>
-                </div>
-              )}
-              {r.accommodation_name && (
-                <div>
-                  <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em', marginBottom: 3 }}>{t('reservations.meta.linkAccommodation')}</div>
-                  <div style={{ display: 'flex', alignItems: 'center', gap: 5, padding: '4px 8px', borderRadius: 7, background: 'var(--bg-secondary)', fontSize: 11, color: 'var(--text-muted)' }}>
-                    <Hotel size={10} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
-                    <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{r.accommodation_name}</span>
-                  </div>
-                </div>
-              )}
-              {linked && (
-                <div>
-                  <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em', marginBottom: 3 }}>{t('reservations.linkAssignment')}</div>
-                  <div style={{ display: 'flex', alignItems: 'center', gap: 5, padding: '4px 8px', borderRadius: 7, background: 'var(--bg-secondary)', fontSize: 11, color: 'var(--text-muted)' }}>
-                    <Link2 size={10} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
-                    <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
-                      {linked.dayTitle || t('dayplan.dayN', { n: linked.dayNumber })} — {linked.placeName}
-                      {linked.startTime ? ` · ${linked.startTime}${linked.endTime ? ' – ' + linked.endTime : ''}` : ''}
-                    </span>
-                  </div>
-                </div>
-              )}
-            </div>
-          )}
-        </div>
-      )}
-
-      {/* Notes */}
-      {r.notes && (
-        <div style={{ padding: '0 12px 8px' }}>
-          <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em', marginBottom: 3 }}>{t('reservations.notes')}</div>
-          <div style={{ padding: '5px 8px', borderRadius: 7, background: 'var(--bg-secondary)', fontSize: 11, color: 'var(--text-muted)', lineHeight: 1.5 }}>
-            {r.notes}
-          </div>
-        </div>
-      )}
-
-      {/* Files */}
-      {attachedFiles.length > 0 && (
-        <div style={{ padding: '0 12px 8px' }}>
-          <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em', marginBottom: 3 }}>{t('files.title')}</div>
-          <div style={{ padding: '4px 8px', borderRadius: 7, background: 'var(--bg-secondary)', display: 'flex', flexDirection: 'column', gap: 3 }}>
-            {attachedFiles.map(f => (
-              <a key={f.id} href="#" onClick={(e) => { e.preventDefault(); openFile(f.url).catch(() => {}) }} style={{ display: 'flex', alignItems: 'center', gap: 4, textDecoration: 'none', cursor: 'pointer' }}>
-                <FileText size={9} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
-                <span style={{ fontSize: 10, color: 'var(--text-muted)', flex: 1, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{f.original_name}</span>
-              </a>
-            ))}
-          </div>
-        </div>
-      )}
-      {/* Delete confirmation popup */}
+      {/* Delete confirmation */}
      {showDeleteConfirm && ReactDOM.createPortal(
        <div style={{
          position: 'fixed', inset: 0, zIndex: 1000,
@@ -316,20 +356,25 @@ interface SectionProps {
 function Section({ title, count, children, defaultOpen = true, accent }: SectionProps) {
  const [open, setOpen] = useState(defaultOpen)
  return (
-    <div style={{ marginBottom: 16 }}>
+    <div style={{ marginBottom: 28 }}>
      <button onClick={() => setOpen(o => !o)} style={{
        display: 'flex', alignItems: 'center', gap: 8, width: '100%',
-        background: 'none', border: 'none', cursor: 'pointer', padding: '4px 0', marginBottom: 8, fontFamily: 'inherit',
+        background: 'none', border: 'none', cursor: 'pointer', padding: '4px 0', marginBottom: 12, fontFamily: 'inherit',
+        userSelect: 'none',
      }}>
        {open ? <ChevronDown size={14} style={{ color: 'var(--text-faint)' }} /> : <ChevronRight size={14} style={{ color: 'var(--text-faint)' }} />}
-        <span style={{ fontWeight: 700, fontSize: 12, color: 'var(--text-primary)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{title}</span>
+        <span style={{ fontWeight: 600, fontSize: 12, color: 'var(--text-muted)', textTransform: 'uppercase', letterSpacing: '0.08em' }}>{title}</span>
        <span style={{
-          fontSize: 10, fontWeight: 700, padding: '1px 7px', borderRadius: 99,
-          background: accent === 'green' ? 'rgba(22,163,74,0.1)' : 'var(--bg-tertiary)',
-          color: accent === 'green' ? '#16a34a' : 'var(--text-faint)',
+          fontSize: 11, fontWeight: 600, padding: '2px 7px', borderRadius: 99,
+          background: 'var(--bg-tertiary)', color: 'var(--text-faint)',
+          minWidth: 20, textAlign: 'center',
        }}>{count}</span>
      </button>
-      {open && <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>{children}</div>}
+      {open && (
+        <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(max(33.33% - 14px, 340px), 1fr))', gap: 14, alignItems: 'stretch' }}>
+          {children}
+        </div>
+      )}
    </div>
  )
 }
@@ -353,55 +398,152 @@ export default function ReservationsPanel({ tripId, reservations, days, assignme
  const canEdit = can('reservation_edit', trip)
  const [showHint, setShowHint] = useState(() => !localStorage.getItem('hideReservationHint'))

+  const storageKey = `trek-reservation-filters-${tripId}`
+  const [typeFilters, setTypeFilters] = useState<Set<string>>(() => {
+    try {
+      const saved = sessionStorage.getItem(storageKey)
+      return saved ? new Set(JSON.parse(saved)) : new Set()
+    } catch { return new Set() }
+  })
+
+  const toggleTypeFilter = (type: string) => {
+    setTypeFilters(prev => {
+      const next = new Set(prev)
+      if (next.has(type)) next.delete(type); else next.add(type)
+      sessionStorage.setItem(storageKey, JSON.stringify([...next]))
+      return next
+    })
+  }
+
  const assignmentLookup = useMemo(() => buildAssignmentLookup(days, assignments), [days, assignments])

-  const allPending = reservations.filter(r => r.status !== 'confirmed')
-  const allConfirmed = reservations.filter(r => r.status === 'confirmed')
-  const total = reservations.length
+  const filtered = useMemo(() =>
+    typeFilters.size === 0 ? reservations : reservations.filter(r => typeFilters.has(r.type)),
+  [reservations, typeFilters])
+
+  const allPending = filtered.filter(r => r.status !== 'confirmed')
+  const allConfirmed = filtered.filter(r => r.status === 'confirmed')
+  const total = filtered.length
+
+  const usedTypes = useMemo(() => new Set(reservations.map(r => r.type)), [reservations])
+  const typeCounts = useMemo(() => {
+    const counts: Record<string, number> = {}
+    for (const r of reservations) counts[r.type] = (counts[r.type] || 0) + 1
+    return counts
+  }, [reservations])

  return (
    <div style={{ height: '100%', display: 'flex', flexDirection: 'column', fontFamily: "-apple-system, BlinkMacSystemFont, 'SF Pro Text', system-ui, sans-serif" }}>
-      {/* Header */}
-      <div style={{ padding: '20px 24px 16px', borderBottom: '1px solid var(--border-faint)', display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
-        <div>
-          <h2 style={{ margin: 0, fontSize: 18, fontWeight: 700, color: 'var(--text-primary)' }}>{t('reservations.title')}</h2>
-          <p style={{ margin: '2px 0 0', fontSize: 12, color: 'var(--text-faint)' }}>
-            {total === 0 ? t('reservations.empty') : t('reservations.summary', { confirmed: allConfirmed.length, pending: allPending.length })}
-          </p>
+      {/* Unified toolbar */}
+      <div style={{ padding: '24px 28px 0' }} className="max-md:!px-4 max-md:!pt-4">
+        <div style={{
+          background: 'var(--bg-tertiary)', borderRadius: 18,
+          padding: '14px 16px 14px 22px',
+          display: 'flex', alignItems: 'center', gap: 16, flexWrap: 'wrap',
+        }}>
+          <h2 style={{ margin: 0, fontSize: 18, fontWeight: 600, color: 'var(--text-primary)', letterSpacing: '-0.01em', flexShrink: 0 }}>
+            {t('reservations.title')}
+          </h2>
+
+          {reservations.length > 0 && (
+            <>
+              <div className="hidden md:block" style={{ width: 1, height: 22, background: 'var(--border-faint)', flexShrink: 0 }} />
+              <div className="hidden md:inline-flex" style={{ gap: 4, flexWrap: 'wrap', flex: 1, minWidth: 0 }}>
+                <button
+                  onClick={() => { setTypeFilters(new Set()); sessionStorage.removeItem(storageKey) }}
+                  style={{
+                    appearance: 'none', border: 'none', cursor: 'pointer', fontFamily: 'inherit',
+                    display: 'inline-flex', alignItems: 'center', gap: 6,
+                    padding: '6px 12px', borderRadius: 99, fontSize: 13, whiteSpace: 'nowrap',
+                    background: typeFilters.size === 0 ? 'var(--bg-card)' : 'transparent',
+                    color: typeFilters.size === 0 ? 'var(--text-primary)' : 'var(--text-muted)',
+                    fontWeight: typeFilters.size === 0 ? 500 : 400,
+                    boxShadow: typeFilters.size === 0 ? '0 1px 2px rgba(0,0,0,0.06)' : 'none',
+                    transition: 'all 0.15s ease',
+                  }}
+                >
+                  {t('common.all')}
+                  <span style={{
+                    fontSize: 10, fontWeight: 600,
+                    background: typeFilters.size === 0 ? 'var(--bg-tertiary)' : 'rgba(0,0,0,0.06)',
+                    color: 'var(--text-faint)',
+                    padding: '1px 6px', borderRadius: 99, minWidth: 16, textAlign: 'center',
+                  }}>{reservations.length}</span>
+                </button>
+                {TYPE_OPTIONS.filter(opt => usedTypes.has(opt.value)).map(opt => {
+                  const active = typeFilters.has(opt.value)
+                  const Icon = opt.Icon
+                  return (
+                    <button
+                      key={opt.value}
+                      onClick={() => toggleTypeFilter(opt.value)}
+                      style={{
+                        appearance: 'none', border: 'none', cursor: 'pointer', fontFamily: 'inherit',
+                        display: 'inline-flex', alignItems: 'center', gap: 6,
+                        padding: '6px 12px', borderRadius: 99, fontSize: 13, whiteSpace: 'nowrap',
+                        background: active ? 'var(--bg-card)' : 'transparent',
+                        color: active ? 'var(--text-primary)' : 'var(--text-muted)',
+                        fontWeight: active ? 500 : 400,
+                        boxShadow: active ? '0 1px 2px rgba(0,0,0,0.06)' : 'none',
+                        transition: 'all 0.15s ease',
+                      }}
+                    >
+                      <Icon size={13} style={{ color: active ? opt.color : 'var(--text-faint)' }} />
+                      {t(opt.labelKey)}
+                      <span style={{
+                        fontSize: 10, fontWeight: 600,
+                        background: active ? 'var(--bg-tertiary)' : 'rgba(0,0,0,0.06)',
+                        color: 'var(--text-faint)',
+                        padding: '1px 6px', borderRadius: 99, minWidth: 16, textAlign: 'center',
+                      }}>{typeCounts[opt.value] || 0}</span>
+                    </button>
+                  )
+                })}
+              </div>
+            </>
+          )}
+
+          {canEdit && (
+            <button onClick={onAdd} style={{
+              appearance: 'none', border: 'none', cursor: 'pointer', fontFamily: 'inherit',
+              display: 'inline-flex', alignItems: 'center', gap: 6,
+              padding: '9px 14px', borderRadius: 10, fontSize: 13, fontWeight: 500,
+              background: 'var(--accent)', color: 'var(--accent-text)', flexShrink: 0,
+              marginLeft: 'auto',
+              transition: 'opacity 0.15s ease',
+            }}
+              onMouseEnter={e => e.currentTarget.style.opacity = '0.88'}
+              onMouseLeave={e => e.currentTarget.style.opacity = '1'}
+            >
+              <Plus size={14} strokeWidth={2.5} />
+              <span className="hidden sm:inline">{t('reservations.addManual')}</span>
+            </button>
+          )}
        </div>
-        {canEdit && (
-          <button onClick={onAdd} style={{
-            display: 'flex', alignItems: 'center', gap: 5, padding: '7px 14px', borderRadius: 99,
-            border: 'none', background: 'var(--accent)', color: 'var(--accent-text)',
-            fontSize: 12, fontWeight: 600, cursor: 'pointer', fontFamily: 'inherit',
-          }}>
-            <Plus size={13} /> <span className="hidden sm:inline">{t('reservations.addManual')}</span>
-          </button>
-        )}
      </div>

      {/* Content */}
-      <div style={{ flex: 1, overflowY: 'auto', padding: '16px 24px' }}>
-        {total === 0 ? (
+      <div style={{ flex: 1, overflowY: 'auto', padding: '24px 28px 80px' }} className="max-md:!px-4 max-md:!pt-4">
+        {total === 0 && reservations.length === 0 ? (
          <div style={{ textAlign: 'center', padding: '60px 20px' }}>
            <BookMarked size={36} style={{ color: 'var(--text-faint)', display: 'block', margin: '0 auto 12px' }} />
            <p style={{ fontSize: 14, fontWeight: 600, color: 'var(--text-secondary)', margin: '0 0 4px' }}>{t('reservations.empty')}</p>
            <p style={{ fontSize: 12, color: 'var(--text-faint)', margin: 0 }}>{t('reservations.emptyHint')}</p>
          </div>
+        ) : total === 0 ? (
+          <div style={{ textAlign: 'center', padding: '60px 20px' }}>
+            <p style={{ fontSize: 13, color: 'var(--text-faint)' }}>{t('places.noneFound')}</p>
+          </div>
        ) : (
          <>
            {allPending.length > 0 && (
              <Section title={t('reservations.pending')} count={allPending.length} accent="gray">
-                <div className="grid grid-cols-1 lg:grid-cols-2 gap-3">
-                  {allPending.map(r => <ReservationCard key={r.id} r={r} tripId={tripId} onEdit={onEdit} onDelete={onDelete} files={files} onNavigateToFiles={onNavigateToFiles} assignmentLookup={assignmentLookup} canEdit={canEdit} />)}
-                </div>
+                {allPending.map(r => <ReservationCard key={r.id} r={r} tripId={tripId} onEdit={onEdit} onDelete={onDelete} files={files} onNavigateToFiles={onNavigateToFiles} assignmentLookup={assignmentLookup} canEdit={canEdit} />)}
              </Section>
            )}
            {allConfirmed.length > 0 && (
              <Section title={t('reservations.confirmed')} count={allConfirmed.length} accent="green">
-                <div className="grid grid-cols-1 lg:grid-cols-2 gap-3">
-                  {allConfirmed.map(r => <ReservationCard key={r.id} r={r} tripId={tripId} onEdit={onEdit} onDelete={onDelete} files={files} onNavigateToFiles={onNavigateToFiles} assignmentLookup={assignmentLookup} canEdit={canEdit} />)}
-                </div>
+                {allConfirmed.map(r => <ReservationCard key={r.id} r={r} tripId={tripId} onEdit={onEdit} onDelete={onDelete} files={files} onNavigateToFiles={onNavigateToFiles} assignmentLookup={assignmentLookup} canEdit={canEdit} />)}
              </Section>
            )}
          </>
@@ -34,7 +34,7 @@ describe('AboutTab', () => {
  it('FE-COMP-ABOUT-005: displays Discord link with correct href', () => {
    render(<AboutTab appVersion="2.9.10" />);
    const link = screen.getByText('Discord').closest('a');
-    expect(link).toHaveAttribute('href', 'https://discord.gg/nSdKaXgN');
+    expect(link).toHaveAttribute('href', 'https://discord.gg/NhZBDSd4qW');
  });

  it('FE-COMP-ABOUT-006: displays bug report link', () => {
@@ -66,7 +66,7 @@ export default function AboutTab({ appVersion }: Props): React.ReactElement {
          <ExternalLink size={14} className="ml-auto flex-shrink-0" style={{ color: 'var(--text-faint)' }} />
        </a>
        <a
-          href="https://discord.gg/nSdKaXgN"
+          href="https://discord.gg/NhZBDSd4qW"
          target="_blank"
          rel="noopener noreferrer"
          className="rounded-xl border overflow-hidden flex items-center gap-4 px-5 py-4 transition-all"
@@ -347,6 +347,99 @@ describe('NotificationsTab', () => {
    });
  });

+  it('FE-COMP-NOTIFICATIONS-ntfy-001: ntfy topic input renders when ntfy channel is available', async () => {
+    server.use(
+      http.get('/api/notifications/preferences', () =>
+        HttpResponse.json({
+          preferences: { trip_invite: { inapp: true, ntfy: false } },
+          available_channels: { email: false, webhook: false, inapp: true, ntfy: true },
+          event_types: ['trip_invite'],
+          implemented_combos: { trip_invite: ['inapp', 'ntfy'] },
+        }),
+      ),
+    );
+
+    render(<NotificationsTab />);
+    await waitFor(() => {
+      expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
+    });
+
+    // Ntfy topic input should be present (placeholder text from i18n key or EN default)
+    const inputs = await screen.findAllByRole('textbox');
+    expect(inputs.length).toBeGreaterThan(0);
+  });
+
+  it('FE-COMP-NOTIFICATIONS-ntfy-002: ntfy test button disabled when no topic entered', async () => {
+    server.use(
+      http.get('/api/notifications/preferences', () =>
+        HttpResponse.json({
+          preferences: { trip_invite: { inapp: true, ntfy: false } },
+          available_channels: { email: false, webhook: false, inapp: true, ntfy: true },
+          event_types: ['trip_invite'],
+          implemented_combos: { trip_invite: ['inapp', 'ntfy'] },
+        }),
+      ),
+      http.get('/api/settings', () => HttpResponse.json({ settings: { ntfy_topic: '' } })),
+    );
+
+    render(<NotificationsTab />);
+    await waitFor(() => {
+      expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
+    });
+
+    // Test button should be disabled when topic is empty
+    const allButtons = await screen.findAllByRole('button');
+    const testBtn = allButtons.find(b => /test/i.test(b.textContent || ''));
+    expect(testBtn).toBeDefined();
+    expect(testBtn).toBeDisabled();
+  });
+
+  it('FE-COMP-NOTIFICATIONS-ntfy-003: entering topic and clicking Test calls test-ntfy API', async () => {
+    const user = userEvent.setup();
+    let ntfyCalled = false;
+    server.use(
+      http.get('/api/notifications/preferences', () =>
+        HttpResponse.json({
+          preferences: { trip_invite: { inapp: true, ntfy: false } },
+          available_channels: { email: false, webhook: false, inapp: true, ntfy: true },
+          event_types: ['trip_invite'],
+          implemented_combos: { trip_invite: ['inapp', 'ntfy'] },
+        }),
+      ),
+      http.post('/api/notifications/test-ntfy', () => {
+        ntfyCalled = true;
+        return HttpResponse.json({ success: true });
+      }),
+    );
+
+    render(
+      <>
+        <NotificationsTab />
+        <ToastContainer />
+      </>,
+    );
+
+    await waitFor(() => {
+      expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
+    });
+
+    // Find the topic input (first textbox in the ntfy block) and type a topic
+    const inputs = await screen.findAllByRole('textbox');
+    await user.type(inputs[0], 'my-test-topic');
+
+    // Test button should now be enabled
+    const allButtons = screen.getAllByRole('button');
+    const testBtn = allButtons.find(b => /test/i.test(b.textContent || ''));
+    expect(testBtn).toBeDefined();
+    expect(testBtn).not.toBeDisabled();
+
+    await user.click(testBtn!);
+
+    await waitFor(() => {
+      expect(ntfyCalled).toBe(true);
+    });
+  });
+
  it('FE-COMP-NOTIFICATIONS-014: failed test webhook shows error toast with message', async () => {
    const user = userEvent.setup();
    server.use(
@@ -8,15 +8,17 @@ import Section from './Section'

 interface PreferencesMatrix {
  preferences: Record<string, Record<string, boolean>>
-  available_channels: { email: boolean; webhook: boolean; inapp: boolean }
+  available_channels: { email: boolean; webhook: boolean; inapp: boolean; ntfy: boolean }
  event_types: string[]
  implemented_combos: Record<string, string[]>
+  defaults?: { ntfyServer: string | null }
 }

 const CHANNEL_LABEL_KEYS: Record<string, string> = {
  email: 'settings.notificationPreferences.email',
  webhook: 'settings.notificationPreferences.webhook',
  inapp: 'settings.notificationPreferences.inapp',
+  ntfy: 'settings.notificationPreferences.ntfy',
 }

 const EVENT_LABEL_KEYS: Record<string, string> = {
@@ -39,6 +41,12 @@ export default function NotificationsTab(): React.ReactElement {
  const [webhookIsSet, setWebhookIsSet] = useState(false)
  const [webhookSaving, setWebhookSaving] = useState(false)
  const [webhookTesting, setWebhookTesting] = useState(false)
+  const [ntfyTopic, setNtfyTopic] = useState('')
+  const [ntfyServer, setNtfyServer] = useState('')
+  const [ntfyToken, setNtfyToken] = useState('')
+  const [ntfyTokenIsSet, setNtfyTokenIsSet] = useState(false)
+  const [ntfySaving, setNtfySaving] = useState(false)
+  const [ntfyTesting, setNtfyTesting] = useState(false)

  useEffect(() => {
    notificationsApi.getPreferences().then((data: PreferencesMatrix) => setMatrix(data)).catch(() => {})
@@ -50,12 +58,21 @@ export default function NotificationsTab(): React.ReactElement {
      } else {
        setWebhookUrl(val)
      }
+      setNtfyTopic((data.settings?.ntfy_topic as string) || '')
+      setNtfyServer((data.settings?.ntfy_server as string) || '')
+      const rawToken = (data.settings?.ntfy_token as string) || ''
+      if (rawToken === '••••••••') {
+        setNtfyTokenIsSet(true)
+        setNtfyToken('')
+      } else {
+        setNtfyToken(rawToken)
+      }
    }).catch(() => {})
  }, [])

  const visibleChannels = matrix
-    ? (['email', 'webhook', 'inapp'] as const).filter(ch => {
-        if (!matrix.available_channels[ch]) return false
+    ? (['email', 'webhook', 'ntfy', 'inapp'] as const).filter(ch => {
+        if (!matrix.available_channels[ch as keyof typeof matrix.available_channels]) return false
        return matrix.event_types.some(evt => matrix.implemented_combos[evt]?.includes(ch))
      })
    : []
@@ -106,6 +123,52 @@ export default function NotificationsTab(): React.ReactElement {
    }
  }

+  const saveNtfySettings = async () => {
+    setNtfySaving(true)
+    try {
+      await settingsApi.setBulk({
+        ntfy_topic: ntfyTopic,
+        ntfy_server: ntfyServer,
+        ...(ntfyToken && ntfyToken !== '••••••••' ? { ntfy_token: ntfyToken } : {}),
+      })
+      if (ntfyToken && ntfyToken !== '••••••••') setNtfyTokenIsSet(true)
+      toast.success(t('settings.ntfyUrl.saved'))
+    } catch {
+      toast.error(t('common.error'))
+    } finally {
+      setNtfySaving(false)
+    }
+  }
+
+  const clearNtfyToken = async () => {
+    try {
+      await settingsApi.set('ntfy_token', '')
+      setNtfyToken('')
+      setNtfyTokenIsSet(false)
+      toast.success(t('settings.ntfyUrl.tokenCleared'))
+    } catch {
+      toast.error(t('common.error'))
+    }
+  }
+
+  const testNtfySettings = async () => {
+    if (!ntfyTopic) return
+    setNtfyTesting(true)
+    try {
+      const result = await notificationsApi.testNtfy({
+        topic: ntfyTopic,
+        server: ntfyServer || null,
+        token: ntfyToken && ntfyToken !== '••••••••' ? ntfyToken : null,
+      })
+      if (result.success) toast.success(t('settings.ntfyUrl.testSuccess'))
+      else toast.error(result.error || t('settings.ntfyUrl.testFailed'))
+    } catch {
+      toast.error(t('settings.ntfyUrl.testFailed'))
+    } finally {
+      setNtfyTesting(false)
+    }
+  }
+
  const renderContent = () => {
    if (!matrix) return <p style={{ fontSize: 12, color: 'var(--text-faint)', fontStyle: 'italic' }}>{t('common.loading')}</p>

@@ -139,7 +202,7 @@ export default function NotificationsTab(): React.ReactElement {
                disabled={webhookSaving}
                style={{ fontSize: 12, padding: '6px 12px', background: 'var(--text-primary)', color: 'var(--bg-primary)', border: 'none', borderRadius: 6, cursor: webhookSaving ? 'not-allowed' : 'pointer', opacity: webhookSaving ? 0.6 : 1 }}
              >
-                {t('settings.webhookUrl.save')}
+                {t('common.save')}
              </button>
              <button
                onClick={testWebhookUrl}
@@ -151,6 +214,66 @@ export default function NotificationsTab(): React.ReactElement {
            </div>
          </div>
        )}
+        {matrix.available_channels.ntfy && (
+          <div style={{ marginBottom: 16, padding: '12px', background: 'var(--bg-secondary)', borderRadius: 8, border: '1px solid var(--border-primary)' }}>
+            <label style={{ display: 'block', fontSize: 12, fontWeight: 600, color: 'var(--text-secondary)', marginBottom: 4 }}>
+              {t('settings.ntfyUrl.topicLabel')}
+            </label>
+            <p style={{ fontSize: 11, color: 'var(--text-faint)', marginBottom: 8 }}>{t('settings.ntfyUrl.hint')}</p>
+            <input
+              type="text"
+              value={ntfyTopic}
+              onChange={e => setNtfyTopic(e.target.value)}
+              placeholder={t('settings.ntfyUrl.topicPlaceholder')}
+              style={{ width: '100%', boxSizing: 'border-box', fontSize: 13, padding: '6px 10px', border: '1px solid var(--border-primary)', borderRadius: 6, background: 'var(--bg-primary)', color: 'var(--text-primary)', marginBottom: 6 }}
+            />
+            <label style={{ display: 'block', fontSize: 12, fontWeight: 600, color: 'var(--text-secondary)', marginBottom: 4 }}>
+              {t('settings.ntfyUrl.serverLabel')}
+            </label>
+            <input
+              type="text"
+              value={ntfyServer}
+              onChange={e => setNtfyServer(e.target.value)}
+              placeholder={matrix.defaults?.ntfyServer || t('settings.ntfyUrl.serverPlaceholder')}
+              style={{ width: '100%', boxSizing: 'border-box', fontSize: 13, padding: '6px 10px', border: '1px solid var(--border-primary)', borderRadius: 6, background: 'var(--bg-primary)', color: 'var(--text-primary)', marginBottom: 6 }}
+            />
+            <label style={{ display: 'block', fontSize: 12, fontWeight: 600, color: 'var(--text-secondary)', marginBottom: 4 }}>
+              {t('settings.ntfyUrl.tokenLabel')}
+            </label>
+            <p style={{ fontSize: 11, color: 'var(--text-faint)', marginBottom: 4 }}>{t('settings.ntfyUrl.tokenHint')}</p>
+            <div style={{ display: 'flex', gap: 8, alignItems: 'center' }}>
+              <input
+                type="password"
+                value={ntfyToken}
+                onChange={e => setNtfyToken(e.target.value)}
+                placeholder={ntfyTokenIsSet ? '••••••••' : ''}
+                style={{ flex: 1, fontSize: 13, padding: '6px 10px', border: '1px solid var(--border-primary)', borderRadius: 6, background: 'var(--bg-primary)', color: 'var(--text-primary)' }}
+              />
+              {ntfyTokenIsSet && (
+                <button
+                  onClick={clearNtfyToken}
+                  style={{ fontSize: 12, padding: '6px 12px', background: 'transparent', color: 'var(--color-danger, #e53e3e)', border: '1px solid var(--color-danger, #e53e3e)', borderRadius: 6, cursor: 'pointer' }}
+                >
+                  {t('common.clear')}
+                </button>
+              )}
+              <button
+                onClick={saveNtfySettings}
+                disabled={ntfySaving}
+                style={{ fontSize: 12, padding: '6px 12px', background: 'var(--text-primary)', color: 'var(--bg-primary)', border: 'none', borderRadius: 6, cursor: ntfySaving ? 'not-allowed' : 'pointer', opacity: ntfySaving ? 0.6 : 1 }}
+              >
+                {t('common.save')}
+              </button>
+              <button
+                onClick={testNtfySettings}
+                disabled={!ntfyTopic || ntfyTesting}
+                style={{ fontSize: 12, padding: '6px 12px', background: 'transparent', color: 'var(--text-secondary)', border: '1px solid var(--border-primary)', borderRadius: 6, cursor: (!ntfyTopic || ntfyTesting) ? 'not-allowed' : 'pointer', opacity: (!ntfyTopic || ntfyTesting) ? 0.5 : 1 }}
+              >
+                {t('settings.ntfyUrl.test')}
+              </button>
+            </div>
+          </div>
+        )}
        {/* Header row */}
        <div style={{ display: 'grid', gridTemplateColumns: `1fr ${visibleChannels.map(() => '64px').join(' ')}`, gap: 4, paddingBottom: 6, marginBottom: 4, borderBottom: '1px solid var(--border-primary)' }}>
          <span />
@@ -10,6 +10,7 @@ import ru from './translations/ru'
 import zh from './translations/zh'
 import zhTw from './translations/zhTw'
 import nl from './translations/nl'
+import id from './translations/id'
 import ar from './translations/ar'
 import br from './translations/br'
 import cs from './translations/cs'
@@ -22,14 +23,13 @@ type TranslationStrings = Record<string, string | { name: string; category: stri

 // Keyed by SupportedLanguageCode so TypeScript enforces all languages have a translation.
 const translations: Record<SupportedLanguageCode, TranslationStrings> = {
-  de, en, es, fr, hu, it, ru, zh, 'zh-TW': zhTw, nl, ar, br, cs, pl,
+  de, en, es, fr, hu, it, ru, zh, 'zh-TW': zhTw, nl, id, ar, br, cs, pl,
 }

 // Derived from SUPPORTED_LANGUAGES — add new languages there, not here.
 const LOCALES: Record<string, string> = Object.fromEntries(
  SUPPORTED_LANGUAGES.map(l => [l.value, l.locale])
 )
-
 const RTL_LANGUAGES = new Set(['ar'])

 export function getLocaleForLanguage(language: string): string {
@@ -38,7 +38,7 @@ export function getLocaleForLanguage(language: string): string {

 export function getIntlLanguage(language: string): string {
  if (language === 'br') return 'pt-BR'
-  return ['de', 'es', 'fr', 'hu', 'it', 'ru', 'zh', 'zh-TW', 'nl', 'ar', 'cs', 'pl'].includes(language) ? language : 'en'
+  return ['de', 'es', 'fr', 'hu', 'it', 'ru', 'zh', 'zh-TW', 'nl', 'ar', 'cs', 'pl', 'id'].includes(language) ? language : 'en'
 }

 export function isRtlLanguage(language: string): boolean {
@@ -13,6 +13,7 @@ export const SUPPORTED_LANGUAGES = [
  { value: 'zh-TW', label: '繁體中文',              locale: 'zh-TW' },
  { value: 'it',    label: 'Italiano',             locale: 'it-IT' },
  { value: 'ar',    label: 'العربية',              locale: 'ar-SA' },
+  { value: 'id',    label: 'Bahasa Indonesia',     locale: 'id-ID' },
 ] as const

 export type SupportedLanguageCode = typeof SUPPORTED_LANGUAGES[number]['value']
@@ -8,6 +8,7 @@ const ar: Record<string, string | { name: string; category: string }[]> = {
  'common.showMore': 'عرض المزيد',
  'common.showLess': 'عرض أقل',
  'common.cancel': 'إلغاء',
+  'common.clear': 'مسح',
  'common.delete': 'حذف',
  'common.edit': 'تعديل',
  'common.add': 'إضافة',
@@ -463,6 +464,12 @@ const ar: Record<string, string | { name: string; category: string }[]> = {
  'admin.tabs.audit': 'تدقيق',
  'admin.tabs.settings': 'الإعدادات',
  'admin.tabs.config': 'التخصيص',
+  'admin.tabs.defaults': 'الإعدادات الافتراضية',
+  'admin.defaultSettings.title': 'إعدادات المستخدم الافتراضية',
+  'admin.defaultSettings.description': 'تعيين الإعدادات الافتراضية على مستوى النظام. سيرى المستخدمون الذين لم يغيروا إعدادًا هذه القيم. تحظى تغييراتهم دائمًا بالأولوية.',
+  'admin.defaultSettings.saved': 'تم حفظ الإعداد الافتراضي',
+  'admin.defaultSettings.reset': 'إعادة التعيين إلى الإعداد الافتراضي المدمج',
+  'admin.defaultSettings.resetToBuiltIn': 'إعادة تعيين',
  'admin.tabs.templates': 'قوالب التعبئة',
  'admin.tabs.addons': 'الإضافات',
  'admin.tabs.mcpTokens': 'وصول MCP',
@@ -583,6 +590,14 @@ const ar: Record<string, string | { name: string; category: string }[]> = {
  // Packing Templates & Bag Tracking
  'admin.bagTracking.title': 'تتبع الأمتعة',
  'admin.bagTracking.subtitle': 'تفعيل الوزن وتعيين الأمتعة للعناصر',
+  'admin.collab.chat.title': 'الدردشة',
+  'admin.collab.chat.subtitle': 'المراسلة في الوقت الفعلي للتعاون',
+  'admin.collab.notes.title': 'الملاحظات',
+  'admin.collab.notes.subtitle': 'ملاحظات ومستندات مشتركة',
+  'admin.collab.polls.title': 'الاستطلاعات',
+  'admin.collab.polls.subtitle': 'استطلاعات وتصويت جماعي',
+  'admin.collab.whatsnext.title': 'ما التالي',
+  'admin.collab.whatsnext.subtitle': 'اقتراحات الأنشطة والخطوات التالية',
  'admin.packingTemplates.title': 'قوالب التعبئة',
  'admin.packingTemplates.subtitle': 'إنشاء قوائم تعبئة قابلة لإعادة الاستخدام',
  'admin.packingTemplates.create': 'قالب جديد',
@@ -1006,6 +1021,7 @@ const ar: Record<string, string | { name: string; category: string }[]> = {
  'reservations.meta.platform': 'المنصة',
  'reservations.meta.seat': 'المقعد',
  'reservations.meta.checkIn': 'تسجيل الوصول',
+  'reservations.meta.checkInUntil': 'تسجيل الدخول حتى',
  'reservations.meta.checkOut': 'تسجيل المغادرة',
  'reservations.meta.linkAccommodation': 'الإقامة',
  'reservations.meta.pickAccommodation': 'ربط بالإقامة',
@@ -1490,6 +1506,7 @@ const ar: Record<string, string | { name: string; category: string }[]> = {
  'day.noPlacesForHotel': 'أضف أماكن إلى رحلتك أولًا',
  'day.allDays': 'الكل',
  'day.checkIn': 'تسجيل الوصول',
+  'day.checkInUntil': 'حتى',
  'day.checkOut': 'تسجيل المغادرة',
  'day.confirmation': 'التأكيد',
  'day.editAccommodation': 'تعديل الإقامة',
@@ -1809,14 +1826,26 @@ const ar: Record<string, string | { name: string; category: string }[]> = {
  'settings.webhookUrl.label': 'رابط Webhook',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': 'أدخل رابط Webhook الخاص بـ Discord أو Slack أو المخصص لتلقي الإشعارات.',
-  'settings.webhookUrl.save': 'حفظ',
  'settings.webhookUrl.saved': 'تم حفظ رابط Webhook',
  'settings.webhookUrl.test': 'اختبار',
  'settings.webhookUrl.testSuccess': 'تم إرسال Webhook الاختباري بنجاح',
  'settings.webhookUrl.testFailed': 'فشل إرسال Webhook الاختباري',
+  'settings.ntfyUrl.topicLabel': 'موضوع Ntfy',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': 'عنوان URL خادم Ntfy (اختياري)',
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': 'أدخل موضوع Ntfy الخاص بك لتلقي الإشعارات الفورية. اترك حقل الخادم فارغاً لاستخدام الإعداد الافتراضي الذي حدده المسؤول.',
+  'settings.ntfyUrl.tokenLabel': 'رمز الوصول (اختياري)',
+  'settings.ntfyUrl.tokenHint': 'مطلوب للمواضيع المحمية بكلمة مرور.',
+  'settings.ntfyUrl.saved': 'تم حفظ إعدادات Ntfy',
+  'settings.ntfyUrl.test': 'اختبار',
+  'settings.ntfyUrl.testSuccess': 'تم إرسال إشعار Ntfy التجريبي بنجاح',
+  'settings.ntfyUrl.testFailed': 'فشل إشعار Ntfy التجريبي',
+  'settings.ntfyUrl.tokenCleared': 'تم مسح رمز الوصول',
  'settings.notificationPreferences.inapp': 'In-App',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.email': 'Email',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'admin.notifications.emailPanel.title': 'Email (SMTP)',
  'admin.notifications.webhookPanel.title': 'Webhook',
  'admin.notifications.inappPanel.title': 'In-App',
@@ -1827,6 +1856,25 @@ const ar: Record<string, string | { name: string; category: string }[]> = {
  'admin.notifications.adminWebhookPanel.testSuccess': 'تم إرسال Webhook الاختباري بنجاح',
  'admin.notifications.adminWebhookPanel.testFailed': 'فشل إرسال Webhook الاختباري',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': 'يُرسل Webhook المسؤول تلقائيًا عند تعيين رابط URL',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': 'تسمح للمستخدمين بإعداد موضوعات ntfy الخاصة لتلقي إشعارات الدفع. قم بتعيين الخادم الافتراضي أدناه لملء إعدادات المستخدم مسبقًا.',
+  'admin.notifications.testNtfy': 'إرسال Ntfy تجريبي',
+  'admin.notifications.testNtfySuccess': 'تم إرسال Ntfy التجريبي بنجاح',
+  'admin.notifications.testNtfyFailed': 'فشل إرسال Ntfy التجريبي',
+  'admin.notifications.adminNtfyPanel.title': 'Ntfy المسؤول',
+  'admin.notifications.adminNtfyPanel.hint': 'يُستخدم موضوع Ntfy هذا حصريًا لإشعارات المسؤول (مثل تنبيهات الإصدارات). وهو مستقل عن مواضيع المستخدمين ويُرسل دائمًا عند تهيئته.',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'عنوان URL خادم Ntfy',
+  'admin.notifications.adminNtfyPanel.serverHint': 'يُستخدم أيضًا كخادم افتراضي لإشعارات ntfy للمستخدمين. اتركه فارغًا لاستخدام ntfy.sh. يمكن للمستخدمين تغييره في إعداداتهم الخاصة.',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': 'موضوع المسؤول',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': 'رمز الوصول (اختياري)',
+  'admin.notifications.adminNtfyPanel.tokenCleared': 'تم مسح رمز وصول المسؤول',
+  'admin.notifications.adminNtfyPanel.saved': 'تم حفظ إعدادات Ntfy للمسؤول',
+  'admin.notifications.adminNtfyPanel.test': 'إرسال Ntfy تجريبي',
+  'admin.notifications.adminNtfyPanel.testSuccess': 'تم إرسال Ntfy التجريبي بنجاح',
+  'admin.notifications.adminNtfyPanel.testFailed': 'فشل إرسال Ntfy التجريبي',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': 'يُرسل Ntfy للمسؤول دائمًا عند تهيئة موضوع',
  'admin.notifications.adminNotificationsHint': 'حدد القنوات التي تُسلّم إشعارات المسؤول (مثل تنبيهات الإصدارات). يُرسل الـ Webhook تلقائيًا عند تعيين رابط URL لـ Webhook المسؤول.',
  'admin.tabs.notifications': 'الإشعارات',
  'notifications.versionAvailable.title': 'تحديث متاح',
@@ -4,6 +4,7 @@ const br: Record<string, string | { name: string; category: string }[]> = {
  'common.showMore': 'Mostrar mais',
  'common.showLess': 'Mostrar menos',
  'common.cancel': 'Cancelar',
+  'common.clear': 'Limpar',
  'common.delete': 'Excluir',
  'common.edit': 'Editar',
  'common.add': 'Adicionar',
@@ -547,7 +548,21 @@ const br: Record<string, string | { name: string; category: string }[]> = {
  // Packing Templates & Bag Tracking
  'admin.bagTracking.title': 'Rastreamento de malas',
  'admin.bagTracking.subtitle': 'Ativar peso e atribuição de mala para itens da lista',
+  'admin.collab.chat.title': 'Chat',
+  'admin.collab.chat.subtitle': 'Mensagens em tempo real para colaboração',
+  'admin.collab.notes.title': 'Notas',
+  'admin.collab.notes.subtitle': 'Notas e documentos compartilhados',
+  'admin.collab.polls.title': 'Enquetes',
+  'admin.collab.polls.subtitle': 'Enquetes e votações em grupo',
+  'admin.collab.whatsnext.title': 'Próximos passos',
+  'admin.collab.whatsnext.subtitle': 'Sugestões de atividades e próximos passos',
  'admin.tabs.config': 'Personalização',
+  'admin.tabs.defaults': 'Padrões do usuário',
+  'admin.defaultSettings.title': 'Configurações padrão do usuário',
+  'admin.defaultSettings.description': 'Defina padrões para toda a instância. Usuários que não alteraram uma configuração verão esses valores. As próprias alterações deles sempre têm prioridade.',
+  'admin.defaultSettings.saved': 'Padrão salvo',
+  'admin.defaultSettings.reset': 'Redefinir para o padrão integrado',
+  'admin.defaultSettings.resetToBuiltIn': 'redefinir',
  'admin.tabs.templates': 'Modelos de mala',
  'admin.packingTemplates.title': 'Modelos de mala',
  'admin.packingTemplates.subtitle': 'Crie listas de mala reutilizáveis para suas viagens',
@@ -975,6 +990,7 @@ const br: Record<string, string | { name: string; category: string }[]> = {
  'reservations.meta.platform': 'Plataforma',
  'reservations.meta.seat': 'Assento',
  'reservations.meta.checkIn': 'Check-in',
+  'reservations.meta.checkInUntil': 'Check-in até',
  'reservations.meta.checkOut': 'Check-out',
  'reservations.meta.linkAccommodation': 'Hospedagem',
  'reservations.meta.pickAccommodation': 'Vincular à hospedagem',
@@ -1459,6 +1475,7 @@ const br: Record<string, string | { name: string; category: string }[]> = {
  'day.noPlacesForHotel': 'Adicione lugares à viagem primeiro',
  'day.allDays': 'Todos',
  'day.checkIn': 'Check-in',
+  'day.checkInUntil': 'Até',
  'day.checkOut': 'Check-out',
  'day.confirmation': 'Confirmação',
  'day.editAccommodation': 'Editar hospedagem',
@@ -1758,14 +1775,26 @@ const br: Record<string, string | { name: string; category: string }[]> = {
  'settings.webhookUrl.label': 'URL do webhook',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': 'Insira a URL do seu webhook do Discord, Slack ou personalizado para receber notificações.',
-  'settings.webhookUrl.save': 'Salvar',
  'settings.webhookUrl.saved': 'URL do webhook salva',
  'settings.webhookUrl.test': 'Testar',
  'settings.webhookUrl.testSuccess': 'Webhook de teste enviado com sucesso',
  'settings.webhookUrl.testFailed': 'Falha no webhook de teste',
+  'settings.ntfyUrl.topicLabel': 'Tópico Ntfy',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': 'URL do servidor Ntfy (opcional)',
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': 'Insira seu tópico Ntfy para receber notificações push. Deixe o servidor em branco para usar o padrão configurado pelo seu administrador.',
+  'settings.ntfyUrl.tokenLabel': 'Token de acesso (opcional)',
+  'settings.ntfyUrl.tokenHint': 'Necessário para tópicos protegidos por senha.',
+  'settings.ntfyUrl.saved': 'Configurações do Ntfy salvas',
+  'settings.ntfyUrl.test': 'Testar',
+  'settings.ntfyUrl.testSuccess': 'Notificação de teste do Ntfy enviada com sucesso',
+  'settings.ntfyUrl.testFailed': 'Falha na notificação de teste do Ntfy',
+  'settings.ntfyUrl.tokenCleared': 'Token de acesso removido',
  'settings.notificationPreferences.inapp': 'In-App',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.email': 'Email',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'admin.notifications.emailPanel.title': 'Email (SMTP)',
  'admin.notifications.webhookPanel.title': 'Webhook',
  'admin.notifications.inappPanel.title': 'In-App',
@@ -1776,6 +1805,25 @@ const br: Record<string, string | { name: string; category: string }[]> = {
  'admin.notifications.adminWebhookPanel.testSuccess': 'Webhook de teste enviado com sucesso',
  'admin.notifications.adminWebhookPanel.testFailed': 'Falha no webhook de teste',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': 'O webhook de admin dispara automaticamente quando uma URL está configurada',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': 'Permite que os usuários configurem seus próprios tópicos ntfy para notificações push. Configure o servidor padrão abaixo para preencher as configurações do usuário.',
+  'admin.notifications.testNtfy': 'Enviar Ntfy de teste',
+  'admin.notifications.testNtfySuccess': 'Ntfy de teste enviado com sucesso',
+  'admin.notifications.testNtfyFailed': 'Falha ao enviar Ntfy de teste',
+  'admin.notifications.adminNtfyPanel.title': 'Ntfy de admin',
+  'admin.notifications.adminNtfyPanel.hint': 'Este tópico Ntfy é usado exclusivamente para notificações de admin (ex. alertas de versão). É independente dos tópicos por usuário e sempre dispara quando configurado.',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'URL do servidor Ntfy',
+  'admin.notifications.adminNtfyPanel.serverHint': 'Também usado como servidor padrão para notificações ntfy dos usuários. Deixe em branco para usar ntfy.sh. Os usuários podem substituir isso em suas próprias configurações.',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': 'Tópico de admin',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': 'Token de acesso (opcional)',
+  'admin.notifications.adminNtfyPanel.tokenCleared': 'Token de acesso admin removido',
+  'admin.notifications.adminNtfyPanel.saved': 'Configurações de Ntfy de admin salvas',
+  'admin.notifications.adminNtfyPanel.test': 'Enviar Ntfy de teste',
+  'admin.notifications.adminNtfyPanel.testSuccess': 'Ntfy de teste enviado com sucesso',
+  'admin.notifications.adminNtfyPanel.testFailed': 'Falha ao enviar Ntfy de teste',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': 'O Ntfy de admin sempre dispara quando um tópico está configurado',
  'admin.notifications.adminNotificationsHint': 'Configure quais canais entregam notificações de admin (ex. alertas de versão). O webhook dispara automaticamente se uma URL de webhook de admin estiver definida.',
  'admin.tabs.notifications': 'Notificações',
  'notifications.versionAvailable.title': 'Atualização disponível',
@@ -4,6 +4,7 @@ const cs: Record<string, string | { name: string; category: string }[]> = {
  'common.showMore': 'Zobrazit více',
  'common.showLess': 'Zobrazit méně',
  'common.cancel': 'Zrušit',
+  'common.clear': 'Vymazat',
  'common.delete': 'Smazat',
  'common.edit': 'Upravit',
  'common.add': 'Přidat',
@@ -547,7 +548,21 @@ const cs: Record<string, string | { name: string; category: string }[]> = {
  // Šablony balení (Packing Templates)
  'admin.bagTracking.title': 'Sledování zavazadel',
  'admin.bagTracking.subtitle': 'Povolit váhu a přiřazení k zavazadlům u položek balení',
+  'admin.collab.chat.title': 'Chat',
+  'admin.collab.chat.subtitle': 'Zasílání zpráv v reálném čase',
+  'admin.collab.notes.title': 'Poznámky',
+  'admin.collab.notes.subtitle': 'Sdílené poznámky a dokumenty',
+  'admin.collab.polls.title': 'Ankety',
+  'admin.collab.polls.subtitle': 'Skupinové ankety a hlasování',
+  'admin.collab.whatsnext.title': 'Co dál',
+  'admin.collab.whatsnext.subtitle': 'Návrhy aktivit a další kroky',
  'admin.tabs.config': 'Personalizace',
+  'admin.tabs.defaults': 'Výchozí nastavení uživatele',
+  'admin.defaultSettings.title': 'Výchozí nastavení uživatele',
+  'admin.defaultSettings.description': 'Nastavte výchozí hodnoty pro celou instanci. Uživatelé, kteří nezměnili nastavení, uvidí tyto hodnoty. Jejich vlastní změny mají vždy přednost.',
+  'admin.defaultSettings.saved': 'Výchozí nastavení uloženo',
+  'admin.defaultSettings.reset': 'Obnovit na vestavěnou výchozí hodnotu',
+  'admin.defaultSettings.resetToBuiltIn': 'obnovit',
  'admin.tabs.templates': 'Šablony seznamů',
  'admin.packingTemplates.title': 'Šablony pro balení',
  'admin.packingTemplates.subtitle': 'Vytvářejte opakovaně použitelné seznamy pro své cesty',
@@ -1004,6 +1019,7 @@ const cs: Record<string, string | { name: string; category: string }[]> = {
  'reservations.meta.platform': 'Nástupiště',
  'reservations.meta.seat': 'Sedadlo',
  'reservations.meta.checkIn': 'Check-in',
+  'reservations.meta.checkInUntil': 'Check-in do',
  'reservations.meta.checkOut': 'Check-out',
  'reservations.meta.linkAccommodation': 'Ubytování',
  'reservations.meta.pickAccommodation': 'Propojit s ubytováním',
@@ -1488,6 +1504,7 @@ const cs: Record<string, string | { name: string; category: string }[]> = {
  'day.noPlacesForHotel': 'Nejprve přidejte místa ke své cestě',
  'day.allDays': 'Vše',
  'day.checkIn': 'Check-in',
+  'day.checkInUntil': 'Do',
  'day.checkOut': 'Check-out',
  'day.confirmation': 'Potvrzení',
  'day.editAccommodation': 'Upravit ubytování',
@@ -1763,14 +1780,26 @@ const cs: Record<string, string | { name: string; category: string }[]> = {
  'settings.webhookUrl.label': 'URL webhooku',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': 'Zadejte URL vašeho Discord, Slack nebo vlastního webhooku pro příjem oznámení.',
-  'settings.webhookUrl.save': 'Uložit',
  'settings.webhookUrl.saved': 'URL webhooku uložena',
  'settings.webhookUrl.test': 'Otestovat',
  'settings.webhookUrl.testSuccess': 'Testovací webhook byl úspěšně odeslán',
  'settings.webhookUrl.testFailed': 'Testovací webhook selhal',
+  'settings.ntfyUrl.topicLabel': 'Téma Ntfy',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': 'URL serveru Ntfy (volitelné)',
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': 'Zadejte své téma Ntfy pro příjem push notifikací. Pole serveru ponechte prázdné pro použití výchozího nastavení správce.',
+  'settings.ntfyUrl.tokenLabel': 'Přístupový token (volitelné)',
+  'settings.ntfyUrl.tokenHint': 'Vyžadováno pro témata chráněná heslem.',
+  'settings.ntfyUrl.saved': 'Nastavení Ntfy uloženo',
+  'settings.ntfyUrl.test': 'Otestovat',
+  'settings.ntfyUrl.testSuccess': 'Testovací notifikace Ntfy byla úspěšně odeslána',
+  'settings.ntfyUrl.testFailed': 'Testovací notifikace Ntfy selhala',
+  'settings.ntfyUrl.tokenCleared': 'Přístupový token byl vymazán',
  'settings.notificationPreferences.inapp': 'In-App',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.email': 'Email',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'admin.notifications.emailPanel.title': 'Email (SMTP)',
  'admin.notifications.webhookPanel.title': 'Webhook',
  'admin.notifications.inappPanel.title': 'In-App',
@@ -1781,6 +1810,25 @@ const cs: Record<string, string | { name: string; category: string }[]> = {
  'admin.notifications.adminWebhookPanel.testSuccess': 'Testovací webhook byl úspěšně odeslán',
  'admin.notifications.adminWebhookPanel.testFailed': 'Testovací webhook selhal',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': 'Admin webhook odesílá automaticky, pokud je nastavena URL',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': 'Umožňuje uživatelům nakonfigurovat vlastní témata ntfy pro přijímání push notifikací. Níže nastavte výchozí server pro předvyplnění nastavení uživatelů.',
+  'admin.notifications.testNtfy': 'Odeslat testovací Ntfy',
+  'admin.notifications.testNtfySuccess': 'Testovací Ntfy bylo úspěšně odesláno',
+  'admin.notifications.testNtfyFailed': 'Testovací Ntfy selhalo',
+  'admin.notifications.adminNtfyPanel.title': 'Admin Ntfy',
+  'admin.notifications.adminNtfyPanel.hint': 'Toto téma Ntfy se používá výhradně pro admin oznámení (např. upozornění na verze). Je nezávislé na tématech uživatelů a odesílá vždy, když je nakonfigurováno.',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'URL serveru Ntfy',
+  'admin.notifications.adminNtfyPanel.serverHint': 'Slouží také jako výchozí server pro ntfy notifikace uživatelů. Ponechte prázdné pro použití ntfy.sh. Uživatelé si to mohou změnit ve vlastním nastavení.',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': 'Admin téma',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': 'Přístupový token (volitelné)',
+  'admin.notifications.adminNtfyPanel.tokenCleared': 'Přístupový token admina byl vymazán',
+  'admin.notifications.adminNtfyPanel.saved': 'Nastavení admin Ntfy uloženo',
+  'admin.notifications.adminNtfyPanel.test': 'Odeslat testovací Ntfy',
+  'admin.notifications.adminNtfyPanel.testSuccess': 'Testovací Ntfy bylo úspěšně odesláno',
+  'admin.notifications.adminNtfyPanel.testFailed': 'Testovací Ntfy selhalo',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': 'Admin Ntfy odesílá vždy, když je nakonfigurováno téma',
  'admin.notifications.adminNotificationsHint': 'Nastavte, které kanály doručují admin oznámení (např. upozornění na verze). Webhook odesílá automaticky, pokud je nastavena URL admin webhooku.',
  'admin.tabs.notifications': 'Oznámení',
  'notifications.versionAvailable.title': 'Dostupná aktualizace',
@@ -4,6 +4,7 @@ const de: Record<string, string | { name: string; category: string }[]> = {
  'common.showMore': 'Mehr anzeigen',
  'common.showLess': 'Weniger anzeigen',
  'common.cancel': 'Abbrechen',
+  'common.clear': 'Löschen',
  'common.delete': 'Löschen',
  'common.edit': 'Bearbeiten',
  'common.add': 'Hinzufügen',
@@ -551,7 +552,21 @@ const de: Record<string, string | { name: string; category: string }[]> = {
  // Packing Templates & Bag Tracking
  'admin.bagTracking.title': 'Gepäck-Tracking',
  'admin.bagTracking.subtitle': 'Gewicht und Gepäckstück-Zuordnung für Packlisteneinträge aktivieren',
+  'admin.collab.chat.title': 'Chat',
+  'admin.collab.chat.subtitle': 'Echtzeit-Nachrichten für die Reiseplanung',
+  'admin.collab.notes.title': 'Notizen',
+  'admin.collab.notes.subtitle': 'Gemeinsame Notizen und Dokumente',
+  'admin.collab.polls.title': 'Umfragen',
+  'admin.collab.polls.subtitle': 'Gruppen-Umfragen und Abstimmungen',
+  'admin.collab.whatsnext.title': 'Was kommt als Nächstes',
+  'admin.collab.whatsnext.subtitle': 'Aktivitätsvorschläge und nächste Schritte',
  'admin.tabs.config': 'Personalisierung',
+  'admin.tabs.defaults': 'Benutzer-Standards',
+  'admin.defaultSettings.title': 'Standard-Benutzereinstellungen',
+  'admin.defaultSettings.description': 'Instanzweite Standards festlegen. Benutzer, die eine Einstellung nicht geändert haben, sehen diese Werte. Eigene Änderungen haben immer Vorrang.',
+  'admin.defaultSettings.saved': 'Standard gespeichert',
+  'admin.defaultSettings.reset': 'Auf eingebauten Standard zurücksetzen',
+  'admin.defaultSettings.resetToBuiltIn': 'zurücksetzen',
  'admin.tabs.templates': 'Packvorlagen',
  'admin.packingTemplates.title': 'Packvorlagen',
  'admin.packingTemplates.subtitle': 'Wiederverwendbare Packlisten für deine Reisen erstellen',
@@ -1006,6 +1021,7 @@ const de: Record<string, string | { name: string; category: string }[]> = {
  'reservations.meta.platform': 'Gleis',
  'reservations.meta.seat': 'Sitzplatz',
  'reservations.meta.checkIn': 'Check-in',
+  'reservations.meta.checkInUntil': 'Check-in bis',
  'reservations.meta.checkOut': 'Check-out',
  'reservations.meta.linkAccommodation': 'Unterkunft',
  'reservations.meta.pickAccommodation': 'Mit Unterkunft verknüpfen',
@@ -1490,6 +1506,7 @@ const de: Record<string, string | { name: string; category: string }[]> = {
  'day.noPlacesForHotel': 'Füge zuerst Orte zu deiner Reise hinzu',
  'day.allDays': 'Alle',
  'day.checkIn': 'Check-in',
+  'day.checkInUntil': 'Bis',
  'day.checkOut': 'Check-out',
  'day.confirmation': 'Bestätigung',
  'day.editAccommodation': 'Unterkunft bearbeiten',
@@ -1766,14 +1783,26 @@ const de: Record<string, string | { name: string; category: string }[]> = {
  'settings.webhookUrl.label': 'Webhook-URL',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': 'Gib deine Discord-, Slack- oder benutzerdefinierte Webhook-URL ein, um Benachrichtigungen zu erhalten.',
-  'settings.webhookUrl.save': 'Speichern',
  'settings.webhookUrl.saved': 'Webhook-URL gespeichert',
  'settings.webhookUrl.test': 'Testen',
  'settings.webhookUrl.testSuccess': 'Test-Webhook erfolgreich gesendet',
  'settings.webhookUrl.testFailed': 'Test-Webhook fehlgeschlagen',
+  'settings.ntfyUrl.topicLabel': 'Ntfy-Thema',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': 'Ntfy-Server-URL (optional)',
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': 'Gib dein Ntfy-Thema ein, um Push-Benachrichtigungen zu erhalten. Lasse das Server-Feld leer, um den vom Administrator konfigurierten Standard zu verwenden.',
+  'settings.ntfyUrl.tokenLabel': 'Zugriffstoken (optional)',
+  'settings.ntfyUrl.tokenHint': 'Erforderlich für passwortgeschützte Themen.',
+  'settings.ntfyUrl.saved': 'Ntfy-Einstellungen gespeichert',
+  'settings.ntfyUrl.test': 'Testen',
+  'settings.ntfyUrl.testSuccess': 'Test-Ntfy-Benachrichtigung erfolgreich gesendet',
+  'settings.ntfyUrl.testFailed': 'Test-Ntfy-Benachrichtigung fehlgeschlagen',
+  'settings.ntfyUrl.tokenCleared': 'Zugriffstoken gelöscht',
  'settings.notificationPreferences.inapp': 'In-App',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.email': 'Email',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'admin.notifications.emailPanel.title': 'Email (SMTP)',
  'admin.notifications.webhookPanel.title': 'Webhook',
  'admin.notifications.inappPanel.title': 'In-App',
@@ -1784,6 +1813,25 @@ const de: Record<string, string | { name: string; category: string }[]> = {
  'admin.notifications.adminWebhookPanel.testSuccess': 'Test-Webhook erfolgreich gesendet',
  'admin.notifications.adminWebhookPanel.testFailed': 'Test-Webhook fehlgeschlagen',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': 'Admin-Webhook sendet automatisch, wenn eine URL konfiguriert ist',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': 'Erlaubt Benutzern, eigene ntfy-Themen für Push-Benachrichtigungen zu konfigurieren. Legen Sie unten den Standardserver fest, um die Benutzereinstellungen vorauszufüllen.',
+  'admin.notifications.testNtfy': 'Test-Ntfy senden',
+  'admin.notifications.testNtfySuccess': 'Test-Ntfy erfolgreich gesendet',
+  'admin.notifications.testNtfyFailed': 'Test-Ntfy fehlgeschlagen',
+  'admin.notifications.adminNtfyPanel.title': 'Admin-Ntfy',
+  'admin.notifications.adminNtfyPanel.hint': 'Dieses Ntfy-Thema wird ausschließlich für Admin-Benachrichtigungen verwendet (z. B. Versions-Updates). Es ist unabhängig von Benutzer-Themen und sendet immer, wenn es konfiguriert ist.',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'Ntfy-Server-URL',
+  'admin.notifications.adminNtfyPanel.serverHint': 'Wird auch als Standardserver für Benutzer-ntfy-Benachrichtigungen verwendet. Leer lassen für ntfy.sh. Benutzer können dies in ihren eigenen Einstellungen überschreiben.',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': 'Admin-Thema',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': 'Zugriffstoken (optional)',
+  'admin.notifications.adminNtfyPanel.tokenCleared': 'Admin-Zugriffstoken gelöscht',
+  'admin.notifications.adminNtfyPanel.saved': 'Admin-Ntfy-Einstellungen gespeichert',
+  'admin.notifications.adminNtfyPanel.test': 'Test-Ntfy senden',
+  'admin.notifications.adminNtfyPanel.testSuccess': 'Test-Ntfy erfolgreich gesendet',
+  'admin.notifications.adminNtfyPanel.testFailed': 'Test-Ntfy fehlgeschlagen',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': 'Admin-Ntfy sendet immer, wenn ein Thema konfiguriert ist',
  'admin.notifications.adminNotificationsHint': 'Konfiguriere, welche Kanäle Admin-Benachrichtigungen liefern (z. B. Versions-Updates). Der Webhook sendet automatisch, wenn eine Admin-Webhook-URL gesetzt ist.',
  'admin.tabs.notifications': 'Benachrichtigungen',
  'notifications.versionAvailable.title': 'Update verfügbar',
@@ -4,6 +4,7 @@ const en: Record<string, string | { name: string; category: string }[]> = {
  'common.showMore': 'Show more',
  'common.showLess': 'Show less',
  'common.cancel': 'Cancel',
+  'common.clear': 'Clear',
  'common.delete': 'Delete',
  'common.edit': 'Edit',
  'common.add': 'Add',
@@ -189,25 +190,42 @@ const en: Record<string, string | { name: string; category: string }[]> = {
  'settings.notificationPreferences.email': 'Email',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.inapp': 'In-App',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'settings.notificationPreferences.noChannels': 'No notification channels are configured. Ask an admin to set up email or webhook notifications.',
  'settings.webhookUrl.label': 'Webhook URL',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': 'Enter your Discord, Slack, or custom webhook URL to receive notifications.',
-  'settings.webhookUrl.save': 'Save',
  'settings.webhookUrl.saved': 'Webhook URL saved',
  'settings.webhookUrl.test': 'Test',
  'settings.webhookUrl.testSuccess': 'Test webhook sent successfully',
  'settings.webhookUrl.testFailed': 'Test webhook failed',
+  'settings.ntfyUrl.topicLabel': 'Ntfy Topic',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': 'Ntfy Server URL (optional)',
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': 'Enter your ntfy topic to receive push notifications. Leave server blank to use the default configured by your admin.',
+  'settings.ntfyUrl.tokenLabel': 'Access Token (optional)',
+  'settings.ntfyUrl.tokenHint': 'Required for password-protected topics.',
+  'settings.ntfyUrl.saved': 'Ntfy settings saved',
+  'settings.ntfyUrl.test': 'Test',
+  'settings.ntfyUrl.testSuccess': 'Test ntfy notification sent successfully',
+  'settings.ntfyUrl.testFailed': 'Test ntfy notification failed',
+  'settings.ntfyUrl.tokenCleared': 'Access token cleared',
  'admin.notifications.title': 'Notifications',
  'admin.notifications.hint': 'Choose one notification channel. Only one can be active at a time.',
  'admin.notifications.none': 'Disabled',
  'admin.notifications.email': 'Email (SMTP)',
  'admin.notifications.webhook': 'Webhook',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': 'Allow users to configure their own ntfy topics for push notifications. Set the default server below to pre-fill user settings.',
  'admin.notifications.save': 'Save notification settings',
  'admin.notifications.saved': 'Notification settings saved',
  'admin.notifications.testWebhook': 'Send test webhook',
  'admin.notifications.testWebhookSuccess': 'Test webhook sent successfully',
  'admin.notifications.testWebhookFailed': 'Test webhook failed',
+  'admin.notifications.testNtfy': 'Send test ntfy',
+  'admin.notifications.testNtfySuccess': 'Test ntfy sent successfully',
+  'admin.notifications.testNtfyFailed': 'Test ntfy failed',
  'admin.notifications.emailPanel.title': 'Email (SMTP)',
  'admin.notifications.webhookPanel.title': 'Webhook',
  'admin.notifications.inappPanel.title': 'In-App',
@@ -218,6 +236,20 @@ const en: Record<string, string | { name: string; category: string }[]> = {
  'admin.notifications.adminWebhookPanel.testSuccess': 'Test webhook sent successfully',
  'admin.notifications.adminWebhookPanel.testFailed': 'Test webhook failed',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': 'Admin webhook always fires when a URL is configured',
+  'admin.notifications.adminNtfyPanel.title': 'Admin Ntfy',
+  'admin.notifications.adminNtfyPanel.hint': 'This ntfy topic is used exclusively for admin notifications (e.g. version alerts). It is separate from per-user topics and always fires when configured.',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'Ntfy Server URL',
+  'admin.notifications.adminNtfyPanel.serverHint': 'Also used as the default server for user ntfy notifications. Leave blank to default to ntfy.sh. Users can override this in their own settings.',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': 'Admin Topic',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': 'Access Token (optional)',
+  'admin.notifications.adminNtfyPanel.tokenCleared': 'Admin access token cleared',
+  'admin.notifications.adminNtfyPanel.saved': 'Admin ntfy settings saved',
+  'admin.notifications.adminNtfyPanel.test': 'Send test ntfy',
+  'admin.notifications.adminNtfyPanel.testSuccess': 'Test ntfy sent successfully',
+  'admin.notifications.adminNtfyPanel.testFailed': 'Test ntfy failed',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': 'Admin ntfy always fires when a topic is configured',
  'admin.notifications.adminNotificationsHint': 'Configure which channels deliver admin-only notifications (e.g. version alerts).',
  'admin.smtp.title': 'Email & Notifications',
  'admin.smtp.hint': 'SMTP configuration for sending email notifications.',
@@ -576,7 +608,21 @@ const en: Record<string, string | { name: string; category: string }[]> = {
  // Packing Templates & Bag Tracking
  'admin.bagTracking.title': 'Bag Tracking',
  'admin.bagTracking.subtitle': 'Enable weight and bag assignment for packing items',
+  'admin.collab.chat.title': 'Chat',
+  'admin.collab.chat.subtitle': 'Real-time messaging for trip collaboration',
+  'admin.collab.notes.title': 'Notes',
+  'admin.collab.notes.subtitle': 'Shared notes and documents',
+  'admin.collab.polls.title': 'Polls',
+  'admin.collab.polls.subtitle': 'Group polls and voting',
+  'admin.collab.whatsnext.title': "What's Next",
+  'admin.collab.whatsnext.subtitle': 'Activity suggestions and next steps',
  'admin.tabs.config': 'Personalization',
+  'admin.tabs.defaults': 'User Defaults',
+  'admin.defaultSettings.title': 'Default User Settings',
+  'admin.defaultSettings.description': 'Set instance-wide defaults. Users who have not changed a setting will see these values. Their own changes always take priority.',
+  'admin.defaultSettings.saved': 'Default saved',
+  'admin.defaultSettings.reset': 'Reset to built-in default',
+  'admin.defaultSettings.resetToBuiltIn': 'reset',
  'admin.tabs.templates': 'Packing Templates',
  'admin.packingTemplates.title': 'Packing Templates',
  'admin.packingTemplates.subtitle': 'Create reusable packing lists for your trips',
@@ -1028,6 +1074,7 @@ const en: Record<string, string | { name: string; category: string }[]> = {
  'reservations.meta.platform': 'Platform',
  'reservations.meta.seat': 'Seat',
  'reservations.meta.checkIn': 'Check-in',
+  'reservations.meta.checkInUntil': 'Check-in until',
  'reservations.meta.checkOut': 'Check-out',
  'reservations.meta.linkAccommodation': 'Accommodation',
  'reservations.meta.pickAccommodation': 'Link to accommodation',
@@ -1512,6 +1559,7 @@ const en: Record<string, string | { name: string; category: string }[]> = {
  'day.noPlacesForHotel': 'Add places to your trip first',
  'day.allDays': 'All',
  'day.checkIn': 'Check-in',
+  'day.checkInUntil': 'Until',
  'day.checkOut': 'Check-out',
  'day.confirmation': 'Confirmation',
  'day.editAccommodation': 'Edit accommodation',
@@ -4,6 +4,7 @@ const es: Record<string, string> = {
  'common.showMore': 'Ver más',
  'common.showLess': 'Ver menos',
  'common.cancel': 'Cancelar',
+  'common.clear': 'Borrar',
  'common.delete': 'Eliminar',
  'common.edit': 'Editar',
  'common.add': 'Añadir',
@@ -542,7 +543,21 @@ const es: Record<string, string> = {

  'admin.bagTracking.title': 'Seguimiento de equipaje',
  'admin.bagTracking.subtitle': 'Activar peso y asignación de equipaje para artículos de la lista',
+  'admin.collab.chat.title': 'Chat',
+  'admin.collab.chat.subtitle': 'Mensajería en tiempo real para la colaboración',
+  'admin.collab.notes.title': 'Notas',
+  'admin.collab.notes.subtitle': 'Notas y documentos compartidos',
+  'admin.collab.polls.title': 'Encuestas',
+  'admin.collab.polls.subtitle': 'Encuestas y votaciones grupales',
+  'admin.collab.whatsnext.title': 'Qué sigue',
+  'admin.collab.whatsnext.subtitle': 'Sugerencias de actividades y próximos pasos',
  'admin.tabs.config': 'Personalización',
+  'admin.tabs.defaults': 'Valores predeterminados',
+  'admin.defaultSettings.title': 'Configuración predeterminada de usuarios',
+  'admin.defaultSettings.description': 'Establece valores predeterminados para toda la instancia. Los usuarios que no hayan cambiado una opción verán estos valores. Sus propios cambios siempre tienen prioridad.',
+  'admin.defaultSettings.saved': 'Predeterminado guardado',
+  'admin.defaultSettings.reset': 'Restaurar al valor predeterminado integrado',
+  'admin.defaultSettings.resetToBuiltIn': 'restaurar',
  'admin.tabs.templates': 'Plantillas de equipaje',
  'admin.packingTemplates.title': 'Plantillas de equipaje',
  'admin.packingTemplates.subtitle': 'Crear listas de equipaje reutilizables para tus viajes',
@@ -1439,6 +1454,7 @@ const es: Record<string, string> = {
  'day.noPlacesForHotel': 'Añade primero lugares al viaje',
  'day.allDays': 'Todos',
  'day.checkIn': 'Registro de entrada',
+  'day.checkInUntil': 'Hasta',
  'day.checkOut': 'Registro de salida',
  'day.confirmation': 'Confirmación',
  'day.editAccommodation': 'Editar alojamiento',
@@ -1606,6 +1622,7 @@ const es: Record<string, string> = {
  'reservations.meta.platform': 'Andén',
  'reservations.meta.seat': 'Asiento',
  'reservations.meta.checkIn': 'Registro de entrada',
+  'reservations.meta.checkInUntil': 'Check-in hasta',
  'reservations.meta.checkOut': 'Registro de salida',
  'reservations.meta.linkAccommodation': 'Alojamiento',
  'reservations.meta.pickAccommodation': 'Vincular con alojamiento',
@@ -1768,14 +1785,26 @@ const es: Record<string, string> = {
  'settings.webhookUrl.label': 'URL del webhook',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': 'Introduce tu URL de webhook de Discord, Slack o personalizada para recibir notificaciones.',
-  'settings.webhookUrl.save': 'Guardar',
  'settings.webhookUrl.saved': 'URL del webhook guardada',
  'settings.webhookUrl.test': 'Probar',
  'settings.webhookUrl.testSuccess': 'Webhook de prueba enviado correctamente',
  'settings.webhookUrl.testFailed': 'Error al enviar el webhook de prueba',
+  'settings.ntfyUrl.topicLabel': 'Tema de Ntfy',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': 'URL del servidor Ntfy (opcional)',
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': 'Introduce tu tema de Ntfy para recibir notificaciones push. Deja el servidor en blanco para usar el predeterminado configurado por tu administrador.',
+  'settings.ntfyUrl.tokenLabel': 'Token de acceso (opcional)',
+  'settings.ntfyUrl.tokenHint': 'Requerido para temas protegidos con contraseña.',
+  'settings.ntfyUrl.saved': 'Configuración de Ntfy guardada',
+  'settings.ntfyUrl.test': 'Probar',
+  'settings.ntfyUrl.testSuccess': 'Notificación de prueba de Ntfy enviada correctamente',
+  'settings.ntfyUrl.testFailed': 'Error en la notificación de prueba de Ntfy',
+  'settings.ntfyUrl.tokenCleared': 'Token de acceso eliminado',
  'settings.notificationPreferences.inapp': 'In-App',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.email': 'Email',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'admin.notifications.emailPanel.title': 'Email (SMTP)',
  'admin.notifications.webhookPanel.title': 'Webhook',
  'admin.notifications.inappPanel.title': 'In-App',
@@ -1786,6 +1815,25 @@ const es: Record<string, string> = {
  'admin.notifications.adminWebhookPanel.testSuccess': 'Webhook de prueba enviado correctamente',
  'admin.notifications.adminWebhookPanel.testFailed': 'Error al enviar el webhook de prueba',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': 'El webhook de admin se activa automáticamente si hay una URL configurada',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': 'Permite a los usuarios configurar sus propios temas ntfy para notificaciones push. Establece el servidor predeterminado a continuación para rellenar automáticamente los ajustes del usuario.',
+  'admin.notifications.testNtfy': 'Enviar Ntfy de prueba',
+  'admin.notifications.testNtfySuccess': 'Ntfy de prueba enviado correctamente',
+  'admin.notifications.testNtfyFailed': 'Error al enviar el Ntfy de prueba',
+  'admin.notifications.adminNtfyPanel.title': 'Ntfy de admin',
+  'admin.notifications.adminNtfyPanel.hint': 'Este tema Ntfy se usa exclusivamente para notificaciones de admin (ej. alertas de versión). Es independiente de los temas por usuario y siempre se activa cuando está configurado.',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'URL del servidor Ntfy',
+  'admin.notifications.adminNtfyPanel.serverHint': 'También se usa como servidor predeterminado para las notificaciones ntfy de los usuarios. Déjalo en blanco para usar ntfy.sh. Los usuarios pueden cambiarlo en sus propios ajustes.',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': 'Tema de admin',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': 'Token de acceso (opcional)',
+  'admin.notifications.adminNtfyPanel.tokenCleared': 'Token de acceso de admin eliminado',
+  'admin.notifications.adminNtfyPanel.saved': 'Configuración de Ntfy de admin guardada',
+  'admin.notifications.adminNtfyPanel.test': 'Enviar Ntfy de prueba',
+  'admin.notifications.adminNtfyPanel.testSuccess': 'Ntfy de prueba enviado correctamente',
+  'admin.notifications.adminNtfyPanel.testFailed': 'Error al enviar el Ntfy de prueba',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': 'El Ntfy de admin siempre se activa cuando hay un tema configurado',
  'admin.notifications.adminNotificationsHint': 'Configura qué canales entregan notificaciones de admin (ej. alertas de versión). El webhook se activa automáticamente si hay una URL de webhook de admin configurada.',
  'admin.tabs.notifications': 'Notificaciones',
  'notifications.versionAvailable.title': 'Actualización disponible',
@@ -4,6 +4,7 @@ const fr: Record<string, string> = {
  'common.showMore': 'Voir plus',
  'common.showLess': 'Voir moins',
  'common.cancel': 'Annuler',
+  'common.clear': 'Effacer',
  'common.delete': 'Supprimer',
  'common.edit': 'Modifier',
  'common.add': 'Ajouter',
@@ -546,7 +547,21 @@ const fr: Record<string, string> = {

  'admin.bagTracking.title': 'Suivi des bagages',
  'admin.bagTracking.subtitle': 'Activer le poids et l\'attribution de bagages pour les articles',
+  'admin.collab.chat.title': 'Chat',
+  'admin.collab.chat.subtitle': 'Messagerie en temps réel pour la collaboration',
+  'admin.collab.notes.title': 'Notes',
+  'admin.collab.notes.subtitle': 'Notes et documents partagés',
+  'admin.collab.polls.title': 'Sondages',
+  'admin.collab.polls.subtitle': 'Sondages et votes de groupe',
+  'admin.collab.whatsnext.title': 'Et ensuite',
+  'admin.collab.whatsnext.subtitle': "Suggestions d'activités et prochaines étapes",
  'admin.tabs.config': 'Personnalisation',
+  'admin.tabs.defaults': 'Valeurs par défaut',
+  'admin.defaultSettings.title': 'Paramètres utilisateur par défaut',
+  'admin.defaultSettings.description': "Définissez des valeurs par défaut pour toute l'instance. Les utilisateurs n'ayant pas modifié un paramètre verront ces valeurs. Leurs propres modifications ont toujours la priorité.",
+  'admin.defaultSettings.saved': 'Valeur par défaut enregistrée',
+  'admin.defaultSettings.reset': 'Réinitialiser à la valeur par défaut intégrée',
+  'admin.defaultSettings.resetToBuiltIn': 'réinitialiser',
  'admin.tabs.templates': 'Modèles de bagages',
  'admin.packingTemplates.title': 'Modèles de bagages',
  'admin.packingTemplates.subtitle': 'Créer des listes de bagages réutilisables pour vos voyages',
@@ -1002,6 +1017,7 @@ const fr: Record<string, string> = {
  'reservations.meta.platform': 'Quai',
  'reservations.meta.seat': 'Place',
  'reservations.meta.checkIn': 'Arrivée',
+  'reservations.meta.checkInUntil': "Check-in jusqu'à",
  'reservations.meta.checkOut': 'Départ',
  'reservations.meta.linkAccommodation': 'Hébergement',
  'reservations.meta.pickAccommodation': 'Lier à un hébergement',
@@ -1486,6 +1502,7 @@ const fr: Record<string, string> = {
  'day.noPlacesForHotel': 'Ajoutez d\'abord des lieux à votre voyage',
  'day.allDays': 'Tous',
  'day.checkIn': 'Arrivée',
+  'day.checkInUntil': "Jusqu'à",
  'day.checkOut': 'Départ',
  'day.confirmation': 'Confirmation',
  'day.editAccommodation': 'Modifier l\'hébergement',
@@ -1762,14 +1779,26 @@ const fr: Record<string, string> = {
  'settings.webhookUrl.label': 'URL du webhook',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': 'Entrez votre URL de webhook Discord, Slack ou personnalisée pour recevoir des notifications.',
-  'settings.webhookUrl.save': 'Enregistrer',
  'settings.webhookUrl.saved': 'URL du webhook enregistrée',
  'settings.webhookUrl.test': 'Tester',
  'settings.webhookUrl.testSuccess': 'Webhook de test envoyé avec succès',
  'settings.webhookUrl.testFailed': 'Échec du webhook de test',
+  'settings.ntfyUrl.topicLabel': 'Sujet Ntfy',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': "URL du serveur Ntfy (optionnel)",
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': "Entrez votre sujet Ntfy pour recevoir des notifications push. Laissez le serveur vide pour utiliser la valeur par défaut configurée par votre administrateur.",
+  'settings.ntfyUrl.tokenLabel': "Jeton d'accès (optionnel)",
+  'settings.ntfyUrl.tokenHint': 'Requis pour les sujets protégés par mot de passe.',
+  'settings.ntfyUrl.saved': 'Paramètres Ntfy enregistrés',
+  'settings.ntfyUrl.test': 'Tester',
+  'settings.ntfyUrl.testSuccess': 'Notification de test Ntfy envoyée avec succès',
+  'settings.ntfyUrl.testFailed': 'Échec de la notification de test Ntfy',
+  'settings.ntfyUrl.tokenCleared': "Jeton d'accès effacé",
  'settings.notificationPreferences.inapp': 'In-App',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.email': 'Email',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'admin.notifications.emailPanel.title': 'Email (SMTP)',
  'admin.notifications.webhookPanel.title': 'Webhook',
  'admin.notifications.inappPanel.title': 'In-App',
@@ -1780,6 +1809,25 @@ const fr: Record<string, string> = {
  'admin.notifications.adminWebhookPanel.testSuccess': 'Webhook de test envoyé avec succès',
  'admin.notifications.adminWebhookPanel.testFailed': 'Échec du webhook de test',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': 'Le webhook admin s\'active automatiquement si une URL est configurée',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': 'Permet aux utilisateurs de configurer leurs propres sujets ntfy pour les notifications push. Définissez le serveur par défaut ci-dessous pour pré-remplir les paramètres utilisateur.',
+  'admin.notifications.testNtfy': 'Envoyer un Ntfy de test',
+  'admin.notifications.testNtfySuccess': 'Ntfy de test envoyé avec succès',
+  'admin.notifications.testNtfyFailed': 'Échec de l\'envoi du Ntfy de test',
+  'admin.notifications.adminNtfyPanel.title': 'Ntfy admin',
+  'admin.notifications.adminNtfyPanel.hint': 'Ce sujet Ntfy est utilisé exclusivement pour les notifications admin (ex. alertes de version). Il est séparé des sujets par utilisateur et s\'active toujours lorsqu\'il est configuré.',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'URL du serveur Ntfy',
+  'admin.notifications.adminNtfyPanel.serverHint': 'Utilisé également comme serveur par défaut pour les notifications ntfy des utilisateurs. Laisser vide pour utiliser ntfy.sh. Les utilisateurs peuvent le modifier dans leurs propres paramètres.',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': 'Sujet admin',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': "Jeton d'accès (optionnel)",
+  'admin.notifications.adminNtfyPanel.tokenCleared': "Jeton d'accès admin effacé",
+  'admin.notifications.adminNtfyPanel.saved': 'Paramètres Ntfy admin enregistrés',
+  'admin.notifications.adminNtfyPanel.test': 'Envoyer un Ntfy de test',
+  'admin.notifications.adminNtfyPanel.testSuccess': 'Ntfy de test envoyé avec succès',
+  'admin.notifications.adminNtfyPanel.testFailed': 'Échec de l\'envoi du Ntfy de test',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': 'Le Ntfy admin s\'active toujours lorsqu\'un sujet est configuré',
  'admin.notifications.adminNotificationsHint': 'Configurez quels canaux envoient les notifications admin (ex. alertes de version). Le webhook s\'active automatiquement si une URL webhook admin est définie.',
  'admin.tabs.notifications': 'Notifications',
  'notifications.versionAvailable.title': 'Mise à jour disponible',
@@ -4,6 +4,7 @@ const hu: Record<string, string | { name: string; category: string }[]> = {
  'common.showMore': 'Továbbiak',
  'common.showLess': 'Kevesebb',
  'common.cancel': 'Mégse',
+  'common.clear': 'Törlés',
  'common.delete': 'Törlés',
  'common.edit': 'Szerkesztés',
  'common.add': 'Hozzáadás',
@@ -547,7 +548,21 @@ const hu: Record<string, string | { name: string; category: string }[]> = {
  // Csomagolási sablonok és poggyászkövetés
  'admin.bagTracking.title': 'Poggyászkövetés',
  'admin.bagTracking.subtitle': 'Súly- és táskahozzárendelés engedélyezése csomagolási tételeknél',
+  'admin.collab.chat.title': 'Chat',
+  'admin.collab.chat.subtitle': 'Valós idejű üzenetküldés az együttműködéshez',
+  'admin.collab.notes.title': 'Jegyzetek',
+  'admin.collab.notes.subtitle': 'Megosztott jegyzetek és dokumentumok',
+  'admin.collab.polls.title': 'Szavazások',
+  'admin.collab.polls.subtitle': 'Csoportos szavazások',
+  'admin.collab.whatsnext.title': 'Mi következik',
+  'admin.collab.whatsnext.subtitle': 'Tevékenységjavaslatok és következő lépések',
  'admin.tabs.config': 'Személyre szabás',
+  'admin.tabs.defaults': 'Alapértelmezett beállítások',
+  'admin.defaultSettings.title': 'Alapértelmezett felhasználói beállítások',
+  'admin.defaultSettings.description': 'Állítson be alapértelmezett értékeket az egész példányra. Azok a felhasználók, akik nem módosítottak egy beállítást, ezeket az értékeket fogják látni. A saját módosításaik mindig elsőbbséget élveznek.',
+  'admin.defaultSettings.saved': 'Alapértelmezett mentve',
+  'admin.defaultSettings.reset': 'Visszaállítás a beépített alapértelmezésre',
+  'admin.defaultSettings.resetToBuiltIn': 'visszaállítás',
  'admin.tabs.templates': 'Csomagolási sablonok',
  'admin.packingTemplates.title': 'Csomagolási sablonok',
  'admin.packingTemplates.subtitle': 'Újrafelhasználható csomagolási listák létrehozása utazásaidhoz',
@@ -1004,6 +1019,7 @@ const hu: Record<string, string | { name: string; category: string }[]> = {
  'reservations.meta.platform': 'Vágány',
  'reservations.meta.seat': 'Ülés',
  'reservations.meta.checkIn': 'Bejelentkezés',
+  'reservations.meta.checkInUntil': 'Bejelentkezés eddig',
  'reservations.meta.checkOut': 'Kijelentkezés',
  'reservations.meta.linkAccommodation': 'Szállás',
  'reservations.meta.pickAccommodation': 'Szállás hozzárendelése',
@@ -1487,6 +1503,7 @@ const hu: Record<string, string | { name: string; category: string }[]> = {
  'day.noPlacesForHotel': 'Először adj hozzá helyeket az utazásodhoz',
  'day.allDays': 'Összes',
  'day.checkIn': 'Bejelentkezés',
+  'day.checkInUntil': 'Eddig',
  'day.checkOut': 'Kijelentkezés',
  'day.confirmation': 'Visszaigazolás',
  'day.editAccommodation': 'Szállás szerkesztése',
@@ -1760,14 +1777,26 @@ const hu: Record<string, string | { name: string; category: string }[]> = {
  'settings.webhookUrl.label': 'Webhook URL',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': 'Adja meg a Discord, Slack vagy egyéni webhook URL-jét az értesítések fogadásához.',
-  'settings.webhookUrl.save': 'Mentés',
  'settings.webhookUrl.saved': 'Webhook URL mentve',
  'settings.webhookUrl.test': 'Teszt',
  'settings.webhookUrl.testSuccess': 'Teszt webhook sikeresen elküldve',
  'settings.webhookUrl.testFailed': 'Teszt webhook sikertelen',
+  'settings.ntfyUrl.topicLabel': 'Ntfy téma',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': 'Ntfy szerver URL (opcionális)',
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': 'Add meg az Ntfy témádat push értesítések fogadásához. Hagyd üresen a szervert a rendszergazda által beállított alapértelmezett használatához.',
+  'settings.ntfyUrl.tokenLabel': 'Hozzáférési token (opcionális)',
+  'settings.ntfyUrl.tokenHint': 'Jelszóval védett témákhoz szükséges.',
+  'settings.ntfyUrl.saved': 'Ntfy beállítások mentve',
+  'settings.ntfyUrl.test': 'Teszt',
+  'settings.ntfyUrl.testSuccess': 'Teszt Ntfy értesítés sikeresen elküldve',
+  'settings.ntfyUrl.testFailed': 'Teszt Ntfy értesítés sikertelen',
+  'settings.ntfyUrl.tokenCleared': 'Hozzáférési token törölve',
  'settings.notificationPreferences.inapp': 'In-App',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.email': 'Email',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'admin.notifications.emailPanel.title': 'Email (SMTP)',
  'admin.notifications.webhookPanel.title': 'Webhook',
  'admin.notifications.inappPanel.title': 'In-App',
@@ -1778,6 +1807,25 @@ const hu: Record<string, string | { name: string; category: string }[]> = {
  'admin.notifications.adminWebhookPanel.testSuccess': 'Teszt webhook sikeresen elküldve',
  'admin.notifications.adminWebhookPanel.testFailed': 'Teszt webhook sikertelen',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': 'Az admin webhook automatikusan küld, ha URL van beállítva',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': 'Lehetővé teszi a felhasználóknak, hogy saját ntfy-témáikat konfigurálják push értesítésekhez. Állítsa be az alapértelmezett szervert alább a felhasználói beállítások előre kitöltéséhez.',
+  'admin.notifications.testNtfy': 'Teszt Ntfy küldése',
+  'admin.notifications.testNtfySuccess': 'Teszt Ntfy sikeresen elküldve',
+  'admin.notifications.testNtfyFailed': 'Teszt Ntfy sikertelen',
+  'admin.notifications.adminNtfyPanel.title': 'Admin Ntfy',
+  'admin.notifications.adminNtfyPanel.hint': 'Ez az Ntfy téma kizárólag admin értesítésekhez használatos (pl. verziófrissítési figyelmeztetések). Független a felhasználói témáktól, és mindig küld, ha konfigurálva van.',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'Ntfy szerver URL',
+  'admin.notifications.adminNtfyPanel.serverHint': 'Alapértelmezett szerverként is szolgál a felhasználói ntfy értesítésekhez. Üresen hagyva ntfy.sh-t használ. A felhasználók felülírhatják saját beállításaikban.',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': 'Admin téma',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': 'Hozzáférési token (opcionális)',
+  'admin.notifications.adminNtfyPanel.tokenCleared': 'Admin hozzáférési token törölve',
+  'admin.notifications.adminNtfyPanel.saved': 'Admin Ntfy beállítások mentve',
+  'admin.notifications.adminNtfyPanel.test': 'Teszt Ntfy küldése',
+  'admin.notifications.adminNtfyPanel.testSuccess': 'Teszt Ntfy sikeresen elküldve',
+  'admin.notifications.adminNtfyPanel.testFailed': 'Teszt Ntfy sikertelen',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': 'Az admin Ntfy mindig küld, ha egy téma konfigurálva van',
  'admin.notifications.adminNotificationsHint': 'Állítsa be, hogy mely csatornák szállítsák az admin értesítéseket (pl. verziófrissítési figyelmeztetések). A webhook automatikusan küld, ha admin webhook URL van megadva.',
  'admin.tabs.notifications': 'Értesítések',
  'notifications.versionAvailable.title': 'Elérhető frissítés',
@@ -4,6 +4,7 @@ const it: Record<string, string | { name: string; category: string }[]> = {
  'common.showMore': 'Mostra di più',
  'common.showLess': 'Mostra meno',
  'common.cancel': 'Annulla',
+  'common.clear': 'Cancella',
  'common.delete': 'Elimina',
  'common.edit': 'Modifica',
  'common.add': 'Aggiungi',
@@ -546,7 +547,21 @@ const it: Record<string, string | { name: string; category: string }[]> = {
    // Packing Templates & Bag Tracking
  'admin.bagTracking.title': 'Tracciamento valigia',
  'admin.bagTracking.subtitle': 'Abilita il peso e l\'assegnazione della valigia per gli elementi della lista valigia',
+  'admin.collab.chat.title': 'Chat',
+  'admin.collab.chat.subtitle': 'Messaggistica in tempo reale per la collaborazione',
+  'admin.collab.notes.title': 'Note',
+  'admin.collab.notes.subtitle': 'Note e documenti condivisi',
+  'admin.collab.polls.title': 'Sondaggi',
+  'admin.collab.polls.subtitle': 'Sondaggi e votazioni di gruppo',
+  'admin.collab.whatsnext.title': 'Prossimi passi',
+  'admin.collab.whatsnext.subtitle': 'Suggerimenti attività e prossimi passi',
  'admin.tabs.config': 'Personalizzazione',
+  'admin.tabs.defaults': 'Impostazioni predefinite',
+  'admin.defaultSettings.title': 'Impostazioni predefinite utente',
+  'admin.defaultSettings.description': "Imposta i valori predefiniti per l'intera istanza. Gli utenti che non hanno modificato un'impostazione vedranno questi valori. Le loro modifiche hanno sempre la priorità.",
+  'admin.defaultSettings.saved': 'Predefinito salvato',
+  'admin.defaultSettings.reset': 'Ripristina il predefinito integrato',
+  'admin.defaultSettings.resetToBuiltIn': 'ripristina',
  'admin.tabs.templates': 'Modelli lista valigia',
  'admin.packingTemplates.title': 'Modelli lista valigia',
  'admin.packingTemplates.subtitle': 'Crea liste valigia riutilizzabili per i tuoi viaggi',
@@ -1003,6 +1018,7 @@ const it: Record<string, string | { name: string; category: string }[]> = {
  'reservations.meta.platform': 'Binario',
  'reservations.meta.seat': 'Posto',
  'reservations.meta.checkIn': 'Check-in',
+  'reservations.meta.checkInUntil': 'Check-in fino a',
  'reservations.meta.checkOut': 'Check-out',
  'reservations.meta.linkAccommodation': 'Alloggio',
  'reservations.meta.pickAccommodation': 'Collega a un alloggio',
@@ -1487,6 +1503,7 @@ const it: Record<string, string | { name: string; category: string }[]> = {
  'day.noPlacesForHotel': 'Aggiungi prima i luoghi al tuo viaggio',
  'day.allDays': 'Tutti',
  'day.checkIn': 'Check-in',
+  'day.checkInUntil': 'Fino a',
  'day.checkOut': 'Check-out',
  'day.confirmation': 'Conferma',
  'day.editAccommodation': 'Modifica alloggio',
@@ -1763,14 +1780,26 @@ const it: Record<string, string | { name: string; category: string }[]> = {
  'settings.webhookUrl.label': 'URL webhook',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': 'Inserisci il tuo URL webhook Discord, Slack o personalizzato per ricevere notifiche.',
-  'settings.webhookUrl.save': 'Salva',
  'settings.webhookUrl.saved': 'URL webhook salvato',
  'settings.webhookUrl.test': 'Test',
  'settings.webhookUrl.testSuccess': 'Webhook di test inviato con successo',
  'settings.webhookUrl.testFailed': 'Invio webhook di test fallito',
+  'settings.ntfyUrl.topicLabel': 'Argomento Ntfy',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': 'URL server Ntfy (opzionale)',
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': "Inserisci il tuo argomento Ntfy per ricevere notifiche push. Lascia il server vuoto per usare il valore predefinito configurato dall'amministratore.",
+  'settings.ntfyUrl.tokenLabel': 'Token di accesso (opzionale)',
+  'settings.ntfyUrl.tokenHint': 'Richiesto per gli argomenti protetti da password.',
+  'settings.ntfyUrl.saved': 'Impostazioni Ntfy salvate',
+  'settings.ntfyUrl.test': 'Testa',
+  'settings.ntfyUrl.testSuccess': 'Notifica di test Ntfy inviata con successo',
+  'settings.ntfyUrl.testFailed': 'Notifica di test Ntfy fallita',
+  'settings.ntfyUrl.tokenCleared': 'Token di accesso rimosso',
  'settings.notificationPreferences.inapp': 'In-App',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.email': 'Email',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'admin.notifications.emailPanel.title': 'Email (SMTP)',
  'admin.notifications.webhookPanel.title': 'Webhook',
  'admin.notifications.inappPanel.title': 'In-App',
@@ -1781,6 +1810,25 @@ const it: Record<string, string | { name: string; category: string }[]> = {
  'admin.notifications.adminWebhookPanel.testSuccess': 'Webhook di test inviato con successo',
  'admin.notifications.adminWebhookPanel.testFailed': 'Invio webhook di test fallito',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': 'Il webhook admin si attiva automaticamente quando è configurato un URL',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': 'Consente agli utenti di configurare i propri argomenti ntfy per le notifiche push. Imposta il server predefinito di seguito per precompilare le impostazioni utente.',
+  'admin.notifications.testNtfy': 'Invia Ntfy di test',
+  'admin.notifications.testNtfySuccess': 'Ntfy di test inviato con successo',
+  'admin.notifications.testNtfyFailed': 'Invio Ntfy di test fallito',
+  'admin.notifications.adminNtfyPanel.title': 'Ntfy admin',
+  'admin.notifications.adminNtfyPanel.hint': 'Questo argomento Ntfy viene usato esclusivamente per le notifiche admin (es. avvisi di versione). È separato dagli argomenti per utente e si attiva sempre quando è configurato.',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'URL server Ntfy',
+  'admin.notifications.adminNtfyPanel.serverHint': 'Usato anche come server predefinito per le notifiche ntfy degli utenti. Lasciare vuoto per usare ntfy.sh. Gli utenti possono sovrascriverlo nelle proprie impostazioni.',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': 'Argomento admin',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': 'Token di accesso (opzionale)',
+  'admin.notifications.adminNtfyPanel.tokenCleared': 'Token di accesso admin rimosso',
+  'admin.notifications.adminNtfyPanel.saved': 'Impostazioni Ntfy admin salvate',
+  'admin.notifications.adminNtfyPanel.test': 'Invia Ntfy di test',
+  'admin.notifications.adminNtfyPanel.testSuccess': 'Ntfy di test inviato con successo',
+  'admin.notifications.adminNtfyPanel.testFailed': 'Invio Ntfy di test fallito',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': 'Il Ntfy admin si attiva sempre quando un argomento è configurato',
  'admin.notifications.adminNotificationsHint': 'Configura quali canali consegnano le notifiche admin (es. avvisi di versione). Il webhook si attiva automaticamente se è impostato un URL webhook admin.',
  'admin.tabs.notifications': 'Notifiche',
  'notifications.versionAvailable.title': 'Aggiornamento disponibile',
@@ -4,6 +4,7 @@ const nl: Record<string, string> = {
  'common.showMore': 'Meer tonen',
  'common.showLess': 'Minder tonen',
  'common.cancel': 'Annuleren',
+  'common.clear': 'Wissen',
  'common.delete': 'Verwijderen',
  'common.edit': 'Bewerken',
  'common.add': 'Toevoegen',
@@ -547,7 +548,21 @@ const nl: Record<string, string> = {

  'admin.bagTracking.title': 'Bagagetracking',
  'admin.bagTracking.subtitle': 'Gewicht en bagagetoewijzing inschakelen voor paklijstitems',
+  'admin.collab.chat.title': 'Chat',
+  'admin.collab.chat.subtitle': 'Realtime berichten voor reissamenwerking',
+  'admin.collab.notes.title': 'Notities',
+  'admin.collab.notes.subtitle': 'Gedeelde notities en documenten',
+  'admin.collab.polls.title': 'Peilingen',
+  'admin.collab.polls.subtitle': 'Groepspeilingen en stemmen',
+  'admin.collab.whatsnext.title': 'Wat nu',
+  'admin.collab.whatsnext.subtitle': 'Activiteitssuggesties en volgende stappen',
  'admin.tabs.config': 'Personalisatie',
+  'admin.tabs.defaults': 'Standaardinstellingen',
+  'admin.defaultSettings.title': 'Standaard gebruikersinstellingen',
+  'admin.defaultSettings.description': 'Stel instantiebrede standaardwaarden in. Gebruikers die een instelling niet hebben gewijzigd, zien deze waarden. Hun eigen wijzigingen hebben altijd voorrang.',
+  'admin.defaultSettings.saved': 'Standaard opgeslagen',
+  'admin.defaultSettings.reset': 'Terugzetten naar ingebouwde standaard',
+  'admin.defaultSettings.resetToBuiltIn': 'terugzetten',
  'admin.tabs.templates': 'Paksjablonen',
  'admin.packingTemplates.title': 'Paksjablonen',
  'admin.packingTemplates.subtitle': 'Herbruikbare paklijsten maken voor je reizen',
@@ -1002,6 +1017,7 @@ const nl: Record<string, string> = {
  'reservations.meta.platform': 'Perron',
  'reservations.meta.seat': 'Stoel',
  'reservations.meta.checkIn': 'Inchecken',
+  'reservations.meta.checkInUntil': 'Check-in tot',
  'reservations.meta.checkOut': 'Uitchecken',
  'reservations.meta.linkAccommodation': 'Accommodatie',
  'reservations.meta.pickAccommodation': 'Koppel aan accommodatie',
@@ -1486,6 +1502,7 @@ const nl: Record<string, string> = {
  'day.noPlacesForHotel': 'Voeg eerst plaatsen toe aan je reis',
  'day.allDays': 'Alle',
  'day.checkIn': 'Inchecken',
+  'day.checkInUntil': 'Tot',
  'day.checkOut': 'Uitchecken',
  'day.confirmation': 'Bevestiging',
  'day.editAccommodation': 'Accommodatie bewerken',
@@ -1762,14 +1779,26 @@ const nl: Record<string, string> = {
  'settings.webhookUrl.label': 'Webhook-URL',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': 'Voer je Discord-, Slack- of aangepaste webhook-URL in om meldingen te ontvangen.',
-  'settings.webhookUrl.save': 'Opslaan',
  'settings.webhookUrl.saved': 'Webhook-URL opgeslagen',
  'settings.webhookUrl.test': 'Testen',
  'settings.webhookUrl.testSuccess': 'Test-webhook succesvol verzonden',
  'settings.webhookUrl.testFailed': 'Test-webhook mislukt',
+  'settings.ntfyUrl.topicLabel': 'Ntfy-onderwerp',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': 'Ntfy-server-URL (optioneel)',
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': 'Voer je Ntfy-onderwerp in om pushmeldingen te ontvangen. Laat het serverveld leeg om de standaard te gebruiken die door je beheerder is ingesteld.',
+  'settings.ntfyUrl.tokenLabel': 'Toegangstoken (optioneel)',
+  'settings.ntfyUrl.tokenHint': 'Vereist voor onderwerpen die met een wachtwoord zijn beveiligd.',
+  'settings.ntfyUrl.saved': 'Ntfy-instellingen opgeslagen',
+  'settings.ntfyUrl.test': 'Testen',
+  'settings.ntfyUrl.testSuccess': 'Test-Ntfy-melding succesvol verzonden',
+  'settings.ntfyUrl.testFailed': 'Test-Ntfy-melding mislukt',
+  'settings.ntfyUrl.tokenCleared': 'Toegangstoken gewist',
  'settings.notificationPreferences.inapp': 'In-App',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.email': 'Email',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'admin.notifications.emailPanel.title': 'Email (SMTP)',
  'admin.notifications.webhookPanel.title': 'Webhook',
  'admin.notifications.inappPanel.title': 'In-App',
@@ -1780,6 +1809,25 @@ const nl: Record<string, string> = {
  'admin.notifications.adminWebhookPanel.testSuccess': 'Test-webhook succesvol verzonden',
  'admin.notifications.adminWebhookPanel.testFailed': 'Test-webhook mislukt',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': 'Admin-webhook verstuurt automatisch als er een URL is ingesteld',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': 'Hiermee kunnen gebruikers hun eigen ntfy-onderwerpen instellen voor pushmeldingen. Stel de standaardserver hieronder in om de gebruikersinstellingen vooraf in te vullen.',
+  'admin.notifications.testNtfy': 'Test-Ntfy verzenden',
+  'admin.notifications.testNtfySuccess': 'Test-Ntfy succesvol verzonden',
+  'admin.notifications.testNtfyFailed': 'Test-Ntfy mislukt',
+  'admin.notifications.adminNtfyPanel.title': 'Admin-Ntfy',
+  'admin.notifications.adminNtfyPanel.hint': 'Dit Ntfy-onderwerp wordt uitsluitend gebruikt voor admin-meldingen (bijv. versie-updates). Het staat los van onderwerpen per gebruiker en verstuurt altijd wanneer het geconfigureerd is.',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'Ntfy-server-URL',
+  'admin.notifications.adminNtfyPanel.serverHint': 'Wordt ook gebruikt als standaardserver voor ntfy-meldingen van gebruikers. Laat leeg om ntfy.sh te gebruiken. Gebruikers kunnen dit aanpassen in hun eigen instellingen.',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': 'Admin-onderwerp',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': 'Toegangstoken (optioneel)',
+  'admin.notifications.adminNtfyPanel.tokenCleared': 'Admin-toegangstoken gewist',
+  'admin.notifications.adminNtfyPanel.saved': 'Admin-Ntfy-instellingen opgeslagen',
+  'admin.notifications.adminNtfyPanel.test': 'Test-Ntfy verzenden',
+  'admin.notifications.adminNtfyPanel.testSuccess': 'Test-Ntfy succesvol verzonden',
+  'admin.notifications.adminNtfyPanel.testFailed': 'Test-Ntfy mislukt',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': 'Admin-Ntfy verstuurt altijd wanneer een onderwerp is geconfigureerd',
  'admin.notifications.adminNotificationsHint': 'Stel in via welke kanalen admin-meldingen worden bezorgd (bijv. versie-updates). De webhook verstuurt automatisch als er een admin-webhook-URL is ingesteld.',
  'admin.tabs.notifications': 'Meldingen',
  'notifications.versionAvailable.title': 'Update beschikbaar',
@@ -4,6 +4,7 @@ const pl: Record<string, string | { name: string; category: string }[]> = {
  'common.showMore': 'Pokaż więcej',
  'common.showLess': 'Pokaż mniej',
  'common.cancel': 'Anuluj',
+  'common.clear': 'Wyczyść',
  'common.delete': 'Usuń',
  'common.edit': 'Edytuj',
  'common.add': 'Dodaj',
@@ -519,7 +520,21 @@ const pl: Record<string, string | { name: string; category: string }[]> = {
  // Packing Templates & Bag Tracking
  'admin.bagTracking.title': 'Kontrola bagażu',
  'admin.bagTracking.subtitle': 'Włącz wagę i przypisywanie do toreb dla przedmiotów do pakowania',
+  'admin.collab.chat.title': 'Czat',
+  'admin.collab.chat.subtitle': 'Wiadomości w czasie rzeczywistym',
+  'admin.collab.notes.title': 'Notatki',
+  'admin.collab.notes.subtitle': 'Wspólne notatki i dokumenty',
+  'admin.collab.polls.title': 'Ankiety',
+  'admin.collab.polls.subtitle': 'Ankiety grupowe i głosowania',
+  'admin.collab.whatsnext.title': 'Co dalej',
+  'admin.collab.whatsnext.subtitle': 'Sugestie aktywności i następne kroki',
  'admin.tabs.config': 'Personalizacja',
+  'admin.tabs.defaults': 'Domyślne ustawienia',
+  'admin.defaultSettings.title': 'Domyślne ustawienia użytkownika',
+  'admin.defaultSettings.description': 'Ustaw domyślne wartości dla całej instancji. Użytkownicy, którzy nie zmienili ustawienia, zobaczą te wartości. Ich własne zmiany zawsze mają pierwszeństwo.',
+  'admin.defaultSettings.saved': 'Domyślne zapisane',
+  'admin.defaultSettings.reset': 'Przywróć wbudowaną wartość domyślną',
+  'admin.defaultSettings.resetToBuiltIn': 'przywróć',
  'admin.tabs.templates': 'Szablony pakowania',
  'admin.packingTemplates.title': 'Szablony pakowania',
  'admin.packingTemplates.subtitle': 'Twórz szablony list pakowania do wielokrotnego użycia dla swoich podróży',
@@ -959,6 +974,7 @@ const pl: Record<string, string | { name: string; category: string }[]> = {
  'reservations.meta.platform': 'Peron',
  'reservations.meta.seat': 'Miejsce',
  'reservations.meta.checkIn': 'Zameldowanie',
+  'reservations.meta.checkInUntil': 'Check-in do',
  'reservations.meta.checkOut': 'Wymeldowanie',
  'reservations.meta.linkAccommodation': 'Zakwaterowanie',
  'reservations.meta.pickAccommodation': 'Link do zakwaterowania',
@@ -1441,6 +1457,7 @@ const pl: Record<string, string | { name: string; category: string }[]> = {
  'day.noPlacesForHotel': 'Najpierw dodaj miejsca do swojej podróży',
  'day.allDays': 'Wszystkie',
  'day.checkIn': 'Zameldowanie',
+  'day.checkInUntil': 'Do',
  'day.checkOut': 'Wymeldowanie',
  'day.confirmation': 'Potwierdzenie',
  'day.editAccommodation': 'Edytuj zakwaterowanie',
@@ -1596,6 +1613,25 @@ const pl: Record<string, string | { name: string; category: string }[]> = {
  'admin.notifications.adminWebhookPanel.testSuccess': 'Testowy webhook wysłany pomyślnie',
  'admin.notifications.adminWebhookPanel.testFailed': 'Wysyłanie testowego webhooka nie powiodło się',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': 'Webhook admina wysyła automatycznie, gdy URL jest skonfigurowany',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': 'Pozwala użytkownikom skonfigurować własne tematy ntfy dla powiadomień push. Ustaw domyślny serwer poniżej, aby wstępnie wypełnić ustawienia użytkownika.',
+  'admin.notifications.testNtfy': 'Wyślij testowe Ntfy',
+  'admin.notifications.testNtfySuccess': 'Testowe Ntfy wysłane pomyślnie',
+  'admin.notifications.testNtfyFailed': 'Wysyłanie testowego Ntfy nie powiodło się',
+  'admin.notifications.adminNtfyPanel.title': 'Admin Ntfy',
+  'admin.notifications.adminNtfyPanel.hint': 'Ten temat Ntfy jest używany wyłącznie do powiadomień admina (np. alertów o wersjach). Jest niezależny od tematów użytkowników i zawsze wysyła po skonfigurowaniu.',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'URL serwera Ntfy',
+  'admin.notifications.adminNtfyPanel.serverHint': 'Używany również jako domyślny serwer dla powiadomień ntfy użytkowników. Pozostaw puste, aby użyć ntfy.sh. Użytkownicy mogą to nadpisać w swoich ustawieniach.',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': 'Temat admina',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': 'Token dostępu (opcjonalne)',
+  'admin.notifications.adminNtfyPanel.tokenCleared': 'Token dostępu admina wyczyszczony',
+  'admin.notifications.adminNtfyPanel.saved': 'Ustawienia admin Ntfy zapisane',
+  'admin.notifications.adminNtfyPanel.test': 'Wyślij testowe Ntfy',
+  'admin.notifications.adminNtfyPanel.testSuccess': 'Testowe Ntfy wysłane pomyślnie',
+  'admin.notifications.adminNtfyPanel.testFailed': 'Wysyłanie testowego Ntfy nie powiodło się',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': 'Admin Ntfy zawsze wysyła po skonfigurowaniu tematu',
  'admin.notifications.adminNotificationsHint': 'Skonfiguruj, które kanały dostarczają powiadomienia admina (np. alerty o wersjach). Webhook wysyła automatycznie, gdy ustawiony jest URL webhooka admina.',
  'admin.webhook.hint': 'Pozwól użytkownikom konfigurować własne adresy URL webhooka dla powiadomień (Discord, Slack itp.).',
  'settings.notificationsDisabled': 'Powiadomienia nie są skonfigurowane.',
@@ -1603,14 +1639,26 @@ const pl: Record<string, string | { name: string; category: string }[]> = {
  'settings.webhookUrl.label': 'URL webhooka',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': 'Wprowadź adres URL webhooka Discord, Slack lub własnego, aby otrzymywać powiadomienia.',
-  'settings.webhookUrl.save': 'Zapisz',
  'settings.webhookUrl.saved': 'URL webhooka zapisany',
  'settings.webhookUrl.test': 'Testuj',
  'settings.webhookUrl.testSuccess': 'Testowy webhook wysłany pomyślnie',
  'settings.webhookUrl.testFailed': 'Wysyłanie testowego webhooka nie powiodło się',
+  'settings.ntfyUrl.topicLabel': 'Temat Ntfy',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': 'URL serwera Ntfy (opcjonalne)',
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': 'Wprowadź swój temat Ntfy, aby otrzymywać powiadomienia push. Pozostaw pole serwera puste, aby użyć domyślnego ustawienia skonfigurowanego przez administratora.',
+  'settings.ntfyUrl.tokenLabel': 'Token dostępu (opcjonalne)',
+  'settings.ntfyUrl.tokenHint': 'Wymagane dla tematów chronionych hasłem.',
+  'settings.ntfyUrl.saved': 'Ustawienia Ntfy zapisane',
+  'settings.ntfyUrl.test': 'Testuj',
+  'settings.ntfyUrl.testSuccess': 'Testowe powiadomienie Ntfy wysłane pomyślnie',
+  'settings.ntfyUrl.testFailed': 'Testowe powiadomienie Ntfy nie powiodło się',
+  'settings.ntfyUrl.tokenCleared': 'Token dostępu wyczyszczony',
  'settings.notificationPreferences.inapp': 'In-App',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.email': 'Email',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'settings.notificationsActive': 'Aktywny kanał',
  'settings.notificationsManagedByAdmin': 'Zdarzenia konfigurowane przez administratora.',
  'settings.mustChangePassword': 'Musisz zmienić hasło przed kontynuowaniem.',
@@ -4,6 +4,7 @@ const ru: Record<string, string> = {
  'common.showMore': 'Показать больше',
  'common.showLess': 'Показать меньше',
  'common.cancel': 'Отмена',
+  'common.clear': 'Очистить',
  'common.delete': 'Удалить',
  'common.edit': 'Редактировать',
  'common.add': 'Добавить',
@@ -547,7 +548,21 @@ const ru: Record<string, string> = {

  'admin.bagTracking.title': 'Отслеживание багажа',
  'admin.bagTracking.subtitle': 'Включить вес и привязку к багажу для вещей',
+  'admin.collab.chat.title': 'Чат',
+  'admin.collab.chat.subtitle': 'Обмен сообщениями для совместной работы',
+  'admin.collab.notes.title': 'Заметки',
+  'admin.collab.notes.subtitle': 'Общие заметки и документы',
+  'admin.collab.polls.title': 'Опросы',
+  'admin.collab.polls.subtitle': 'Групповые опросы и голосования',
+  'admin.collab.whatsnext.title': 'Что дальше',
+  'admin.collab.whatsnext.subtitle': 'Предложения активностей и следующие шаги',
  'admin.tabs.config': 'Персонализация',
+  'admin.tabs.defaults': 'Настройки по умолчанию',
+  'admin.defaultSettings.title': 'Настройки пользователей по умолчанию',
+  'admin.defaultSettings.description': 'Задайте значения по умолчанию для всего экземпляра. Пользователи, не изменившие параметр, увидят эти значения. Их собственные изменения всегда имеют приоритет.',
+  'admin.defaultSettings.saved': 'Значение по умолчанию сохранено',
+  'admin.defaultSettings.reset': 'Сбросить до встроенного значения',
+  'admin.defaultSettings.resetToBuiltIn': 'сбросить',
  'admin.tabs.templates': 'Шаблоны упаковки',
  'admin.packingTemplates.title': 'Шаблоны упаковки',
  'admin.packingTemplates.subtitle': 'Создавайте многоразовые списки вещей для поездок',
@@ -1002,6 +1017,7 @@ const ru: Record<string, string> = {
  'reservations.meta.platform': 'Платформа',
  'reservations.meta.seat': 'Место',
  'reservations.meta.checkIn': 'Заезд',
+  'reservations.meta.checkInUntil': 'Заселение до',
  'reservations.meta.checkOut': 'Выезд',
  'reservations.meta.linkAccommodation': 'Жильё',
  'reservations.meta.pickAccommodation': 'Привязать к жилью',
@@ -1486,6 +1502,7 @@ const ru: Record<string, string> = {
  'day.noPlacesForHotel': 'Сначала добавьте места в поездку',
  'day.allDays': 'Все',
  'day.checkIn': 'Заезд',
+  'day.checkInUntil': 'До',
  'day.checkOut': 'Выезд',
  'day.confirmation': 'Подтверждение',
  'day.editAccommodation': 'Редактировать жильё',
@@ -1759,14 +1776,26 @@ const ru: Record<string, string> = {
  'settings.webhookUrl.label': 'URL вебхука',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': 'Введите URL вашего вебхука Discord, Slack или пользовательского для получения уведомлений.',
-  'settings.webhookUrl.save': 'Сохранить',
  'settings.webhookUrl.saved': 'URL вебхука сохранён',
  'settings.webhookUrl.test': 'Тест',
  'settings.webhookUrl.testSuccess': 'Тестовый вебхук успешно отправлен',
  'settings.webhookUrl.testFailed': 'Ошибка тестового вебхука',
+  'settings.ntfyUrl.topicLabel': 'Тема Ntfy',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': 'URL сервера Ntfy (необязательно)',
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': 'Введите тему Ntfy для получения push-уведомлений. Оставьте поле сервера пустым, чтобы использовать настройку по умолчанию, заданную администратором.',
+  'settings.ntfyUrl.tokenLabel': 'Токен доступа (необязательно)',
+  'settings.ntfyUrl.tokenHint': 'Требуется для тем, защищённых паролем.',
+  'settings.ntfyUrl.saved': 'Настройки Ntfy сохранены',
+  'settings.ntfyUrl.test': 'Тест',
+  'settings.ntfyUrl.testSuccess': 'Тестовое уведомление Ntfy успешно отправлено',
+  'settings.ntfyUrl.testFailed': 'Ошибка отправки тестового уведомления Ntfy',
+  'settings.ntfyUrl.tokenCleared': 'Токен доступа очищен',
  'settings.notificationPreferences.inapp': 'In-App',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.email': 'Email',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'admin.notifications.emailPanel.title': 'Email (SMTP)',
  'admin.notifications.webhookPanel.title': 'Webhook',
  'admin.notifications.inappPanel.title': 'In-App',
@@ -1777,6 +1806,25 @@ const ru: Record<string, string> = {
  'admin.notifications.adminWebhookPanel.testSuccess': 'Тестовый вебхук успешно отправлен',
  'admin.notifications.adminWebhookPanel.testFailed': 'Ошибка тестового вебхука',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': 'Вебхук администратора отправляется автоматически при наличии URL',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': 'Позволяет пользователям настраивать собственные темы ntfy для push-уведомлений. Установите сервер по умолчанию ниже, чтобы предварительно заполнить настройки пользователей.',
+  'admin.notifications.testNtfy': 'Отправить тестовое Ntfy',
+  'admin.notifications.testNtfySuccess': 'Тестовое Ntfy успешно отправлено',
+  'admin.notifications.testNtfyFailed': 'Ошибка отправки тестового Ntfy',
+  'admin.notifications.adminNtfyPanel.title': 'Ntfy администратора',
+  'admin.notifications.adminNtfyPanel.hint': 'Эта тема Ntfy используется исключительно для уведомлений администратора (например, оповещения о версиях). Она независима от тем пользователей и всегда отправляется при наличии настройки.',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'URL сервера Ntfy',
+  'admin.notifications.adminNtfyPanel.serverHint': 'Также используется как сервер по умолчанию для ntfy-уведомлений пользователей. Оставьте пустым, чтобы использовать ntfy.sh. Пользователи могут изменить это в своих настройках.',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': 'Тема администратора',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': 'Токен доступа (необязательно)',
+  'admin.notifications.adminNtfyPanel.tokenCleared': 'Токен доступа администратора очищен',
+  'admin.notifications.adminNtfyPanel.saved': 'Настройки Ntfy администратора сохранены',
+  'admin.notifications.adminNtfyPanel.test': 'Отправить тестовое Ntfy',
+  'admin.notifications.adminNtfyPanel.testSuccess': 'Тестовое Ntfy успешно отправлено',
+  'admin.notifications.adminNtfyPanel.testFailed': 'Ошибка отправки тестового Ntfy',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': 'Ntfy администратора всегда отправляется при наличии настроенной темы',
  'admin.notifications.adminNotificationsHint': 'Настройте, какие каналы доставляют уведомления администратора (например, оповещения о версиях). Вебхук отправляется автоматически, если задан URL вебхука администратора.',
  'admin.tabs.notifications': 'Уведомления',
  'notifications.versionAvailable.title': 'Доступно обновление',
@@ -4,6 +4,7 @@ const zh: Record<string, string> = {
  'common.showMore': '显示更多',
  'common.showLess': '收起',
  'common.cancel': '取消',
+  'common.clear': '清除',
  'common.delete': '删除',
  'common.edit': '编辑',
  'common.add': '添加',
@@ -547,7 +548,21 @@ const zh: Record<string, string> = {

  'admin.bagTracking.title': '行李追踪',
  'admin.bagTracking.subtitle': '为打包物品启用重量和行李分配',
+  'admin.collab.chat.title': '聊天',
+  'admin.collab.chat.subtitle': '实时消息协作',
+  'admin.collab.notes.title': '笔记',
+  'admin.collab.notes.subtitle': '共享笔记和文档',
+  'admin.collab.polls.title': '投票',
+  'admin.collab.polls.subtitle': '群组投票和表决',
+  'admin.collab.whatsnext.title': '下一步',
+  'admin.collab.whatsnext.subtitle': '活动建议和后续步骤',
  'admin.tabs.config': '个性化',
+  'admin.tabs.defaults': '用户默认设置',
+  'admin.defaultSettings.title': '用户默认设置',
+  'admin.defaultSettings.description': '设置实例范围的默认值。未更改设置的用户将看到这些值。用户自己的更改始终优先。',
+  'admin.defaultSettings.saved': '默认值已保存',
+  'admin.defaultSettings.reset': '重置为内置默认值',
+  'admin.defaultSettings.resetToBuiltIn': '重置',
  'admin.tabs.templates': '打包模板',
  'admin.packingTemplates.title': '打包模板',
  'admin.packingTemplates.subtitle': '创建可复用的旅行打包清单',
@@ -1002,6 +1017,7 @@ const zh: Record<string, string> = {
  'reservations.meta.platform': '站台',
  'reservations.meta.seat': '座位',
  'reservations.meta.checkIn': '入住',
+  'reservations.meta.checkInUntil': '入住截止',
  'reservations.meta.checkOut': '退房',
  'reservations.meta.linkAccommodation': '住宿',
  'reservations.meta.pickAccommodation': '关联住宿',
@@ -1486,6 +1502,7 @@ const zh: Record<string, string> = {
  'day.noPlacesForHotel': '请先在旅行中添加地点',
  'day.allDays': '全部',
  'day.checkIn': '入住',
+  'day.checkInUntil': '截止',
  'day.checkOut': '退房',
  'day.confirmation': '确认号',
  'day.editAccommodation': '编辑住宿',
@@ -1759,14 +1776,26 @@ const zh: Record<string, string> = {
  'settings.webhookUrl.label': 'Webhook URL',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': '输入您的 Discord、Slack 或自定义 Webhook URL 以接收通知。',
-  'settings.webhookUrl.save': '保存',
  'settings.webhookUrl.saved': 'Webhook URL 已保存',
  'settings.webhookUrl.test': '测试',
  'settings.webhookUrl.testSuccess': '测试 Webhook 发送成功',
  'settings.webhookUrl.testFailed': '测试 Webhook 失败',
+  'settings.ntfyUrl.topicLabel': 'Ntfy 主题',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': 'Ntfy 服务器 URL（可选）',
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': '输入您的 Ntfy 主题以接收推送通知。将服务器留空以使用管理员配置的默认值。',
+  'settings.ntfyUrl.tokenLabel': '访问令牌（可选）',
+  'settings.ntfyUrl.tokenHint': '受密码保护的主题需要此项。',
+  'settings.ntfyUrl.saved': 'Ntfy 设置已保存',
+  'settings.ntfyUrl.test': '测试',
+  'settings.ntfyUrl.testSuccess': '测试 Ntfy 通知发送成功',
+  'settings.ntfyUrl.testFailed': '测试 Ntfy 通知失败',
+  'settings.ntfyUrl.tokenCleared': '访问令牌已清除',
  'settings.notificationPreferences.inapp': 'In-App',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.email': 'Email',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'admin.notifications.emailPanel.title': 'Email (SMTP)',
  'admin.notifications.webhookPanel.title': 'Webhook',
  'admin.notifications.inappPanel.title': 'In-App',
@@ -1777,6 +1806,25 @@ const zh: Record<string, string> = {
  'admin.notifications.adminWebhookPanel.testSuccess': '测试 Webhook 发送成功',
  'admin.notifications.adminWebhookPanel.testFailed': '测试 Webhook 失败',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': '配置 URL 后管理员 Webhook 自动触发',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': '允许用户配置自己的 ntfy 主题以接收推送通知。在下方设置默认服务器以预填充用户设置。',
+  'admin.notifications.testNtfy': '发送测试 Ntfy',
+  'admin.notifications.testNtfySuccess': '测试 Ntfy 发送成功',
+  'admin.notifications.testNtfyFailed': '测试 Ntfy 失败',
+  'admin.notifications.adminNtfyPanel.title': '管理员 Ntfy',
+  'admin.notifications.adminNtfyPanel.hint': '此 Ntfy 主题专用于管理员通知（如版本更新提醒）。它与每用户主题相互独立，配置后始终触发。',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'Ntfy 服务器 URL',
+  'admin.notifications.adminNtfyPanel.serverHint': '同时用作用户 ntfy 通知的默认服务器。留空则默认使用 ntfy.sh。用户可在其自己的设置中覆盖此项。',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': '管理员主题',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': '访问令牌（可选）',
+  'admin.notifications.adminNtfyPanel.tokenCleared': '管理员访问令牌已清除',
+  'admin.notifications.adminNtfyPanel.saved': '管理员 Ntfy 设置已保存',
+  'admin.notifications.adminNtfyPanel.test': '发送测试 Ntfy',
+  'admin.notifications.adminNtfyPanel.testSuccess': '测试 Ntfy 发送成功',
+  'admin.notifications.adminNtfyPanel.testFailed': '测试 Ntfy 失败',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': '配置主题后管理员 Ntfy 始终触发',
  'admin.notifications.adminNotificationsHint': '配置哪些渠道发送管理员通知（如版本更新提醒）。设置管理员 Webhook URL 后，Webhook 将自动触发。',
  'admin.tabs.notifications': '通知',
  'notifications.versionAvailable.title': '有可用更新',
@@ -4,6 +4,7 @@ const zhTw: Record<string, string> = {
  'common.showMore': '顯示更多',
  'common.showLess': '收起',
  'common.cancel': '取消',
+  'common.clear': '清除',
  'common.delete': '刪除',
  'common.edit': '編輯',
  'common.add': '新增',
@@ -186,15 +187,27 @@ const zhTw: Record<string, string> = {
  'settings.notificationPreferences.email': '電子郵件',
  'settings.notificationPreferences.webhook': 'Webhook',
  'settings.notificationPreferences.inapp': '應用程式內',
+  'settings.notificationPreferences.ntfy': 'Ntfy',
  'settings.notificationPreferences.noChannels': '未配置通知渠道。請聯絡管理員設定電子郵件或 Webhook 通知。',
  'settings.webhookUrl.label': 'Webhook URL',
  'settings.webhookUrl.placeholder': 'https://discord.com/api/webhooks/...',
  'settings.webhookUrl.hint': '輸入您的 Discord、Slack 或自訂 Webhook URL 以接收通知。',
-  'settings.webhookUrl.save': '儲存',
  'settings.webhookUrl.saved': 'Webhook URL 已儲存',
  'settings.webhookUrl.test': '測試',
  'settings.webhookUrl.testSuccess': '測試 Webhook 傳送成功',
  'settings.webhookUrl.testFailed': '測試 Webhook 傳送失敗',
+  'settings.ntfyUrl.topicLabel': 'Ntfy 主題',
+  'settings.ntfyUrl.topicPlaceholder': 'my-trek-alerts',
+  'settings.ntfyUrl.serverLabel': 'Ntfy 伺服器 URL（選填）',
+  'settings.ntfyUrl.serverPlaceholder': 'https://ntfy.sh',
+  'settings.ntfyUrl.hint': '輸入您的 Ntfy 主題以接收推播通知。將伺服器留空以使用管理員設定的預設值。',
+  'settings.ntfyUrl.tokenLabel': '存取權杖（選填）',
+  'settings.ntfyUrl.tokenHint': '受密碼保護的主題需要此項目。',
+  'settings.ntfyUrl.saved': 'Ntfy 設定已儲存',
+  'settings.ntfyUrl.test': '測試',
+  'settings.ntfyUrl.testSuccess': '測試 Ntfy 通知傳送成功',
+  'settings.ntfyUrl.testFailed': '測試 Ntfy 通知失敗',
+  'settings.ntfyUrl.tokenCleared': '存取權杖已清除',
  'settings.notificationsDisabled': '通知尚未配置。請聯絡管理員啟用電子郵件或 Webhook 通知。',
  'settings.notificationsActive': '活躍頻道',
  'settings.notificationsManagedByAdmin': '通知事件由管理員配置。',
@@ -218,6 +231,25 @@ const zhTw: Record<string, string> = {
  'admin.notifications.adminWebhookPanel.testSuccess': '測試 Webhook 傳送成功',
  'admin.notifications.adminWebhookPanel.testFailed': '測試 Webhook 傳送失敗',
  'admin.notifications.adminWebhookPanel.alwaysOnHint': '配置 URL 後，管理員 Webhook 始終觸發',
+  'admin.notifications.ntfy': 'Ntfy',
+  'admin.ntfy.hint': '允許使用者設定自己的 ntfy 主題以接收推播通知。在下方設定預設伺服器以預先填入使用者設定。',
+  'admin.notifications.testNtfy': '傳送測試 Ntfy',
+  'admin.notifications.testNtfySuccess': '測試 Ntfy 傳送成功',
+  'admin.notifications.testNtfyFailed': '測試 Ntfy 失敗',
+  'admin.notifications.adminNtfyPanel.title': '管理員 Ntfy',
+  'admin.notifications.adminNtfyPanel.hint': '此 Ntfy 主題專用於管理員通知（例如版本提醒）。它與每位使用者的主題分開，設定後始終會觸發。',
+  'admin.notifications.adminNtfyPanel.serverLabel': 'Ntfy 伺服器 URL',
+  'admin.notifications.adminNtfyPanel.serverHint': '同時用作使用者 ntfy 通知的預設伺服器。留空則預設使用 ntfy.sh。使用者可在自己的設定中覆寫此項。',
+  'admin.notifications.adminNtfyPanel.serverPlaceholder': 'https://ntfy.sh',
+  'admin.notifications.adminNtfyPanel.topicLabel': '管理員主題',
+  'admin.notifications.adminNtfyPanel.topicPlaceholder': 'trek-admin-alerts',
+  'admin.notifications.adminNtfyPanel.tokenLabel': '存取權杖（選填）',
+  'admin.notifications.adminNtfyPanel.tokenCleared': '管理員存取權杖已清除',
+  'admin.notifications.adminNtfyPanel.saved': '管理員 Ntfy 設定已儲存',
+  'admin.notifications.adminNtfyPanel.test': '傳送測試 Ntfy',
+  'admin.notifications.adminNtfyPanel.testSuccess': '測試 Ntfy 傳送成功',
+  'admin.notifications.adminNtfyPanel.testFailed': '測試 Ntfy 失敗',
+  'admin.notifications.adminNtfyPanel.alwaysOnHint': '設定主題後管理員 Ntfy 始終觸發',
  'admin.notifications.adminNotificationsHint': '配置哪些渠道傳遞僅管理員通知（例如版本提醒）。',
  'admin.smtp.title': '郵件與通知',
  'admin.smtp.hint': '用於傳送電子郵件通知的 SMTP 配置。',
@@ -572,7 +604,21 @@ const zhTw: Record<string, string> = {

  'admin.bagTracking.title': '行李追蹤',
  'admin.bagTracking.subtitle': '為打包物品啟用重量和行李分配',
+  'admin.collab.chat.title': '聊天',
+  'admin.collab.chat.subtitle': '即時訊息協作',
+  'admin.collab.notes.title': '筆記',
+  'admin.collab.notes.subtitle': '共享筆記和文件',
+  'admin.collab.polls.title': '投票',
+  'admin.collab.polls.subtitle': '群組投票和表決',
+  'admin.collab.whatsnext.title': '下一步',
+  'admin.collab.whatsnext.subtitle': '活動建議和後續步驟',
  'admin.tabs.config': '配置',
+  'admin.tabs.defaults': '用戶預設設定',
+  'admin.defaultSettings.title': '用戶預設設定',
+  'admin.defaultSettings.description': '設定整個執行個體的預設值。未更改設定的用戶將看到這些值。用戶自己的更改始終優先。',
+  'admin.defaultSettings.saved': '預設值已儲存',
+  'admin.defaultSettings.reset': '重設為內建預設值',
+  'admin.defaultSettings.resetToBuiltIn': '重設',
  'admin.tabs.templates': '打包模板',
  'admin.packingTemplates.title': '打包模板',
  'admin.packingTemplates.subtitle': '建立可複用的旅行打包清單',
@@ -1027,6 +1073,7 @@ const zhTw: Record<string, string> = {
  'reservations.meta.platform': '站臺',
  'reservations.meta.seat': '座位',
  'reservations.meta.checkIn': '入住',
+  'reservations.meta.checkInUntil': '入住截止',
  'reservations.meta.checkOut': '退房',
  'reservations.meta.linkAccommodation': '住宿',
  'reservations.meta.pickAccommodation': '關聯住宿',
@@ -1511,6 +1558,7 @@ const zhTw: Record<string, string> = {
  'day.noPlacesForHotel': '請先在旅行中新增地點',
  'day.allDays': '全部',
  'day.checkIn': '入住',
+  'day.checkInUntil': '截止',
  'day.checkOut': '退房',
  'day.confirmation': '確認號',
  'day.editAccommodation': '編輯住宿',
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import apiClient, { adminApi, authApi, notificationsApi } from '../api/client'
 import DevNotificationsPanel from '../components/Admin/DevNotificationsPanel'
+import DefaultUserSettingsTab from '../components/Admin/DefaultUserSettingsTab'
 import { useAuthStore } from '../store/authStore'
 import { useSettingsStore } from '../store/settingsStore'
 import { useAddonStore } from '../store/addonStore'
@@ -66,6 +67,7 @@ const ADMIN_CHANNEL_LABEL_KEYS: Record<string, string> = {
  inapp: 'settings.notificationPreferences.inapp',
  email: 'settings.notificationPreferences.email',
  webhook: 'settings.notificationPreferences.webhook',
+  ntfy: 'settings.notificationPreferences.ntfy',
 }

 function AdminNotificationsPanel({ t, toast }: { t: (k: string) => string; toast: ReturnType<typeof useToast> }) {
@@ -78,7 +80,7 @@ function AdminNotificationsPanel({ t, toast }: { t: (k: string) => string; toast

  if (!matrix) return <p style={{ fontSize: 12, color: 'var(--text-faint)', fontStyle: 'italic', padding: 16 }}>Loading…</p>

-  const visibleChannels = (['inapp', 'email', 'webhook'] as const).filter(ch => {
+  const visibleChannels = (['inapp', 'email', 'webhook', 'ntfy'] as const).filter(ch => {
    if (!matrix.available_channels[ch]) return false
    return matrix.event_types.some((evt: string) => matrix.implemented_combos[evt]?.includes(ch))
  })
@@ -168,6 +170,7 @@ export default function AdminPage(): React.ReactElement {
  const TABS = [
    { id: 'users', label: t('admin.tabs.users') },
    { id: 'config', label: t('admin.tabs.config') },
+    { id: 'defaults', label: t('admin.tabs.defaults') },
    { id: 'addons', label: t('admin.tabs.addons') },
    { id: 'settings', label: t('admin.tabs.settings') },
    { id: 'notifications', label: t('admin.tabs.notifications') },
@@ -191,6 +194,10 @@ export default function AdminPage(): React.ReactElement {
  const [bagTrackingEnabled, setBagTrackingEnabled] = useState<boolean>(false)
  useEffect(() => { adminApi.getBagTracking().then(d => setBagTrackingEnabled(d.enabled)).catch(() => {}) }, [])

+  // Collab features
+  const [collabFeatures, setCollabFeatures] = useState<{ chat: boolean; notes: boolean; polls: boolean; whatsnext: boolean }>({ chat: true, notes: true, polls: true, whatsnext: true })
+  useEffect(() => { adminApi.getCollabFeatures().then(d => setCollabFeatures(d)).catch(() => {}) }, [])
+
  // OIDC config
  const [oidcConfig, setOidcConfig] = useState<OidcConfig>({ issuer: '', client_id: '', client_secret: '', client_secret_set: false, display_name: '', discovery_url: '' })
  const [savingOidc, setSavingOidc] = useState<boolean>(false)
@@ -796,6 +803,10 @@ export default function AdminPage(): React.ReactElement {
                const next = !bagTrackingEnabled
                setBagTrackingEnabled(next)
                try { await adminApi.updateBagTracking(next) } catch { setBagTrackingEnabled(!next) }
+              }} collabFeatures={collabFeatures} onToggleCollabFeature={async (key: string) => {
+                const next = { ...collabFeatures, [key]: !collabFeatures[key] }
+                setCollabFeatures(next)
+                try { await adminApi.updateCollabFeatures({ [key]: next[key] }) } catch { setCollabFeatures(collabFeatures) }
              }} />
            </div>
          )}
@@ -1168,15 +1179,16 @@ export default function AdminPage(): React.ReactElement {
            const activeChans = rawChannels === 'none' ? [] : rawChannels.split(',').map((c: string) => c.trim())
            const emailActive = activeChans.includes('email')
            const webhookActive = activeChans.includes('webhook')
+            const ntfyActive = activeChans.includes('ntfy')

-            const setChannels = async (email: boolean, webhook: boolean) => {
-              const chans = [email && 'email', webhook && 'webhook'].filter(Boolean).join(',') || 'none'
+            const setChannels = async (email: boolean, webhook: boolean, ntfy: boolean) => {
+              const chans = [email && 'email', webhook && 'webhook', ntfy && 'ntfy'].filter(Boolean).join(',') || 'none'
              setSmtpValues(prev => ({ ...prev, notification_channels: chans }))
              try {
                await authApi.updateAppSettings({ notification_channels: chans })
              } catch {
                // Revert state on failure
-                const reverted = [emailActive && 'email', webhookActive && 'webhook'].filter(Boolean).join(',') || 'none'
+                const reverted = [emailActive && 'email', webhookActive && 'webhook', ntfyActive && 'ntfy'].filter(Boolean).join(',') || 'none'
                setSmtpValues(prev => ({ ...prev, notification_channels: reverted }))
                toast.error(t('common.error'))
              }
@@ -1207,7 +1219,7 @@ export default function AdminPage(): React.ReactElement {
                      <p className="text-xs text-slate-400 mt-1">{t('admin.smtp.hint')}</p>
                    </div>
                    <button
-                      onClick={() => setChannels(!emailActive, webhookActive)}
+                      onClick={() => setChannels(!emailActive, webhookActive, ntfyActive)}
                      className="relative inline-flex h-6 w-11 items-center rounded-full transition-colors flex-shrink-0"
                      style={{ background: emailActive ? 'var(--text-primary)' : 'var(--border-primary)' }}
                    >
@@ -1283,7 +1295,7 @@ export default function AdminPage(): React.ReactElement {
                      <p className="text-xs text-slate-400 mt-1">{t('admin.webhook.hint')}</p>
                    </div>
                    <button
-                      onClick={() => setChannels(emailActive, !webhookActive)}
+                      onClick={() => setChannels(emailActive, !webhookActive, ntfyActive)}
                      className="relative inline-flex h-6 w-11 items-center rounded-full transition-colors flex-shrink-0"
                      style={{ background: webhookActive ? 'var(--text-primary)' : 'var(--border-primary)' }}
                    >
@@ -1293,6 +1305,24 @@ export default function AdminPage(): React.ReactElement {
                  </div>
                </div>

+                {/* Ntfy Panel */}
+                <div className="bg-white rounded-xl border border-slate-200 overflow-hidden">
+                  <div className="px-6 py-4 flex items-center justify-between">
+                    <div>
+                      <h2 className="font-semibold text-slate-900">{t('admin.notifications.ntfy')}</h2>
+                      <p className="text-xs text-slate-400 mt-1">{t('admin.ntfy.hint') || 'Allow users to configure their own ntfy topics for push notifications.'}</p>
+                    </div>
+                    <button
+                      onClick={() => setChannels(emailActive, webhookActive, !ntfyActive)}
+                      className="relative inline-flex h-6 w-11 items-center rounded-full transition-colors flex-shrink-0"
+                      style={{ background: ntfyActive ? 'var(--text-primary)' : 'var(--border-primary)' }}
+                    >
+                      <span className="absolute left-0.5 h-5 w-5 rounded-full bg-white transition-transform duration-200"
+                        style={{ transform: ntfyActive ? 'translateX(20px)' : 'translateX(0)' }} />
+                    </button>
+                  </div>
+                </div>
+
                {/* In-App Panel */}
                <div className="bg-white rounded-xl border border-slate-200 overflow-hidden">
                  <div className="px-6 py-4 border-b border-slate-100 flex items-center justify-between">
@@ -1358,6 +1388,106 @@ export default function AdminPage(): React.ReactElement {
                  </div>
                </div>

+                {/* Admin Ntfy Panel */}
+                <div className="bg-white rounded-xl border border-slate-200 overflow-hidden">
+                  <div className="px-6 py-4 border-b border-slate-100">
+                    <h2 className="font-semibold text-slate-900">{t('admin.notifications.adminNtfyPanel.title')}</h2>
+                    <p className="text-xs text-slate-400 mt-1">{t('admin.notifications.adminNtfyPanel.hint')}</p>
+                  </div>
+                  <div className="p-6 space-y-3">
+                    {smtpLoaded && (
+                      <>
+                        <div>
+                          <label className="block text-xs font-medium text-slate-500 mb-1">{t('admin.notifications.adminNtfyPanel.serverLabel')}</label>
+                          <input
+                            type="text"
+                            value={smtpValues.admin_ntfy_server || ''}
+                            onChange={e => setSmtpValues(prev => ({ ...prev, admin_ntfy_server: e.target.value }))}
+                            placeholder={t('admin.notifications.adminNtfyPanel.serverPlaceholder')}
+                            className="w-full px-3 py-2 border border-slate-300 rounded-lg text-sm focus:ring-2 focus:ring-slate-400 focus:border-transparent"
+                          />
+                          <p className="text-xs text-slate-400 mt-1">{t('admin.notifications.adminNtfyPanel.serverHint')}</p>
+                        </div>
+                        <div>
+                          <label className="block text-xs font-medium text-slate-500 mb-1">{t('admin.notifications.adminNtfyPanel.topicLabel')}</label>
+                          <input
+                            type="text"
+                            value={smtpValues.admin_ntfy_topic || ''}
+                            onChange={e => setSmtpValues(prev => ({ ...prev, admin_ntfy_topic: e.target.value }))}
+                            placeholder={t('admin.notifications.adminNtfyPanel.topicPlaceholder')}
+                            className="w-full px-3 py-2 border border-slate-300 rounded-lg text-sm focus:ring-2 focus:ring-slate-400 focus:border-transparent"
+                          />
+                        </div>
+                        <div>
+                          <label className="block text-xs font-medium text-slate-500 mb-1">{t('admin.notifications.adminNtfyPanel.tokenLabel')}</label>
+                          <div className="flex gap-2">
+                            <input
+                              type="password"
+                              value={smtpValues.admin_ntfy_token === '••••••••' ? '' : smtpValues.admin_ntfy_token || ''}
+                              onChange={e => setSmtpValues(prev => ({ ...prev, admin_ntfy_token: e.target.value }))}
+                              placeholder={smtpValues.admin_ntfy_token === '••••••••' ? '••••••••' : ''}
+                              className="flex-1 px-3 py-2 border border-slate-300 rounded-lg text-sm focus:ring-2 focus:ring-slate-400 focus:border-transparent"
+                            />
+                            {smtpValues.admin_ntfy_token === '••••••••' && (
+                              <button
+                                onClick={async () => {
+                                  try {
+                                    await authApi.updateAppSettings({ admin_ntfy_token: '' })
+                                    setSmtpValues(prev => ({ ...prev, admin_ntfy_token: '' }))
+                                    toast.success(t('admin.notifications.adminNtfyPanel.tokenCleared'))
+                                  } catch { toast.error(t('common.error')) }
+                                }}
+                                className="px-3 py-2 border border-red-300 text-red-600 rounded-lg text-sm font-medium hover:bg-red-50 transition-colors"
+                              >
+                                {t('common.clear')}
+                              </button>
+                            )}
+                          </div>
+                        </div>
+                      </>
+                    )}
+                  </div>
+                  <div className="px-6 pb-4 flex items-center gap-2 border-t border-slate-100 pt-4">
+                    <button
+                      onClick={async () => {
+                        try {
+                          await authApi.updateAppSettings({
+                            admin_ntfy_server: smtpValues.admin_ntfy_server || '',
+                            admin_ntfy_topic: smtpValues.admin_ntfy_topic || '',
+                            ...(smtpValues.admin_ntfy_token && smtpValues.admin_ntfy_token !== '••••••••'
+                              ? { admin_ntfy_token: smtpValues.admin_ntfy_token }
+                              : {}),
+                          })
+                          toast.success(t('admin.notifications.adminNtfyPanel.saved'))
+                        } catch { toast.error(t('common.error')) }
+                      }}
+                      className="flex items-center gap-2 px-4 py-2 bg-slate-900 text-white rounded-lg text-sm font-medium hover:bg-slate-800 transition-colors">
+                      <Save className="w-4 h-4" />{t('common.save')}
+                    </button>
+                    <button
+                      onClick={async () => {
+                        const topic = smtpValues.admin_ntfy_topic?.trim()
+                        if (!topic) return
+                        try {
+                          const token = smtpValues.admin_ntfy_token && smtpValues.admin_ntfy_token !== '••••••••'
+                            ? smtpValues.admin_ntfy_token : null
+                          const result = await notificationsApi.testNtfy({
+                            topic,
+                            server: smtpValues.admin_ntfy_server || null,
+                            token,
+                          })
+                          if (result.success) toast.success(t('admin.notifications.adminNtfyPanel.testSuccess'))
+                          else toast.error(result.error || t('admin.notifications.adminNtfyPanel.testFailed'))
+                        } catch { toast.error(t('admin.notifications.adminNtfyPanel.testFailed')) }
+                      }}
+                      disabled={!smtpValues.admin_ntfy_topic?.trim()}
+                      className="px-4 py-2 border border-slate-300 text-slate-700 rounded-lg text-sm font-medium hover:bg-slate-50 transition-colors disabled:opacity-40"
+                    >
+                      {t('admin.notifications.adminNtfyPanel.test')}
+                    </button>
+                  </div>
+                </div>
+
              </div>
              <div className="mt-6">
                <AdminNotificationsPanel t={t} toast={toast} />
@@ -1373,6 +1503,8 @@ export default function AdminPage(): React.ReactElement {

          {activeTab === 'github' && <GitHubPanel isPrerelease={updateInfo?.is_prerelease ?? false} />}

+          {activeTab === 'defaults' && <DefaultUserSettingsTab />}
+
          {activeTab === 'dev-notifications' && <DevNotificationsPanel />}
        </div>
      </div>
@@ -100,6 +100,7 @@ export default function TripPlannerPage(): React.ReactElement | null {
  }, [undo, lastActionLabel, toast])

  const [enabledAddons, setEnabledAddons] = useState<Record<string, boolean>>({ packing: true, budget: true, documents: true, collab: false })
+  const [collabFeatures, setCollabFeatures] = useState<{ chat: boolean; notes: boolean; polls: boolean; whatsnext: boolean }>({ chat: true, notes: true, polls: true, whatsnext: true })
  const [tripAccommodations, setTripAccommodations] = useState<Accommodation[]>([])
  const [allowedFileTypes, setAllowedFileTypes] = useState<string | null>(null)
  const [tripMembers, setTripMembers] = useState<TripMember[]>([])
@@ -116,6 +117,7 @@ export default function TripPlannerPage(): React.ReactElement | null {
      const map = {}
      data.addons.forEach(a => { map[a.id] = true })
      setEnabledAddons({ packing: !!map.packing, budget: !!map.budget, documents: !!map.documents, collab: !!map.collab })
+      if (data.collabFeatures) setCollabFeatures(data.collabFeatures)
    }).catch(() => {})
    authApi.getAppConfig().then(config => {
      if (config.allowed_file_types) setAllowedFileTypes(config.allowed_file_types)
@@ -246,7 +248,11 @@ export default function TripPlannerPage(): React.ReactElement | null {

    return places.filter(p => {
      if (!p.lat || !p.lng) return false
-      if (mapCategoryFilter.size > 0 && !mapCategoryFilter.has(String(p.category_id))) return false
+      if (mapCategoryFilter.size > 0) {
+        if (p.category_id == null) {
+          if (!mapCategoryFilter.has('uncategorized')) return false
+        } else if (!mapCategoryFilter.has(String(p.category_id))) return false
+      }
      if (hiddenPlaceIds.has(p.id)) return false
      if (plannedIds && plannedIds.has(p.id)) return false
      return true
@@ -906,7 +912,7 @@ export default function TripPlannerPage(): React.ReactElement | null {
        )}

        {activeTab === 'buchungen' && (
-          <div style={{ height: '100%', maxWidth: 1200, margin: '0 auto', width: '100%', display: 'flex', flexDirection: 'column', overflowY: 'auto', overscrollBehavior: 'contain', paddingBottom: 'var(--bottom-nav-h)' }}>
+          <div style={{ height: '100%', maxWidth: 1800, margin: '0 auto', width: '100%', display: 'flex', flexDirection: 'column', overflowY: 'auto', overscrollBehavior: 'contain', paddingBottom: 'var(--bottom-nav-h)' }}>
            <ReservationsPanel
              tripId={tripId}
              reservations={reservations}
@@ -952,7 +958,7 @@ export default function TripPlannerPage(): React.ReactElement | null {

        {activeTab === 'collab' && (
          <div style={{ position: 'absolute', inset: 0, overflow: 'hidden' }}>
-            <CollabPanel tripId={tripId} tripMembers={tripMembers} />
+            <CollabPanel tripId={tripId} tripMembers={tripMembers} collabFeatures={collabFeatures} />
          </div>
        )}
      </div>
@@ -241,6 +241,7 @@ export interface Accommodation {
  name: string
  address: string | null
  check_in: string | null
+  check_in_end: string | null
  check_out: string | null
  confirmation_number: string | null
  notes: string | null
@@ -61,6 +61,10 @@ export const notificationHandlers = [
    return HttpResponse.json({ success: true });
  }),

+  http.post('/api/notifications/test-ntfy', async () => {
+    return HttpResponse.json({ success: true });
+  }),
+
  http.post('/api/notifications/in-app/:id/respond', async ({ request, params }) => {
    const body = await request.json() as { response: string };
    return HttpResponse.json({
@@ -91,7 +91,7 @@ describe('isRtlLanguage', () => {
 describe('SUPPORTED_LANGUAGES', () => {
  it('FE-COMP-I18N-009: contains expected entries with value/label shape', () => {
    expect(Array.isArray(SUPPORTED_LANGUAGES)).toBe(true)
-    expect(SUPPORTED_LANGUAGES).toHaveLength(14)
+    expect(SUPPORTED_LANGUAGES).toHaveLength(15)
    expect(SUPPORTED_LANGUAGES).toContainEqual(expect.objectContaining({ value: 'en', label: 'English' }))
    expect(SUPPORTED_LANGUAGES).toContainEqual(expect.objectContaining({ value: 'ar', label: 'العربية' }))
  })
@@ -1,12 +1,12 @@
 {
  "name": "trek-server",
-  "version": "2.9.13",
+  "version": "2.9.14",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "trek-server",
-      "version": "2.9.13",
+      "version": "2.9.14",
      "dependencies": {
        "@modelcontextprotocol/sdk": "^1.28.0",
        "archiver": "^6.0.1",
@@ -1,6 +1,6 @@
 {
  "name": "trek-server",
-  "version": "2.9.13",
+  "version": "2.9.14",
  "main": "src/index.ts",
  "scripts": {
    "start": "node --import tsx src/index.ts",
@@ -45,6 +45,7 @@ import publicConfigRoutes from './routes/publicConfig';
 import { mcpHandler } from './mcp';
 import { Addon } from './types';
 import { getPhotoProviderConfig } from './services/memories/helpersService';
+import { getCollabFeatures } from './services/adminService';

 export function createApp(): express.Application {
  const app = express();
@@ -236,6 +237,7 @@ export function createApp(): express.Application {
    }

    res.json({
+      collabFeatures: getCollabFeatures(),
      addons: [
        ...addons.map(a => ({ ...a, enabled: !!a.enabled })),
        ...providers.map(p => ({
@@ -1605,6 +1605,16 @@ function runMigrations(db: Database.Database): void {
        CREATE INDEX IF NOT EXISTS idx_idempotency_keys_created ON idempotency_keys(created_at);
      `);
    },
+
+    // Migration 101: Enable naver_list_import by default
+    () => {
+      db.prepare("UPDATE addons SET enabled = 1 WHERE id = 'naver_list_import'").run();
+    },
+
+    // Migration 102: Add check_in_end column for check-in time ranges
+    () => {
+      try { db.exec('ALTER TABLE day_accommodations ADD COLUMN check_in_end TEXT'); } catch (err: any) { if (!err.message?.includes('duplicate column name')) throw err; }
+    },
  ];

  if (currentVersion < migrations.length) {
@@ -334,6 +334,7 @@ function createTables(db: Database.Database): void {
      start_day_id INTEGER NOT NULL REFERENCES days(id) ON DELETE CASCADE,
      end_day_id INTEGER NOT NULL REFERENCES days(id) ON DELETE CASCADE,
      check_in TEXT,
+      check_in_end TEXT,
      check_out TEXT,
      confirmation TEXT,
      notes TEXT,
@@ -92,7 +92,7 @@ function seedAddons(db: Database.Database): void {
      { id: 'vacay', name: 'Vacay', description: 'Personal vacation day planner with calendar view', type: 'global', icon: 'CalendarDays', enabled: 1, sort_order: 10 },
      { id: 'atlas', name: 'Atlas', description: 'World map of your visited countries with travel stats', type: 'global', icon: 'Globe', enabled: 1, sort_order: 11 },
      { id: 'mcp', name: 'MCP', description: 'Model Context Protocol for AI assistant integration', type: 'integration', icon: 'Terminal', enabled: 0, sort_order: 12 },
-      { id: 'naver_list_import', name: 'Naver List Import', description: 'Import places from shared Naver Maps lists', type: 'trip', icon: 'Link2', enabled: 0, sort_order: 13 },
+      { id: 'naver_list_import', name: 'Naver List Import', description: 'Import places from shared Naver Maps lists', type: 'trip', icon: 'Link2', enabled: 1, sort_order: 13 },
      { id: 'collab', name: 'Collab', description: 'Notes, polls, and live chat for trip collaboration', type: 'trip', icon: 'Users', enabled: 1, sort_order: 6 },
      { id: 'journey', name: 'Journey', description: 'Trip tracking & travel journal — check-ins, photos, daily stories', type: 'global', icon: 'Compass', enabled: 0, sort_order: 35 },
    ];
@@ -3,6 +3,7 @@ import { authenticate, adminOnly } from '../middleware/auth';
 import { AuthRequest } from '../types';
 import { writeAudit, getClientIp, logInfo } from '../services/auditLog';
 import * as svc from '../services/adminService';
+import { getAdminUserDefaults, setAdminUserDefaults } from '../services/settingsService';
 import { invalidateMcpSessions } from '../mcp';
 import { getPreferencesMatrix, setAdminPreferences } from '../services/notificationPreferencesService';

@@ -200,6 +201,24 @@ router.put('/bag-tracking', (req: Request, res: Response) => {
  res.json(result);
 });

+// ── Collab Features ───────────────────────────────────────────────────────
+
+router.get('/collab-features', (_req: Request, res: Response) => {
+  res.json(svc.getCollabFeatures());
+});
+
+router.put('/collab-features', (req: Request, res: Response) => {
+  const result = svc.updateCollabFeatures(req.body);
+  const authReq = req as AuthRequest;
+  writeAudit({
+    userId: authReq.user.id,
+    action: 'admin.collab_features',
+    ip: getClientIp(req),
+    details: result,
+  });
+  res.json(result);
+});
+
 // ── Packing Templates ──────────────────────────────────────────────────────

 router.get('/packing-templates', (_req: Request, res: Response) => {
@@ -346,6 +365,31 @@ router.post('/rotate-jwt-secret', (req: Request, res: Response) => {
  res.json({ success: true });
 });

+// ── Default User Settings ──────────────────────────────────────────────────────
+
+router.get('/default-user-settings', (_req: Request, res: Response) => {
+  res.json(getAdminUserDefaults());
+});
+
+router.put('/default-user-settings', (req: Request, res: Response) => {
+  if (!req.body || typeof req.body !== 'object' || Array.isArray(req.body)) {
+    return res.status(400).json({ error: 'Object body required' });
+  }
+  try {
+    setAdminUserDefaults(req.body);
+    const authReq = req as AuthRequest;
+    writeAudit({
+      userId: authReq.user.id,
+      action: 'admin.default_user_settings_update',
+      ip: getClientIp(req),
+      details: req.body,
+    });
+    res.json(getAdminUserDefaults());
+  } catch (err: any) {
+    res.status(400).json({ error: err.message });
+  }
+});
+
 // ── Dev-only: test notification endpoints ──────────────────────────────────────
 if (process.env.NODE_ENV === 'development') {
  const { send } = require('../services/notificationService');
@@ -73,7 +73,7 @@ accommodationsRouter.post('/', authenticate, requireTripAccess, (req: Request, r
    return res.status(403).json({ error: 'No permission' });

  const { tripId } = req.params;
-  const { place_id, start_day_id, end_day_id, check_in, check_out, confirmation, notes } = req.body;
+  const { place_id, start_day_id, end_day_id, check_in, check_in_end, check_out, confirmation, notes } = req.body;

  if (!place_id || !start_day_id || !end_day_id) {
    return res.status(400).json({ error: 'place_id, start_day_id, and end_day_id are required' });
@@ -82,7 +82,7 @@ accommodationsRouter.post('/', authenticate, requireTripAccess, (req: Request, r
  const errors = dayService.validateAccommodationRefs(tripId, place_id, start_day_id, end_day_id);
  if (errors.length > 0) return res.status(404).json({ error: errors[0].message });

-  const accommodation = dayService.createAccommodation(tripId, { place_id, start_day_id, end_day_id, check_in, check_out, confirmation, notes });
+  const accommodation = dayService.createAccommodation(tripId, { place_id, start_day_id, end_day_id, check_in, check_in_end, check_out, confirmation, notes });
  res.status(201).json({ accommodation });
  broadcast(tripId, 'accommodation:created', { accommodation }, req.headers['x-socket-id'] as string);
  broadcast(tripId, 'reservation:created', {}, req.headers['x-socket-id'] as string);
@@ -98,12 +98,12 @@ accommodationsRouter.put('/:id', authenticate, requireTripAccess, (req: Request,
  const existing = dayService.getAccommodation(id, tripId);
  if (!existing) return res.status(404).json({ error: 'Accommodation not found' });

-  const { place_id, start_day_id, end_day_id, check_in, check_out, confirmation, notes } = req.body;
+  const { place_id, start_day_id, end_day_id, check_in, check_in_end, check_out, confirmation, notes } = req.body;

  const errors = dayService.validateAccommodationRefs(tripId, place_id, start_day_id, end_day_id);
  if (errors.length > 0) return res.status(404).json({ error: errors[0].message });

-  const accommodation = dayService.updateAccommodation(id, existing, { place_id, start_day_id, end_day_id, check_in, check_out, confirmation, notes });
+  const accommodation = dayService.updateAccommodation(id, existing, { place_id, start_day_id, end_day_id, check_in, check_in_end, check_out, confirmation, notes });
  res.json({ accommodation });
  broadcast(tripId, 'accommodation:updated', { accommodation }, req.headers['x-socket-id'] as string);
 });
@@ -1,7 +1,7 @@
 import express, { Request, Response } from 'express';
 import { authenticate } from '../middleware/auth';
 import { AuthRequest } from '../types';
-import { testSmtp, testWebhook, getAdminWebhookUrl, getUserWebhookUrl } from '../services/notifications';
+import { testSmtp, testWebhook, testNtfy, getAdminWebhookUrl, getUserWebhookUrl, getUserNtfyConfig, getAdminNtfyConfig } from '../services/notifications';
 import {
  getNotifications,
  getUnreadCount,
@@ -47,6 +47,26 @@ router.post('/test-webhook', authenticate, async (req: Request, res: Response) =
  res.json(await testWebhook(url));
 });

+router.post('/test-ntfy', authenticate, async (req: Request, res: Response) => {
+  const authReq = req as AuthRequest;
+  const { topic, server, token } = req.body as { topic?: string; server?: string; token?: string };
+
+  // Always load saved config for fallbacks (token may be masked or absent in request)
+  const userCfg = getUserNtfyConfig(authReq.user.id);
+  const adminCfg = getAdminNtfyConfig();
+
+  const resolvedTopic = topic || userCfg?.topic || undefined;
+  const resolvedServer = server || userCfg?.server || adminCfg.server || undefined;
+  // Reuse saved token when request sends null, empty, or the masked placeholder
+  const resolvedToken = (token && token !== '••••••••')
+    ? token
+    : (userCfg?.token ?? adminCfg.token ?? null);
+
+  if (!resolvedTopic) return res.status(400).json({ error: 'No ntfy topic configured' });
+
+  res.json(await testNtfy({ topic: resolvedTopic, server: resolvedServer ?? null, token: resolvedToken }));
+});
+
 // ── In-app notifications ──────────────────────────────────────────────────────

 // GET /in-app — list notifications (paginated)
@@ -5,7 +5,6 @@ import { requireTripAccess } from '../middleware/tripAccess';
 import { broadcast } from '../websocket';
 import { validateStringLengths } from '../middleware/validate';
 import { checkPermission } from '../services/permissions';
-import { isAddonEnabled } from '../services/adminService';
 import { AuthRequest } from '../types';
 import {
  listPlaces,
@@ -135,10 +134,6 @@ router.post('/import/naver-list', authenticate, requireTripAccess, async (req: R
  const authReq = req as AuthRequest;
  if (!checkPermission('place_edit', authReq.user.role, authReq.trip!.user_id, authReq.user.id, authReq.trip!.user_id !== authReq.user.id))
    return res.status(403).json({ error: 'No permission' });
-  if (!isAddonEnabled('naver_list_import')) {
-    return res.status(403).json({ error: 'Naver list import addon is disabled' });
-  }
-
  const { tripId } = req.params;
  const { url } = req.body;
  if (!url || typeof url !== 'string') return res.status(400).json({ error: 'URL is required' });
@@ -459,6 +459,31 @@ export function updateBagTracking(enabled: boolean) {
  return { enabled: !!enabled };
 }

+// ── Collab Features ───────────────────────────────────────────────────────
+
+const COLLAB_FEATURE_KEYS = ['collab_chat_enabled', 'collab_notes_enabled', 'collab_polls_enabled', 'collab_whatsnext_enabled'] as const;
+
+export function getCollabFeatures() {
+  const rows = db.prepare("SELECT key, value FROM app_settings WHERE key IN ('collab_chat_enabled', 'collab_notes_enabled', 'collab_polls_enabled', 'collab_whatsnext_enabled')").all() as { key: string; value: string }[];
+  const map: Record<string, string> = {};
+  for (const r of rows) map[r.key] = r.value;
+  return {
+    chat: map['collab_chat_enabled'] !== 'false',
+    notes: map['collab_notes_enabled'] !== 'false',
+    polls: map['collab_polls_enabled'] !== 'false',
+    whatsnext: map['collab_whatsnext_enabled'] !== 'false',
+  };
+}
+
+export function updateCollabFeatures(features: { chat?: boolean; notes?: boolean; polls?: boolean; whatsnext?: boolean }) {
+  const mapping: Record<string, string> = { chat: 'collab_chat_enabled', notes: 'collab_notes_enabled', polls: 'collab_polls_enabled', whatsnext: 'collab_whatsnext_enabled' };
+  const stmt = db.prepare("INSERT OR REPLACE INTO app_settings (key, value) VALUES (?, ?)");
+  for (const [feat, key] of Object.entries(mapping)) {
+    if (features[feat] !== undefined) stmt.run(key, features[feat] ? 'true' : 'false');
+  }
+  return getCollabFeatures();
+}
+
 // ── Packing Templates ──────────────────────────────────────────────────────

 export function listPackingTemplates() {
@@ -30,7 +30,7 @@ const MFA_BACKUP_CODE_COUNT = 10;
 const ADMIN_SETTINGS_KEYS = [
  'allow_registration', 'allowed_file_types', 'require_mfa',
  'smtp_host', 'smtp_port', 'smtp_user', 'smtp_pass', 'smtp_from', 'smtp_skip_tls_verify',
-  'notification_channels', 'admin_webhook_url',
+  'notification_channels', 'admin_webhook_url', 'admin_ntfy_server', 'admin_ntfy_topic', 'admin_ntfy_token',
  'password_login', 'password_registration', 'oidc_login', 'oidc_registration',
 ];

@@ -714,7 +714,7 @@ export function getAppSettings(userId: number): { error?: string; status?: numbe
  const result: Record<string, string> = {};
  for (const key of ADMIN_SETTINGS_KEYS) {
    const row = db.prepare("SELECT value FROM app_settings WHERE key = ?").get(key) as { value: string } | undefined;
-    if (row) result[key] = (key === 'smtp_pass' || key === 'admin_webhook_url') ? '••••••••' : row.value;
+    if (row) result[key] = (key === 'smtp_pass' || key === 'admin_webhook_url' || key === 'admin_ntfy_token') ? '••••••••' : row.value;
  }
  return { data: result };
 }
@@ -768,6 +768,8 @@ export function updateAppSettings(
      if (key === 'smtp_pass') val = encrypt_api_key(val);
      if (key === 'admin_webhook_url' && val === '••••••••') continue;
      if (key === 'admin_webhook_url' && val) val = maybe_encrypt_api_key(val) ?? val;
+      if (key === 'admin_ntfy_token' && val === '••••••••') continue;
+      if (key === 'admin_ntfy_token' && val) val = maybe_encrypt_api_key(val) ?? val;
      db.prepare("INSERT OR REPLACE INTO app_settings (key, value) VALUES (?, ?)").run(key, val);
    }
  }
@@ -778,6 +780,7 @@ export function updateAppSettings(
  const smtpChanged = changedKeys.some(k => k.startsWith('smtp_'));
  if (changedKeys.includes('notification_channels')) summary.notification_channels = body.notification_channels;
  if (changedKeys.includes('admin_webhook_url')) summary.admin_webhook_url_updated = true;
+  if (changedKeys.some(k => k.startsWith('admin_ntfy_'))) summary.admin_ntfy_updated = true;
  if (smtpChanged) summary.smtp_settings_updated = true;
  if (changedKeys.includes('allow_registration')) summary.allow_registration = body.allow_registration;
  if (changedKeys.includes('allowed_file_types')) summary.allowed_file_types_updated = true;
@@ -170,6 +170,7 @@ export interface DayAccommodation {
  start_day_id: number;
  end_day_id: number;
  check_in: string | null;
+  check_in_end: string | null;
  check_out: string | null;
  confirmation: string | null;
  notes: string | null;
@@ -220,17 +221,18 @@ interface CreateAccommodationData {
  start_day_id: number;
  end_day_id: number;
  check_in?: string;
+  check_in_end?: string;
  check_out?: string;
  confirmation?: string;
  notes?: string;
 }

 export function createAccommodation(tripId: string | number, data: CreateAccommodationData) {
-  const { place_id, start_day_id, end_day_id, check_in, check_out, confirmation, notes } = data;
+  const { place_id, start_day_id, end_day_id, check_in, check_in_end, check_out, confirmation, notes } = data;

  const result = db.prepare(
-    'INSERT INTO day_accommodations (trip_id, place_id, start_day_id, end_day_id, check_in, check_out, confirmation, notes) VALUES (?, ?, ?, ?, ?, ?, ?, ?)'
-  ).run(tripId, place_id, start_day_id, end_day_id, check_in || null, check_out || null, confirmation || null, notes || null);
+    'INSERT INTO day_accommodations (trip_id, place_id, start_day_id, end_day_id, check_in, check_in_end, check_out, confirmation, notes) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)'
+  ).run(tripId, place_id, start_day_id, end_day_id, check_in || null, check_in_end || null, check_out || null, confirmation || null, notes || null);

  const accommodationId = result.lastInsertRowid;

@@ -239,6 +241,7 @@ export function createAccommodation(tripId: string | number, data: CreateAccommo
  const startDayDate = (db.prepare('SELECT date FROM days WHERE id = ?').get(start_day_id) as { date: string } | undefined)?.date || null;
  const meta: Record<string, string> = {};
  if (check_in) meta.check_in_time = check_in;
+  if (check_in_end) meta.check_in_end_time = check_in_end;
  if (check_out) meta.check_out_time = check_out;
  db.prepare(`
    INSERT INTO reservations (trip_id, day_id, title, reservation_time, location, confirmation_number, notes, status, type, accommodation_id, metadata)
@@ -258,25 +261,27 @@ export function getAccommodation(id: string | number, tripId: string | number) {

 export function updateAccommodation(id: string | number, existing: DayAccommodation, fields: {
  place_id?: number; start_day_id?: number; end_day_id?: number;
-  check_in?: string; check_out?: string; confirmation?: string; notes?: string;
+  check_in?: string; check_in_end?: string; check_out?: string; confirmation?: string; notes?: string;
 }) {
  const newPlaceId = fields.place_id !== undefined ? fields.place_id : existing.place_id;
  const newStartDayId = fields.start_day_id !== undefined ? fields.start_day_id : existing.start_day_id;
  const newEndDayId = fields.end_day_id !== undefined ? fields.end_day_id : existing.end_day_id;
  const newCheckIn = fields.check_in !== undefined ? fields.check_in : existing.check_in;
+  const newCheckInEnd = fields.check_in_end !== undefined ? fields.check_in_end : existing.check_in_end;
  const newCheckOut = fields.check_out !== undefined ? fields.check_out : existing.check_out;
  const newConfirmation = fields.confirmation !== undefined ? fields.confirmation : existing.confirmation;
  const newNotes = fields.notes !== undefined ? fields.notes : existing.notes;

  db.prepare(
-    'UPDATE day_accommodations SET place_id = ?, start_day_id = ?, end_day_id = ?, check_in = ?, check_out = ?, confirmation = ?, notes = ? WHERE id = ?'
-  ).run(newPlaceId, newStartDayId, newEndDayId, newCheckIn, newCheckOut, newConfirmation, newNotes, id);
+    'UPDATE day_accommodations SET place_id = ?, start_day_id = ?, end_day_id = ?, check_in = ?, check_in_end = ?, check_out = ?, confirmation = ?, notes = ? WHERE id = ?'
+  ).run(newPlaceId, newStartDayId, newEndDayId, newCheckIn, newCheckInEnd, newCheckOut, newConfirmation, newNotes, id);

  // Sync check-in/out/confirmation to linked reservation
  const linkedRes = db.prepare('SELECT id, metadata FROM reservations WHERE accommodation_id = ?').get(Number(id)) as { id: number; metadata: string | null } | undefined;
  if (linkedRes) {
    const meta = linkedRes.metadata ? JSON.parse(linkedRes.metadata) : {};
    if (newCheckIn) meta.check_in_time = newCheckIn;
+    if (newCheckInEnd) meta.check_in_end_time = newCheckInEnd;
    if (newCheckOut) meta.check_out_time = newCheckOut;
    db.prepare('UPDATE reservations SET metadata = ?, confirmation_number = COALESCE(?, confirmation_number) WHERE id = ?')
      .run(JSON.stringify(meta), newConfirmation || null, linkedRes.id);
@@ -241,9 +241,10 @@ export async function streamImmichAsset(
  const creds = getImmichCredentials(effectiveUserId);
  if (!creds) return { error: 'Not found', status: 404 };

-  const path = kind === 'thumbnail' ? 'thumbnail' : 'original';
  const timeout = kind === 'thumbnail' ? 10000 : 30000;
-  const url = `${creds.immich_url}/api/assets/${assetId}/${path}`;
+  const url = kind === 'thumbnail'
+    ? `${creds.immich_url}/api/assets/${assetId}/thumbnail?size=thumbnail`
+    : `${creds.immich_url}/api/assets/${assetId}/thumbnail?size=fullsize`;

  response.set('Cache-Control', 'public, max-age=86400');
  await pipeAsset(url, response, { 'x-api-key': creds.immich_api_key }, AbortSignal.timeout(timeout));
@@ -3,7 +3,7 @@ import { decrypt_api_key } from './apiKeyCrypto';

 // ── Types ──────────────────────────────────────────────────────────────────

-export type NotifChannel = 'email' | 'webhook' | 'inapp';
+export type NotifChannel = 'email' | 'webhook' | 'inapp' | 'ntfy';

 export type NotifEventType =
  | 'trip_invite'
@@ -20,19 +20,20 @@ export interface AvailableChannels {
  email: boolean;
  webhook: boolean;
  inapp: boolean;
+  ntfy: boolean;
 }

 // Which channels are implemented for each event type.
 // Only implemented combos show toggles in the user preferences UI.
 const IMPLEMENTED_COMBOS: Record<NotifEventType, NotifChannel[]> = {
-  trip_invite:       ['inapp', 'email', 'webhook'],
-  booking_change:    ['inapp', 'email', 'webhook'],
-  trip_reminder:     ['inapp', 'email', 'webhook'],
-  vacay_invite:      ['inapp', 'email', 'webhook'],
-  photos_shared:     ['inapp', 'email', 'webhook'],
-  collab_message:    ['inapp', 'email', 'webhook'],
-  packing_tagged:    ['inapp', 'email', 'webhook'],
-  version_available: ['inapp', 'email', 'webhook'],
+  trip_invite:       ['inapp', 'email', 'webhook', 'ntfy'],
+  booking_change:    ['inapp', 'email', 'webhook', 'ntfy'],
+  trip_reminder:     ['inapp', 'email', 'webhook', 'ntfy'],
+  vacay_invite:      ['inapp', 'email', 'webhook', 'ntfy'],
+  photos_shared:     ['inapp', 'email', 'webhook', 'ntfy'],
+  collab_message:    ['inapp', 'email', 'webhook', 'ntfy'],
+  packing_tagged:    ['inapp', 'email', 'webhook', 'ntfy'],
+  version_available: ['inapp', 'email', 'webhook', 'ntfy'],
  synology_session_cleared: ['inapp'],
 };

@@ -55,7 +56,7 @@ function getAppSetting(key: string): string | null {
 export function getActiveChannels(): NotifChannel[] {
  const raw = getAppSetting('notification_channels') || getAppSetting('notification_channel') || 'none';
  if (raw === 'none') return [];
-  return raw.split(',').map(c => c.trim()).filter((c): c is NotifChannel => c === 'email' || c === 'webhook');
+  return raw.split(',').map(c => c.trim()).filter((c): c is NotifChannel => c === 'email' || c === 'webhook' || c === 'ntfy');
 }

 /**
@@ -64,8 +65,8 @@ export function getActiveChannels(): NotifChannel[] {
 */
 export function getAvailableChannels(): AvailableChannels {
  const hasSmtp = !!(process.env.SMTP_HOST || getAppSetting('smtp_host'));
-  const hasWebhook = getActiveChannels().includes('webhook');
-  return { email: hasSmtp, webhook: hasWebhook, inapp: true };
+  const activeChannels = getActiveChannels();
+  return { email: hasSmtp, webhook: activeChannels.includes('webhook'), ntfy: activeChannels.includes('ntfy'), inapp: true };
 }

 // ── Per-user preference checks ─────────────────────────────────────────────
@@ -88,6 +89,7 @@ export interface PreferencesMatrix {
  available_channels: AvailableChannels;
  event_types: NotifEventType[];
  implemented_combos: Record<NotifEventType, NotifChannel[]>;
+  defaults?: { ntfyServer: string | null };
 }

 /**
@@ -115,8 +117,8 @@ export function getPreferencesMatrix(userId: number, userRole: string, scope: 'u
    const channels = IMPLEMENTED_COMBOS[eventType];
    preferences[eventType] = {};
    for (const channel of channels) {
-      // Admin-scoped events use global settings for email/webhook
-      if (scope === 'admin' && ADMIN_SCOPED_EVENTS.has(eventType) && (channel === 'email' || channel === 'webhook')) {
+      // Admin-scoped events use global settings for email/webhook/ntfy
+      if (scope === 'admin' && ADMIN_SCOPED_EVENTS.has(eventType) && (channel === 'email' || channel === 'webhook' || channel === 'ntfy')) {
        preferences[eventType]![channel] = getAdminGlobalPref(eventType, channel);
      } else {
        preferences[eventType]![channel] = stored[eventType]?.[channel] ?? true;
@@ -134,12 +136,14 @@ export function getPreferencesMatrix(userId: number, userRole: string, scope: 'u
  if (scope === 'admin') {
    const hasSmtp = !!(process.env.SMTP_HOST || getAppSetting('smtp_host'));
    const hasAdminWebhook = !!(getAppSetting('admin_webhook_url'));
-    available_channels = { email: hasSmtp, webhook: hasAdminWebhook, inapp: true };
+    const hasAdminNtfy = !!(getAppSetting('admin_ntfy_topic'));
+    available_channels = { email: hasSmtp, webhook: hasAdminWebhook, ntfy: hasAdminNtfy, inapp: true };
  } else {
    const activeChannels = getActiveChannels();
    available_channels = {
      email: activeChannels.includes('email'),
      webhook: activeChannels.includes('webhook'),
+      ntfy: activeChannels.includes('ntfy'),
      inapp: true,
    };
  }
@@ -149,24 +153,25 @@ export function getPreferencesMatrix(userId: number, userRole: string, scope: 'u
    available_channels,
    event_types,
    implemented_combos: IMPLEMENTED_COMBOS,
+    ...(scope === 'user' && { defaults: { ntfyServer: getAppSetting('admin_ntfy_server') || null } }),
  };
 }

 // ── Admin global preferences (stored in app_settings) ─────────────────────

-const ADMIN_GLOBAL_CHANNELS: NotifChannel[] = ['email', 'webhook'];
+const ADMIN_GLOBAL_CHANNELS: NotifChannel[] = ['email', 'webhook', 'ntfy'];

 /**
 * Returns the global admin preference for an event+channel.
 * Stored in app_settings as `admin_notif_pref_{event}_{channel}`.
 * Defaults to true (enabled) when no row exists.
 */
-export function getAdminGlobalPref(event: NotifEventType, channel: 'email' | 'webhook'): boolean {
+export function getAdminGlobalPref(event: NotifEventType, channel: 'email' | 'webhook' | 'ntfy'): boolean {
  const val = getAppSetting(`admin_notif_pref_${event}_${channel}`);
  return val !== '0';
 }

-function setAdminGlobalPref(event: NotifEventType, channel: 'email' | 'webhook', enabled: boolean): void {
+function setAdminGlobalPref(event: NotifEventType, channel: 'email' | 'webhook' | 'ntfy', enabled: boolean): void {
  db.prepare('INSERT OR REPLACE INTO app_settings (key, value) VALUES (?, ?)').run(
    `admin_notif_pref_${event}_${channel}`,
    enabled ? '1' : '0'
@@ -250,7 +255,7 @@ export function setAdminPreferences(
  for (const [eventType, channels] of Object.entries(globalPrefs)) {
    if (!channels) continue;
    for (const [channel, enabled] of Object.entries(channels)) {
-      setAdminGlobalPref(eventType as NotifEventType, channel as 'email' | 'webhook', enabled);
+      setAdminGlobalPref(eventType as NotifEventType, channel as 'email' | 'webhook' | 'ntfy', enabled);
    }
  }

@@ -7,15 +7,20 @@ import {
  isSmtpConfigured,
  ADMIN_SCOPED_EVENTS,
  type NotifEventType,
+  type NotifChannel,
 } from './notificationPreferencesService';
 import {
  getEventText,
  sendEmail,
  sendWebhook,
+  sendNtfy,
  getUserEmail,
  getUserLanguage,
  getUserWebhookUrl,
  getAdminWebhookUrl,
+  getUserNtfyConfig,
+  getAdminNtfyConfig,
+  resolveNtfyUrl,
  getAppUrl,
 } from './notifications';
 import {
@@ -270,6 +275,19 @@ export async function send(payload: NotificationPayload): Promise<void> {
      }
    }

+    // ── Ntfy (per-user) — skip for admin-scoped events (handled globally below) ──
+    if (!ADMIN_SCOPED_EVENTS.has(event) && activeChannels.includes('ntfy') && isEnabledForEvent(recipientId, event, 'ntfy' as NotifChannel)) {
+      const userNtfyCfg = getUserNtfyConfig(recipientId);
+      const adminNtfyCfg = getAdminNtfyConfig();
+      const ntfyUrl = resolveNtfyUrl(adminNtfyCfg, userNtfyCfg);
+      if (ntfyUrl) {
+        const lang = getUserLanguage(recipientId);
+        const { title, body } = getEventText(lang, event, params);
+        const token = userNtfyCfg?.token ?? adminNtfyCfg.token;
+        promises.push(sendNtfy(ntfyUrl, token, { event, title, body, link: fullLink }));
+      }
+    }
+
    const results = await Promise.allSettled(promises);
    for (const result of results) {
      if (result.status === 'rejected') {
@@ -288,4 +306,16 @@ export async function send(payload: NotificationPayload): Promise<void> {
      });
    }
  }
+
+  // ── Admin ntfy (scope: admin) — global, respects global pref ─────────
+  if (scope === 'admin' && getAdminGlobalPref(event, 'ntfy')) {
+    const adminNtfyCfg = getAdminNtfyConfig();
+    const adminNtfyUrl = resolveNtfyUrl(adminNtfyCfg, null);
+    if (adminNtfyUrl) {
+      const { title, body } = getEventText('en', event, params);
+      await sendNtfy(adminNtfyUrl, adminNtfyCfg.token, { event, title, body, link: fullLink }).catch((err: unknown) => {
+        logError(`notificationService.send admin ntfy failed event=${event}: ${err instanceof Error ? err.message : err}`);
+      });
+    }
+  }
 }
@@ -88,6 +88,7 @@ const I18N: Record<string, EmailStrings> = {
  zh: { footer: '您收到此邮件是因为您在 TREK 中启用了通知。', manage: '管理偏好设置', madeWith: 'Made with', openTrek: '打开 TREK' },
  'zh-TW': { footer: '您收到這封郵件是因為您在 TREK 中啟用了通知。', manage: '管理偏好設定', madeWith: 'Made with', openTrek: '開啟 TREK' },
  ar: { footer: 'تلقيت هذا لأنك قمت بتفعيل الإشعارات في TREK.', manage: 'إدارة التفضيلات', madeWith: 'Made with', openTrek: 'فتح TREK' },
+  id: { footer: 'Anda menerima ini karena Anda telah mengaktifkan notifikasi di TREK.', manage: 'Kelola preferensi di Pengaturan', madeWith: 'Dibuat dengan', openTrek: 'Buka TREK' },
 };

 // Translated notification texts per event type
@@ -249,6 +250,16 @@ const EVENT_TEXTS: Record<string, Record<NotifEventType, EventTextFn>> = {
    version_available: p => ({ title: 'Nowa wersja TREK dostępna', body: `TREK ${p.version} jest teraz dostępny. Odwiedź panel administracyjny, aby zaktualizować.` }),
    synology_session_cleared: () => ({ title: 'Sesja Synology wyczyszczona', body: 'Twoje konto lub URL Synology uległo zmianie. Zostałeś wylogowany z Synology Photos.' }),
  },
+  id: {
+    trip_invite: p => ({ title: `Undangan perjalanan: "${p.trip}"`, body: `${p.actor} mengundang ${p.invitee || 'seorang anggota'} ke perjalanan "${p.trip}".` }),
+    booking_change: p => ({ title: `Pemesanan baru: ${p.booking}`, body: `${p.actor} menambahkan "${p.booking}" (${p.type}) baru ke "${p.trip}".` }),
+    trip_reminder: p => ({ title: `Pengingat perjalanan: ${p.trip}`, body: `Perjalanan Anda "${p.trip}" akan segera tiba!` }),
+    vacay_invite: p => ({ title: 'Undangan Penggabungan Vacay', body: `${p.actor} mengundang Anda untuk menggabungkan rencana liburan. Buka TREK untuk menerima atau menolak.` }),
+    photos_shared: p => ({ title: `${p.count} foto dibagikan`, body: `${p.actor} membagikan ${p.count} foto di "${p.trip}".` }),
+    collab_message: p => ({ title: `Pesan baru di "${p.trip}"`, body: `${p.actor}: ${p.preview}` }),
+    packing_tagged: p => ({ title: `Pengepakan: ${p.category}`, body: `${p.actor} menugaskan Anda ke kategori "${p.category}" di "${p.trip}".` }),
+    version_available: p => ({ title: 'Versi TREK baru tersedia', body: `TREK ${p.version} sekarang tersedia. Kunjungi panel admin untuk memperbarui.` }),
+  },
 };

 // Get localized event text
@@ -431,3 +442,134 @@ export async function testWebhook(url: string): Promise<{ success: boolean; erro
  }
 }

+// ── Ntfy ──────────────────────────────────────────────────────────────────
+
+export interface NtfyConfig {
+  server: string | null;
+  topic: string | null;
+  token: string | null;
+}
+
+/** Priority and tags mapped to each notification event type. */
+const NTFY_EVENT_META: Partial<Record<NotifEventType, { priority: 1 | 2 | 3 | 4 | 5; tags: string[] }>> = {
+  trip_invite:              { priority: 4, tags: ['loudspeaker'] },
+  booking_change:           { priority: 3, tags: ['calendar'] },
+  trip_reminder:            { priority: 4, tags: ['bell', 'alarm_clock'] },
+  vacay_invite:             { priority: 4, tags: ['palm_tree'] },
+  photos_shared:            { priority: 3, tags: ['camera'] },
+  collab_message:           { priority: 3, tags: ['speech_balloon'] },
+  packing_tagged:           { priority: 3, tags: ['luggage'] },
+  version_available:        { priority: 4, tags: ['package'] },
+  synology_session_cleared: { priority: 3, tags: ['warning'] },
+};
+const NTFY_DEFAULT_META = { priority: 3 as const, tags: [] as string[] };
+
+export function getUserNtfyConfig(userId: number): NtfyConfig | null {
+  const rows = db.prepare(
+    "SELECT key, value FROM settings WHERE user_id = ? AND key IN ('ntfy_topic', 'ntfy_server', 'ntfy_token')"
+  ).all(userId) as { key: string; value: string }[];
+  if (rows.length === 0) return null;
+  const map: Record<string, string> = {};
+  for (const r of rows) map[r.key] = r.value;
+  return {
+    topic: map['ntfy_topic'] || null,
+    server: map['ntfy_server'] || null,
+    token: map['ntfy_token'] ? decrypt_api_key(map['ntfy_token']) : null,
+  };
+}
+
+export function getAdminNtfyConfig(): NtfyConfig {
+  const topic = getAppSetting('admin_ntfy_topic') || null;
+  const server = getAppSetting('admin_ntfy_server') || null;
+  const rawToken = getAppSetting('admin_ntfy_token') || null;
+  return {
+    topic,
+    server,
+    token: rawToken ? decrypt_api_key(rawToken) : null,
+  };
+}
+
+/**
+ * Resolve the ntfy POST URL from admin base config + user override.
+ * Returns null if topic cannot be determined.
+ */
+export function resolveNtfyUrl(adminCfg: NtfyConfig, userCfg: NtfyConfig | null): string | null {
+  const topic = userCfg?.topic || adminCfg.topic;
+  if (!topic) return null;
+  const base = (userCfg?.server || adminCfg.server || 'https://ntfy.sh').replace(/\/+$/, '');
+  return `${base}/${encodeURIComponent(topic)}`;
+}
+
+export function isNtfyConfiguredForUser(userId: number): boolean {
+  const cfg = getUserNtfyConfig(userId);
+  return !!(cfg?.topic);
+}
+
+export function isNtfyConfiguredAdmin(): boolean {
+  return !!(getAppSetting('admin_ntfy_topic'));
+}
+
+export async function sendNtfy(
+  url: string,
+  token: string | null,
+  payload: { event: string; title: string; body: string; link?: string },
+): Promise<boolean> {
+  if (!url) return false;
+
+  const ssrf = await checkSsrf(url);
+  if (!ssrf.allowed) {
+    logError(`Ntfy blocked by SSRF guard event=${payload.event} url=${url} reason=${ssrf.error}`);
+    return false;
+  }
+
+  const meta = NTFY_EVENT_META[payload.event as NotifEventType] ?? NTFY_DEFAULT_META;
+
+  // ntfy header-based API: POST to topic URL, body = plain text message, metadata in headers
+  const headers: Record<string, string> = {
+    'Title': payload.title,
+    'Priority': String(meta.priority),
+  };
+  if (meta.tags.length > 0) headers['Tags'] = meta.tags.join(',');
+  if (payload.link) headers['Click'] = payload.link;
+  if (token) headers['Authorization'] = `Bearer ${token}`;
+
+  try {
+    const res = await fetch(url, {
+      method: 'POST',
+      headers,
+      body: payload.body,
+      signal: AbortSignal.timeout(10000),
+      dispatcher: createPinnedDispatcher(ssrf.resolvedIp!),
+    } as any);
+
+    if (!res.ok) {
+      const errBody = await res.text().catch(() => '');
+      logError(`Ntfy HTTP ${res.status}: ${errBody}`);
+      return false;
+    }
+
+    logInfo(`Ntfy sent event=${payload.event}`);
+    logDebug(`Ntfy url=${url} priority=${meta.priority} tags=${meta.tags.join(',')}`);
+    return true;
+  } catch (err) {
+    logError(`Ntfy failed event=${payload.event}: ${err instanceof Error ? err.message : err}`);
+    return false;
+  }
+}
+
+export async function testNtfy(cfg: { topic: string; server?: string | null; token?: string | null }): Promise<{ success: boolean; error?: string }> {
+  const adminCfg = getAdminNtfyConfig();
+  const url = resolveNtfyUrl(adminCfg, { topic: cfg.topic, server: cfg.server ?? null, token: cfg.token ?? null });
+  if (!url) return { success: false, error: 'Could not resolve ntfy URL — missing topic' };
+  try {
+    const sent = await sendNtfy(url, cfg.token ?? null, {
+      event: 'test',
+      title: 'Test Notification',
+      body: 'This is a test notification from TREK. If you received this, your ntfy configuration is working correctly.',
+    });
+    return sent ? { success: true } : { success: false, error: 'Failed to send ntfy notification' };
+  } catch (err) {
+    return { success: false, error: err instanceof Error ? err.message : 'Unknown error' };
+  }
+}
+
@@ -123,9 +123,9 @@ export function createReservation(tripId: string | number, data: CreateReservati
  // Sync check-in/out to accommodation if linked
  if (accommodation_id && metadata) {
    const meta = typeof metadata === 'string' ? JSON.parse(metadata) : metadata;
-    if (meta.check_in_time || meta.check_out_time) {
-      db.prepare('UPDATE day_accommodations SET check_in = COALESCE(?, check_in), check_out = COALESCE(?, check_out) WHERE id = ?')
-        .run(meta.check_in_time || null, meta.check_out_time || null, accommodation_id);
+    if (meta.check_in_time || meta.check_in_end_time || meta.check_out_time) {
+      db.prepare('UPDATE day_accommodations SET check_in = COALESCE(?, check_in), check_in_end = COALESCE(?, check_in_end), check_out = COALESCE(?, check_out) WHERE id = ?')
+        .run(meta.check_in_time || null, meta.check_in_end_time || null, meta.check_out_time || null, accommodation_id);
    }
    if (confirmation_number) {
      db.prepare('UPDATE day_accommodations SET confirmation = COALESCE(?, confirmation) WHERE id = ?')
@@ -257,9 +257,9 @@ export function updateReservation(id: string | number, tripId: string | number,
  const resolvedMeta = metadata !== undefined ? metadata : (current.metadata ? JSON.parse(current.metadata as string) : null);
  if (resolvedAccId && resolvedMeta) {
    const meta = typeof resolvedMeta === 'string' ? JSON.parse(resolvedMeta) : resolvedMeta;
-    if (meta.check_in_time || meta.check_out_time) {
-      db.prepare('UPDATE day_accommodations SET check_in = COALESCE(?, check_in), check_out = COALESCE(?, check_out) WHERE id = ?')
-        .run(meta.check_in_time || null, meta.check_out_time || null, resolvedAccId);
+    if (meta.check_in_time || meta.check_in_end_time || meta.check_out_time) {
+      db.prepare('UPDATE day_accommodations SET check_in = COALESCE(?, check_in), check_in_end = COALESCE(?, check_in_end), check_out = COALESCE(?, check_out) WHERE id = ?')
+        .run(meta.check_in_time || null, meta.check_in_end_time || null, meta.check_out_time || null, resolvedAccId);
    }
    const resolvedConf = confirmation_number !== undefined ? confirmation_number : current.confirmation_number;
    if (resolvedConf) {
@@ -1,23 +1,101 @@
 import { db } from '../db/database';
 import { maybe_encrypt_api_key } from './apiKeyCrypto';

-const ENCRYPTED_SETTING_KEYS = new Set(['webhook_url']);
+const ENCRYPTED_SETTING_KEYS = new Set(['webhook_url', 'ntfy_token']);
+
+export const DEFAULTABLE_USER_SETTING_KEYS = [
+  'temperature_unit',
+  'dark_mode',
+  'time_format',
+  'route_calculation',
+  'blur_booking_codes',
+  'map_tile_url',
+] as const;
+
+type DefaultableKey = typeof DEFAULTABLE_USER_SETTING_KEYS[number];
+
+const VALID_VALUES: Partial<Record<DefaultableKey, unknown[]>> = {
+  temperature_unit: ['fahrenheit', 'celsius'],
+  time_format: ['12h', '24h'],
+  dark_mode: [true, false, 'light', 'dark', 'auto'],
+};
+
+const BOOLEAN_KEYS = new Set<DefaultableKey>(['route_calculation', 'blur_booking_codes']);
+
+function parseValue(raw: string): unknown {
+  try { return JSON.parse(raw); } catch { return raw; }
+}
+
+export function getAdminUserDefaults(): Record<string, unknown> {
+  const rows = db.prepare(
+    "SELECT key, value FROM app_settings WHERE key LIKE 'default_user_setting_%'"
+  ).all() as { key: string; value: string }[];
+  const defaults: Record<string, unknown> = {};
+  for (const row of rows) {
+    const settingKey = row.key.slice('default_user_setting_'.length);
+    defaults[settingKey] = parseValue(row.value);
+  }
+  return defaults;
+}
+
+export function setAdminUserDefaults(partial: Record<string, unknown>): void {
+  const upsert = db.prepare(
+    `INSERT INTO app_settings (key, value) VALUES (?, ?)
+     ON CONFLICT(key) DO UPDATE SET value = excluded.value`
+  );
+  const del = db.prepare("DELETE FROM app_settings WHERE key = ?");
+
+  db.exec('BEGIN');
+  try {
+    for (const [key, value] of Object.entries(partial)) {
+      if (!(DEFAULTABLE_USER_SETTING_KEYS as readonly string[]).includes(key)) {
+        throw new Error(`Invalid setting key: ${key}`);
+      }
+      const typedKey = key as DefaultableKey;
+      const appKey = `default_user_setting_${key}`;
+
+      // null/undefined means "reset to built-in default" — delete the row
+      if (value === null || value === undefined) {
+        del.run(appKey);
+        continue;
+      }
+
+      if (BOOLEAN_KEYS.has(typedKey) && typeof value !== 'boolean') {
+        throw new Error(`Setting ${key} must be a boolean`);
+      }
+      const allowed = VALID_VALUES[typedKey];
+      if (allowed && !allowed.includes(value)) {
+        throw new Error(`Invalid value for ${key}: ${value}`);
+      }
+
+      upsert.run(appKey, JSON.stringify(value));
+    }
+    db.exec('COMMIT');
+  } catch (err) {
+    db.exec('ROLLBACK');
+    throw err;
+  }
+}

 export function getUserSettings(userId: number): Record<string, unknown> {
+  const adminDefaults = getAdminUserDefaults();
+
  const rows = db.prepare('SELECT key, value FROM settings WHERE user_id = ?').all(userId) as { key: string; value: string }[];
-  const settings: Record<string, unknown> = {};
+  const userSettings: Record<string, unknown> = {};
  for (const row of rows) {
    if (ENCRYPTED_SETTING_KEYS.has(row.key)) {
-      settings[row.key] = row.value ? '••••••••' : '';
+      userSettings[row.key] = row.value ? '••••••••' : '';
      continue;
    }
    try {
-      settings[row.key] = JSON.parse(row.value);
+      userSettings[row.key] = JSON.parse(row.value);
    } catch {
-      settings[row.key] = row.value;
+      userSettings[row.key] = row.value;
    }
  }
-  return settings;
+
+  // Admin defaults fill in only for keys the user hasn't explicitly set
+  return { ...adminDefaults, ...userSettings };
 }

 function serializeValue(key: string, value: unknown): string {
@@ -407,7 +407,7 @@ describe('Immich asset proxy', () => {
      .set('Cookie', authCookie(member.id));

    expect(res.status).toBe(200);
-    expect(res.headers['content-type']).toContain('image/jpeg');
+    expect(res.headers['content-type']).toContain('image/');
  });

  it('IMMICH-057 — GET /assets/info where trip does not exist returns 403', async () => {
@@ -348,6 +348,43 @@ describe('Notification test endpoints', () => {
    expect(res.status).toBe(200);
    expect(res.body).toHaveProperty('success');
  });
+
+  it('NOTIF-007 — POST /api/notifications/test-ntfy returns 400 when no topic configured', async () => {
+    const { user } = createUser(testDb);
+
+    const res = await request(app)
+      .post('/api/notifications/test-ntfy')
+      .set('Cookie', authCookie(user.id))
+      .send({});
+
+    expect(res.status).toBe(400);
+    expect(res.body).toHaveProperty('error');
+  });
+
+  it('NOTIF-008 — POST /api/notifications/test-ntfy with explicit topic returns 200', async () => {
+    const { user } = createUser(testDb);
+
+    const res = await request(app)
+      .post('/api/notifications/test-ntfy')
+      .set('Cookie', authCookie(user.id))
+      .send({ topic: 'trek-integration-test-topic' });
+
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('success');
+  });
+
+  it('NOTIF-009 — POST /api/notifications/test-ntfy falls back to user saved topic', async () => {
+    const { user } = createUser(testDb);
+    testDb.prepare("INSERT OR REPLACE INTO settings (user_id, key, value) VALUES (?, 'ntfy_topic', 'saved-user-topic')").run(user.id);
+
+    const res = await request(app)
+      .post('/api/notifications/test-ntfy')
+      .set('Cookie', authCookie(user.id))
+      .send({});
+
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('success');
+  });
 });

 // ─────────────────────────────────────────────────────────────────────────────
@@ -525,21 +525,6 @@ describe('Naver list import', () => {
    vi.unstubAllGlobals();
  });

-  it('POST /import/naver-list returns 403 when addon is disabled', async () => {
-    const { user } = createUser(testDb);
-    const trip = createTrip(testDb, user.id);
-
-    testDb.prepare("UPDATE addons SET enabled = 0 WHERE id = 'naver_list_import'").run();
-
-    const res = await request(app)
-      .post(`/api/trips/${trip.id}/places/import/naver-list`)
-      .set('Cookie', authCookie(user.id))
-      .send({ url: 'https://naver.me/GYDpx3Wv' });
-
-    expect(res.status).toBe(403);
-    expect(res.body.error).toContain('addon is disabled');
-  });
-
  it('POST /import/naver-list resolves shortlink, paginates, and creates places', async () => {
    const { user } = createUser(testDb);
    const trip = createTrip(testDb, user.id);
@@ -153,14 +153,15 @@ describe('getPreferencesMatrix', () => {
    expect(available_channels.email).toBe(false);
  });

-  it('NPREF-011 — implemented_combos maps version_available to [inapp, email, webhook]', () => {
+  it('NPREF-011 — implemented_combos maps version_available to [inapp, email, webhook, ntfy]', () => {
    const { user } = createAdmin(testDb);
    const { implemented_combos } = getPreferencesMatrix(user.id, 'admin', 'admin');
-    expect(implemented_combos['version_available']).toEqual(['inapp', 'email', 'webhook']);
-    // All events now support all three channels
+    expect(implemented_combos['version_available']).toEqual(['inapp', 'email', 'webhook', 'ntfy']);
+    // All events now support all four channels
    expect(implemented_combos['trip_invite']).toContain('inapp');
    expect(implemented_combos['trip_invite']).toContain('email');
    expect(implemented_combos['trip_invite']).toContain('webhook');
+    expect(implemented_combos['trip_invite']).toContain('ntfy');
  });
 });

@@ -458,3 +458,72 @@ describe('send() — channel failure resilience', () => {
    expect(countAllNotifications()).toBe(1);
  });
 });
+
+// ── Ntfy dispatch ─────────────────────────────────────────────────────────────
+
+function setUserNtfyTopic(userId: number, topic = 'my-trek-topic'): void {
+  testDb.prepare("INSERT OR REPLACE INTO settings (user_id, key, value) VALUES (?, 'ntfy_topic', ?)").run(userId, topic);
+}
+
+function setAdminNtfyTopic(topic = 'trek-admin-alerts'): void {
+  setAppSetting(testDb, 'admin_ntfy_topic', topic);
+}
+
+describe('send() — ntfy channel dispatch', () => {
+  beforeEach(() => {
+    fetchMock.mockResolvedValue({ ok: true, text: async () => '' });
+  });
+
+  it('NTFY-SVCB-001 — ntfy fires when channel active and user has topic configured', async () => {
+    const { user } = createUser(testDb);
+    setUserNtfyTopic(user.id);
+    setNotificationChannels(testDb, 'ntfy');
+    const tripId = (testDb.prepare('INSERT INTO trips (title, user_id) VALUES (?, ?)').run('Tokyo', user.id)).lastInsertRowid as number;
+
+    await send({ event: 'trip_invite', actorId: null, scope: 'user', targetId: user.id, params: { trip: 'Tokyo', actor: 'Alice', invitee: 'Bob', tripId: String(tripId) } });
+
+    const ntfyCalls = fetchMock.mock.calls.filter(([url]: [string]) => url.includes('ntfy.sh'));
+    expect(ntfyCalls.length).toBeGreaterThan(0);
+    // Header-based API: metadata in headers, body = plain text
+    expect(ntfyCalls[0][1].headers['Priority']).toBe('4'); // trip_invite = high priority
+    expect(ntfyCalls[0][1].headers['Tags']).toContain('loudspeaker');
+  });
+
+  it('NTFY-SVCB-002 — ntfy skips when channel not in active channels', async () => {
+    const { user } = createUser(testDb);
+    setUserNtfyTopic(user.id);
+    setNotificationChannels(testDb, 'none');
+
+    fetchMock.mockClear();
+    await send({ event: 'trip_invite', actorId: null, scope: 'user', targetId: user.id, params: { trip: 'Paris', actor: 'Alice', invitee: 'Bob', tripId: '1' } });
+
+    const ntfyCalls = fetchMock.mock.calls.filter(([url]: [string]) => url.includes('ntfy.sh'));
+    expect(ntfyCalls.length).toBe(0);
+  });
+
+  it('NTFY-SVCB-003 — ntfy skips when user has no topic configured', async () => {
+    const { user } = createUser(testDb);
+    setNotificationChannels(testDb, 'ntfy');
+    // No ntfy_topic set, but no admin_ntfy_server either — resolveNtfyUrl returns null
+
+    fetchMock.mockClear();
+    await send({ event: 'trip_invite', actorId: null, scope: 'user', targetId: user.id, params: { trip: 'Rome', actor: 'Alice', invitee: 'Bob', tripId: '1' } });
+
+    const ntfyCalls = fetchMock.mock.calls.filter(([url]: [string]) => url.includes('ntfy.sh'));
+    expect(ntfyCalls.length).toBe(0);
+  });
+
+  it('NTFY-SVCB-004 — admin-scoped version_available fires admin ntfy topic', async () => {
+    createAdmin(testDb);
+    setAdminNtfyTopic();
+    setNotificationChannels(testDb, 'none');
+
+    fetchMock.mockClear();
+    await send({ event: 'version_available', actorId: null, scope: 'admin', targetId: 0, params: { version: '3.0.0' } });
+
+    const ntfyCalls = fetchMock.mock.calls.filter(([url]: [string]) => url.includes('ntfy.sh'));
+    expect(ntfyCalls.length).toBeGreaterThan(0);
+    expect(ntfyCalls[0][1].headers['Priority']).toBe('4'); // version_available = high priority
+    expect(ntfyCalls[0][1].headers['Tags']).toContain('package');
+  });
+});
@@ -24,7 +24,7 @@ vi.mock('../../../src/utils/ssrfGuard', () => ({
  createPinnedDispatcher: vi.fn(() => ({})),
 }));

-import { getEventText, buildEmailHtml, buildWebhookBody, sendWebhook } from '../../../src/services/notifications';
+import { getEventText, buildEmailHtml, buildWebhookBody, sendWebhook, sendNtfy, resolveNtfyUrl, type NtfyConfig } from '../../../src/services/notifications';
 import { checkSsrf } from '../../../src/utils/ssrfGuard';
 import { logError } from '../../../src/services/auditLog';

@@ -319,3 +319,140 @@ describe('sendWebhook SSRF protection (SEC-017)', () => {
 });

 afterAll(() => vi.unstubAllGlobals());
+
+// ── resolveNtfyUrl ────────────────────────────────────────────────────────────
+
+describe('resolveNtfyUrl', () => {
+  const adminCfg: NtfyConfig = { server: 'https://ntfy.sh', topic: 'admin-topic', token: null };
+
+  it('uses admin server + admin topic when no user config', () => {
+    expect(resolveNtfyUrl(adminCfg, null)).toBe('https://ntfy.sh/admin-topic');
+  });
+
+  it('uses user topic over admin topic', () => {
+    const user: NtfyConfig = { server: null, topic: 'my-topic', token: null };
+    expect(resolveNtfyUrl(adminCfg, user)).toBe('https://ntfy.sh/my-topic');
+  });
+
+  it('uses user server override', () => {
+    const user: NtfyConfig = { server: 'https://ntfy.example.com', topic: 'my-topic', token: null };
+    expect(resolveNtfyUrl(adminCfg, user)).toBe('https://ntfy.example.com/my-topic');
+  });
+
+  it('strips trailing slash from server', () => {
+    const admin: NtfyConfig = { server: 'https://ntfy.sh/', topic: 'alerts', token: null };
+    expect(resolveNtfyUrl(admin, null)).toBe('https://ntfy.sh/alerts');
+  });
+
+  it('returns null when no topic in admin or user config', () => {
+    const noTopic: NtfyConfig = { server: 'https://ntfy.sh', topic: null, token: null };
+    expect(resolveNtfyUrl(noTopic, null)).toBeNull();
+  });
+
+  it('falls back to https://ntfy.sh when no server configured', () => {
+    const noServer: NtfyConfig = { server: null, topic: 'my-topic', token: null };
+    expect(resolveNtfyUrl(noServer, null)).toBe('https://ntfy.sh/my-topic');
+  });
+});
+
+// ── sendNtfy ─────────────────────────────────────────────────────────────────
+
+describe('sendNtfy', () => {
+  const ntfyUrl = 'https://ntfy.sh/trek-test';
+  const payload = { event: 'trip_invite', title: 'Test Title', body: 'Test body' };
+
+  beforeEach(() => {
+    vi.mocked(logError).mockClear();
+    (globalThis.fetch as ReturnType<typeof vi.fn>).mockClear();
+    vi.mocked(checkSsrf).mockResolvedValue({ allowed: true, isPrivate: false, resolvedIp: '1.2.3.4' });
+  });
+
+  it('NTFY-001 — sends POST to topic URL with plain text body and metadata in headers', async () => {
+    const mockFetch = globalThis.fetch as unknown as ReturnType<typeof vi.fn>;
+    mockFetch.mockResolvedValueOnce({ ok: true, text: async () => '' } as never);
+
+    const result = await sendNtfy(ntfyUrl, null, payload);
+    expect(result).toBe(true);
+    expect(mockFetch).toHaveBeenCalledOnce();
+
+    const [calledUrl, calledOpts] = mockFetch.mock.calls[0];
+    expect(calledUrl).toBe(ntfyUrl);
+    // Body should be plain text, not JSON
+    expect(calledOpts.body).toBe('Test body');
+    // Title, Priority, Tags go in headers
+    expect(calledOpts.headers['Title']).toBe('Test Title');
+    expect(calledOpts.headers['Priority']).toBe('4'); // trip_invite maps to priority 4
+    expect(calledOpts.headers['Tags']).toContain('loudspeaker');
+  });
+
+  it('NTFY-002 — attaches Bearer token when token provided', async () => {
+    const mockFetch = globalThis.fetch as unknown as ReturnType<typeof vi.fn>;
+    mockFetch.mockResolvedValueOnce({ ok: true, text: async () => '' } as never);
+
+    await sendNtfy(ntfyUrl, 'my-secret-token', payload);
+
+    const [, calledOpts] = mockFetch.mock.calls[0];
+    expect(calledOpts.headers['Authorization']).toBe('Bearer my-secret-token');
+  });
+
+  it('NTFY-003 — no Authorization header when token is null', async () => {
+    const mockFetch = globalThis.fetch as unknown as ReturnType<typeof vi.fn>;
+    mockFetch.mockResolvedValueOnce({ ok: true, text: async () => '' } as never);
+
+    await sendNtfy(ntfyUrl, null, payload);
+
+    const [, calledOpts] = mockFetch.mock.calls[0];
+    expect(calledOpts.headers['Authorization']).toBeUndefined();
+  });
+
+  it('NTFY-004 — includes Click header when link is provided', async () => {
+    const mockFetch = globalThis.fetch as unknown as ReturnType<typeof vi.fn>;
+    mockFetch.mockResolvedValueOnce({ ok: true, text: async () => '' } as never);
+
+    await sendNtfy(ntfyUrl, null, { ...payload, link: 'https://trek.example.com/trips/5' });
+
+    const [, calledOpts] = mockFetch.mock.calls[0];
+    expect(calledOpts.headers['Click']).toBe('https://trek.example.com/trips/5');
+  });
+
+  it('NTFY-005 — SSRF guard blocks private URL and returns false', async () => {
+    vi.mocked(checkSsrf).mockResolvedValueOnce({
+      allowed: false, isPrivate: true, resolvedIp: '192.168.1.1',
+      error: 'Requests to private/internal network addresses are not allowed',
+    });
+
+    const result = await sendNtfy('http://192.168.1.1/ntfy', null, payload);
+    expect(result).toBe(false);
+    expect(vi.mocked(logError)).toHaveBeenCalledWith(expect.stringContaining('SSRF'));
+    expect(globalThis.fetch as ReturnType<typeof vi.fn>).not.toHaveBeenCalled();
+  });
+
+  it('NTFY-006 — HTTP non-2xx response returns false and logs error', async () => {
+    const mockFetch = globalThis.fetch as unknown as ReturnType<typeof vi.fn>;
+    mockFetch.mockResolvedValueOnce({ ok: false, status: 403, text: async () => 'Forbidden' } as never);
+
+    const result = await sendNtfy(ntfyUrl, null, payload);
+    expect(result).toBe(false);
+    expect(vi.mocked(logError)).toHaveBeenCalledWith(expect.stringContaining('403'));
+  });
+
+  it('NTFY-007 — network error returns false', async () => {
+    const mockFetch = globalThis.fetch as unknown as ReturnType<typeof vi.fn>;
+    mockFetch.mockRejectedValueOnce(new Error('Network failure'));
+
+    const result = await sendNtfy(ntfyUrl, null, payload);
+    expect(result).toBe(false);
+    expect(vi.mocked(logError)).toHaveBeenCalledWith(expect.stringContaining('Network failure'));
+  });
+
+  it('NTFY-008 — unknown event falls back to priority 3 and no Tags header', async () => {
+    const mockFetch = globalThis.fetch as unknown as ReturnType<typeof vi.fn>;
+    mockFetch.mockResolvedValueOnce({ ok: true, text: async () => '' } as never);
+
+    await sendNtfy(ntfyUrl, null, { event: 'unknown_event', title: 'T', body: 'B' });
+
+    const [, calledOpts] = mockFetch.mock.calls[0];
+    expect(calledOpts.headers['Priority']).toBe('3');
+    expect(calledOpts.headers['Tags']).toBeUndefined(); // empty tags = no header
+  });
+});
Author	SHA1	Message	Date
Maurice	9739542a3a	Merge pull request #672 from mauriceboe/feature/uncategorized-filter feat: add uncategorized filter to category dropdown and more	2026-04-16 00:34:28 +02:00
Maurice	9f3a88223d	fix: update ReservationModal test for check-in time range fields Use getAllByText for check-in labels since both "Check-in" and "Check-in until" now match the /Check-in/i pattern.	2026-04-16 00:29:25 +02:00
Maurice	409a63633c	feat: support check-in time ranges for hotel accommodations - Add check_in_end column to day_accommodations (Migration 102) - Server: create/update accommodation accepts check_in_end - Bidirectional sync: check_in_end synced between accommodation and linked reservation metadata (check_in_end_time) - DayDetailPanel: shows check-in range (e.g. "14:00 – 22:00"), new "Until" time picker in hotel form - ReservationModal: new check-in-until field for hotel bookings - ReservationsPanel: displays check-in range in metadata cells - i18n: checkInUntil keys in all 15 languages Closes #366	2026-04-16 00:23:00 +02:00
Maurice	125436fa87	fix: correct test matchers for list import and reservations - PlacesSidebar: match "List Import" (actual i18n value) not "Import List" - ReservationsPanel: use unique titles to avoid matching filter buttons	2026-04-16 00:12:06 +02:00
Maurice	975846c236	fix: update tests for naver always-on and reservations redesign - Remove server test for naver addon disabled (addon check removed) - Update PlacesSidebar tests: "Google List" → "Import List" (both providers always shown) - Update ReservationsPanel tests: status is always a span (no toggle), remove click-to-toggle test, update summary test	2026-04-16 00:04:14 +02:00
Maurice	7befb7d555	feat: enable naver list import by default, remove addon toggle - Remove addon check from naver import endpoint - Naver import always available alongside Google list import - Migration 101: auto-enable naver_list_import for existing installs - Remove unused isAddonEnabled import from places route - Remove unused useAddonStore import from PlacesSidebar	2026-04-15 23:57:09 +02:00
Maurice	099255761c	feat: collab sub-feature toggles and provider icons - Add admin toggles for individual collab sections (Chat, Notes, Polls, What's Next) stored in app_settings - CollabPanel adapts layout dynamically: chat always fixed 380px, remaining panels share space equally - Mobile: disabled tabs are hidden - Add Immich and Synology Photos SVG icons to photo provider toggles - Add Luggage icon to bag tracking sub-toggle - API: GET/PUT /admin/collab-features endpoints - i18n: all 15 languages updated Closes #604	2026-04-15 23:53:16 +02:00
Maurice	c8fc21b8bd	fix: reservations panel mobile responsiveness - Hide type filter pills on mobile (< md breakpoint) - Move add button right-aligned on mobile - Separate booking code into its own row below date/time - Hide weekday in date on mobile for space - Reduce padding on mobile	2026-04-15 23:26:49 +02:00
Maurice	9186b8c850	feat: redesign reservations panel with unified toolbar and responsive grid - Unified toolbar with title, type filter pills (with count badges), and add button in one row - Cards redesigned: labeled fields in rounded boxes, status/type in header, edit/delete actions right-aligned - Responsive grid with max 3 columns, auto-filling full width - Type filters persist in sessionStorage per trip - Widen reservations tab container to match other tabs (1800px)	2026-04-15 23:21:51 +02:00
Maurice	e38c5fed44	feat: add uncategorized filter option to category dropdown Add a "No Category" option to the category filter dropdown in the places sidebar, allowing users to filter for places without an assigned category. The filter is synced with the map view. Closes #607	2026-04-15 22:54:23 +02:00
Julien G.	3b069bc543	Merge pull request #671 from mauriceboe/feat/admin-default-user-settings feat(admin): add admin-configurable default user settings	2026-04-15 22:47:08 +02:00
jubnl	618b1b8697	feat(admin): add map preview and auto-save to default user settings tab	2026-04-15 22:41:33 +02:00
jubnl	e45a0efce3	feat(admin): add admin-configurable default user settings Allow admins to set instance-wide defaults for temperature unit, color mode, time format, route calculation, blur booking codes, and map tile URL via a new Admin > User Defaults tab. Defaults are stored in app_settings (prefixed default_user_setting_*) and applied at read time as a fallback — user's own explicit values always take priority. Translations added for all 16 supported languages.	2026-04-15 22:31:41 +02:00
Julien G.	597a5f7a1d	Merge pull request #670 from mauriceboe/fix/immich-heic-rendering fix(immich): serve fullsize thumbnail for original to fix HEIC rendering	2026-04-15 22:07:28 +02:00
jubnl	42c216b00b	fix(immich): serve fullsize thumbnail for original to fix HEIC rendering Raw /assets/{id}/original returns HEIC bytes which only Safari can render natively. Switch to /assets/{id}/thumbnail?size=fullsize which Immich transcodes to a browser-compatible format. Closes #668	2026-04-15 22:02:48 +02:00
jubnl	f3751ab9aa	ci: manual trigger for prerelease	2026-04-15 21:35:53 +02:00
jubnl	9e8d101d63	fix(ntfy): improve admin ntfy UX and add clear token button - Add missing admin.ntfy.hint translation key in all 15 languages - Add admin ntfy server hint clarifying it is the default for users - Expose admin_ntfy_server via PreferencesMatrix so user settings placeholder reflects the admin-configured default - Add clear token button to admin ntfy panel (same pattern as user settings) - Extract common.clear from settings.ntfyUrl.clearToken across all 15 languages	2026-04-15 20:23:31 +02:00
Julien G.	5656731850	Merge pull request #669 from mauriceboe/feat/ntfy-notification-channel feat(notifications): add ntfy as a first-class notification channel	2026-04-15 14:13:18 +02:00
jubnl	7c4ac70db3	feat(i18n): translate ntfy notification strings into 14 languages Properly translate all ntfy-related UI strings added in the previous commit for ar, br, cs, de, es, fr, hu, id, it, nl, pl, ru, zh, zhTw. Product name 'Ntfy' and placeholder values kept as-is.	2026-04-15 14:08:04 +02:00
jubnl	bfe84b3016	feat(notifications): add ntfy as a first-class notification channel Adds ntfy.sh (and self-hosted instances) as a new push notification channel with full parity to the existing webhook channel. - Backend: NtfyConfig type, getUserNtfyConfig, getAdminNtfyConfig, resolveNtfyUrl, sendNtfy (header-based API with Title/Priority/Tags/ Click headers), testNtfy, NTFY_EVENT_META (priority + emoji tags per event), SSRF guard via existing checkSsrf + createPinnedDispatcher - notificationPreferencesService: ntfy added to NotifChannel union, IMPLEMENTED_COMBOS, getActiveChannels parser, getAvailableChannels, ADMIN_GLOBAL_CHANNELS, and AvailableChannels interface - notificationService: per-user ntfy dispatch after webhook block; admin-scoped ntfy via getAdminGlobalPref for version_available events - Routes: POST /api/notifications/test-ntfy with saved-token fallback - authService: admin_ntfy_server/topic/token in ADMIN_SETTINGS_KEYS, masked + encrypted on read/write - settingsService: ntfy_token added to ENCRYPTED_SETTING_KEYS - Frontend: ntfy topic/server/token inputs + Save/Test/Clear buttons in NotificationsTab; admin Ntfy panel in AdminPage; testNtfy API method - i18n: full English strings; English placeholders in 14 other locales - Tests: resolveNtfyUrl, sendNtfy, dispatch integration, UI tests, MSW handler for test-ntfy endpoint	2026-04-15 13:59:25 +02:00
Julien G.	f349e567f8	Merge pull request #665 from mauriceboe/feat/indonesian-translation Feat/indonesian translation	2026-04-15 08:17:55 +02:00
jubnl	ff434f4515	fix: discord links in tests	2026-04-15 08:12:22 +02:00
jubnl	0c2e0cad5c	feat(i18n): complete Indonesian translation with full parity to en.ts - Translate all 1941 keys to Bahasa Indonesia (up from ~426) - Add 437 keys missing since PR was opened (journey., oauth.scope., dashboard.mobile., settings.oauth., admin.oauthSessions.*, etc.) - Remove 2 stale keys superseded by unified file-import flow - Fix duplicate packing.assignUser entry - Rename const en → const id, update export default - Update SUPPORTED_LANGUAGES length assertion in i18n unit test (14→15)	2026-04-15 08:05:04 +02:00
Julien G.	326f9c0823	Merge pull request #664 from mauriceboe/main Align dev	2026-04-15 07:38:11 +02:00
github-actions[bot]	6df5edfbdb	chore: bump version to 2.9.14 [skip ci]	2026-04-15 05:33:46 +00:00
jubnl	5023406717	Update discord link to a permanent link	2026-04-15 07:33:26 +02:00
Julien G.	5be805910c	Update Discord link in README.md	2026-04-15 07:29:06 +02:00
jubnl	191d59166c	Merge remote-tracking branch 'origin/dev' into feat/indonesian-translation	2026-04-15 06:28:35 +02:00
Julien G.	b0f3440221	Update Discord link in README.md	2026-04-13 23:29:43 +02:00
Julien G.	707b3f227c	Update discord link	2026-04-13 23:27:09 +02:00
xenocent	a4727c4c53	docs: add Indonesian to supported languages	2026-04-11 15:35:08 +07:00
xenocent	577f2b05ca	feat(i18n): add Indonesian translation	2026-04-11 15:26:16 +07:00