diff --git a/apps/android/app/src/main/res/values-es/strings.xml b/apps/android/app/src/main/res/values-es/strings.xml
index 202d8f2589..4dcde92857 100644
--- a/apps/android/app/src/main/res/values-es/strings.xml
+++ b/apps/android/app/src/main/res/values-es/strings.xml
@@ -141,7 +141,7 @@
     <string name="group_member_status_intro_invitation">conectando (invitación de presentación )</string>
     <string name="group_member_status_accepted">conectando (aceptado)</string>
     <string name="group_member_status_announced">conectando (anunciado)</string>
-    <string name="connection_local_display_name">conexión&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"connection ID\" example=\"1\"&gt;</string>
+    <string name="connection_local_display_name">conexión <xliff:g id="connection ID" example="1">%1$d</xliff:g></string>
     <string name="connect_via_link_or_qr">Conectar mediante enlace / Código QR</string>
     <string name="delete_contact_all_messages_deleted_cannot_undo_warning">El contacto y todos los mensajes serán eliminados. ¡No se puede deshacer!</string>
     <string name="icon_descr_contact_checked">Contacto verificado</string>
diff --git a/apps/android/app/src/main/res/values-nl/strings.xml b/apps/android/app/src/main/res/values-nl/strings.xml
index fd98c0b6e8..6d4a34a82b 100644
--- a/apps/android/app/src/main/res/values-nl/strings.xml
+++ b/apps/android/app/src/main/res/values-nl/strings.xml
@@ -473,7 +473,7 @@
     <string name="v4_5_reduced_battery_usage_descr">Meer verbeteringen volgen snel!</string>
     <string name="button_add_members">Nodig leden uit</string>
     <string name="notification_display_mode_hidden_desc">Verberg contact en bericht</string>
-    <string name="turn_off_battery_optimization">Om het te gebruiken &lt;b xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;batterijoptimalisatie uitschakelen&lt;/b&gt; voor &lt;xliff:g xmlns:xliff=\"urn:oasis: names:tc:xliff:document:1.2\" id=\"appName\"&gt;SimpleX&lt;/xliff:g&gt; in het volgende dialoogvenster. Anders worden de meldingen uitgeschakeld.</string>
+    <string name="turn_off_battery_optimization">Om het te gebruiken <b>batterijoptimalisatie uitschakelen</b> voor <xliff:g xmlns:xliff="urn:oasis: names:tc:xliff:document:1.2" id="appName">SimpleX</xliff:g> in het volgende dialoogvenster. Anders worden de meldingen uitgeschakeld.</string>
     <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Als u ervoor kiest om te weigeren, wordt de afzender NIET op de hoogte gesteld.</string>
     <string name="onboarding_notifications_mode_service">Onmiddellijk</string>
     <string name="rcv_group_event_member_added">heeft <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g> uitgenodigd</string>
diff --git a/apps/android/app/src/main/res/values-pt-rBR/strings.xml b/apps/android/app/src/main/res/values-pt-rBR/strings.xml
index f6a74d6e9d..9df7a3b43c 100644
--- a/apps/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/apps/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -687,7 +687,7 @@
     <string name="settings_section_title_you">VOCÊ</string>
     <string name="settings_section_title_messages">MENSAGENS E ARQUIVOS</string>
     <string name="your_chat_database">Seu banco de dados de chat</string>
-    <string name="snd_group_event_member_deleted">Você removeu&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"member profile\" example=\"alice (Alice)\"&gt;</string>
+    <string name="snd_group_event_member_deleted">Você removeu <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
     <string name="group_member_status_removed">removido</string>
     <string name="group_member_status_left">saiu</string>
     <string name="group_member_role_owner">proprietário</string>
@@ -794,7 +794,7 @@
     <string name="videos_limit_title">Excesso de vídeos!</string>
     <string name="icon_descr_video_asked_to_receive">Solicitou receber o vídeo</string>
     <string name="videos_limit_desc">Apenas 10 vídeos podem ser enviados ao mesmo tempo</string>
-    <string name="contact_sent_large_file">Seu contato enviou um arquivo maior que o tamanho máximo permitido (&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"maxFileSize\"&gt;).</string>
+    <string name="contact_sent_large_file">Seu contato enviou um arquivo maior que o tamanho máximo permitido (<xliff:g id="maxFileSize">%1$s</xliff:g>).</string>
     <string name="file_will_be_received_when_contact_completes_uploading">O arquivo será recebido quando seu contato concluir o upload.</string>
     <string name="smp_servers_test_some_failed">Alguns servidores falharam o teste:</string>
     <string name="smp_servers_save">Salvar servidores</string>
@@ -893,7 +893,7 @@
     <string name="v4_5_private_filenames_descr">Para proteger o fuso horário, os arquivos de imagem/voz usam UTC.</string>
     <string name="unknown_message_format">formato de mensagem desconhecido</string>
     <string name="description_via_group_link">via link de grupo</string>
-    <string name="simplex_link_connection">via&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"serverHost\" example=\"smp.simplex.im\"&gt;</string>
+    <string name="simplex_link_connection">via <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g></string>
     <string name="connection_error_auth_desc">A menos que seu contato tenha excluído a conexão ou este link já tenha sido usado, pode ser um bug - por favor, relate-o.
 \nPara se conectar, peça ao seu contato para criar outro link de conexão e verifique se você tem uma conexão de rede estável.</string>
     <string name="error_smp_test_failed_at_step">O teste falhou na etapa %s.</string>
diff --git a/apps/android/app/src/main/res/values-zh-rCN/strings.xml b/apps/android/app/src/main/res/values-zh-rCN/strings.xml
index 9eb897557b..78e1e06846 100644
--- a/apps/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/apps/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -117,8 +117,8 @@
     <string name="icon_descr_audio_on">开启音频</string>
     <string name="icon_descr_asked_to_receive">已要求接收图片</string>
     <string name="network_session_mode_user_description">一个单独的TCP连接（和SOCKS凭证）将被用于<b>，用于您在应用程序中的每个聊天资料</b> 。</string>
-    <string name="network_session_mode_entity_description">每个联系人和群组成员&lt;/b&gt; 将使用单独的 TCP 连接（和 SOCKS 凭证）&lt;b&gt;。
-\n&lt;b&gt;请注意&lt;/b&gt;：如果您有很多连接，您的电池和流量消耗可能会大大增加，并且某些连接可能会失败。</string>
+    <string name="network_session_mode_entity_description">每个联系人和群组成员 <b>将使用单独的 TCP 连接（和 SOCKS 凭证）</b>。
+\n<b>请注意</b>：如果您有很多连接，您的电池和流量消耗可能会大大增加，并且某些连接可能会失败。</string>
     <string name="back">返回</string>
     <string name="add_new_contact_to_create_one_time_QR_code"><b>添加新联系人</b>：为您的联系人创建一次性二维码。</string>
     <string name="onboarding_notifications_mode_off_desc"><b> 最长续航 </b>。您只会在应用程序运行时收到通知（无后台服务）。</string>
@@ -950,7 +950,7 @@
     <string name="ttl_m">%dm</string>
     <string name="ttl_mth">%dmth</string>
     <string name="waiting_for_file">等待文件中</string>
-    <string name="contact_sent_large_file">您的联系人发送的文件大于当前支持的最大大小 (&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"maxFileSize\"&gt;%1$s&lt;/xliff :g&gt;).</string>
+    <string name="contact_sent_large_file">您的联系人发送的文件大于当前支持的最大大小 (<xliff:g id="maxFileSize">%1$s</xliff:g>).</string>
     <string name="you_will_be_connected_when_your_connection_request_is_accepted">当您的连接请求被接受后，您将可以连接，请稍等或稍后检查！</string>
     <string name="smp_servers_use_server">使用服务器</string>
     <string name="smp_servers_your_server_address">您的服务器地址</string>
diff --git a/apps/android/app/src/main/res/values-zh-rTW/strings.xml b/apps/android/app/src/main/res/values-zh-rTW/strings.xml
index 7c0174ecd6..01e7c2067d 100644
--- a/apps/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/apps/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -149,7 +149,7 @@
     <string name="failed_to_create_user_duplicate_title">重複的顯示名稱！</string>
     <string name="network_session_mode_entity_description">一個單獨的 TCP 連接（和 SOCKS 憑證）將用於<b>每個聯絡人和群組內的成員</b>。
 \n<b>請注意</b>：如果你有很多連接，你的電話電量和數據流量的消耗率會大大增加，一些連接有機會會連接失敗。</string>
-    <string name="network_session_mode_user_description">一個單獨的 TCP 連接（和 SOCKS 憑證）將用於&lt;b&gt;每個聊天室的設定&lt;b&gt;。</string>
+    <string name="network_session_mode_user_description">一個單獨的 TCP 連接（和 SOCKS 憑證）將用於 <b>每個聊天室的設定</b>。</string>
     <string name="back">返回</string>
     <string name="turning_off_service_and_periodic">省電模式運行中，關閉了背景通知服務和定期更新接收訊息。你可以在通知設定內重新啟用。</string>
     <string name="settings_section_title_incognito">匿名聊天模式</string>
@@ -366,7 +366,7 @@
     <string name="send_live_message_desc">傳送實況訊息 - 這會即時顯示你在輸入中的文字</string>
     <string name="connect_via_link_or_qr_from_clipboard_or_in_person">（掃描或使用剪貼薄貼上）</string>
     <string name="toast_permission_denied">權限被拒絕！</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery">為了保護你的私隱，&lt;b xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;SimpleX&lt;/xliff:g&gt; 有一個後台通知服務 – 它每天使用你幾 % 的電量。</string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery">為了保護你的私隱，<b><xliff:g id="appName">SimpleX</xliff:g></b> 有一個後台通知服務 – 它每天使用你幾 % 的電量。</string>
     <string name="periodic_notifications">定期通知</string>
     <string name="notifications_mode_periodic_desc">每十分鐘會檢查一次訊息，最快可設為每分鐘檢查一次</string>
     <string name="notification_preview_mode_message">訊息文字</string>
@@ -424,7 +424,7 @@
     <string name="colored">顏色</string>
     <string name="how_to_use_your_servers">如何使用你的伺服器</string>
     <string name="to_connect_via_link_title">使用連結連接</string>
-    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 桌面版：在應用程式內掃描一個已存在的二維碼，透過 &lt;b&gt;掃描二維碼 &lt;b&gt;。</string>
+    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 桌面版：在應用程式內掃描一個已存在的二維碼，透過 <b>掃描二維碼</b>。</string>
     <string name="icon_descr_settings">設定</string>
     <string name="this_QR_code_is_not_a_link">這個二維碼不是一個連結！</string>
     <string name="create_one_time_link">建立一次性邀請連結</string>
@@ -879,7 +879,7 @@
 \n1. 訊息將在傳送至客戶端後兩天或在伺服器內三十天時過時。
 \n2. 訊息解密失敗，因為你或你的聯絡人用了舊的數據庫備份
 \n3. 連接被破壞。</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">只有客戶端裝置才會儲存你的個人檔案、聯絡人，群組，所有訊息都會經過&lt;b&gt;兩層的端對端加密&lt;b&gt;。</string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">只有客戶端裝置才會儲存你的個人檔案、聯絡人，群組，所有訊息都會經過 <b>兩層的端對端加密</b>。</string>
     <string name="store_passphrase_securely">請放置你的密碼於安全的地方，如果你遺失了密碼，將不可能修改你的密碼。</string>
     <string name="stop_chat_to_export_import_or_delete_chat_database">停止聊天室以匯出對話，匯入或刪除對話數據庫。當聊天室停止後你將不能接收或傳送訊息。</string>
     <string name="alert_title_cant_invite_contacts_descr">你正在使用匿名聊天模式進入此群組 - 為了避免分享你的真實個人檔案，邀請聯絡人是不允許的。</string>