Skip to content

Commit

Permalink
Merge branch 'master' into UnitTest
Browse files Browse the repository at this point in the history
  • Loading branch information
Smarshal21 authored Sep 4, 2023
2 parents f86ef30 + 8460784 commit 9312684
Show file tree
Hide file tree
Showing 29 changed files with 125 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ android {

// mayor.minor.hotfix.increment (for increment: 01-50=Alpha / 51-89=RC / 90-99=stable)
// xx .xxx .xx .xx
versionCode 170200001
versionName "17.20.0 Alpha 01"
versionCode 170200002
versionName "17.20.0 Alpha 02"

flavorDimensions "default"
renderscriptTargetApi 19
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<string name="audio_output_wired_headset">سماعة رأس سلكية</string>
<string name="avatar">رمز تجسيدي avatar</string>
<string name="away">بالخارج</string>
<string name="calendar">التقويم Calendar</string>
<string name="call_more_actions_dialog_headline">خيارات الاتصال المتقدمة</string>
<string name="call_running_since_one_hour">المكالمة ما زالت مستمرة منذ حوالي الساعة.</string>
<string name="call_without_notification">اتصال بدون إشعار</string>
Expand All @@ -19,6 +20,7 @@
<string name="close">إغلاق</string>
<string name="continuous_voice_message_recording">قَفْل التسجيل للتسجيل المستمر للرسالة الصوتية</string>
<string name="conversations">محادثات</string>
<string name="custom">مُخصّص</string>
<string name="danger_zone">منطقة خطر</string>
<string name="delete_avatar">إمسح الرمز التجسيدي avatar</string>
<string name="dnd">الرجاء عدم الإزعاج</string>
Expand All @@ -35,6 +37,7 @@
<string name="filename_progress">%1$s (%2$d)</string>
<string name="fourHours">4 ساعات</string>
<string name="invisible">غير مرئي</string>
<string name="later_today">في وقت لاحقٍ اليوم</string>
<string name="load_more_results">تحميل المزيد من النتائج</string>
<string name="lock_symbol">رمز القفل</string>
<string name="lower_hand">خفض اليد </string>
Expand Down Expand Up @@ -264,6 +267,7 @@
<string name="nc_push_disabled">الإشعارات معطلة</string>
<string name="nc_push_to_talk">اضغط للتحدث</string>
<string name="nc_push_to_talk_desc">في وضعية تعطل المايكرفون، علق على الزر &amp; لاستخدام اضغط للتحدث</string>
<string name="nc_remind">ذكرني لاحقا</string>
<string name="nc_remote_audio_off">الصَّوت القصِي remote موقوف</string>
<string name="nc_remove_circle_and_members">حذف الدائرة circle و الأعضاء</string>
<string name="nc_remove_from_favorites">إزالتها مِن المفضلة</string>
Expand Down Expand Up @@ -403,6 +407,7 @@
<string name="nc_wrong_link">رابط المحادثة غير صالح</string>
<string name="nc_wrong_password">كلمة سرية خاطئة</string>
<string name="nc_yes">نعم</string>
<string name="next_week">الأسبوع القادم</string>
<string name="no_phone_book_integration_due_to_permissions">لا ارتباط لرقم الهاتف بسبب أذونات ناقصة</string>
<string name="oneHour">1 ساعة</string>
<string name="online">مُتّصلٌ</string>
Expand Down Expand Up @@ -451,11 +456,13 @@
<string name="scope_toggle_description">تغيير مستوى الخصوصية لـ%1$s</string>
<string name="scroll_to_bottom">مرِّر للأسفل</string>
<string name="secondsAgo">منذ ثوانٍ</string>
<string name="see_similar_system_messages">أنظُر %1$s رسائل مُشابِهة</string>
<string name="selected_list_item">مُحدّدة</string>
<string name="send_to">أرسِل إلى</string>
<string name="send_to_forbidden">ليس مسموحاً لك مشاركة محتوى هذه الدردشة</string>
<string name="send_to_three_dots">إرسالُ إلى…</string>
<string name="send_without_notification">أرسِل بدون إشعار</string>
<string name="set">تعيين</string>
<string name="set_avatar_from_camera">عيّن الرمز التجسيدي avatar من الكاميرا</string>
<string name="set_status">تعيين الحالة</string>
<string name="set_status_message">تعيين رسالة الحالة</string>
Expand Down Expand Up @@ -484,8 +491,10 @@
<string name="thirtyMinutes">30 دقيقة</string>
<string name="thisWeek">هذا الأسبوع</string>
<string name="this_is_a_test_message">هذه رسالة اختبار</string>
<string name="this_weekend">نهاية هذا الأسبوع</string>
<string name="title_attachments">المُرفَقات</string>
<string name="today">اليوم</string>
<string name="tomorrow">غدا</string>
<string name="translate">ترجِم</string>
<string name="translation">الترجمة</string>
<string name="translation_copy_translated_text">نسخ النص المترجم</string>
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/values-b+en+001/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<string name="audio_output_wired_headset">Wired headset</string>
<string name="avatar">Avatar</string>
<string name="away">Away</string>
<string name="calendar">Calendar</string>
<string name="call_more_actions_dialog_headline">Advanced call options</string>
<string name="call_running_since_one_hour">Note: the call has been going on for an hour already.</string>
<string name="call_without_notification">Call without notification</string>
Expand All @@ -19,6 +20,7 @@
<string name="close">Close</string>
<string name="continuous_voice_message_recording">Lock recording for continuously recording of the voice message</string>
<string name="conversations">Conversations</string>
<string name="custom">Custom</string>
<string name="danger_zone">Danger Zone</string>
<string name="delete_avatar">Delete avatar</string>
<string name="dnd">Do not disturb</string>
Expand All @@ -35,6 +37,7 @@
<string name="filename_progress">%1$s (%2$d)</string>
<string name="fourHours">4 hours</string>
<string name="invisible">Invisible</string>
<string name="later_today">Later today</string>
<string name="load_more_results">Load more results</string>
<string name="lock_symbol">Lock symbol</string>
<string name="lower_hand">Lower hand</string>
Expand Down Expand Up @@ -264,6 +267,7 @@
<string name="nc_push_disabled">Push notifications disabled</string>
<string name="nc_push_to_talk">Press-to-transmit</string>
<string name="nc_push_to_talk_desc">With the microphone disabled, click&amp;hold to use Press-to-transmit</string>
<string name="nc_remind">Remind me later</string>
<string name="nc_remote_audio_off">Remote audio off</string>
<string name="nc_remove_circle_and_members">Remove circle and members</string>
<string name="nc_remove_from_favorites">Remove from favourites</string>
Expand Down Expand Up @@ -403,6 +407,7 @@
<string name="nc_wrong_link">Conversation link is not valid</string>
<string name="nc_wrong_password">Wrong password</string>
<string name="nc_yes">Yes</string>
<string name="next_week">Next week</string>
<string name="no_phone_book_integration_due_to_permissions">No phone number integration due to missing permissions</string>
<string name="oneHour">1 hour</string>
<string name="online">Online</string>
Expand Down Expand Up @@ -451,11 +456,13 @@
<string name="scope_toggle_description">Change privacy level of %1$s</string>
<string name="scroll_to_bottom">Scroll to bottom</string>
<string name="secondsAgo">seconds ago</string>
<string name="see_similar_system_messages">See %1$s similar messages</string>
<string name="selected_list_item">Selected</string>
<string name="send_to">Send to</string>
<string name="send_to_forbidden">You are not allowed to share content to this chat</string>
<string name="send_to_three_dots">Send to …</string>
<string name="send_without_notification">Send without notification</string>
<string name="set">Set</string>
<string name="set_avatar_from_camera">Set avatar from camera</string>
<string name="set_status">Set status</string>
<string name="set_status_message">Set status message</string>
Expand Down Expand Up @@ -484,8 +491,10 @@
<string name="thirtyMinutes">30 minutes</string>
<string name="thisWeek">This week</string>
<string name="this_is_a_test_message">This is a test message</string>
<string name="this_weekend">This weekend</string>
<string name="title_attachments">Attachments</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>
<string name="translate">Translate</string>
<string name="translation">Translation</string>
<string name="translation_copy_translated_text">Copy translated text</string>
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values-bg-rBG/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<string name="audio_output_wired_headset">Слушалки с кабел</string>
<string name="avatar">Аватар</string>
<string name="away">Винаги</string>
<string name="calendar">Kалендар</string>
<string name="call_more_actions_dialog_headline">Разширени опции за повикване</string>
<string name="call_without_notification">Обаждане без известие</string>
<string name="camera_permission_granted">Дадено е право на камера. Моля, изберете камера отново. </string>
Expand All @@ -17,6 +18,7 @@
<string name="clear_status_message_after">Изчистване на съобщение за състоянието след</string>
<string name="close">Затваряне</string>
<string name="conversations">Разговори</string>
<string name="custom">Персонализиран</string>
<string name="delete_avatar">Изтриване на аватар</string>
<string name="dnd">Не безпокойте</string>
<string name="dontClear">Да не се изчиства</string>
Expand Down Expand Up @@ -244,6 +246,7 @@
<string name="nc_push_disabled">Push/насочените/ известия са деактивирани</string>
<string name="nc_push_to_talk">Натисни и говори</string>
<string name="nc_push_to_talk_desc">Когато микрофонът е деактивиран, кликнете &amp; и задръжте, за да използвате „Натисни и говори“</string>
<string name="nc_remind">Напомни ми по-късно</string>
<string name="nc_remote_audio_off">Отдалеченото аудио е изключено</string>
<string name="nc_remove_circle_and_members">Премахване на кръга и на членовете</string>
<string name="nc_remove_from_favorites">Премахни от любимите</string>
Expand Down Expand Up @@ -380,6 +383,7 @@
<string name="nc_wrong_link">Невалидна връзка за разговор </string>
<string name="nc_wrong_password">Грешна парола</string>
<string name="nc_yes">Да</string>
<string name="next_week">Следваща седмица</string>
<string name="no_phone_book_integration_due_to_permissions">Няма интеграция на телефонен номер поради липсващи права</string>
<string name="oneHour">1 час</string>
<string name="online">На линия</string>
Expand Down Expand Up @@ -433,6 +437,7 @@
<string name="send_to_forbidden">Нямате право да споделяте съдържание в този чат</string>
<string name="send_to_three_dots">Изпращане до …</string>
<string name="send_without_notification">Изпращане без известие</string>
<string name="set">Да се зададе</string>
<string name="set_avatar_from_camera">Задаване на аватар от камерата</string>
<string name="set_status">Задаване на състояние</string>
<string name="set_status_message">Задаване на съобщение за състояние</string>
Expand Down Expand Up @@ -462,6 +467,7 @@
<string name="thisWeek">Тази седмица</string>
<string name="title_attachments">Прикачени файлове</string>
<string name="today">Днес</string>
<string name="tomorrow">Утре</string>
<string name="translate">Превод</string>
<string name="translation_detect_language">Разпознаване на език</string>
<string name="translation_device_settings">Настройки за устройството</string>
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<string name="audio_output_wired_headset">Auriculars per cable</string>
<string name="avatar">Avatar</string>
<string name="away">Absent</string>
<string name="calendar">Calendari</string>
<string name="call_more_actions_dialog_headline">Opcions avançades de trucada</string>
<string name="call_running_since_one_hour">La trucada porta una hora en marxa.</string>
<string name="call_without_notification">Trucada sense notificació</string>
Expand All @@ -18,6 +19,7 @@
<string name="clear_status_message_after">Esborra el missatge d\'estat després</string>
<string name="close">Tanca</string>
<string name="conversations">Converses</string>
<string name="custom">Personalitzat</string>
<string name="delete_avatar">Suprimeix l\'avatar</string>
<string name="dnd">No molesteu</string>
<string name="dontClear">No l\'esborris</string>
Expand Down Expand Up @@ -242,6 +244,7 @@
<string name="nc_push_disabled">Servei de notificacions desactivat</string>
<string name="nc_push_to_talk">Prem-i-parla</string>
<string name="nc_push_to_talk_desc">Amb el micròfon desactivat, feu clic a &amp; i mantingueu-lo pressionat per fer servir el Prem-i-parla</string>
<string name="nc_remind">Recorda-m\'ho més tard</string>
<string name="nc_remote_audio_off">Àudio remot desactivat</string>
<string name="nc_remove_circle_and_members">Suprimeix el cercle i els membres</string>
<string name="nc_remove_from_favorites">Suprimeix de favorits</string>
Expand Down Expand Up @@ -379,6 +382,7 @@
<string name="nc_wrong_link">L\'enllaç de la conversa no és vàlid</string>
<string name="nc_wrong_password">Contrasenya incorrecta</string>
<string name="nc_yes">Sí</string>
<string name="next_week">Setmana següent</string>
<string name="no_phone_book_integration_due_to_permissions">No hi ha integració amb el número de telèfon perquè falten permisos</string>
<string name="oneHour">1 hora</string>
<string name="online">En línia</string>
Expand Down Expand Up @@ -430,6 +434,7 @@
<string name="send_to_forbidden">No teniu permís per compartir contingut amb aquest xat</string>
<string name="send_to_three_dots">Envia a …</string>
<string name="send_without_notification">Envia sense notificació</string>
<string name="set">Estableix</string>
<string name="set_avatar_from_camera">Estableix l\'avatar des de la càmera</string>
<string name="set_status">Estableix l\'estat</string>
<string name="set_status_message">Estableix un missatge d\'estat</string>
Expand All @@ -456,6 +461,7 @@
<string name="thisWeek">Aquesta setmana</string>
<string name="title_attachments">Adjunts</string>
<string name="today">Avui</string>
<string name="tomorrow">Demà</string>
<string name="translate">Traducció</string>
<string name="translation_copy_translated_text">Copia el text traduït</string>
<string name="translation_detect_language">Detectar idioma</string>
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/res/values-cs-rCZ/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<string name="audio_output_wired_headset">Drátová náhlavní souprava</string>
<string name="avatar">Profilový obrázek</string>
<string name="away">Pryč</string>
<string name="calendar">Kalendář</string>
<string name="call_more_actions_dialog_headline">Pokročilé předvolby pro hovor</string>
<string name="call_running_since_one_hour">Hovor trvá už hodinu.</string>
<string name="call_without_notification">Zavolat bez upozornění</string>
Expand All @@ -19,6 +20,7 @@
<string name="close">Zavřít</string>
<string name="continuous_voice_message_recording">Zamknout nahrávku pro nepřetržité nahrávání hlasové zprávy</string>
<string name="conversations">Konverzace</string>
<string name="custom">Uživatelsky určený</string>
<string name="danger_zone">Nebezpečná zóna</string>
<string name="delete_avatar">Vymazat profilový obrázek</string>
<string name="dnd">Nerušit</string>
Expand All @@ -35,6 +37,7 @@
<string name="filename_progress">%1$s (%2$d)</string>
<string name="fourHours">4 hodiny</string>
<string name="invisible">Není vidět</string>
<string name="later_today">Později dnes</string>
<string name="load_more_results">Načíst další výsledky</string>
<string name="lock_symbol">Uzamknout symbol</string>
<string name="lower_hand">Přestat se hlásit</string>
Expand Down Expand Up @@ -264,6 +267,7 @@
<string name="nc_push_disabled">Push upozorňování vypnutá</string>
<string name="nc_push_to_talk">Vysílačka</string>
<string name="nc_push_to_talk_desc">Při vypnutém mikrofonu, klikněte a dokud držíte, můžete mluvit – jako u vysílačky</string>
<string name="nc_remind">Připomenout později</string>
<string name="nc_remote_audio_off">Ztlumení mikrofonu na dálku</string>
<string name="nc_remove_circle_and_members">Odebrat kruh a členy</string>
<string name="nc_remove_from_favorites">Odebrat z oblíbených</string>
Expand Down Expand Up @@ -403,6 +407,7 @@
<string name="nc_wrong_link">Odkaz na konverzaci není platný</string>
<string name="nc_wrong_password">Nesprávné heslo</string>
<string name="nc_yes">Ano</string>
<string name="next_week">Příští týden</string>
<string name="no_phone_book_integration_due_to_permissions">Není možné propojit telefonní čísla, protože chybí potřebná oprávnění</string>
<string name="oneHour">1 hodina</string>
<string name="online">Online</string>
Expand Down Expand Up @@ -456,6 +461,7 @@
<string name="send_to_forbidden">Nemáte oprávnění sdílet obsah do tohoto chatu</string>
<string name="send_to_three_dots">Odeslat k…</string>
<string name="send_without_notification">Odeslat bez upozornění</string>
<string name="set">Nastavit</string>
<string name="set_avatar_from_camera">Získat zástupný obrázek z kamery</string>
<string name="set_status">Nastavit stav</string>
<string name="set_status_message">Nastavit stavovou zprávu</string>
Expand Down Expand Up @@ -484,8 +490,10 @@
<string name="thirtyMinutes">30 minut</string>
<string name="thisWeek">Tento týden</string>
<string name="this_is_a_test_message">Toto je zkušební zpráva</string>
<string name="this_weekend">Tento víkend</string>
<string name="title_attachments">Přílohy</string>
<string name="today">Dnes</string>
<string name="tomorrow">Zítra</string>
<string name="translate">Překládání</string>
<string name="translation">Překlad</string>
<string name="translation_copy_translated_text">Zkopírovat přeložený text</string>
Expand Down
Loading

0 comments on commit 9312684

Please sign in to comment.