diff --git a/ring-android/app/src/main/res/values-de/strings.xml b/ring-android/app/src/main/res/values-de/strings.xml
index 1a70ff50e37666827387e2d9cb69ed12ecbb60c5..709f1bb191fcfa94a1b9c0d193277914cb6eca22 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -286,6 +286,7 @@
   <string name="tv_send_text">Text senden</string>
   <string name="tv_send_audio">Audio senden</string>
   <string name="tv_send_video">Medien senden</string>
+  <string name="tv_action_more">Mehr</string>
   <string name="conversation_input_speech_hint">Sag etwas...</string>
   <!--Wizard-->
   <string name="wizard_status_recommended">Empfohlen</string>
diff --git a/ring-android/app/src/main/res/values-de/strings_account.xml b/ring-android/app/src/main/res/values-de/strings_account.xml
index cf2b35857412210dff8662f3a620cb91f98bf501..75b2640dfc28507ea8ef79a743ea610b2312e784 100644
--- a/ring-android/app/src/main/res/values-de/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de/strings_account.xml
@@ -170,8 +170,10 @@ Sie können ihr Konto später bearbeiten</string>
   <string name="account_sip_success_message">Sie haben erfolgreich Ihr SIP-Konto registriert.</string>
   <string name="account_sip_register_anyway">Trotzdem registieren</string>
   <!--TV-->
+  <string name="account_tv_settings_header">Kontoeinstellungen</string>
   <string name="account_tv_advance_settings_header">Erweiterte Einstellungen</string>
   <string name="account_tv_add_contact">Kontakt hinzufügen</string>
+  <string name="account_tv_advanced_settings">Allgemeine Einstellungen ändern</string>
   <string name="account_tv_about">Über Jami</string>
   <string name="tv_about_version">Version</string>
   <string name="tv_about_license">Lizenz</string>
@@ -189,6 +191,7 @@ Sie können ihr Konto später bearbeiten</string>
   <string name="account_end_export_button">Schließen</string>
   <string name="account_end_export_infos">Ihre PIN lautet:\n\n%%\n\nUm den Vorgang abzuschließen öffnen Sie Jami auf dem neuen Gerät. Erstellen Sie ein neues Konto mit \"Dieses Gerät mit einem Konto verknüpfen\". Ihre PIN ist 10 Minuten gültig.</string>
   <string name="account_link_export_info_light">Um dieses Konto auf weiteren Geräten zu verwenden, müssen Sie zuerst eine PIN generieren. Diese muss auf dem neuen Gerät eingeben werden, um das Konto zu importieren. Die PIN ist für 10 Minuten gültig.</string>
+  <string name="account_export_title">Konto mit anderen Geräten verbinden</string>
   <string name="account_connect_server_button">Verbindung zum Management-Server</string>
   <string name="account_connect_button">Verbinden</string>
   <string name="prompt_server">Jami Management-Server-URL</string>
@@ -221,6 +224,7 @@ Sie können ihr Konto später bearbeiten</string>
   <string name="account_link_title">Verbinde diese Gerät</string>
   <string name="account_sip_cannot_be_registered">Konto kann nicht registriert werden</string>
   <!--Edit profile-->
+  <string name="account_edit_profile">Mein Konto bearbeiten</string>
   <!--Devices-->
   <string name="account_revoke_device_hint">Passwort zur Bestätigung eingeben</string>
   <string name="enter_password">Passwort eingeben</string>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings.xml b/ring-android/app/src/main/res/values-es-rAR/strings.xml
index dc1761936c8a54313c6591f618b437a9dedffaec..a1996cedfb716baaa2878bfa51e70ccf5e169073 100644
--- a/ring-android/app/src/main/res/values-es-rAR/strings.xml
+++ b/ring-android/app/src/main/res/values-es-rAR/strings.xml
@@ -99,6 +99,10 @@
   <string name="start_error_title">¡No se ha podido iniciar Jami!</string>
   <string name="start_error_mic_required">Jami requiere permisos para acceder al micrófono para funcionar.</string>
   <string name="action_call_accept">Atender</string>
+  <string name="action_call_accept_audio">Responder mediante audio</string>
+  <string name="action_call_accept_video">Responder mediante video</string>
+  <string name="action_call_hold_accept">Mantener en espera y responder llamada de audio</string>
+  <string name="action_call_hold_accept_video">Mantener en espera y responder videollamada</string>
   <string name="action_call_end_accept">Finalizar y responder llamada</string>
   <string name="action_call_decline">Rechazar</string>
   <string name="action_call_mic_mute">Enmudecer micrófono</string>
diff --git a/ring-android/app/src/main/res/values-es/strings.xml b/ring-android/app/src/main/res/values-es/strings.xml
index c2080425891f3664b6a74a9e348a24b25400be35..8d7a7df4a0514552c57519c4b4fcaac188abb09c 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -99,6 +99,10 @@
   <string name="start_error_title">No se puede iniciar Jami!</string>
   <string name="start_error_mic_required">Jami necesita permiso de acceso al micrófono para funcionar.</string>
   <string name="action_call_accept">Contestar a la llamada</string>
+  <string name="action_call_accept_audio">Responder mediante audio</string>
+  <string name="action_call_accept_video">Responder mediante vídeo</string>
+  <string name="action_call_hold_accept">Mantener en espera y responder llamada de audio</string>
+  <string name="action_call_hold_accept_video">Mantener en espera y responder videollamada</string>
   <string name="action_call_end_accept">Finalizar y responder llamada</string>
   <string name="action_call_decline">Rechazar</string>
   <string name="action_call_mic_mute">Silenciar micrófono</string>
@@ -195,7 +199,7 @@
   <string name="prompt_new_username">Ingresa un nuevo nombre de usuario</string>
   <string name="prompt_hint_username">Nombre de usuario</string>
   <string name="help_password_choose">Elige una contraseña robusta que recuerdes para proteger tu cuenta de Jami.</string>
-  <string name="help_password_enter">Ingresa la contraseña maestra de su cuenta de Jami</string>
+  <string name="help_password_enter">Ingresa la contraseña maestra de tu cuenta de Jami</string>
   <string name="help_server_enter">Ingrese la URL del servidor de gestión</string>
   <string name="help_pin_enter">Ingresa el PIN de otra cuenta de Jami configurada. Utiliza la opción \"Exportar cuenta en Jami\" para obtener un PIN.</string>
   <string name="wizard_next">Siguiente</string>
diff --git a/ring-android/app/src/main/res/values-fi/strings.xml b/ring-android/app/src/main/res/values-fi/strings.xml
index 7c8c6845991851e37900d1e7e588346a5a8f4b96..379b67717800490087126881a7aa6424484ea682 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -99,6 +99,10 @@
   <string name="start_error_title">Jamia ei voitu käynnistää!</string>
   <string name="start_error_mic_required">Jami vaatii mikrofonin käyttöoikeuden toimiakseen.</string>
   <string name="action_call_accept">Vastaanota puhelu</string>
+  <string name="action_call_accept_audio">Vastaa äänellä</string>
+  <string name="action_call_accept_video">Vastaa videolla</string>
+  <string name="action_call_hold_accept">Pidä ja tee äänipuhelu</string>
+  <string name="action_call_hold_accept_video">Pidä ja tee videopuhelu</string>
   <string name="action_call_end_accept">Lopeta ja tee puhelu</string>
   <string name="action_call_decline">Kieltäydy</string>
   <string name="action_call_mic_mute">Mykistä mikrofoni</string>
diff --git a/ring-android/app/src/main/res/values-fi/strings_preferences.xml b/ring-android/app/src/main/res/values-fi/strings_preferences.xml
index 82c0ba21a06005e65e023ed91e2886eb3174ad4e..e6b3b62b201555f74c419188bfe8faa992775592 100644
--- a/ring-android/app/src/main/res/values-fi/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fi/strings_preferences.xml
@@ -45,6 +45,8 @@
   <string name="pref_read_summary">Lähetä ja vastaanota kuittaus, jotka osoittaa, että viesti on nähty.</string>
   <string name="pref_block_record_title">Estä ruudunkaappaus ja tallennus</string>
   <string name="pref_block_record_summary">Estä ruudunkaappaus tai tallennus.</string>
+  <string name="pref_link_preview_title">Näytä linkkien esikatselu keskusteluissa</string>
+  <string name="pref_link_preview_summary">Esikatselu vaatii sisällön lataamista kolmannen osapuolen palvelimelta.</string>
   <!--Notifications Visibility-->
   <string name="notification_public">Julkinen \n(näytä ilmoitukset ja niiden sisältö lukitusruudulla)\n</string>
   <string name="notification_private">Yksityinen \n(näytä ilmoitukset, mutta piilottaa sisältö lukitusnäytöllä)\n</string>
diff --git a/ring-android/app/src/main/res/values-fr/strings.xml b/ring-android/app/src/main/res/values-fr/strings.xml
index 579c7b154510a0d94ba09b5916e83ff8b11cd6c3..ee6bfe3856e8fd0a3473eaa79a34dac070bd5f16 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -99,6 +99,10 @@
   <string name="start_error_title">Jami n\'arrive pas à se lancer !</string>
   <string name="start_error_mic_required">Jami demande pour fonctionner votre autorisation d\'utiliser votre microphone .</string>
   <string name="action_call_accept">Répondre</string>
+  <string name="action_call_accept_audio">Répondre en audio</string>
+  <string name="action_call_accept_video">Répondre en vidéo</string>
+  <string name="action_call_hold_accept">Mettre en attente et prendre l\'appel audio</string>
+  <string name="action_call_hold_accept_video">Mettre en attente et prendre l\'appel vidéo</string>
   <string name="action_call_end_accept">Raccrocher et prendre l\'appel</string>
   <string name="action_call_decline">Décliner</string>
   <string name="action_call_mic_mute">Rendre votre microphone muet</string>
diff --git a/ring-android/app/src/main/res/values-fr/strings_preferences.xml b/ring-android/app/src/main/res/values-fr/strings_preferences.xml
index ab1486ea1ea743fcb20ad4c726cd5f03c83534b5..4843661dee4d3765f17a2d48a061830c96f3db85 100644
--- a/ring-android/app/src/main/res/values-fr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_preferences.xml
@@ -45,6 +45,8 @@
   <string name="pref_read_summary">Envoyer et recevoir les indicateurs montrant qu\'un message a été affiché</string>
   <string name="pref_block_record_title">Bloquer la capture d\'écran et l\'enregistrement</string>
   <string name="pref_block_record_summary">Bloquer la capture d\'écran et l\'enregistrement vidéo</string>
+  <string name="pref_link_preview_title">Charger la prévisualisation des liens dans les conversations</string>
+  <string name="pref_link_preview_summary">Les prévisualisations requièrent le téléchargement de contenu provenant serveurs tiers.</string>
   <!--Notifications Visibility-->
   <string name="notification_public">Public \n(montre les notifications et leurs contenus sur l\'écran verrouillé )\n</string>
   <string name="notification_private">Privé\n(montre les notifications mais cache le contenu sur l\'écran verrouillé)\n</string>
diff --git a/ring-android/app/src/main/res/values-hu/strings.xml b/ring-android/app/src/main/res/values-hu/strings.xml
index e0998864bd441a05f0a5e178680fa6f05274463a..df31a8ebf94e1d9b11321cea7eaf86f8242aca0c 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -99,6 +99,10 @@
   <string name="start_error_title">Nem lehet elindítani Jami-t!</string>
   <string name="start_error_mic_required">A Jami működéséhez szükséges a mikrofont elérés engedélyezése.</string>
   <string name="action_call_accept">Hívás fogadása</string>
+  <string name="action_call_accept_audio">Elfogadás hanggal</string>
+  <string name="action_call_accept_video">Elfogadás videóval</string>
+  <string name="action_call_hold_accept">Tartás és elfogadás hanggal</string>
+  <string name="action_call_hold_accept_video">Tartás és elfogadás videóval</string>
   <string name="action_call_end_accept">Hívás befejezése és bejövő hívás fogadása</string>
   <string name="action_call_decline">Elutasítás</string>
   <string name="action_call_mic_mute">Mikrofon elnémítása</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings.xml b/ring-android/app/src/main/res/values-it-rIT/strings.xml
index 00df2dc3137ca47ac2cfbceea148cc07bb0ac280..db1585edd48c3f7f92dba574e2258041e2dcd886 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings.xml
@@ -99,6 +99,10 @@
   <string name="start_error_title">Jami non si avvia!</string>
   <string name="start_error_mic_required">Jami deve usare il microfono per funzionare.</string>
   <string name="action_call_accept">Rispondi</string>
+  <string name="action_call_accept_audio">Rispondi solo con l\'audio</string>
+  <string name="action_call_accept_video">Rispondi con video</string>
+  <string name="action_call_hold_accept">Attesa e rispondi solo con l\'audio</string>
+  <string name="action_call_hold_accept_video">Attesa e rispondi con video</string>
   <string name="action_call_end_accept">Termina e rispondi alla chiamata</string>
   <string name="action_call_decline">Rifiuta</string>
   <string name="action_call_mic_mute">Disattiva microfono</string>
diff --git a/ring-android/app/src/main/res/values-it/strings.xml b/ring-android/app/src/main/res/values-it/strings.xml
index 1752c32ca698aef7000eafa5f6a93be4ca956213..e48eefe05196c23b73114a2cd851fe1eb5828be7 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -99,6 +99,10 @@
   <string name="start_error_title">Jami non si avvia!</string>
   <string name="start_error_mic_required">Jami deve usare il microfono per funzionare.</string>
   <string name="action_call_accept">Rispondi</string>
+  <string name="action_call_accept_audio">Rispondi solo con l\'audio</string>
+  <string name="action_call_accept_video">Rispondi con video</string>
+  <string name="action_call_hold_accept">Attesa e rispondi solo con l\'audio</string>
+  <string name="action_call_hold_accept_video">Attesa e rispondi con video</string>
   <string name="action_call_end_accept">Termina e rispondi alla chiamata</string>
   <string name="action_call_decline">Rifiuta</string>
   <string name="action_call_mic_mute">Disattiva microfono</string>
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings.xml b/ring-android/app/src/main/res/values-ro-rRO/strings.xml
index 03b5a845f54fa508300a76b6ede7895fac460e8f..d72d0f90517b488f26781ba10c0138a47d92e0b9 100644
--- a/ring-android/app/src/main/res/values-ro-rRO/strings.xml
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings.xml
@@ -100,6 +100,10 @@
   <string name="start_error_title">Jami nu se deschide!</string>
   <string name="start_error_mic_required">Jami trebuie să folosească microfonul ca să funcționeze.</string>
   <string name="action_call_accept">Răspunde</string>
+  <string name="action_call_accept_audio">Răspunde doar vocal</string>
+  <string name="action_call_accept_video">Răspunde cu video</string>
+  <string name="action_call_hold_accept">Așteptare și răspunde doar vocal</string>
+  <string name="action_call_hold_accept_video">Așteptare și răspunde cu video</string>
   <string name="action_call_end_accept">Închide și răspunde la apel</string>
   <string name="action_call_decline">Refuză</string>
   <string name="action_call_mic_mute">Oprește microfonul</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings.xml b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
index 427548611d0ca8a10918f068cc3ff7df22cb8b1d..b7d172b83695bb0b819c617bace516ac33f16e72 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
@@ -99,6 +99,10 @@
   <string name="start_error_title">S\’niset dot Jami!</string>
   <string name="start_error_mic_required">Që të funksionojë, Jami lyp leje për mikrofonin.</string>
   <string name="action_call_accept">Pranoje thirrjen</string>
+  <string name="action_call_accept_audio">Përgjigjuni me zë</string>
+  <string name="action_call_accept_video">Përgjigjuni me video</string>
+  <string name="action_call_hold_accept">Mbaje dhe merr thirrje audio</string>
+  <string name="action_call_hold_accept_video">Mbaje dhe merr thirrje video</string>
   <string name="action_call_end_accept">Përfundoje dhe bëje thirrje</string>
   <string name="action_call_decline">Hidhe tej</string>
   <string name="action_call_mic_mute">Heshtoje mikrofonin</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
index add681c3501ad985b9cd67b9d31e078511cf81e1..f1a039f29c5f73d04ab9a228d7bb918a30342693 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
@@ -98,6 +98,10 @@
   <string name="start_error_title">無法啟動 Jami!</string>
   <string name="start_error_mic_required">Jami 需要麥克風權限以正常運作。</string>
   <string name="action_call_accept">打電話</string>
+  <string name="action_call_accept_audio">以音訊回應</string>
+  <string name="action_call_accept_video">以視訊回應</string>
+  <string name="action_call_hold_accept">保留並接聽音訊通話</string>
+  <string name="action_call_hold_accept_video">保留並接聽視訊通話</string>
   <string name="action_call_end_accept">結束並接聽通話</string>
   <string name="action_call_decline">拒絕</string>
   <string name="action_call_mic_mute">麥克風靜音</string>