From 2ae5c7730ae065bc0b95c352f7fe5c6c58179817 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Mon, 22 Jul 2024 16:14:34 +0200
Subject: [PATCH 1/2] update translations

---
 src/main/res/values-es/strings.xml     |  6 ++++++
 src/main/res/values-fa/strings.xml     | 15 ++++++++++-----
 src/main/res/values-hu/strings.xml     |  2 ++
 src/main/res/values-it/strings.xml     |  2 ++
 src/main/res/values-pl/strings.xml     |  2 +-
 src/main/res/values-sq/strings.xml     |  5 ++++-
 src/main/res/values-tr/strings.xml     |  2 +-
 src/main/res/values-uk/strings.xml     | 10 ++++++----
 src/main/res/values-zh-rTW/strings.xml | 21 +++++++++++++++++++++
 9 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index cbe5dc370..0c175c150 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -56,6 +56,7 @@
     <string name="show_full_message">Mostrar mensaje completo…</string>
     <!-- Stay short here, say ~16 characters. The source string could also be "All Read", maybe that hint can make translations easier :) -->
     <string name="mark_all_as_read">Marcar todo como leído</string>
+    <string name="mark_as_read">Marcar como leído</string>
     <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
     <string name="mark_as_read_short">Leído</string>
     <!-- Placeholder text when something is loading -->
@@ -445,6 +446,9 @@
     <string name="send_file_to">Enviar \"%1$s\" a…</string>
     <!-- title shown above a list contacts where one should be selected (eg. when a webxdc attempts to send a message to a chat) -->
     <string name="send_message_to">Enviar mensaje a…</string>
+    <string name="enable_realtime">Canales Webxdc en tiempo real</string>
+    <string name="enable_realtime_explain">Habilitar la API de tiempo real de Webxdc para poder crear conexiones directas entre dispositivos.</string>
+
     <!-- map -->
     <string name="filter_map_on_time">Mostrar ubicaciones en el marco de tiempo</string>
     <string name="show_location_traces">Mostrar trazas</string>
@@ -814,6 +818,8 @@
     <string name="autodel_server_ask">¿Deseas borrar %1$d mensajes ahora y todos los mensajes recibidos en \"%2$s\"  al futuro?\n\n⚠️ Esto incluye correos, multimedia y \"Mensajes guardados\" en todas las carpetas del servidor. No uses esta función sis quieres mantener tus datos en el servidor o si estas usando otros clientes de correo más allá de Delta Chat\n\n⚠️ No uses esta función si deseas mantener tus datos en el servidor\n\n⚠️ No uses esta función si estás usando otros clientes de correo más allá de Delta Chat</string>
     <!-- shown below enabled autodel_server-option, should be a summary of autodel_server_ask and remind about the impact -->
     <string name="autodel_server_enabled_hint">Esto incluye correos, multimedia  y \"Mensajes guardados\" en todas las carpetas del servidor. No uses esta función si quieres mantener tus datos en el servidor o si estas usando otros clientes de correo además de Delta Chat</string>
+    <string name="autodel_server_warn_multi_device_title">Activar la eliminación inmediata</string>
+    <string name="autodel_server_warn_multi_device">Si habilita la eliminación inmediata, no podrá utilizar varios dispositivos en este perfil.</string>
     <string name="autodel_confirm">Comprendo, borrar todos estos mensajes</string>
     <!-- "At once" in the meaning of "Immediately", without any intervening time. -->
     <string name="autodel_at_once">Inmediatamente</string>
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index c971d5d11..6d7f6b216 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -56,6 +56,7 @@
     <string name="show_full_message">نمایش پیام کامل...</string>
     <!-- Stay short here, say ~16 characters. The source string could also be "All Read", maybe that hint can make translations easier :) -->
     <string name="mark_all_as_read">همه را خوانده شده بزن</string>
+    <string name="mark_as_read">علامت زدن به عنوان خوانده شده</string>
     <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
     <string name="mark_as_read_short">خوانده شد</string>
     <!-- Placeholder text when something is loading -->
@@ -199,6 +200,8 @@
     <!-- menu labels (or icon, buttons...) -->
     <string name="menu_new_contact">مخاطب جدید</string>
     <string name="menu_new_classic_contact">اضافه کردن مخاطب به صورت دستی</string>
+    <string name="new_classic_contact_explain">مخاطبینی که دستی اضافه شده‌اند می توانند برای ارسال پیام به حساب ایمیل معمولی
+ استفاده شوند و رمزگذاری سرتاسر آنها تضمین نمی‌شود.</string>
     <string name="menu_new_chat">گپ جدید</string>
     <string name="menu_new_group">گروه جدید</string>
     <!-- consider keeping the term "broadcast" as in WhatsApp or Telegram -->
@@ -230,7 +233,7 @@
     <string name="menu_copy_image_to_clipboard">رونوشت گرفتن از تصویر</string>
     <string name="menu_copy_email_to_clipboard">کپی کردن رایانامه</string>
     <string name="paste_from_clipboard">چسباندن از حافظه</string>
-    <string name="ask_copy_unopenable_link_to_clipboard">نمی توان لینک \"%1$d\" را در مرورگر باز کرد. می خواهید در عوض لینک را کپی کنید؟</string>
+    <string name="ask_copy_unopenable_link_to_clipboard">نمی توان لینک \"%1$d\" را در مرورگر باز کرد. آیا می خواهید در عوض لینک را کپی کنید؟</string>
     <string name="menu_forward">هدایت پیام</string>
     <string name="menu_reply">پاسخ به پیام</string>
     <string name="menu_mute">ساکت کردن اعلان</string>
@@ -544,12 +547,14 @@ https://meet.jit.si/$ROOM
     <!-- Secondary button on the welcome screen, allows to "Add as Second Device", "Restore from Backup"  -->
     <string name="onboarding_alternative_logins">از قبل یک حساب کاربری دارم</string>
     <!-- Button, allows to log in to existing email accounts, setting ports, passwords and so on -->
-    <string name="manual_account_setup_option">ساخت حساب کاربری با حساب ایمیل عادی</string>
+    <string name="manual_account_setup_option">ساخت حساب کاربری با حساب ایمیل معمولی</string>
     <!-- Instant onboarding title (there is not more to do than to set name and avatar) -->
-    <string name="instant_onboarding_title">حساب شما</string>
+    <string name="instant_onboarding_title">نمایه شما</string>
     <!-- Secondary, link-like button to open a page with other possible instances -->
     <string name="instant_onboarding_show_more_instances">استفاده از یک سرور دیگر</string>
     <string name="instant_onboarding_other_server">لیست سرورهای Chatmail</string>
+    <!-- Hint about what happens when "Create Profile" button in pressed; the placeholder will be replaced by contact name and/or address -->
+    <string name="instant_onboarding_contact_info">برای گفتگو با %1$s یک حساب کاربری کنید.</string>
     <string name="welcome_chat_over_email">گفتگو غیرمتمرکز و ایمن</string>
     <string name="scan_invitation_code">اسکن کردن کد دعوت</string>
     <string name="login_title">ورود</string>
@@ -599,7 +604,7 @@ https://meet.jit.si/$ROOM
     <string name="add_account">افزودن حساب کاربری</string>
     <string name="delete_account">حذف حساب کاربری</string>
     <string name="delete_account_ask">آیا از حذف حساب کاربری اطمینان دارید؟</string>
-    <string name="delete_account_explain_with_name">همه اطلاعات حساب مربوط به \"%s\" روی این دستگاه پاک می‌شود؛ که شامل تنظیمات رمزگذاری سرتاسر، مخاطبین، گفتگو ها پیام‌ها، رسانه ها می‌شود. این عمل قابل بازگشت نیست.</string>
+    <string name="delete_account_explain_with_name">همه اطلاعات حساب مربوط به «%s» روی این دستگاه پاک می‌شود. این شامل تنظیمات رمزگذاری سرتاسر، مخاطبین، گفتگو ها، پیام‌ها و رسانه ها می‌شود. این عمل قابل بازگردانی نیست.</string>
     <string name="unconfigured_account">حساب تنظیم نشده</string>
     <string name="unconfigured_account_hint">بازکردن حساب برای تنظیم آن</string>
     <string name="try_connect_now">اکنون برای اتصال تلاش کنید</string>
@@ -684,7 +689,7 @@ https://meet.jit.si/$ROOM
     <!-- the placeholder will be replaced by the name of the profile's email address -->
     <string name="pref_backup_export_x">برون‏بُرد(اکسپورت) %1$s</string>
     <!-- the placeholder will be replaced by the number of profiles to export; the number is always larger than 1 -->
-    <string name="pref_backup_export_all">برون‏بُرد(اکسپورت) هر %1$d حساب </string>
+    <string name="pref_backup_export_all">برون‏بُرد (اکسپورت) همه%1$d حساب ها</string>
     <string name="pref_backup_export_start_button">شروع تهیه نسخه پشتیبان</string>
     <string name="pref_backup_written_to_x">نسخه پشتیبان با موفقیت در\"%1$s\" ذخیره شد.</string>
     <string name="pref_managekeys_menu_title">مدیریت کلیدها</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index ef36eaec3..6ed61615b 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -803,6 +803,8 @@
     <string name="autodel_server_ask">Szeretné törölni a %1$d üzenetet most és az összes újonnan érkező „%2$s” üzenetet a jövőben?\n\n⚠️ Ez magába foglalja az e-maileket, a médiát és a „Mentett üzeneteket” minden kiszolgáló mappában\n\n⚠️ Ne használja ezt a funkciót, ha az adatokat a kiszolgálón szeretné tartani\n\n⚠️ Ne használja ezt a funkciót, ha a Delta Chat mellett más e-mail klienseket is használ.</string>
     <!-- shown below enabled autodel_server-option, should be a summary of autodel_server_ask and remind about the impact -->
     <string name="autodel_server_enabled_hint">Ez magában foglalja az e-maileket, a médiát és a „Mentett üzeneteket” az összes kiszolgálómappában. Ne használja ezt a funkciót, ha a kiszolgálón szeretné megtartani az adatokat, vagy ha a Delta Chat mellett más e-mail klienseket is használ.</string>
+    <string name="autodel_server_warn_multi_device_title">Egyszeri törlés bekapcsolása</string>
+    <string name="autodel_server_warn_multi_device">Ha az egyszeri törlés engedélyezve van, akkor nem használhatja ezt a profilt több eszközről.</string>
     <string name="autodel_confirm">Értem, törölje ezeket az üzeneteket</string>
     <!-- "At once" in the meaning of "Immediately", without any intervening time. -->
     <string name="autodel_at_once">Egyszer</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index a56de91f5..7ff117aae 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -818,6 +818,8 @@
     <string name="autodel_server_ask">Vuoi eliminare %1$d messaggi ora e tutti i messaggi appena recuperati \"%2$s\" nel futuro?\n\n⚠️ Ciò include emails, contenuti multimediali e \"Messaggi salvati\" in tutte le cartelle del server\n\n⚠️ Non utilizzare questa funzione se vuoi mantenere i dati sul server\n\n⚠️ Non utilizzare questa funzione se stai utilizzando altri client di posta elettronica oltre a Delta Chat</string>
     <!-- shown below enabled autodel_server-option, should be a summary of autodel_server_ask and remind about the impact -->
     <string name="autodel_server_enabled_hint">Questo include email, media e \"Messaggi salvati\" in tutte le cartelle del server. Non utilizzare questa funzione se desideri mantenere i dati sul server o se stai utilizzando altri client di posta elettronica oltre a Delta Chat.</string>
+    <string name="autodel_server_warn_multi_device_title">Attiva l\'eliminazione immediata</string>
+    <string name="autodel_server_warn_multi_device">Se abiliti l\'eliminazione immediata non potrai utilizzare più dispositivi su questo profilo.</string>
     <string name="autodel_confirm">Ho capito, elimina tutti i messaggi</string>
     <!-- "At once" in the meaning of "Immediately", without any intervening time. -->
     <string name="autodel_at_once">Subito</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 7499d4549..cb8710b8a 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -834,7 +834,7 @@
     <!-- shown below enabled autodel_server-option, should be a summary of autodel_server_ask and remind about the impact -->
     <string name="autodel_server_enabled_hint">Obejmuje to e-maile, multimedia i „Zapisane wiadomości” we wszystkich folderach na serwerze. Nie używaj tej funkcji, jeśli chcesz zachować dane na serwerze lub jeśli używasz innych klientów poczty e-mail oprócz Delta Chat.</string>
     <string name="autodel_server_warn_multi_device_title">Włącz natychmiastowe usuwanie</string>
-    <string name="autodel_server_warn_multi_device">Jeśli włączysz natychmiastowe usuwanie, nie będzie już można używać wielu urządzeń w tym profilu.</string>
+    <string name="autodel_server_warn_multi_device">Jeśli włączysz natychmiastowe usuwanie, nie będzie można używać wielu urządzeń w tym profilu.</string>
     <string name="autodel_confirm">Rozumiem, usuń te wszystkie wiadomości</string>
     <!-- "At once" in the meaning of "Immediately", without any intervening time. -->
     <string name="autodel_at_once">Od razu po pobraniu</string>
diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml
index 821bc7378..b2af891fd 100644
--- a/src/main/res/values-sq/strings.xml
+++ b/src/main/res/values-sq/strings.xml
@@ -796,6 +796,8 @@
     <string name="autodel_server_ask">Doni të fshihen tani %1$d mesazhe dhe krejt mesazhet e prurë rishtas “%2$s” më vonë në të ardhmen?\n\n⚠️ Kjo përfshin email-et, media dhe “Mesazhe të ruajtur” në krejt dosjet e shërbyesit\n\n⚠️ Mos e përdorni këtë funksion, nëse doni të mbani të dhënat në shërbyes\n\n⚠️ Mos e përdorni këtë funksion, nëse po përdorni klientë të tjerët përkrah Delta Chat-it</string>
     <!-- shown below enabled autodel_server-option, should be a summary of autodel_server_ask and remind about the impact -->
     <string name="autodel_server_enabled_hint">Kjo përfshin email-et, media dhe “Mesazhe të ruajtur” në krejt dosjet e shërbyesit. Mos e përdorni këtë funksion, nëse doni të mbani të dhënat te shërbyesi ose nëse po përdorni klientë të tjerët përkrah Delta Chat-it</string>
+    <string name="autodel_server_warn_multi_device_title">Aktivizoni fshirje të menjëhershme</string>
+    <string name="autodel_server_warn_multi_device">Nëse aktivizoni fshirje të menjëhershme, s’mund të përdorni pajisje të shumta në këtë profil.</string>
     <string name="autodel_confirm">E kuptoj, fshiji krejt këto mesazhe</string>
     <!-- "At once" in the meaning of "Immediately", without any intervening time. -->
     <string name="autodel_at_once">Menjëherë</string>
@@ -1146,4 +1148,5 @@
     <string name="update_1_44_android">Ç’ka të re:\n\n❤️ Po! Kjo ka kohë që pritej: Prekni gjatë mbi një mesazh, për të reaguar\n\n🔗 Nëse nuk skanoni dot kode QR, jepini si lidhje ftesë\n\n🔵 Tashmë mesazhet e palexuar të krejt llogarive numërohen dhe numri shfaqet te titulli\n\n… dhe TONELATA ndreqje të metash … %1$s\n\nNdihmoni të përmirësohet aplikacioni: Përdorni “Rregullime / Të thelluara / Dërgo statistika”, për të ndihmuar zhvilluesit ta bëjnë më optimal për përdorim të përditshëm. Para se të dërgohen, të dhënat mund t’i shqyrtoni</string>
     <string name="update_1_44_ios">Ç’ka të re:\n\n❤️ Po! Kjo ka kohë që pritej: Prekni gjatë mbi një mesazh, për të reaguar\n\n🫸 Njoftime PUSH, nëse kjo mbulohet nga furnizuesit e shërbimeve internet, b.f., https://nine.testrun.org\n\n🔗 Nëse nuk skanoni dot kode QR, jepini si lidhje ftesë\n\n… dhe TONELATA ndreqje të metash … %1$s</string>
     <string name="update_1_46_android">Hapa të Rinj Mirëseardhjeje 🐣 Etj.:\n\n⚡️ Regjistrohuni te shërbyes të siguruar, të shpejtë, chatmail-i (https://delta.chat/chatmail), ose përdorni shërbyes klasikë email-i\n\n👉 Njoftime PUSH për çfarëdo shërbyesi “chatmail”\n\n👤 Lidhuni me shokët tuaj në mënyrë të parrezik, përmes “Bashkëngjitni kontakte”\n\n🥰 Reagoni me çfarëdo emoxhi\n\n📌 Fiksoni fjalosje drejt e nga kërkimi … dhe PLOT të TJERA te %1$s</string>
-    </resources>
+    <string name="update_1_46_ios">Hapa të Rinj Mirëseardhjeje 🐣 dhe të Tjera:\n\n⚡️ Regjistrohuni te shërbyes të siguruar, të shpejtë chatmail-i (https://delta.chat/chatmail), ose përdorni shërbyes klasikë email-i\n\n👉 Njoftime PUSH për çfarëdo shërbyesish “chatmail”\n\n👤 Merrni “Kontakte bashkëmgjitur” dhe lidhuni me shokët tuaj\n\n🥰 Përzgjedhje më e shpejtë reagimesh…ETJ, te %1$s</string>
+</resources>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 42f8ef571..608f71a15 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -804,7 +804,7 @@
     <!-- shown below enabled autodel_server-option, should be a summary of autodel_server_ask and remind about the impact -->
     <string name="autodel_server_enabled_hint">Bu, tüm sunucu klasörlerindeki e-postaları, ortamları ve \"Kaydedilen iletileri\" kapsar. Verileri sunucuda tutmak istiyorsanız ya da Delta Chat\'ten başka diğer e-posta istemcilerini kullanıyorsanız bu işlevi kullanmayın.</string>
     <string name="autodel_server_warn_multi_device_title">Bir kerede silmeyi aç</string>
-    <string name="autodel_server_warn_multi_device">Bir kerede silmeyi etkinleştirirseniz, artık bu profilde çoklu aygıtları kullanamazsınız.</string>
+    <string name="autodel_server_warn_multi_device">Bir kerede silmeyi etkinleştirirseniz, bu profilde çoklu aygıtları kullanamazsınız.</string>
     <string name="autodel_confirm">Anladım, tüm bu iletileri sil</string>
     <!-- "At once" in the meaning of "Immediately", without any intervening time. -->
     <string name="autodel_at_once">İndirdikten Sonra Bir Kerede</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index e0583d520..8bc0e16b9 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -245,7 +245,7 @@
     <string name="menu_delete_messages">Видалити повідомлення</string>
     <string name="delete_contact">Видалити контакт</string>
     <string name="menu_delete_location">Видалити це місце?</string>
-    <string name="menu_message_details">Деталі повідомлення</string>
+    <string name="menu_message_details">Інформація про повідомлення</string>
     <string name="menu_copy_to_clipboard">Копіювати в буфер обміну</string>
     <string name="menu_copy_selection_to_clipboard">Скопіювати позначене</string>
     <string name="menu_copy_link_to_clipboard">Скопіювати посилання</string>
@@ -536,7 +536,7 @@
     <string name="multidevice_this_creates_a_qr_code">Це створить QR-код, який другий пристрій може сканувати, щоб скопіювати обліковий запис.</string>
     <string name="multidevice_install_dc_on_other_device">Установіть Delta Chat на Ваш інший пристрій (https://get.delta.chat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
-    <string name="multidevice_tap_scan_on_other_device">Запустіть Delta Chat, торкніться \"У мене вже є логін / Додати як другий пристрій\" і відскануйте код, показаний тут</string>
+    <string name="multidevice_tap_scan_on_other_device">Запустіть Delta Chat, торкніться \"Я вже маю профіль / Додати як другий пристрій\" і відскануйте код, показаний тут</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
     <string name="multidevice_qr_subtitle">Скануйте, щоб налаштувати другий пристрій %1$s</string>
     <string name="multidevice_receiver_title">Додати як другий пристрій</string>
@@ -833,9 +833,11 @@
     <string name="autodel_server_ask">Ви хочете видалити %1$dповідомлень зараз і всі нові повідомлення \"%2$s\" в майбутньому?\n\n⚠️ Сюди входять електронні листи, медіа та \"Збережені повідомлення\" у всіх папках сервера\n\n⚠️ Не використовуйте цю функцію, якщо Ви хочете зберегти дані на сервері\n\n⚠️ Не використовуйте цю функцію, якщо користуєтеся ще й іншими поштовими клієнтами крім Delta Chat</string>
     <!-- shown below enabled autodel_server-option, should be a summary of autodel_server_ask and remind about the impact -->
     <string name="autodel_server_enabled_hint">Це стосується повідомлень електронної пошти, медіа та \"Збережених повідомлень\" у всіх серверних папках. Не використовуйте цю функцію, якщо хочете зберегти дані на сервері або якщо користуєтесь іншими клієнтами електронної пошти крім Delta Chat.</string>
+    <string name="autodel_server_warn_multi_device_title">Увімкнути одномоментне видалення</string>
+    <string name="autodel_server_warn_multi_device">Якщо ви ввімкнули одномоментне видалення, ви не зможете використовувати кілька пристроїв у цьому профілі.</string>
     <string name="autodel_confirm">Я все розумію, видалити всі повідомлення</string>
     <!-- "At once" in the meaning of "Immediately", without any intervening time. -->
-    <string name="autodel_at_once">Одразу</string>
+    <string name="autodel_at_once">Відразу після завантаження</string>
     <string name="after_30_seconds">Через 30 секунд</string>
     <string name="after_1_minute">Через 1 хвилину</string>
     <string name="after_5_minutes">Через 5 хвилин</string>
@@ -1095,7 +1097,7 @@
     <string name="select_group_image_desktop">Вибрати зображення групи</string>
     <string name="export_backup_desktop">Експорт резервної копії</string>
     <string name="autocrypt_correct_desktop">Налаштування Autocrypt успішно передані!</string>
-    <string name="forget_login_confirmation_desktop">Видалити цей обліковий запис? При цьому будуть видалені всі дані, включно з параметрами наскрізного шифрування, списками контактів, чатами, повідомленнями та медіафайлами. Цю дію не можна буде скасувати.</string>
+    <string name="forget_login_confirmation_desktop">Видалити цей профіль? Все буде видалено, включно з усіма вашими налаштуваннями, контактами, чатами, повідомленнями та медіа. Цю дію неможливо скасувати.</string>
     <!-- deprecated -->
     <string name="account_info_hover_tooltip_desktop2">E-Mail: %1$s\nРозмір: %2$s\nІдентиф. аккаунту: %3$s</string>
     <string name="message_detail_sent_desktop">надіслано</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index c0a329637..b8c50be49 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -438,6 +438,8 @@
     <string name="tab_gallery_empty_hint">本對話中共享的圖片和視訊會顯示在這裡。</string>
     <string name="tab_docs_empty_hint">本對話中共享的文件、音樂和其它檔案會顯示在這裡。</string>
     <string name="media_preview">媒體預覽</string>
+    <!-- option to show images in the gallery as square (instead of using correct width/height) -->
+    <string name="square_grid">方形網格</string>
     <string name="send_message">傳送訊息</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new email addresses. -->
     <string name="aeap_addr_changed">%1$s 已變更他的地址從 %2$s 為 %3$s</string>
@@ -473,10 +475,14 @@
     <string name="part_of_total_used">使用了 %2$s 中的 %1$s</string>
 
 
+    <!-- Button, allows to log in to existing email accounts, setting ports, passwords and so on -->
+    <string name="manual_account_setup_option">經典電子郵件登入</string>
     <!-- Instant onboarding title (there is not more to do than to set name and avatar) -->
     <string name="instant_onboarding_title">你的個人檔案</string>
     <!-- Secondary, link-like button to open a page with other possible instances -->
     <string name="instant_onboarding_show_more_instances">使用其他伺服器</string>
+    <string name="instant_onboarding_other_server">列出 Chatmail 伺服器</string>
+    <string name="scan_invitation_code">掃描邀請碼</string>
     <string name="login_title">登入</string>
     <!-- for classic email, we use the classical term "Account" -->
     <string name="login_header">登入你的電子郵件帳戶</string>
@@ -610,6 +616,7 @@
     <string name="pref_show_emails_accepted_contacts">顯示已接受的聯絡人</string>
     <string name="pref_show_emails_all">所有郵件</string>
     <string name="pref_experimental_features">實驗性功能</string>
+    <string name="pref_on_demand_location_streaming">按需要位置串流</string>
     <string name="pref_developer_mode">開發者模式</string>
     <string name="pref_background_default">預設圖片</string>
     <string name="pref_background_default_color">預設顏色</string>
@@ -626,6 +633,7 @@
     <string name="emoji_search_results">搜尋結果</string>
     <string name="emoji_not_found">找不到表情符號</string>
     <string name="emoji_recent">最近已使用</string>
+    <string name="emoji_nature">動物與自然</string>
     <string name="emoji_activity">活動</string>
     <string name="emoji_objects">物件</string>
     <string name="emoji_symbols">符號</string>
@@ -674,6 +682,7 @@
     <!-- system messages -->
     <string name="systemmsg_read_receipt_subject">收執回條</string>
     <string name="systemmsg_read_receipt_body">這是訊息 %1$s 的收執回條，表示本訊息已經顯示在收件人的裝置上了，但不代表收件人已讀。</string>
+    <string name="systemmsg_subject_for_new_contact">來自 %1$s 的訊息</string>
     <!-- %1$s will be replaced by the old group name, %2$s will be replaced by the new group name -->
     <string name="group_name_changed_by_you">我群組名稱已從 %1$s 更改為 %2$s</string>
     <!-- %1$s will be replaced by the old group name, %2$s will be replaced by the new group name, %3$s will be replaced by name and address of the contact who did the action. -->
@@ -707,6 +716,9 @@
     <string name="qrscan_fingerprint_label">指紋</string>
     <string name="qrshow_title">QR 圖碼邀請碼</string>
     <string name="qrshow_x_joining">%1$s 加入了。</string>
+    <string name="qrshow_x_has_joined_group">%1$s 已加入群組。</string>
+    <string name="qrshow_join_group_title">QR 圖碼邀請碼</string>
+    <string name="qrshow_join_contact_title">QR 圖碼邀請碼</string>
     <!-- This text is shown inside the "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and address eg. "Scan to chat with Alice (alice@example.org)" -->
     <string name="qrshow_join_contact_hint">掃描 QRCode 以新增 %1$s</string>
     <string name="please_enter_name">請輸入名稱。</string>
@@ -730,11 +742,13 @@
     <string name="ImageEditorHud_brush_marker">標記筆</string>
     <string name="ImageEditorHud_brush_highlight">螢光筆</string>
     <string name="ImageEditorHud_crop">裁切</string>
+    <string name="ImageEditorHud_flip">翻轉</string>
     <string name="ImageEditorHud_rotate">旋轉</string>
 
     <!-- dc_str_* resources -->
     <string name="encrypted_message">已加密的訊息</string>
 
+    <string name="welcome_desktop">歡迎來到 Delta Chat</string>
     <string name="global_menu_preferences_language_desktop">語言</string>
     <string name="global_menu_file_desktop">檔案</string>
     <string name="global_menu_file_quit_desktop">退出</string>
@@ -748,18 +762,23 @@
     <string name="global_menu_view_developer_desktop">開發者</string>
     <string name="global_menu_view_developer_tools_desktop">開發者工具</string>
     <string name="global_menu_help_desktop">幫助</string>
+    <string name="global_menu_help_contribute_desktop">在 GitHub 上作出貢獻</string>
+    <string name="global_menu_help_report_desktop">報告問題</string>
     <string name="global_menu_help_about_desktop">關於 Delta Chat</string>
     <string name="global_menu_file_open_desktop">開啟 Delta Chat</string>
     <string name="global_menu_minimize_to_tray">最小化</string>
+    <string name="write_message_desktop">撰寫訊息</string>
     <string name="encryption_info_title_desktop">加密資訊</string>
     <string name="delete_message_desktop">刪除訊息</string>
     <string name="more_info_desktop">更多資訊</string>
     <string name="remove_desktop">移除</string>
     <string name="save_desktop">儲存</string>
     <string name="name_desktop">名稱</string>
+    <string name="select_group_image_desktop">選擇群組圖片</string>
     <string name="export_backup_desktop">匯出備份</string>
     <string name="forget_login_confirmation_desktop">確定要刪除這裡的登入嗎? 所有的設定都會被刪除，包括端到端加密設定、聯絡人、對話、訊息、媒體檔案等。本動作不能復原。</string>
     <string name="message_detail_sent_desktop">已傳送</string>
+    <string name="message_detail_received_desktop">已收到</string>
     <string name="show_window">顯示視窗</string>
     <!-- title of the "keybindings" dialog (for the keybindings names as such, where possible the normal command strings are used) -->
     <string name="keybindings">按鍵綁定</string>
@@ -773,6 +792,8 @@
 
     <string name="a11y_message_context_menu_btn_label">訊息動作</string>
     <string name="a11y_background_preview_label">壁紙預覽</string>
+    <!-- iOS specific strings, developers: please take care to remove strings that are no longer used! -->
+    <string name="stop_sharing_location">停止分享位置</string>
     <string name="open_settings">開啟設定</string>
     <!-- iOS connectivity view, Adjective, used eg. as "Notifications: Delayed" -->
     <string name="delayed">已延遲</string>

From 56260e52107225eabe1a6913dceb182f430700b4 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Tue, 23 Jul 2024 17:58:47 +0200
Subject: [PATCH 2/2] update local help

---
 src/main/assets/help/it/help.html | 12 ++++++------
 src/main/assets/help/uk/help.html | 15 ++++-----------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/main/assets/help/it/help.html b/src/main/assets/help/it/help.html
index 05cd7a136..6082c7966 100644
--- a/src/main/assets/help/it/help.html
+++ b/src/main/assets/help/it/help.html
@@ -1205,11 +1205,11 @@ un’analisi di sicurezza indipendente, dal più recente al più vecchio:</p>
 
 <ul>
   <li>
-    <p>2024 March, we received a deep security analysis from the Applied Cryptography
-research group at ETH Zuerich and addressed all raised issues. 
-See our blog post about <a href="https://delta.chat/en/2024-03-25-crypto-analysis-securejoin">Hardening Guaranteed End-to-End encryption</a> for more detailed information and the
-<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
-research paper published afterwards.</p>
+    <p>Marzo 2024, abbiamo ricevuto un’analisi approfondita della sicurezza dalla Crittografia Applicata
+gruppo di ricerca dell’ETH di Zurigo e ha affrontato tutte le questioni sollevate. 
+Consulta il nostro post sul blog su <a href="https://delta.chat/en/2024-03-25-crypto-analysis-securejoin">Rafforzamento della crittografia end-to-end garantita</a> per informazioni più dettagliate e
+<a href="https://eprint.iacr.org/2024/918.pdf">Analisi crittografica di Delta Chat</a> 
+articolo di ricerca pubblicato successivamente.</p>
   </li>
   <li>
     <p>A partire dal 2023, abbiamo risolto i problemi di sicurezza e privacy con il servizio “web
@@ -1917,7 +1917,7 @@ proposte, in particolare per <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">E
   <li>
     <p>A volte riceviamo donazioni una tantum da privati.
 Ad esempio, nel 2021 un generoso individuo ci ha trasferito in banca 4K EUR
-con l’oggetto “mantenete il buoni sviluppi!”. 💜
+con l’oggetto “continuate il buon sviluppo!”. 💜
 Usiamo questi soldi per finanziare incontri di sviluppo o per sostenere spese ad hoc
 che non possono essere facilmente previsti o rimborsati da finanziamenti pubblici.
 Ricevere più donazioni ci aiuta anche a diventare più indipendenti e vitali a lungo termine
diff --git a/src/main/assets/help/uk/help.html b/src/main/assets/help/uk/help.html
index 72962b014..65b41b752 100644
--- a/src/main/assets/help/uk/help.html
+++ b/src/main/assets/help/uk/help.html
@@ -457,12 +457,9 @@
         
       </h3>
 
-<p>Yes, Delta Chat automatically uses Push Notifications for <a href="https://delta.chat/chatmail">chatmail</a> profiles.
-And no, there is no alternative on Apple’s phones to achieve instant message delivery
-because Apple devices do not allow Delta Chat to fetch data in the background.
-Push notifications are automatically activated for iOS users because
-<a href="#privacy-notifications">Delta Chat’s privacy-preserving Push Notification system</a>
-does not expose data to Apple that it doesn’t already have.</p>
+<p>Так, Delta Chat автоматично використовує push-повідомлення для профілів <a href="https://delta.chat/chatmail">chatmail</a>.
+І ні, на телефонах Apple немає альтернативи миттєвій доставці повідомлень тому, що пристрої Apple не дозволяють Delta Chat отримувати дані у фоновому режимі.
+Push-сповіщення автоматично активуються для користувачів iOS, тому що <a href="#privacy-notifications">система push-сповіщень Delta Chat, що зберігає конфіденційність</a> не передає Apple дані, якими вона ще не володіє.</p>
     
       <h3 id="android-push">
         
@@ -882,11 +879,7 @@ Look for something like <strong>Start Autocrypt Setup Transfer</strong> in the s
 
 <ul>
   <li>
-    <p>2024 March, we received a deep security analysis from the Applied Cryptography
-research group at ETH Zuerich and addressed all raised issues. 
-See our blog post about <a href="https://delta.chat/en/2024-03-25-crypto-analysis-securejoin">Hardening Guaranteed End-to-End encryption</a> for more detailed information and the
-<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
-research paper published afterwards.</p>
+    <p>2024 березня ми отримали глибокий аналіз безпеки від дослідницької групи Applied Cryptography дослідницької групи з прикладної криптографії в ETH Zuerich і вирішили всі порушені питання. Більш детальну інформацію можна знайти в нашому блозі в статті <a href="https://delta.chat/en/2024-03-25-crypto-analysis-securejoin">Hardening Guaranteed End-to-end encryption</a>, а також в дослідженні <a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a>, опублікованому пізніше.</p>
   </li>
   <li>
     <p>Починаючи з 2023 року, ми виправили проблеми з безпекою та конфіденційністю у функції “веб застосунків, що поширені у чаті”, пов’язані зі збоями в роботі пісочниці особливо в Chromium. Згодом ми отримали незалежний аудит безпеки аудит безпеки від Cure53, і всі знайдені проблеми були виправлені в серії додатків 1.36, випущених у квітні 2023 року. Повну історію про наскрізну безпеку в Інтернеті дивіться <a href="https://delta.chat/en/2023-05-22-webxdc-security">тут</a>.</p>