k1nq/TREK
1
0
Fork 0
mirror of https://github.com/mauriceboe/TREK.git synced 2026-07-18 19:36:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve merge conflicts with dev branch

Browse Source 
Merge dev into feat/notification-system, keeping all i18n keys from both
branches (notification system keys + reservation price/budget keys).
This commit is contained in:
mauriceboe
2026-04-05 01:43:43 +02:00
parent fc29c5f7d0 b8058a2755
commit 6df8b2555d
21 changed files with 354 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/i18n/translations/ru.ts
+5
View File
@@ -982,6 +982,11 @@ const ru: Record<string, string> = {
'reservations.span.end': 'Конец',
'reservations.span.ongoing': 'Продолжается',
'reservations.validation.endBeforeStart': 'Дата/время окончания должны быть позже даты/времени начала',
'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': 'Бюджет',