Skip to content

Commit cbae8fd

Browse files
ganfraganfra
committed
Merge branch 'develop' into feature/fga/pinned_event_feature_flag
2 parents d5bc682 + 1cbd03a commit cbae8fd

File tree

87 files changed

+1799
-610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1799
-610
lines changed

‎app/src/main/res/xml/locales_config.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<locale android:name="sk"/>
2222
<locale android:name="sv"/>
2323
<locale android:name="uk"/>
24+
<locale android:name="uz"/>
2425
<locale android:name="zh-CN"/>
2526
<locale android:name="zh-TW"/>
2627
</locale-config>

‎features/analytics/api/src/main/res/values-pl/translations.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
33
<string name="screen_analytics_settings_help_us_improve">"Udostępniaj anonimowe dane dotyczące użytkowania, aby pomóc nam identyfikować problemy."</string>
4-
<string name="screen_analytics_settings_read_terms">"Możesz przeczytać wszystkie nasze warunki %1$s."</string>
4+
<string name="screen_analytics_settings_read_terms">"Przeczytaj nasze warunki użytkowania %1$s."</string>
55
<string name="screen_analytics_settings_read_terms_content_link">"tutaj"</string>
66
<string name="screen_analytics_settings_share_data">"Udostępniaj dane analityczne"</string>
77
</resources>

‎features/analytics/api/src/main/res/values-uz/translations.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_analytics_settings_help_us_improve">"Muammolarni aniqlashda yordam berish uchun anonim foydalanish maʼlumotlarini baham koʻring."</string>
4+
<string name="screen_analytics_settings_read_terms">"Siz bizning barcha shartlarimizni o\'qishingiz mumkin%1$s."</string>
5+
<string name="screen_analytics_settings_read_terms_content_link">"Bu yerga"</string>
6+
<string name="screen_analytics_settings_share_data">"Analitik ma\'lumotlarni ulashish"</string>
7+
</resources>

‎features/analytics/impl/src/main/res/values-pl/translations.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
33
<string name="screen_analytics_prompt_data_usage">"Nie będziemy rejestrować ani profilować żadnych danych osobistych"</string>
44
<string name="screen_analytics_prompt_help_us_improve">"Udostępniaj anonimowe dane dotyczące użytkowania, aby pomóc nam identyfikować problemy."</string>
5-
<string name="screen_analytics_prompt_read_terms">"Możesz przeczytać wszystkie nasze warunki %1$s."</string>
5+
<string name="screen_analytics_prompt_read_terms">"Przeczytaj nasze warunki użytkowania %1$s."</string>
66
<string name="screen_analytics_prompt_read_terms_content_link">"tutaj"</string>
77
<string name="screen_analytics_prompt_settings">"Możesz to wyłączyć w dowolnym momencie"</string>
88
<string name="screen_analytics_prompt_third_party_sharing">"Nie będziemy udostępniać Twoich danych podmiotom trzecim"</string>

‎features/analytics/impl/src/main/res/values-uz/translations.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_analytics_prompt_data_usage">"Biz hech qanday shaxsiy ma\'lumotlarni yozmaymiz yoki profilga kiritmaymiz"</string>
4+
<string name="screen_analytics_prompt_help_us_improve">"Muammolarni aniqlashda yordam berish uchun anonim foydalanish maʼlumotlarini baham koʻring."</string>
5+
<string name="screen_analytics_prompt_read_terms">"Siz bizning barcha shartlarimizni o\'qishingiz mumkin%1$s."</string>
6+
<string name="screen_analytics_prompt_read_terms_content_link">"Bu yerga"</string>
7+
<string name="screen_analytics_prompt_settings">"Buni istalgan vaqtda oʻchirib qoʻyishingiz mumkin"</string>
8+
<string name="screen_analytics_prompt_third_party_sharing">"Biz sizning ma\'lumotlaringizni uchinchi tomonlar bilan baham ko\'rmaymiz"</string>
9+
<string name="screen_analytics_prompt_title">"Yaxshilashga yordam bering%1$s"</string>
10+
</resources>

‎features/call/impl/src/main/res/values-pl/translations.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
<string name="call_foreground_service_channel_title_android">"Połączenie w trakcie"</string>
44
<string name="call_foreground_service_message_android">"Stuknij, aby wrócić do rozmowy"</string>
55
<string name="call_foreground_service_title_android">"☎️ Rozmowa w toku"</string>
6+
<string name="screen_incoming_call_subtitle_android">"Przychodzące połączenie Element"</string>
67
</resources>

‎features/call/impl/src/main/res/values-uz/translations.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="call_foreground_service_channel_title_android">"Davom etayotgan qo\'ng\'iroq"</string>
4+
<string name="call_foreground_service_message_android">"Qo\'ng\'iroqqa qaytish uchun bosing"</string>
5+
<string name="call_foreground_service_title_android">"☎️ Qo‘ng‘iroq davom etmoqda"</string>
6+
</resources>

‎features/createroom/impl/src/main/res/values-pl/translations.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<string name="screen_create_room_private_option_description">"Wiadomości w tym pokoju są szyfrowane. Szyfrowania nie można później wyłączyć."</string>
77
<string name="screen_create_room_private_option_title">"Pokój prywatny (tylko zaproszenie)"</string>
88
<string name="screen_create_room_public_option_description">"Wiadomości nie są szyfrowane i każdy może je odczytać. Możesz aktywować szyfrowanie później."</string>
9-
<string name="screen_create_room_public_option_title">"Pokój publiczny (każdy)"</string>
9+
<string name="screen_create_room_public_option_title">"Pokój publiczny (wszyscy)"</string>
1010
<string name="screen_create_room_room_name_label">"Nazwa pokoju"</string>
1111
<string name="screen_create_room_title">"Utwórz pokój"</string>
1212
<string name="screen_create_room_topic_label">"Temat (opcjonalnie)"</string>

‎features/createroom/impl/src/main/res/values-uz/translations.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_create_room_action_create_room">"Yangi xona"</string>
4+
<string name="screen_create_room_add_people_title">"Odamlarni taklif qiling"</string>
5+
<string name="screen_create_room_error_creating_room">"Xonani yaratishda xatolik yuz berdi"</string>
6+
<string name="screen_create_room_private_option_description">"Bu xonadagi xabarlar shifrlangan. Keyinchalik shifrlashni o‘chirib bo‘lmaydi."</string>
7+
<string name="screen_create_room_private_option_title">"Shaxsiy xona (faqat taklif)"</string>
8+
<string name="screen_create_room_public_option_description">"Xabarlar shifrlanmagan va har kim ularni o\'qiy oladi. Keyinchalik shifrlashni yoqishingiz mumkin."</string>
9+
<string name="screen_create_room_public_option_title">"Jamoat xonasi (har kim)"</string>
10+
<string name="screen_create_room_room_name_label">"Xona nomi"</string>
11+
<string name="screen_create_room_title">"Xonani yaratish"</string>
12+
<string name="screen_create_room_topic_label">"Mavzu (ixtiyoriy)"</string>
13+
<string name="screen_start_chat_error_starting_chat">"Suhbatni boshlashda xatolik yuz berdi"</string>
14+
</resources>

‎features/ftue/impl/src/main/res/values-uz/translations.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_notification_optin_subtitle">"Sozlamalaringizni keyinroq o\'zgartirishingiz mumkin."</string>
4+
<string name="screen_notification_optin_title">"Bildirishnomalarga ruxsat bering va hech qachon xabarni o\'tkazib yubormang"</string>
5+
<string name="screen_welcome_bullet_1">"Qo\'ng\'iroqlar, so\'ro\'vlar, qidiruv va boshqalar shu yil oxirida qo\'shiladi."</string>
6+
<string name="screen_welcome_bullet_2">"Shifrlangan xonalar uchun xabarlar tarixi hali mavjud emas."</string>
7+
<string name="screen_welcome_bullet_3">"Biz sizdan eshitishni istardik, sozlamalar sahifasi orqali fikringizni bildiring."</string>
8+
<string name="screen_welcome_button">"Qani ketdik!"</string>
9+
<string name="screen_welcome_subtitle">"Buni bilishingiz kerak:"</string>
10+
<string name="screen_welcome_title">"%1$sga Xush kelibsiz!"</string>
11+
</resources>

0 commit comments

Comments
 (0)