From b0c625bc9b2abf2b71b5a2be38f5eb81d304e7fe Mon Sep 17 00:00:00 2001
From: KrugarValdes <sm.vit2003@gmail.com>
Date: Wed, 30 Jul 2025 19:09:18 +0600
Subject: [PATCH] feat: Update English and Russian text strings

---
 .../commonMain/composeResources/values-ru/strings_ru.xml  | 2 +-
 .../ui/src/commonMain/composeResources/values/strings.xml | 6 +++---
 .../office/tablet/core/ui/common/EventDurationView.kt     | 8 ++++----
 .../commonMain/composeResources/values-ru/strings_ru.xml  | 2 +-
 .../src/commonMain/composeResources/values/strings.xml    | 2 +-
 .../commonMain/composeResources/values-ru/strings_ru.xml  | 2 +-
 .../src/commonMain/composeResources/values/strings.xml    | 6 +++---
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/clients/tablet/core/ui/src/commonMain/composeResources/values-ru/strings_ru.xml b/clients/tablet/core/ui/src/commonMain/composeResources/values-ru/strings_ru.xml
index 3ccdf63f..3c13527d 100644
--- a/clients/tablet/core/ui/src/commonMain/composeResources/values-ru/strings_ru.xml
+++ b/clients/tablet/core/ui/src/commonMain/composeResources/values-ru/strings_ru.xml
@@ -27,7 +27,7 @@
     <string name="on_main">На главную</string>
     <string name="success_text">Вы заняли %1$s</string>
     <string name="cancel">Отмена</string>
-    <string name="loading_slot_for_time">Загрузка слота на время: %1$s - %2$s</string>
+    <string name="loading_slot_for_time">Загрузка слота на время: %1$s — %2$s</string>
     <string name="empty_slot">Свободно %1$s мин</string>
     <string name="event_slot">Занято %1$s</string>
     <string name="multislot">%1$s брони</string>
diff --git a/clients/tablet/core/ui/src/commonMain/composeResources/values/strings.xml b/clients/tablet/core/ui/src/commonMain/composeResources/values/strings.xml
index c661b9cf..9f521484 100644
--- a/clients/tablet/core/ui/src/commonMain/composeResources/values/strings.xml
+++ b/clients/tablet/core/ui/src/commonMain/composeResources/values/strings.xml
@@ -11,7 +11,7 @@
     <string name="plus_date_button_string">+ 30 min</string>
     <string name="short_minuets">min</string>
     <string name="short_hours">h</string>
-    <string name="selectbox_organizer_title">Select organizer</string>
+    <string name="selectbox_organizer_title">Choose organizer</string>
     <string name="selectbox_organizer_error">Invalid organizer, try again</string>
     <string name="timepicker_view_title">Book from</string>
     <string name="apply_date_time_for_booking">Confirm</string>
@@ -27,8 +27,8 @@
     <string name="on_main">Back to main</string>
     <string name="success_text">You booked %1$s</string>
     <string name="cancel">Cancel</string>
-    <string name="loading_slot_for_time">Loading slot for time: %1$s - %2$s</string>
-    <string name="empty_slot">Free for %1$s min</string>
+    <string name="loading_slot_for_time">Loading slot for time: %1$s — %2$s</string>
+    <string name="empty_slot">Available for %1$s min</string>
     <string name="event_slot">Booked by %1$s</string>
     <string name="multislot">%1$s bookings</string>
     <string name="loading_slot">Slot is loading</string>
diff --git a/clients/tablet/core/ui/src/commonMain/kotlin/band/effective/office/tablet/core/ui/common/EventDurationView.kt b/clients/tablet/core/ui/src/commonMain/kotlin/band/effective/office/tablet/core/ui/common/EventDurationView.kt
index fcabd888..3e87eee2 100644
--- a/clients/tablet/core/ui/src/commonMain/kotlin/band/effective/office/tablet/core/ui/common/EventDurationView.kt
+++ b/clients/tablet/core/ui/src/commonMain/kotlin/band/effective/office/tablet/core/ui/common/EventDurationView.kt
@@ -95,9 +95,9 @@ private fun Int.getDurationString(): String {
     val hours = this / 60
     val minutes = this % 60
     return when {
-        hours == 0 -> "$minutes${stringResource(Res.string.short_minuets)}"
-        minutes == 0 -> "$hours${stringResource(Res.string.short_hours)}"
-        else -> "$hours${stringResource( Res.string.short_hours)} " +
-                "$minutes${stringResource(Res.string.short_minuets)}"
+        hours == 0 -> "$minutes ${stringResource(Res.string.short_minuets)}"
+        minutes == 0 -> "$hours ${stringResource(Res.string.short_hours)}"
+        else -> "$hours ${stringResource( Res.string.short_hours)} " +
+                "$minutes ${stringResource(Res.string.short_minuets)}"
     }
 }
diff --git a/clients/tablet/feature/bookingEditor/src/commonMain/composeResources/values-ru/strings_ru.xml b/clients/tablet/feature/bookingEditor/src/commonMain/composeResources/values-ru/strings_ru.xml
index 2a9ea279..95b29000 100644
--- a/clients/tablet/feature/bookingEditor/src/commonMain/composeResources/values-ru/strings_ru.xml
+++ b/clients/tablet/feature/bookingEditor/src/commonMain/composeResources/values-ru/strings_ru.xml
@@ -3,7 +3,7 @@
     <string name="create_view_title">Занять %1$s</string>
     <string name="booking_view_title">Изменить бронь</string>
     <string name="booking_time_button">Занять c %1$s до %2$s</string>
-    <string name="update_button">Изменить</string>
+    <string name="update_button">Сохранить изменения</string>
     <string name="delete_button">Удалить бронь</string>
     <string name="error">Произошла ошибка</string>
     <string name="is_time_in_past_error">Ошибка, выбрана неправильная дата</string>
diff --git a/clients/tablet/feature/bookingEditor/src/commonMain/composeResources/values/strings.xml b/clients/tablet/feature/bookingEditor/src/commonMain/composeResources/values/strings.xml
index 989bb565..0e4ac31d 100644
--- a/clients/tablet/feature/bookingEditor/src/commonMain/composeResources/values/strings.xml
+++ b/clients/tablet/feature/bookingEditor/src/commonMain/composeResources/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="create_view_title">Book %1$s</string>
     <string name="booking_view_title">Edit booking</string>
     <string name="booking_time_button">Book from %1$s to %2$s</string>
-    <string name="update_button">Update</string>
+    <string name="update_button">Confirm changes</string>
     <string name="delete_button">Delete booking</string>
     <string name="error">An error occurred</string>
     <string name="is_time_in_past_error">Error, incorrect date selected</string>
diff --git a/clients/tablet/feature/main/src/commonMain/composeResources/values-ru/strings_ru.xml b/clients/tablet/feature/main/src/commonMain/composeResources/values-ru/strings_ru.xml
index bed24afc..78dbe7c3 100644
--- a/clients/tablet/feature/main/src/commonMain/composeResources/values-ru/strings_ru.xml
+++ b/clients/tablet/feature/main/src/commonMain/composeResources/values-ru/strings_ru.xml
@@ -36,7 +36,7 @@
     <string name="free_now">Сейчас свободна</string>
     <string name="data_not_upd">Данные брони могут быть неактуальны</string>
     <string name="fastbooking_button">%1$s мин</string>
-    <string name="fastbooking_title">Занять любую переговорку на:</string>
+    <string name="fastbooking_title">Занять любую переговорку</string>
     <string name="free_select_room">Освободить переговорку?</string>
     <string name="try_again">Попробовать ещё раз</string>
     <string name="free_select_room_button">Освободить</string>
diff --git a/clients/tablet/feature/main/src/commonMain/composeResources/values/strings.xml b/clients/tablet/feature/main/src/commonMain/composeResources/values/strings.xml
index ec4b48f3..dbf9a9bb 100644
--- a/clients/tablet/feature/main/src/commonMain/composeResources/values/strings.xml
+++ b/clients/tablet/feature/main/src/commonMain/composeResources/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="room_occupancy_date">Booked until %1$s</string>
-    <string name="room_occupancy_time">· Until %1$s</string>
+    <string name="room_occupancy_time">· %1$s left</string>
     <string name="free_room_occupancy_date">Free until %1$s</string>
     <string name="free_room_occupancy_time">· Until start %1$s</string>
     <string name="stop_meeting_button">Release</string>
@@ -33,10 +33,10 @@
     <string name="reset_button">Restart app</string>
     <string name="exit">Exit</string>
     <string name="choose_room">Choose %1$s</string>
-    <string name="free_now">Free now</string>
+    <string name="free_now">Available now</string>
     <string name="data_not_upd">Booking data may be outdated</string>
     <string name="fastbooking_button">%1$s min</string>
-    <string name="fastbooking_title">Book any meeting room for:</string>
+    <string name="fastbooking_title">Book any available room</string>
     <string name="free_select_room">Release the meeting room?</string>
     <string name="try_again">Try again</string>
     <string name="free_select_room_button">Release</string>
-- 
GitLab