chore: resolve merge conflicts with dev branch

Merge dev into feat/notification-system, keeping all i18n keys from both branches (notification system keys + reservation price/budget keys).
2026-06-30 18:46:00 +00:00 · 2026-04-05 01:43:43 +02:00
parent fc29c5f7d0 b8058a2755
commit 6df8b2555d
21 changed files with 354 additions and 57 deletions
@@ -983,6 +983,11 @@ const it: Record<string, string | { name: string; category: string }[]> = {
  'reservations.span.end': 'Fine',
  'reservations.span.ongoing': 'In corso',
  'reservations.validation.endBeforeStart': 'La data/ora di fine deve essere successiva alla data/ora di inizio',
+  'reservations.price': 'Price',
+  'reservations.budgetCategory': 'Budget category',
+  'reservations.budgetCategoryPlaceholder': 'e.g. Transport, Accommodation',
+  'reservations.budgetCategoryAuto': 'Auto (from booking type)',
+  'reservations.budgetHint': 'A budget entry will be created automatically when saving.',

  // Budget
  'budget.title': 'Budget',