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 a21a22ca64ca680e5469080bb61f84a87ab4f1b3..eeb07838919e0be01f490ef8795fa97c7d35f76d 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -176,6 +176,13 @@
   <string name="block_contact_dialog_message">%1$sei voi ottaa sinuun yhteyttä kunnes poistat hänen estonsa.</string>
   <string name="block_contact_completed">%1$s estettiin.</string>
   <string name="conversation_contact_is_typing">Hän kirjoittaa...</string>
+  <string name="conversation_info_contact_you">Sinä</string>
+  <string name="conversation_members">Jäsenet</string>
+  <string name="conversation_preference_color">Keskustelun väri</string>
+  <string name="conversation_preference_emoji">Keskustelun hymiö</string>
+  <string name="conversation_type_contact">Jami kontakti</string>
+  <string name="conversation_type_private">Yksityinen parvi</string>
+  <string name="conversation_type_group">Ryhmän parvi</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Lisää %1$s?</string>
   <string name="prompt_new_password">Uusi salasana</string>
@@ -257,6 +264,7 @@
   <string name="file_transfer_status_timed_out">aika loppui</string>
   <string name="file_saved_in">Tiedosto tallennettu %s</string>
   <string name="file_saved_successfully">Tiedosto tallennettu onnistuneesti</string>
+  <string name="file_download">Lataa</string>
   <string name="no_space_left_on_device">laitteessa ei ole tilaa jäljellä</string>
   <string name="title_media_viewer">Median katseluohjelma</string>
   <string name="menu_file_open">Avaa tiedosto</string>
diff --git a/ring-android/app/src/main/res/values-fi/strings_call.xml b/ring-android/app/src/main/res/values-fi/strings_call.xml
index 3decdd89f304ea2ca8fd04c4c75a85ada0959c5e..a60ccf864e35c01bb9280978062c808edad9c9bf 100644
--- a/ring-android/app/src/main/res/values-fi/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fi/strings_call.xml
@@ -38,4 +38,5 @@ along with this program; if not, write to the Free Software
     <string name="call_human_state_over">Loppu</string>
     <!-- Conferences -->
     <string name="call_moderator">Valvoja</string>
-    </resources>
\ No newline at end of file
+    <string name="call_muted">Mykistetty</string>
+</resources>
\ No newline at end of file
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 43630361b7271eba98cadfb134d15f5f1bae5f70..82c0ba21a06005e65e023ed91e2886eb3174ad4e 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
@@ -5,6 +5,7 @@
   <string name="pref_category_video">Video</string>
   <string name="pref_category_system">Järjestelmä</string>
   <string name="pref_category_privacy">Yksityisyys</string>
+  <string name="pref_category_diagnostic">Diagnostiikka</string>
   <string name="pref_mobileData_title">Mobiilidata</string>
   <string name="pref_mobileData_summary">Salli Jamin käyttää 3G/LTE-verkkoa wifi-yhteyden lisäksi</string>
   <string name="pref_pushNotifications_title">Ilmoitukset</string>
@@ -34,6 +35,10 @@
   <string name="pref_delete_account_summary">Poista tilisi tästä laitteesta</string>
   <string name="pref_persistNotification_title">Suorita taustalla</string>
   <string name="pref_persistNotification_summary">Salli tausta-ajo vastaanottamaan puheluita ja viestejä.</string>
+  <string name="pref_logs_title">Diagnostiikan loki</string>
+  <string name="pref_logs_summary">Avaa diagnostiikan lokin asetukset</string>
+  <string name="pref_logs_start">Aloita kirjaaminen</string>
+  <string name="pref_logs_stop">Lopeta kirjaaminen</string>
   <string name="pref_typing_title">Kirjoittamisen merkki käyttöön</string>
   <string name="pref_typing_summary">Lähetä ja vastaanota kirjoituksen merkki, joka osoittaa, että viestiä kirjoitetaan.</string>
   <string name="pref_read_title">Lukukuittaukset käyttöö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 fc8486465b4c3f0a8ea285514bd82077a8da776a..ce64b7e8a4190c20b9ca9c9b9d8a7c7ef4463475 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -15,6 +15,7 @@
   <string name="license">Ce logiciel est offert \"tel quel\", sans aucune garantie. Pour plus d\'informations,  voir <u>GNU General Public License version 3 or later</u></string>
   <string name="description">Jami est un logiciel libre de communication universel qui respecte les libertés et la vie privée de ses utilisateurs.</string>
   <string name="credits">Crédits</string>
+  <string name="pip_title">Conférence Jami</string>
   <string name="call_service_description">Ce service est nécessaire pour que vos appels continuent de fonctionner en arrière-plan. Il ne fonctionne que pendant les appels.</string>
   <string name="data_transfer_service_description">Ce service est nécessaire pour afficher les notifications persistantes pendant un transfert de fichier. Il ne fonctionne que pendant le transfert de fichiers.</string>
   <!--About dialog-->
@@ -175,6 +176,13 @@
   <string name="block_contact_dialog_message">%1$s ne pourra pas vous contacter tant que vous ne l\'aurez pas débloqué.</string>
   <string name="block_contact_completed">%1$s a été bloqué.</string>
   <string name="conversation_contact_is_typing">Votre interlocuteur est en train d\'écrire...</string>
+  <string name="conversation_info_contact_you">Vous</string>
+  <string name="conversation_members">Membres</string>
+  <string name="conversation_preference_color">Couleur de la conversation</string>
+  <string name="conversation_preference_emoji">Émoji de conversation</string>
+  <string name="conversation_type_contact">Contact Jami</string>
+  <string name="conversation_type_private">Swarm privé</string>
+  <string name="conversation_type_group">Swarm</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Ajouter %1$s ?</string>
   <string name="prompt_new_password">Nouveau mot de passe</string>
@@ -256,6 +264,7 @@
   <string name="file_transfer_status_timed_out">délai dépassé</string>
   <string name="file_saved_in">Fichier sauvegardé dans %s</string>
   <string name="file_saved_successfully">Le fichier a été sauvegardé</string>
+  <string name="file_download">Télécharger</string>
   <string name="no_space_left_on_device">Espace de stockage insuffisant sur l\'appareil</string>
   <string name="title_media_viewer">Application de consultation de média</string>
   <string name="menu_file_open">Ouvrir le fichier</string>
diff --git a/ring-android/app/src/main/res/values-fr/strings_call.xml b/ring-android/app/src/main/res/values-fr/strings_call.xml
index 0fe0cece5200bc6d77ea17a8c2bbe11c162c9f26..0fbc3e6dbf38c8eda88582b2cc4962f1198badf2 100644
--- a/ring-android/app/src/main/res/values-fr/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_call.xml
@@ -38,4 +38,5 @@ along with this program; if not, write to the Free Software
     <string name="call_human_state_over">Terminé</string>
     <!-- Conferences -->
     <string name="call_moderator">Modérateur</string>
-    </resources>
\ No newline at end of file
+    <string name="call_muted">Son désactivé</string>
+</resources>
\ No newline at end of file
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 35be47418068565f3a64b04ea8dc01ceed203ede..ab1486ea1ea743fcb20ad4c726cd5f03c83534b5 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
@@ -5,6 +5,7 @@
   <string name="pref_category_video">Vidéo</string>
   <string name="pref_category_system">Système</string>
   <string name="pref_category_privacy">Confidentialité</string>
+  <string name="pref_category_diagnostic">Diagnostiques</string>
   <string name="pref_mobileData_title">Données mobiles</string>
   <string name="pref_mobileData_summary">Autoriser Jami sur les réseaux mobiles en plus du Wi-fi.</string>
   <string name="pref_pushNotifications_title">Notifications poussées</string>
@@ -34,6 +35,10 @@
   <string name="pref_delete_account_summary">Supprimer votre compte de cet appareil</string>
   <string name="pref_persistNotification_title">Fonctionne en arrière-plan</string>
   <string name="pref_persistNotification_summary">Permet de fonctionner en arrière-plan pour recevoir des appels ou des messages</string>
+  <string name="pref_logs_title">Journaux de diagnostiques</string>
+  <string name="pref_logs_summary">Ouvrir les paramètres  des journaux de diagnostiques</string>
+  <string name="pref_logs_start">Démarrer la journalisation</string>
+  <string name="pref_logs_stop">Arrêter la journalisation</string>
   <string name="pref_typing_title">Activer les indicateurs de frappe</string>
   <string name="pref_typing_summary">Envoyer et recevoir les indicateurs de frappe montrant qu\'un message est cours de rédaction.</string>
   <string name="pref_read_title">Activer les accusés de réception de messages lus</string>
diff --git a/ring-android/app/src/main/res/values-gl/strings.xml b/ring-android/app/src/main/res/values-gl/strings.xml
index df582c53018039e5f0dc52e9b565bc5b0d247f50..051a4139dd7e34a2fdf6340e8885435a60ff19d5 100644
--- a/ring-android/app/src/main/res/values-gl/strings.xml
+++ b/ring-android/app/src/main/res/values-gl/strings.xml
@@ -176,6 +176,13 @@
   <string name="block_contact_dialog_message">%1$s non poderá contactar contigo ata que o desbloquees.</string>
   <string name="block_contact_completed">%1$s foi bloqueada.</string>
   <string name="conversation_contact_is_typing">O contacto está a escribir...</string>
+  <string name="conversation_info_contact_you">Ti</string>
+  <string name="conversation_members">Membresía</string>
+  <string name="conversation_preference_color">Cor da conversa</string>
+  <string name="conversation_preference_emoji">Emojis da conversa</string>
+  <string name="conversation_type_contact">Contacto Jami</string>
+  <string name="conversation_type_private">Swarm privado</string>
+  <string name="conversation_type_group">Swarm en grupo</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Engadir %1$s?</string>
   <string name="prompt_new_password">Novo contrasinal</string>
@@ -257,6 +264,7 @@
   <string name="file_transfer_status_timed_out">caducada</string>
   <string name="file_saved_in">Ficheiro gardado en %s</string>
   <string name="file_saved_successfully">Ficheiro gardado</string>
+  <string name="file_download">Descargar</string>
   <string name="no_space_left_on_device">Non queda espazo no dispositivo</string>
   <string name="title_media_viewer">Visor de multimedia</string>
   <string name="menu_file_open">Abrir ficheiro</string>
diff --git a/ring-android/app/src/main/res/values-gl/strings_preferences.xml b/ring-android/app/src/main/res/values-gl/strings_preferences.xml
index eede2c1fee38d4ac2700b47d9c5caf9eae49f129..9e1fb5a097ff342f6c239d0ece53ac29933aa7b9 100644
--- a/ring-android/app/src/main/res/values-gl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-gl/strings_preferences.xml
@@ -5,6 +5,7 @@
   <string name="pref_category_video">Vídeo</string>
   <string name="pref_category_system">Sistema</string>
   <string name="pref_category_privacy">Privacidade</string>
+  <string name="pref_category_diagnostic">Diagnósticos</string>
   <string name="pref_mobileData_title">Datos móbiles</string>
   <string name="pref_mobileData_summary">Permitir que Jami acceda a redes 3G/LTE ademáis de a Wi-Fi.</string>
   <string name="pref_pushNotifications_title">Notificacións Push</string>
@@ -34,6 +35,10 @@
   <string name="pref_delete_account_summary">Elimina a túa conta deste dispositivo.</string>
   <string name="pref_persistNotification_title">Executar en segundo plano</string>
   <string name="pref_persistNotification_summary">Permitir a execución en segundo plano para recibir mensaxe e chamadas.</string>
+  <string name="pref_logs_title">Rexistros do diagnóstico</string>
+  <string name="pref_logs_summary">Abrir axustes do rexistro dos diagnósticos</string>
+  <string name="pref_logs_start">Comezar a rexistrar</string>
+  <string name="pref_logs_stop">Deter o rexistro</string>
   <string name="pref_typing_title">Activar indicadores de escritura</string>
   <string name="pref_typing_summary">Enviar e recibir indicadores de escritura mostrando que se está a escribir unha mensaxe.</string>
   <string name="pref_read_title">Activar notificación de lectura</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 e2cc00be6e31a999d36ea08b08a6ceae18479067..cdd8fb3b7d118bc6febff77062848b4466e712fa 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -176,6 +176,13 @@
   <string name="block_contact_dialog_message">%1$s nem lesz képes felvenni veled a kapcsolatot, amíg nincsen feloldva a tiltásod.</string>
   <string name="block_contact_completed">%1$s tiltva lett.</string>
   <string name="conversation_contact_is_typing">Kapcsolat gépel…</string>
+  <string name="conversation_info_contact_you">Ön</string>
+  <string name="conversation_members">Tagok</string>
+  <string name="conversation_preference_color">Beszélgetés színe</string>
+  <string name="conversation_preference_emoji">Beszélgetés hangulatjel</string>
+  <string name="conversation_type_contact">Jami-kapcsolat</string>
+  <string name="conversation_type_private">Privát rajcsoport</string>
+  <string name="conversation_type_group">Rajcsoport</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Hozzáadja %1$s?</string>
   <string name="prompt_new_password">Új jelszó</string>
@@ -245,10 +252,10 @@
   <string name="file_transfer_status_created">Átvitel előkészítése</string>
   <string name="file_transfer_status_unsupported">nem támogatott</string>
   <string name="file_transfer_status_wait_peer_acceptance">várakozó egyenrangú elfogadás</string>
-  <string name="file_transfer_status_wait_host_acceptance">várakozó gazdagép elfogadása</string>
+  <string name="file_transfer_status_wait_host_acceptance">várakozó gazda elfogadása</string>
   <string name="file_transfer_status_ongoing">folyamatban lévő</string>
   <string name="file_transfer_status_finished">befejezett</string>
-  <string name="file_transfer_status_closed_by_host">gazdagép bezárta</string>
+  <string name="file_transfer_status_closed_by_host">gazda bezárta</string>
   <string name="file_transfer_status_closed_by_peer">bezárva a egyenrangúról</string>
   <string name="file_transfer_status_invalid_pathname">érvénytelen elérési útvonala</string>
   <string name="file_transfer_status_unjoinable_peer">egyenrangú nem csatlakoztatható</string>
@@ -257,6 +264,7 @@
   <string name="file_transfer_status_timed_out">időtúllépés</string>
   <string name="file_saved_in">A fájl mentve%s</string>
   <string name="file_saved_successfully">Fájl sikeresen mentve</string>
+  <string name="file_download">Letöltés</string>
   <string name="no_space_left_on_device">Nincs hely az eszközön</string>
   <string name="title_media_viewer">Média lejátszó</string>
   <string name="menu_file_open">Fájl megnyitása</string>
diff --git a/ring-android/app/src/main/res/values-hu/strings_account.xml b/ring-android/app/src/main/res/values-hu/strings_account.xml
index 0c7c7a9521305330361d22f3c2709c98ac0420ab..fa9ce505a4a34d3430428525f54697ef469a314d 100644
--- a/ring-android/app/src/main/res/values-hu/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_account.xml
@@ -9,7 +9,7 @@
   <string name="add_sip_account_title">SIP-fiók hozzáadása</string>
   <string name="ring_account_default_name">Jami-fiók: %1$s</string>
   <string name="prompt_alias">Álnév</string>
-  <string name="prompt_hostname">Kiszolgálónév</string>
+  <string name="prompt_hostname">Állomásnév</string>
   <string name="prompt_username">Felhasználónév</string>
   <string name="prompt_password">Jelszó</string>
   <string name="action_create">Fiók létrehozása</string>
@@ -22,7 +22,7 @@
   <string name="dialog_wait_update">Fiók frissítése</string>
   <string name="dialog_wait_update_details">Várjon, amíg a fiókja frissül…</string>
   <string name="dialog_warn_ip2ip_account_title">Létrehoz egy üres SIP-fiókot?</string>
-  <string name="dialog_warn_ip2ip_account_message">Egy üres SIP-fiók készítésére készül, érvényes kiszolgálónév nélkül.
+  <string name="dialog_warn_ip2ip_account_message">Egy üres SIP-fiók készítésére készül, érvényes állomásnév nélkül.
         Csak közvetlen IP-hívásokat tud majd indítani és fogadni.
         A fiókját később is módosíthatja</string>
   <string name="account_type_ip2ip">IP-fiók</string>
@@ -52,7 +52,7 @@
   <string name="account_preferences_basic_tab">Általános</string>
   <string name="account_basic_category">Alapbeállítások</string>
   <string name="account_alias_label">Fióknév</string>
-  <string name="account_hostname_label">Kiszolgálónév</string>
+  <string name="account_hostname_label">Állomásnév</string>
   <string name="account_bootstrap_label">Rendszerindítás</string>
   <string name="account_username_label">Felhasználónév</string>
   <string name="account_password_label">Jelszó</string>
diff --git a/ring-android/app/src/main/res/values-hu/strings_call.xml b/ring-android/app/src/main/res/values-hu/strings_call.xml
index b15eb1284413d5e16ac889a0042714902b9f9d38..6b5e243a9b70f45ae501c54d5d3daf96b7fee3ea 100644
--- a/ring-android/app/src/main/res/values-hu/strings_call.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_call.xml
@@ -38,4 +38,5 @@ along with this program; if not, write to the Free Software
     <string name="call_human_state_over">Véget ért</string>
     <!-- Conferences -->
     <string name="call_moderator">Moderátor</string>
-    </resources>
\ No newline at end of file
+    <string name="call_muted">Elnémítva</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-hu/strings_preferences.xml b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
index 52f35fd5381c56c12eda50c0335bbf3e540c93fc..0ec035a27b048e80fd36e2ca9e8d6ef4a4e68d88 100644
--- a/ring-android/app/src/main/res/values-hu/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
@@ -5,6 +5,7 @@
   <string name="pref_category_video">Videó</string>
   <string name="pref_category_system">Rendszer</string>
   <string name="pref_category_privacy">Adatvédelem</string>
+  <string name="pref_category_diagnostic">Diagnosztika</string>
   <string name="pref_mobileData_title">Adathasználat</string>
   <string name="pref_mobileData_summary">A Jami engedélyezése 3G/LTE és Wi-Fi hálózatokon</string>
   <string name="pref_pushNotifications_title">Push-értesítések</string>
@@ -34,6 +35,10 @@
   <string name="pref_delete_account_summary">Fiók törlése erről az eszközről</string>
   <string name="pref_persistNotification_title">Háttérfolyamat engedélyezése</string>
   <string name="pref_persistNotification_summary">Háttérfolyamat engedélyezése hívások és üzenetek fogadásához.</string>
+  <string name="pref_logs_title">Diagnosztikai naplók</string>
+  <string name="pref_logs_summary">Diagnosztikai naplóbeállítások megnyitása</string>
+  <string name="pref_logs_start">Naplózás indítása</string>
+  <string name="pref_logs_stop">Naplózás leállítása</string>
   <string name="pref_typing_title">Gépelésjelző megjelenítése</string>
   <string name="pref_typing_summary">Küldjön és fogadjon gépelési mutatókat, amelyek azt mutatják, hogy egy üzenetet gépel.</string>
   <string name="pref_read_title">Olvasási visszaigazolások küldése</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 117af0b9462e392ef26730c6286d941871309236..a0876fc3957ee057f42e8ccfb0b1f80a2085e69a 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
@@ -152,13 +152,13 @@
   <string name="tab_scan"> Scansiona Codice</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">Azzerate la cronologia?</string>
-  <string name="clear_history_dialog_message">Questa azione non può essere annullata</string>
+  <string name="clear_history_dialog_message">Questa azione è irreversibile.</string>
   <string name="clear_history_completed">La cronologia è stata cancellata.</string>
   <!--Conversation-->
   <string name="conversation_details">Dettagli contatto</string>
   <string name="conversation_action_delete_this">Cancella questa conversazione</string>
   <string name="conversation_action_delete_this_title">Cancellare questa conversazione?</string>
-  <string name="conversation_action_delete_this_message">Questa operazione non può essere annullata.</string>
+  <string name="conversation_action_delete_this_message">Questa azione è irreversibile.</string>
   <string name="conversation_action_history_clear">Elimina cronologia</string>
   <string name="conversation_action_history_clear_title">Cancellare la cronologia delle conversazioni?</string>
   <string name="conversation_action_history_clear_message">Questo cancellerà definitivamente la cronologia delle conversazioni.</string>
@@ -176,18 +176,25 @@
   <string name="block_contact_dialog_message">%1$s non sara\' in grado di contattare l\'utente fino a sbloccarlo.</string>
   <string name="block_contact_completed">%1$sè bloccato.</string>
   <string name="conversation_contact_is_typing">Il contatto sta scrivendo...</string>
+  <string name="conversation_info_contact_you">Tu</string>
+  <string name="conversation_members">Membri</string>
+  <string name="conversation_preference_color">Colore della conversazione</string>
+  <string name="conversation_preference_emoji">Emoji conversazione</string>
+  <string name="conversation_type_contact">Contatto Jami</string>
+  <string name="conversation_type_private">Gruppo privato</string>
+  <string name="conversation_type_group">Gruppo</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Aggiungi %1$s?</string>
   <string name="prompt_new_password">Nuova password</string>
   <string name="prompt_new_password_optional">Nuova password (opzionale)</string>
   <string name="prompt_new_password_repeat">Ripeti nuova password</string>
   <string name="account_create_title">Crea un account Jami</string>
-  <string name="prompt_new_username">Inserisci il nuovo nome utente</string>
+  <string name="prompt_new_username">Inserire il nuovo nome utente</string>
   <string name="prompt_hint_username">Utente</string>
   <string name="help_password_choose">Scegliere una password facile da ricordare per proteggere il tuo account Jami.</string>
-  <string name="help_password_enter">Inserisci la password del tuo account Jami principale.</string>
-  <string name="help_server_enter">Immettere l\'URL del server di gestione.</string>
-  <string name="help_pin_enter">Jami configurato per inserire il PIN da un altro account. Utilizzare la funzione di \"esporta account Jami\" per ottenere un PIN.</string>
+  <string name="help_password_enter">Inserire la password del tuo account principale Jami.</string>
+  <string name="help_server_enter">Inserire l\'URL del server di gestione.</string>
+  <string name="help_pin_enter">Jami configurato per inserire il PIN da un altro account. Utilizzare la funzione di \"Esporta account Jami\" per ottenere un PIN.</string>
   <string name="wizard_next">Prossimo</string>
   <string name="wizard_back">Indietro</string>
   <string name="wizard_skip">Salta</string>
@@ -197,7 +204,7 @@
   <string name="profile_message_warning">Il tuo profilo è condiviso solo con i tuoi contatti</string>
   <string name="open_the_gallery">Apri la galleria immagini</string>
   <string name="take_a_photo">Scatta una foto</string>
-  <string name="profile_name_hint">Inserisci il tuo nome</string>
+  <string name="profile_name_hint">Inserire il tuo nome</string>
   <string name="registered_name">Nome Registrato</string>
   <string name="no_registered_name">Nessun nome registrato</string>
   <string name="identity">Indentità</string>
@@ -257,6 +264,7 @@
   <string name="file_transfer_status_timed_out">in pausa</string>
   <string name="file_saved_in">File salvato in %s</string>
   <string name="file_saved_successfully">File salvato con successo</string>
+  <string name="file_download">Scarica</string>
   <string name="no_space_left_on_device">Nessuno spazio lasciato sul dispositivo</string>
   <string name="title_media_viewer">Visualizzatore di media</string>
   <string name="menu_file_open">Apri file</string>
@@ -296,10 +304,10 @@
   <string name="wizard_username_button">Scegli un nome utente</string>
   <string name="wizard_username_skip">Salta la scelta del nome utente</string>
   <string name="wizard_password_info">Password dell\'account</string>
-  <string name="wizard_password_placeholder">Scegli una password per crittografare la chiave dell\'account su questo dispositivo</string>
+  <string name="wizard_password_placeholder">Scegli una password per cifrare il tuo account su questo dispositivo.</string>
   <string name="wizard_password_button">Scegli password</string>
   <string name="wizard_password_skip">Crea account</string>
-  <string name="wizard_password_switch">Crittografa account con password</string>
+  <string name="wizard_password_switch">Cifrare l\'account con una password</string>
   <string name="wizard_password_warning">Si noti che la password non può essere recuperata</string>
   <string name="wizard_profile_info">Il profilo è condiviso solo con i contatti</string>
   <string name="wizard_profile_button">Salva il profilo</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
index 740d48d1444d694ccb48d359930365821bba4040..2a2e68b4b5e6d5da6127a5517f7e6ce0207b0118 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
@@ -9,12 +9,12 @@
   <string name="add_sip_account_title">Aggiungi account SIP</string>
   <string name="ring_account_default_name">Account Jami %1$s</string>
   <string name="prompt_alias">Alias</string>
-  <string name="prompt_hostname">Nome Host</string>
+  <string name="prompt_hostname">Nome host</string>
   <string name="prompt_username">Nome utente</string>
   <string name="prompt_password">Password</string>
   <string name="action_create">Crea account</string>
   <string name="action_create_short">Crea</string>
-  <string name="action_register">Salva</string>
+  <string name="action_register">Registrati</string>
   <string name="action_settings">Impostazioni</string>
   <string name="error_field_required">Questo dato è obbligatorio</string>
   <string name="dialog_wait_create">Aggiungi account</string>
@@ -32,7 +32,7 @@ Potrai modificare il tuo account successivamente</string>
   <string name="create_sip_account">Aggiungi SIP account</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Eliminare l\'account?</string>
-  <string name="account_delete_dialog_message">Questa operazione non può essere annullata.</string>
+  <string name="account_delete_dialog_message">Questa azione è irreversibile.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nessun account registrato</string>
   <string name="normal_accounts_titles">Accounts</string>
@@ -52,9 +52,9 @@ Potrai modificare il tuo account successivamente</string>
   <string name="account_preferences_basic_tab">Generale</string>
   <string name="account_basic_category">Impostazioni base</string>
   <string name="account_alias_label">Nome account</string>
-  <string name="account_hostname_label">Hostname</string>
+  <string name="account_hostname_label">Nome host</string>
   <string name="account_bootstrap_label">Avvio</string>
-  <string name="account_username_label">Utente</string>
+  <string name="account_username_label">Nome utente</string>
   <string name="account_password_label">Password</string>
   <string name="account_optionnal_category">Impostazioni aggiuntive</string>
   <string name="account_useragent_label">User Agent</string>
@@ -82,7 +82,7 @@ Potrai modificare il tuo account successivamente</string>
   <string name="account_registration_exp_label">Scadenza registrazione</string>
   <string name="account_local_interface_label">Interfaccia locale</string>
   <string name="account_local_port_label">Porta locale</string>
-  <string name="account_stun_enable_label">Usa Stun</string>
+  <string name="account_stun_enable_label">Utilizza STUN</string>
   <string name="account_stun_server_label">Server Stun</string>
   <string name="account_accept_files">Accetta i file in arrivo automaticamente</string>
   <string name="account_conversation_settings_title">Impostazioni di conversazione</string>
@@ -104,16 +104,16 @@ Potrai modificare il tuo account successivamente</string>
   <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Scopri utenti locali</string>
   <string name="account_peer_discovery_enable_label">Abilita il rilevamento di utenti locali</string>
-  <string name="account_peer_discovery_enable_summary">Connettiti ad altri nodi DHT pubblicizzati sulla nostra rete locale</string>
+  <string name="account_peer_discovery_enable_summary">Connettiti ad altri nodi DHT nella tua rete locale.</string>
   <!--Security Details-->
   <string name="account_credentials_label">Credenziali</string>
   <string name="account_credentials_edit">Modifica credenziali</string>
   <string name="account_credentials_add">Aggiungi credenziali</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Sicurezza</string>
-  <string name="account_srtp_switch_label">Cripta i flussi (SRTP)</string>
+  <string name="account_srtp_switch_label">Cifrare i flussi multimediali (SRTP)</string>
   <string name="account_srtp_enable_sdes">Abilita SDES come protocollo di scambio chiavi</string>
-  <string name="account_srtp_rtp_fallback">Fallback su RTP se SRTP fallisce</string>
+  <string name="account_srtp_rtp_fallback">Utilizzare RTP quando SRTP fallisce</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Usa trasporto TLS</string>
@@ -150,7 +150,7 @@ Potrai modificare il tuo account successivamente</string>
   <string name="account_share_body_with_username">Contattami usando \'%1$s\"o il mio nome utente pubblico\"%2$s\'sulla piattaforma di comunicazione distribuita Jami:%3$s</string>
   <string name="account_contact_me">Contattami su Jami!</string>
   <string name="update_account">Aggiorna account</string>
-  <string name="account_migration">Il tuo account Jami può essere aggiornato. \ Inserisci la tua password.</string>
+  <string name="account_migration">Il tuo account Jami può essere aggiornato.\nInserisci la tua password.</string>
   <string name="ring_account">Account Jami</string>
   <string name="ring_account_identity">Indentità</string>
   <string name="account_migration_title_dialog">Migrazione account</string>
@@ -172,33 +172,33 @@ Potrai modificare il tuo account successivamente</string>
   <string name="account_link_device">Connettiti da un altro dispositivo</string>
   <string name="account_link_button">Connetti dalla rete</string>
   <string name="account_link_archive_button">Connetti dal backup</string>
-  <string name="account_link_prompt_pin">Inserisci il PIN</string>
+  <string name="account_link_prompt_pin">Inserire il PIN</string>
   <string name="account_new_button">Crea un account Jami</string>
   <string name="account_link_export_button">Collega un nuovo dispositivo</string>
   <string name="account_link_show_button">Mostra %d altri dispositivi collegati</string>
   <string name="account_link_hide_button">Nascondi dispositivo collegato</string>
-  <string name="account_link_export_info">Per utilizzare questo account su altri dispositivi, devi prima esporlo su Jami. Questo sarà un codice che devi configurare. Il PIN è valido per 10 minuti.</string>
+  <string name="account_link_export_info">Per utilizzare questo account su altri dispositivi, devi prima esporlo su Jami. Questo genererà un codice PIN che devi inserire sul nuovo dispositivo per configurare l\'account. Il PIN è valido per 10 minuti.</string>
   <string name="account_start_export_button">Genera PIN</string>
   <string name="account_end_export_button">chiudi</string>
   <string name="account_end_export_infos">Il tuo PIN è: \ n \ n%%\ n\nPer completare la procedura, è necessario aprire Jami sul nuovo dispositivo. Crea un nuovo account con \"Collega questo dispositivo a un account\". Il tuo PIN è valido per 10 minuti.</string>
-  <string name="account_link_export_info_light">Per utilizzare questo account su altri dispositivi, devi prima esporlo su Jami. Questo sarà un codice che devi configurare. Il PIN è valido per 10 minuti.</string>
+  <string name="account_link_export_info_light">Per utilizzare questo account su altri dispositivi, devi prima esporlo su Jami. Questo genererà un codice PIN che devi inserire sul nuovo dispositivo per configurare l\'account. Il PIN è valido per 10 minuti.</string>
   <string name="account_export_title">Aggiungi dispositivi</string>
   <string name="account_connect_server_button">Connessione al server di gestione</string>
   <string name="account_connect_button">Connetti</string>
   <string name="prompt_server">URL del server di gestione Jami</string>
-  <string name="help_credentials_enter">Inserisci le credenziali della tua organizzazione</string>
-  <string name="help_connect_password_enter">Inserisci la password della tua organizzazione</string>
+  <string name="help_credentials_enter">Inserire le credenziali della tua organizzazione</string>
+  <string name="help_connect_password_enter">Inserire la password della tua organizzazione</string>
   <string name="account_connect_prompt_username">Utente</string>
   <!--Name registration-->
   <string name="error_username_empty">Inserire un nome utente</string>
   <string name="no_registered_name_for_account">Nessun nome registrato</string>
   <string name="username_available">Nome utente disponibile !</string>
-  <string name="register_name">Nome registro</string>
+  <string name="register_name">Registra nome</string>
   <string name="trying_to_register_name">Tentativo di registrazione del nome</string>
   <string name="registered_username">Nome utente registrato</string>
   <string name="register_username">Registra nome utente pubblico</string>
   <string name="register_recommended">Consigliato</string>
-  <string name="username_already_taken">Il nome utente è già utilizzato</string>
+  <string name="username_already_taken">Nome utente già utilizzato</string>
   <string name="invalid_username">Nome utente non valido</string>
   <string name="unknown_error">Errore sconosciuto. Controlla la tua connessione di rete!</string>
   <string name="looking_for_username_availability">La disponibilità del nome utente viene controllata...</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_call.xml b/ring-android/app/src/main/res/values-it-rIT/strings_call.xml
index 84685d67c13eed5cf63d3c868bb6044a6db41652..8123ee85e62ee692e83bd89ab3b4edbe1914e3dc 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_call.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_call.xml
@@ -38,4 +38,5 @@ along with this program; if not, write to the Free Software
     <string name="call_human_state_over">Terminata</string>
     <!-- Conferences -->
     <string name="call_moderator">Moderatore</string>
-    </resources>
\ No newline at end of file
+    <string name="call_muted">Disattivato</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
index 7b36312127174971a2c0107a49b27360eb621707..af494d6e835ab249fbeedaf12566973afc55a56b 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
@@ -5,6 +5,7 @@
   <string name="pref_category_video">Video</string>
   <string name="pref_category_system">Sistema</string>
   <string name="pref_category_privacy">Privacy</string>
+  <string name="pref_category_diagnostic">Diagnostica</string>
   <string name="pref_mobileData_title">Dati mobili</string>
   <string name="pref_mobileData_summary">Permetti Jami su reti 3G/LTE in aggiunta al Wi-Fi</string>
   <string name="pref_pushNotifications_title">Notifiche</string>
@@ -34,6 +35,10 @@
   <string name="pref_delete_account_summary">Elimina il tuo account da questo dispositivo</string>
   <string name="pref_persistNotification_title">Esegui in background</string>
   <string name="pref_persistNotification_summary">Consenti l\'esecuzione in background per ricevere chiamate e messaggi.</string>
+  <string name="pref_logs_title">Registri di diagnostica</string>
+  <string name="pref_logs_summary">Apri le impostazioni di diagnostica</string>
+  <string name="pref_logs_start">Inizia la diagnostica</string>
+  <string name="pref_logs_stop">Ferma la diagnostica</string>
   <string name="pref_typing_title">Abilita gli indicatori di digitazione</string>
   <string name="pref_typing_summary">Invia e ricevi indicatori di digitazione quando si sta scrivendo un messagio.</string>
   <string name="pref_read_title">Abilita conferme di lettura</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 911592bc38d5b6b61a3b8bae7200945167a68912..86e30bc3f5309175a8694020dc64e7947b4159e8 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -148,13 +148,13 @@
   <string name="tab_scan">Scansiona Codice</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">Cancellare la cronologia?</string>
-  <string name="clear_history_dialog_message">Questa azione non può essere annullata.</string>
+  <string name="clear_history_dialog_message">Questa azione è irreversibile.</string>
   <string name="clear_history_completed">La cronologia è stata cancellata.</string>
   <!--Conversation-->
   <string name="conversation_details">Dettagli del contatto</string>
   <string name="conversation_action_delete_this">Cancella questa conversazione</string>
   <string name="conversation_action_delete_this_title">Cancellare questa conversazione ?</string>
-  <string name="conversation_action_delete_this_message">Questa azione non può essere annullata.</string>
+  <string name="conversation_action_delete_this_message">Questa azione è irreversibile.</string>
   <string name="conversation_action_history_clear">Cancella cronologia</string>
   <string name="conversation_action_history_clear_title">Cancellare la cronologia della conversazione?</string>
   <string name="conversation_action_history_clear_message">Questo cancellerà definitivamente la cronologia della conversazione.</string>
@@ -171,15 +171,24 @@
   <string name="block_contact_dialog_title">Bloccare %1$s?</string>
   <string name="block_contact_dialog_message">%1$s non sarà in grado di contattarti finché non lo sblocchi.</string>
   <string name="block_contact_completed">%1$s è stato bloccato.</string>
+  <string name="conversation_info_contact_you">Tu</string>
+  <string name="conversation_members">Membri</string>
+  <string name="conversation_preference_color">Colore della conversazione</string>
+  <string name="conversation_preference_emoji">Emoji conversazione</string>
+  <string name="conversation_type_contact">Contatto Jami</string>
+  <string name="conversation_type_private">Gruppo privato</string>
+  <string name="conversation_type_group">Gruppo</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Aggiungere %1$s?</string>
   <string name="prompt_new_password">Nuova password</string>
   <string name="prompt_new_password_optional">Nuova password (opzionale)</string>
   <string name="prompt_new_password_repeat">Ripeti la nuova password</string>
   <string name="account_create_title">Crea un account Jami</string>
-  <string name="prompt_new_username">Inserisci il nuovo nome utente</string>
+  <string name="prompt_new_username">Inserire il nuovo nome utente</string>
   <string name="prompt_hint_username">Nome utente</string>
   <string name="help_password_choose">Scegli una password sicura che ricorderai per proteggere il tuo account Jami.</string>
+  <string name="help_password_enter">Inserire la password del tuo account principale Jami.</string>
+  <string name="help_server_enter">Inserire l\'URL del server di gestione.</string>
   <string name="help_pin_enter">Inserire il PIN da un altro account Jami configurato. Utilizzare la funzione \"Esporta account Jami\" per ottenere un PIN.</string>
   <string name="wizard_next">Seguente</string>
   <string name="wizard_back">Indietro</string>
@@ -189,6 +198,7 @@
   <string name="profile_message_warning">Il tuo profilo è condiviso solo con i tuoi contatti</string>
   <string name="open_the_gallery">Apri la galleria</string>
   <string name="take_a_photo">Scatta una foto</string>
+  <string name="profile_name_hint">Inserire il tuo nome</string>
   <string name="identity">Identità</string>
   <string name="account">Profilo</string>
   <!--Share fragment-->
@@ -239,6 +249,7 @@
   <string name="file_transfer_status_error">fallito a causa di un errore</string>
   <string name="file_saved_in">File salvato in %s</string>
   <string name="file_saved_successfully">File salvato con successo</string>
+  <string name="file_download">Scarica</string>
   <string name="no_space_left_on_device">Spazio sul dispositivo esaurito</string>
   <string name="title_media_viewer">Visualizzatore media</string>
   <string name="menu_file_open">Apri file</string>
@@ -264,7 +275,9 @@
   <string name="tv_dialog_send">Invia</string>
   <string name="tv_send_audio">Invia audio</string>
   <!--Wizard-->
+  <string name="wizard_username_info">Scegli un nome utente per il tuo account</string>
+  <string name="wizard_password_placeholder">Scegli una password per cifrare il tuo account su questo dispositivo.</string>
   <string name="wizard_password_skip">Crea account</string>
-  <string name="wizard_password_switch">Cifra l\'account con password</string>
+  <string name="wizard_password_switch">Cifrare l\'account con una password</string>
   <string name="wizard_profile_info">Il profilo è condiviso solo con i contatti</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-it/strings_account.xml b/ring-android/app/src/main/res/values-it/strings_account.xml
index 33faeac768525f2b42366bfd815c6db5ad1dcc2d..2da6be55f46443e5d5d6437593f86389cf0a3a3b 100644
--- a/ring-android/app/src/main/res/values-it/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it/strings_account.xml
@@ -9,7 +9,7 @@
   <string name="add_sip_account_title">Aggiungi account SIP</string>
   <string name="ring_account_default_name">Account Jami %1$s</string>
   <string name="prompt_alias">Alias</string>
-  <string name="prompt_hostname">Nome Host</string>
+  <string name="prompt_hostname">Nome host</string>
   <string name="prompt_username">Nome utente</string>
   <string name="prompt_password">Password</string>
   <string name="action_create">Crea account</string>
@@ -31,8 +31,8 @@ Si potra modificare questo account più tardi.</string>
   <string name="help_sip">Importare un account SIP esistente</string>
   <string name="create_sip_account">Aggiungi account SIP</string>
   <!--Strings related to account deletion-->
-  <string name="account_delete_dialog_title">Rimuovere l\'account?</string>
-  <string name="account_delete_dialog_message">Questa azione è irreversibilie.</string>
+  <string name="account_delete_dialog_title">Eliminare l\'account?</string>
+  <string name="account_delete_dialog_message">Questa azione è irreversibile.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nessun account registrato</string>
   <string name="normal_accounts_titles">Account</string>
@@ -45,7 +45,7 @@ Si potra modificare questo account più tardi.</string>
   <string name="account_preferences_basic_tab">Generale</string>
   <string name="account_basic_category">Impostazioni base</string>
   <string name="account_alias_label">Nome dell\'account</string>
-  <string name="account_hostname_label">Nome Host</string>
+  <string name="account_hostname_label">Nome host</string>
   <string name="account_bootstrap_label">Innesco</string>
   <string name="account_username_label">Nome utente</string>
   <string name="account_password_label">Password</string>
@@ -72,13 +72,13 @@ Si potra modificare questo account più tardi.</string>
   <string name="account_preferences_advanced_tab">Avanzato</string>
   <string name="account_call_settings_title">Impostazioni di chiamata</string>
   <string name="account_dht_public_in_calls_label">Consenti chiamate in arrivo da utenti sconosciuti</string>
-  <string name="account_registration_exp_label">Registrazione scaduta</string>
+  <string name="account_registration_exp_label">Scadenza registrazione</string>
   <string name="account_local_interface_label">Interfaccia locale</string>
   <string name="account_local_port_label">Porto locale</string>
-  <string name="account_stun_enable_label">Usare STUN</string>
+  <string name="account_stun_enable_label">Utilizza STUN</string>
   <string name="account_stun_server_label">Server STUN</string>
   <string name="account_accept_files">Accetta automaticamente i file in arrivo</string>
-  <string name="account_turn_enable_label">Usa TURN</string>
+  <string name="account_turn_enable_label">Utilizza TURN</string>
   <string name="account_turn_server_label">Server TURN</string>
   <string name="account_turn_username_label">Nome utente TURN</string>
   <string name="account_turn_password_label">Password TURN</string>
@@ -91,13 +91,14 @@ Si potra modificare questo account più tardi.</string>
   <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Scopri utenti locali</string>
   <string name="account_peer_discovery_enable_label">Abilita il rilevamento di utenti locali</string>
+  <string name="account_peer_discovery_enable_summary">Connettiti ad altri nodi DHT nella tua rete locale.</string>
   <!--Security Details-->
   <string name="account_credentials_label">Credenziali</string>
   <string name="account_credentials_edit">Modifica credenziali</string>
   <string name="account_credentials_add">Aggiungi credenziali</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Sicurezza</string>
-  <string name="account_srtp_switch_label">Cifrare i flussi media (SRTP)</string>
+  <string name="account_srtp_switch_label">Cifrare i flussi multimediali (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Usare il trasporto TLS</string>
@@ -116,7 +117,7 @@ Si potra modificare questo account più tardi.</string>
   <string name="account_rtp_min_port">Minimo</string>
   <string name="account_rtp_port_range">Intervallo porti audio RTP</string>
   <!--restore/backup-->
-  <string name="account_new_device_password">Inserisci la password principale per sbloccare l\'account</string>
+  <string name="account_new_device_password">Inserire la password principale per sbloccare l\'account</string>
   <string name="error_password_char_count">6 caratteri minimo</string>
   <string name="error_passwords_not_equals">Le password no corrispondono</string>
   <string name="export_account_wait_title">Aspettare</string>
@@ -128,11 +129,12 @@ Si potra modificare questo account più tardi.</string>
   <string name="account_export_end_network_message">Impossibile esportare l\'account sulla rete. Verifica la connettività.</string>
   <string name="account_export_end_error_title">Errore</string>
   <string name="account_export_end_error_message">Impossibile esportare l\'account. Errore sconosciuto.</string>
-  <string name="account_enter_password">Inserisci la password</string>
+  <string name="account_enter_password">Inserire la password</string>
   <string name="account_share_body">Contattami con \'%1$s\' sulla piattaforma di comunicazione distribuita Jami: %2$s</string>
   <string name="account_share_body_with_username">Contattami con \'%1$s\' o utilizzando il mio nome pubblico \'%2$s\' disponibile sulla piattaforma di comunicazione distribuita Jami: %3$s</string>
   <string name="account_contact_me">Contattami su Jami !</string>
   <string name="update_account">Aggiorna account</string>
+  <string name="account_migration">Il tuo account Jami può essere aggiornato.\nInserisci la tua password.</string>
   <string name="ring_account">Account Jami</string>
   <string name="ring_account_identity">Identità</string>
   <string name="account_migration_title_dialog">Migrazione account</string>
@@ -141,15 +143,19 @@ Si potra modificare questo account più tardi.</string>
   <string name="account_no_network_title">Impossibile connettersi alla rete</string>
   <string name="account_sip_success_title">Account SIP registrato</string>
   <string name="account_link_archive_button">Connetti dal backup</string>
-  <string name="account_link_prompt_pin">Inserisci PIN</string>
+  <string name="account_link_prompt_pin">Inserire il PIN</string>
   <string name="account_new_button">Crea un account Jami</string>
+  <string name="account_link_export_info">Per utilizzare questo account su altri dispositivi, devi prima esporlo su Jami. Questo genererà un codice PIN che devi inserire sul nuovo dispositivo per configurare l\'account. Il PIN è valido per 10 minuti.</string>
   <string name="account_start_export_button">Genera PIN</string>
   <string name="account_end_export_button">chiudi</string>
+  <string name="account_link_export_info_light">Per utilizzare questo account su altri dispositivi, devi prima esporlo su Jami. Questo genererà un codice PIN che devi inserire sul nuovo dispositivo per configurare l\'account. Il PIN è valido per 10 minuti.</string>
   <string name="account_export_title">Aggiungi dispositivi</string>
   <string name="account_connect_button">Connetti</string>
+  <string name="help_credentials_enter">Inserire le credenziali della tua organizzazione</string>
+  <string name="help_connect_password_enter">Inserire la password della tua organizzazione</string>
   <string name="account_connect_prompt_username">Nome utente</string>
   <!--Name registration-->
-  <string name="error_username_empty">Inserisci un nome utente</string>
+  <string name="error_username_empty">Inserire un nome utente</string>
   <string name="username_available">Nome utente disponibile !</string>
   <string name="registered_username">Nome utente registrato</string>
   <string name="username_already_taken">Nome utente già utilizzato</string>
@@ -167,8 +173,8 @@ Si potra modificare questo account più tardi.</string>
   <!--Edit profile-->
   <string name="account_edit_profile">Modifica il tuo profilo</string>
   <!--Devices-->
-  <string name="account_revoke_device_hint">Inserisci la password per confermare</string>
-  <string name="enter_password">Inserisci la password</string>
+  <string name="account_revoke_device_hint">Inserire la password per confermare</string>
+  <string name="enter_password">Inserire la password</string>
   <string name="revoke_device_title">Revoca dispositivo</string>
   <string name="revoke_device_wait_title">Aspettare</string>
   <string name="rename_device_title">Rinomina questo dispositivo</string>
diff --git a/ring-android/app/src/main/res/values-it/strings_call.xml b/ring-android/app/src/main/res/values-it/strings_call.xml
index d47ec44faa6579fd7e96cab051dc1ba489c3a406..62a0405ed00ac453e4ede3951289460d72ad53ad 100644
--- a/ring-android/app/src/main/res/values-it/strings_call.xml
+++ b/ring-android/app/src/main/res/values-it/strings_call.xml
@@ -36,4 +36,7 @@ along with this program; if not, write to the Free Software
     <string name="call_human_state_hold">Attesa</string>
     <string name="call_human_state_unhold">Riprendi</string>
     <string name="call_human_state_over">Terminata</string>
-    </resources>
\ No newline at end of file
+    <!-- Conferences -->
+    <string name="call_moderator">Moderatore</string>
+    <string name="call_muted">Disattivato</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-it/strings_preferences.xml b/ring-android/app/src/main/res/values-it/strings_preferences.xml
index 7fb13a030a90d8cb38b788d48183d5839e12bb7c..c8d6d3b223d3df3905813251d1538f9c005ba2e9 100644
--- a/ring-android/app/src/main/res/values-it/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-it/strings_preferences.xml
@@ -5,6 +5,7 @@
   <string name="pref_category_video">Video</string>
   <string name="pref_category_system">Sistema</string>
   <string name="pref_category_privacy">Privacy</string>
+  <string name="pref_category_diagnostic">Diagnostica</string>
   <string name="pref_mobileData_title">Dati mobili</string>
   <string name="pref_mobileData_summary">Attiva Jami sulle reti 3G/LTE in aggiunta al Wi-Fi</string>
   <string name="pref_pushNotifications_title">Notifiche</string>
@@ -34,6 +35,10 @@
   <string name="pref_delete_account_summary">Elimina il tuo account da questo dispositivo</string>
   <string name="pref_persistNotification_title">Esegui in background</string>
   <string name="pref_persistNotification_summary">Consenti l\'esecuzione in background per ricevere chiamate e messaggi.</string>
+  <string name="pref_logs_title">Registri di diagnostica</string>
+  <string name="pref_logs_summary">Apri le impostazioni di diagnostica</string>
+  <string name="pref_logs_start">Inizia la diagnostica</string>
+  <string name="pref_logs_stop">Ferma la diagnostica</string>
   <string name="pref_typing_title">Mostra indicazioni di scrittura</string>
   <string name="pref_typing_summary">Invia e ricevi indicatori di scrittura quando si sta scrivendo un messagio.</string>
   <string name="pref_read_title">Mostra conferme di lettura</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 d93dd1562a55fdbb08a8bd192eb401d1c1cbaeba..05e772983025fc8b23dea0afb85d5940368b0a36 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
@@ -177,6 +177,13 @@
   <string name="block_contact_dialog_message">%1$s nu te va putea contacta cît timp va fi blocat.</string>
   <string name="block_contact_completed">%1$s a fost blocat.</string>
   <string name="conversation_contact_is_typing">Contactul tău scrie...</string>
+  <string name="conversation_info_contact_you">Tu</string>
+  <string name="conversation_members">Membri</string>
+  <string name="conversation_preference_color">Culoarea conversației</string>
+  <string name="conversation_preference_emoji">Emoji de conversație</string>
+  <string name="conversation_type_contact">Contact Jami</string>
+  <string name="conversation_type_private">Grup privat</string>
+  <string name="conversation_type_group">Grup</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Adaugi %1$s?</string>
   <string name="prompt_new_password">Parolă nouă</string>
@@ -186,7 +193,7 @@
   <string name="prompt_new_username">Introdu un nou nume de utilizator</string>
   <string name="prompt_hint_username">Nume de utilizator</string>
   <string name="help_password_choose">Alege o parolă complexă pe care să ți-o amintești, pentru a proteja contul tău Jami.</string>
-  <string name="help_password_enter">Introdu parola principală a contului tău Jami.</string>
+  <string name="help_password_enter">Introdu parola contului tău principal Jami.</string>
   <string name="help_server_enter">Introdu URL-ul serverului de administrare</string>
   <string name="help_pin_enter">Introdu codul PIN obținut de la un cont Jami. Folosește opțiunea„ Exportă contul Jami” pentru a obține codul PIN.</string>
   <string name="wizard_next">Înainte</string>
@@ -258,6 +265,7 @@
   <string name="file_transfer_status_timed_out">pauză</string>
   <string name="file_saved_in">Fișier salvat în %s</string>
   <string name="file_saved_successfully">Fișier salvat cu succes</string>
+  <string name="file_download">Descarcă</string>
   <string name="no_space_left_on_device">Spațiu de stocare insuficient</string>
   <string name="title_media_viewer">Vizualizator Media</string>
   <string name="menu_file_open">Deschide fișierul</string>
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml b/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml
index 5303b20db3e6747e2c65d29c90521cb1bd5f49d1..e7132892cfe139c96ab7013b544468e2d0bde8c4 100644
--- a/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml
@@ -104,7 +104,7 @@
   <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Descoperă utilizatori locali</string>
   <string name="account_peer_discovery_enable_label">Activează descoperirea utilizatorilor locali</string>
-  <string name="account_peer_discovery_enable_summary">Conectează-te la alte noduri DHT afișate în rețeaua locală</string>
+  <string name="account_peer_discovery_enable_summary">Conectează-te la alte noduri DHT din rețeaua ta locală.</string>
   <!--Security Details-->
   <string name="account_credentials_label">Date de autentificare</string>
   <string name="account_credentials_edit">Modifică datele de autentificare</string>
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_call.xml b/ring-android/app/src/main/res/values-ro-rRO/strings_call.xml
index a058da9c421de6b58638d082c6cc8e16c6fde793..af50916fdd1a1af3858e733342b2a9b613c7df95 100644
--- a/ring-android/app/src/main/res/values-ro-rRO/strings_call.xml
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings_call.xml
@@ -38,4 +38,5 @@ along with this program; if not, write to the Free Software
     <string name="call_human_state_over">Terminat</string>
     <!-- Conferences -->
     <string name="call_moderator">Moderator</string>
-    </resources>
\ No newline at end of file
+    <string name="call_muted">Oprit</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml b/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
index f2a5217cb3ab722a209e1a83095aa9fd7f398dc8..1f6318330e2ec2aac4863bc05b94d58062dad2ba 100644
--- a/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
@@ -5,6 +5,7 @@
   <string name="pref_category_video">Video</string>
   <string name="pref_category_system">Sistem</string>
   <string name="pref_category_privacy">Confidențialitate</string>
+  <string name="pref_category_diagnostic">Diagnoză</string>
   <string name="pref_mobileData_title">Date mobile</string>
   <string name="pref_mobileData_summary">Permite Jami pe rețelele 3G/LTE în plus față de Wi-Fi</string>
   <string name="pref_pushNotifications_title">Notificări</string>
@@ -34,6 +35,10 @@
   <string name="pref_delete_account_summary">Șterge contul tău de pe acest aparat.</string>
   <string name="pref_persistNotification_title">Folosește în ascuns</string>
   <string name="pref_persistNotification_summary">Permite funcționarea în ascuns pentru a primi apeluri și mesaje.</string>
+  <string name="pref_logs_title">Jurnalul diagnozei</string>
+  <string name="pref_logs_summary">Deschide reglările diagnozei</string>
+  <string name="pref_logs_start">Pornește diagnoza</string>
+  <string name="pref_logs_stop">Oprește diagnoza</string>
   <string name="pref_typing_title">Arată indicatorul de scriere</string>
   <string name="pref_typing_summary">Trimite și primește indicatori de scriere care arată că se scrie un mesaj.</string>
   <string name="pref_read_title">Arată confirmarea de citire</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 4a281858c427990b6bb148d0ac03d4239644ddd4..4fc0fe086dd855117737c6e04b33f7c186a385c3 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
@@ -176,6 +176,13 @@
   <string name="block_contact_dialog_message">%1$s s’do të jetë në gjendje të lidhet me ju, deri sa ta zhbllokoni.</string>
   <string name="block_contact_completed">%1$s u bllokua.</string>
   <string name="conversation_contact_is_typing">Kontakti po shtyp…</string>
+  <string name="conversation_info_contact_you">Ju</string>
+  <string name="conversation_members">Anëtarë</string>
+  <string name="conversation_preference_color">Ngjyrë bisede</string>
+  <string name="conversation_preference_emoji">Emoji bisede</string>
+  <string name="conversation_type_contact">Kontakt Jami</string>
+  <string name="conversation_type_private">Zgjua privat</string>
+  <string name="conversation_type_group">Zgjua grupi</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Të shtohet %1$s?</string>
   <string name="prompt_new_password">Fjalëkalim i ri</string>
@@ -257,6 +264,7 @@
   <string name="file_transfer_status_timed_out">i mbaroi koha</string>
   <string name="file_saved_in">Kartela u ruajt te %s</string>
   <string name="file_saved_successfully">Kartela u ruajt me sukses</string>
+  <string name="file_download">Shkarkoje</string>
   <string name="no_space_left_on_device">S\’ka më hapësirë në pajisje</string>
   <string name="title_media_viewer">Parës mediash</string>
   <string name="menu_file_open">Hap kartelë</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_call.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_call.xml
index 2238af49445c0a489c7151a791829396d1314326..69c5b9aeeae83af2d8bd555e15fbeb520908348d 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_call.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_call.xml
@@ -38,4 +38,5 @@ along with this program; if not, write to the Free Software
     <string name="call_human_state_over">Mbaroi</string>
     <!-- Conferences -->
     <string name="call_moderator">Moderator</string>
-    </resources>
\ No newline at end of file
+    <string name="call_muted">Heshtuar</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
index f374e304908b0a3f08b5bbaa0bd9a97d2368655b..f6644d9bf4e11a77f6b1f05284f34b5e73284413 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
@@ -5,6 +5,7 @@
   <string name="pref_category_video">Video</string>
   <string name="pref_category_system">Sistem</string>
   <string name="pref_category_privacy">Privatësi</string>
+  <string name="pref_category_diagnostic">Diagnostikime</string>
   <string name="pref_mobileData_title">Të dhëna celulare</string>
   <string name="pref_mobileData_summary">Lejoni Jami në rrjete 3G/LTE, si shtesë ndaj atyre Wi-Fi</string>
   <string name="pref_pushNotifications_title">Njoftime push</string>
@@ -34,6 +35,10 @@
   <string name="pref_delete_account_summary">Fshini llogarinë tuaj prej kësaj pajisjeje</string>
   <string name="pref_persistNotification_title">Xhiro në prapaskenë</string>
   <string name="pref_persistNotification_summary">Lejoni xhirimin në prapaskenë që të merrni thirrje dhe mesazhe.</string>
+  <string name="pref_logs_title">Regjistra diagnostikimesh</string>
+  <string name="pref_logs_summary">Hapni rregullime regjistrash diagnostikimi</string>
+  <string name="pref_logs_start">Fillo Regjistrim</string>
+  <string name="pref_logs_stop">Ndale regjistrimin</string>
   <string name="pref_typing_title">Aktivizo tregues shtypjeje</string>
   <string name="pref_typing_summary">Dërgoni dhe merrni shenja shtypjeje që tregojnë se po shtypet një mesazh.</string>
   <string name="pref_read_title">Aktivizo dëshmi leximi</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index a8025f81ff7d684da3d7e17546442577b48920d6..8a15cc9159cd5e9c41c527fe6c05d6d047d9ad8d 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
@@ -175,6 +175,8 @@
   <string name="block_contact_dialog_message">您将不能联系%1$s直到您解除屏蔽。</string>
   <string name="block_contact_completed">%1$s已被屏蔽。</string>
   <string name="conversation_contact_is_typing">联系人正在输入...</string>
+  <string name="conversation_members">成员</string>
+  <string name="conversation_type_contact">Jami 联系人</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">添加%1$s？</string>
   <string name="prompt_new_password">新密码</string>
@@ -256,6 +258,7 @@
   <string name="file_transfer_status_timed_out">超时</string>
   <string name="file_saved_in">文件已保存到%s</string>
   <string name="file_saved_successfully">文件保存成功</string>
+  <string name="file_download">下载</string>
   <string name="no_space_left_on_device">设备无剩余空间</string>
   <string name="title_media_viewer">媒体播放器</string>
   <string name="menu_file_open">打开文件</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
index e3e774cb04b40ad67a31cb9b92422f8b54ec14be..6e16204778de5fe7e99dbe4c4407f233f89ec51d 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
@@ -5,6 +5,7 @@
   <string name="pref_category_video">视频</string>
   <string name="pref_category_system">系统</string>
   <string name="pref_category_privacy">隐私</string>
+  <string name="pref_category_diagnostic">诊断</string>
   <string name="pref_mobileData_title">移动数据</string>
   <string name="pref_mobileData_summary">允许 Jami 使用 3G/LTE 网络作为 Wi-Fi 的补充</string>
   <string name="pref_pushNotifications_title">推送通知</string>
@@ -34,6 +35,8 @@
   <string name="pref_delete_account_summary">将您的账户从本设备删除</string>
   <string name="pref_persistNotification_title">后台运行</string>
   <string name="pref_persistNotification_summary">允许在后台运行以接收电话和消息。</string>
+  <string name="pref_logs_title">诊断日志</string>
+  <string name="pref_logs_summary">打开诊断日志设置</string>
   <string name="pref_typing_title">启用输入状态显示</string>
   <string name="pref_typing_summary">发送和接收表示正在编写消息的输入状态。</string>
   <string name="pref_read_title">启用已读回执</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 972a4f42fa18fdb79cf0185403e5c48675389665..fdfecfc16ffb82e880bbb5b9a3a6b069b1142d81 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
@@ -175,6 +175,13 @@
   <string name="block_contact_dialog_message">直到您解除封鎖前，%1$s 都不能再聯絡您。</string>
   <string name="block_contact_completed">%1$s 已被封鎖。</string>
   <string name="conversation_contact_is_typing">聯絡人正在打字……</string>
+  <string name="conversation_info_contact_you">您</string>
+  <string name="conversation_members">成員</string>
+  <string name="conversation_preference_color">對話色彩</string>
+  <string name="conversation_preference_emoji">對話表情符號</string>
+  <string name="conversation_type_contact">Jami 聯絡人</string>
+  <string name="conversation_type_private">私人 swarm</string>
+  <string name="conversation_type_group">群組 swarm</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">新增 %1$s？</string>
   <string name="prompt_new_password">新密碼</string>
@@ -256,6 +263,7 @@
   <string name="file_transfer_status_timed_out">逾時</string>
   <string name="file_saved_in">檔案儲存在 %s</string>
   <string name="file_saved_successfully">檔案儲存成功</string>
+  <string name="file_download">下載</string>
   <string name="no_space_left_on_device">裝置上沒有剩餘空間</string>
   <string name="title_media_viewer">媒體檢視器</string>
   <string name="menu_file_open">開啟檔案</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml
index 8cb9d7e172ceb8e20922c0454ef25fc5a3a9ade2..81873cfc1a3b5e71df186bf8d50f0232c941a58d 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml
@@ -38,4 +38,5 @@ along with this program; if not, write to the Free Software
     <string name="call_human_state_over">結束</string>
     <!-- Conferences -->
     <string name="call_moderator">主持人</string>
-    </resources>
\ No newline at end of file
+    <string name="call_muted">已靜音</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
index 57f4513e36db25be11354859be05268e3207e4ac..19c51f8181f7cb90067d0ee8a5aaa59d05db9d60 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
@@ -5,6 +5,7 @@
   <string name="pref_category_video">視訊</string>
   <string name="pref_category_system">系統</string>
   <string name="pref_category_privacy">隱私</string>
+  <string name="pref_category_diagnostic">診斷</string>
   <string name="pref_mobileData_title">行動數據</string>
   <string name="pref_mobileData_summary">除了 Wi-Fi 之外，允許 Jami 在 3G/LTE 網路上使用</string>
   <string name="pref_pushNotifications_title">推播通知</string>
@@ -34,6 +35,10 @@
   <string name="pref_delete_account_summary">從此裝置刪除您的帳號</string>
   <string name="pref_persistNotification_title">在背景執行</string>
   <string name="pref_persistNotification_summary">允許在背景中執行以接收通話與訊息。</string>
+  <string name="pref_logs_title">診斷紀錄檔</string>
+  <string name="pref_logs_summary">開啟診斷紀錄檔設定</string>
+  <string name="pref_logs_start">開始記錄</string>
+  <string name="pref_logs_stop">停止記錄</string>
   <string name="pref_typing_title">啟用輸入指示器</string>
   <string name="pref_typing_summary">傳送與接收輸入指示器，表明正在輸入訊息。</string>
   <string name="pref_read_title">啟用讀取回條</string>