diff --git a/ring-android/app/src/main/res/values-ar/strings.xml b/ring-android/app/src/main/res/values-ar/strings.xml
index 438d6ec9f2e40c4276b211d171d5abf1920e994a..e496b1ee93bb1ace46ccc3e99b4503d51879ec26 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -82,11 +82,8 @@
   <string name="notif_dismiss">رفض</string>
   <string name="notif_reply">الرد</string>
   <string name="notif_incoming_file_transfer_title">مكالمة واردة من %1$s</string>
-  <string name="notif_incoming_file_transfer">أحدهم يريد أن يرسل إليك ملف</string>
   <string name="notif_outgoing_file_transfer_title">إرسال ملف الى %1$s</string>
-  <string name="notif_outgoing_file_transfer">أحدهم يريد أن يرسل إليك ملف</string>
   <string name="notif_incoming_picture">صورة من %1$s</string>
-  <string name="action_open">إفتح</string>
   <string name="notif_sync_title">مزامنة البيانات...</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">أنت:</string>
diff --git a/ring-android/app/src/main/res/values-ar/strings_account.xml b/ring-android/app/src/main/res/values-ar/strings_account.xml
index cd4cfbb717002282ca29655a0c94da960e7911c5..afaff4faa0ad4d3e90643129346df8e0dab67135 100644
--- a/ring-android/app/src/main/res/values-ar/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ar/strings_account.xml
@@ -102,6 +102,7 @@
   <!--Name registration-->
   <string name="account_status_connecting">يتم الإتصال</string>
   <string name="account_status_unknown">مجهول</string>
+  <string name="account_status_error">خطأ</string>
   <!--Create account-->
   <string name="account_creation_home">مرحبا بك في جامي</string>
   <string name="account_creation_profile">أنشئ ملفك الشخصي</string>
diff --git a/ring-android/app/src/main/res/values-bg/strings.xml b/ring-android/app/src/main/res/values-bg/strings.xml
index aa0e255c1f63c5d1b32c7588baba845072064da3..16cf91fa8426db9f5021bd213ecbe14073e09a94 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -70,11 +70,8 @@
   <string name="notif_dismiss">Отказ</string>
   <string name="notif_reply">Отговор</string>
   <string name="notif_incoming_file_transfer_title">Входящ файл от %1$s</string>
-  <string name="notif_incoming_file_transfer">Някой иска да ви изпрати файл.</string>
   <string name="notif_outgoing_file_transfer_title">Изпращане на файл до %1$s</string>
-  <string name="notif_outgoing_file_transfer">Някой иска да ви изпрати файл.</string>
   <string name="notif_incoming_picture">Снимка от %1$s</string>
-  <string name="action_open">Отваряне</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Вие:</string>
   <string name="action_call_hangup">Затваряне</string>
diff --git a/ring-android/app/src/main/res/values-bg/strings_account.xml b/ring-android/app/src/main/res/values-bg/strings_account.xml
index e26b2a15409ddb82218e8c45a79a9968a41ce6c4..644f8ff3c2abc9e626bdf5efc5b24b618ae16f85 100644
--- a/ring-android/app/src/main/res/values-bg/strings_account.xml
+++ b/ring-android/app/src/main/res/values-bg/strings_account.xml
@@ -146,6 +146,7 @@
   <string name="account_status_online">На линия</string>
   <string name="account_status_unknown">Неизвестно</string>
   <string name="account_status_offline">Извън линия</string>
+  <string name="account_status_error">Грешка</string>
   <!--Create account-->
   <string name="account_creation_home">Добре дошли в Jami</string>
   <string name="account_creation_profile">Създаване на профил</string>
diff --git a/ring-android/app/src/main/res/values-ca/strings.xml b/ring-android/app/src/main/res/values-ca/strings.xml
index 614c44600499a5c1fb886be53094223fdf19cfaf..510393815b2576328d85310b141ce55985d98ebe 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -66,9 +66,6 @@
   <string name="notif_group_calls">Trucades</string>
   <string name="notif_background_service">Jami s\'està executant en segon pla</string>
   <string name="notif_mark_as_read">Marca com a llegit</string>
-  <string name="notif_incoming_file_transfer">Alguna persona us està enviant un fitxer</string>
-  <string name="notif_outgoing_file_transfer">Algú prova d\'enviar-te un fitxer</string>
-  <string name="action_open">Obre</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Usuari:</string>
   <string name="action_call_hangup">Penja</string>
diff --git a/ring-android/app/src/main/res/values-ca/strings_account.xml b/ring-android/app/src/main/res/values-ca/strings_account.xml
index f26882185508de4916daed474b4ab4eb264f4be5..2a7a3c3a38d8256c293c887e520f1b69a8c77a35 100644
--- a/ring-android/app/src/main/res/values-ca/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ca/strings_account.xml
@@ -133,6 +133,7 @@ Podeu editar el vostre compte més endavant.</string>
   <string name="account_status_connecting">Connectant</string>
   <string name="account_status_connection_error">Error de xarxa</string>
   <string name="account_status_unknown">Desconegut</string>
+  <string name="account_status_error">Error</string>
   <!--Create account-->
   <string name="account_creation_profile">Crei el seu perfil</string>
   <!--Edit profile-->
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
index b29ed147d9f4aea04c4f2440d397ad501830b742..8975236ffd24d785944f1e56a7aa0803d4b1878a 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
@@ -72,11 +72,8 @@
   <string name="notif_dismiss">Odmítnout</string>
   <string name="notif_reply">Odpovědět</string>
   <string name="notif_incoming_file_transfer_title">Příchozí soubor od %1$s</string>
-  <string name="notif_incoming_file_transfer">Někdo vám chce poslat soubor</string>
   <string name="notif_outgoing_file_transfer_title">Posílá se soubor %1$s</string>
-  <string name="notif_outgoing_file_transfer">Někdo vám chce poslat soubor</string>
   <string name="notif_incoming_picture">Obrázek od %1$s</string>
-  <string name="action_open">Otevřít</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Vy:</string>
   <string name="action_call_hangup">Zavěsit</string>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
index ef9c792eacea163fe98bb4cf52f579e71371aab5..0981eb282ef40a06d3adc721f12838bddf258c38 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
@@ -169,6 +169,7 @@ Prověřte, prosím, své heslo.</string>
   <string name="account_status_online">Připojen</string>
   <string name="account_status_unknown">Neznámé</string>
   <string name="account_status_offline">Nepřipojen</string>
+  <string name="account_status_error">Chyba</string>
   <!--Create account-->
   <string name="account_creation_home">Vítejte v Jami</string>
   <string name="account_creation_profile">Vytvořit vlastní profil</string>
diff --git a/ring-android/app/src/main/res/values-da/strings.xml b/ring-android/app/src/main/res/values-da/strings.xml
index c5f9c622e6e66321a032eb4aa41927da8435992f..e1f28137e77cd078721a906e04a5a4ce0d74726b 100644
--- a/ring-android/app/src/main/res/values-da/strings.xml
+++ b/ring-android/app/src/main/res/values-da/strings.xml
@@ -62,11 +62,8 @@
   <string name="notif_dismiss">Afvis</string>
   <string name="notif_reply">Svar</string>
   <string name="notif_incoming_file_transfer_title">Indgående fil fra %1$s</string>
-  <string name="notif_incoming_file_transfer">Nogen vil sende dig en fil</string>
   <string name="notif_outgoing_file_transfer_title">Sender fil til %1$s</string>
-  <string name="notif_outgoing_file_transfer">Nogen vil sende dig en fil</string>
   <string name="notif_incoming_picture">Billede fra %1$s</string>
-  <string name="action_open">Åbn</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Dig:</string>
   <string name="action_call_hangup">Læg på</string>
diff --git a/ring-android/app/src/main/res/values-da/strings_account.xml b/ring-android/app/src/main/res/values-da/strings_account.xml
index ac79dc4f3910c65b674b6255e51d76e134bbcc56..c398a2506f4036cdca05d2325cff3a376662825c 100644
--- a/ring-android/app/src/main/res/values-da/strings_account.xml
+++ b/ring-android/app/src/main/res/values-da/strings_account.xml
@@ -150,6 +150,7 @@ Du kan rette din konto senere</string>
   <string name="account_status_online">Forbundet</string>
   <string name="account_status_unknown">Ukendt</string>
   <string name="account_status_offline">Ingen forbindelse</string>
+  <string name="account_status_error">Fejl</string>
   <!--Create account-->
   <string name="account_creation_profile">Opret din profil</string>
   <string name="account_link_title">Tilknyt denne enhed</string>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index cb684b7cd6e5af64d29201bfc6c8d07d29ee4121..a4deb35dc87b4b9ea26d5cc49520ca3cbc574e55 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings.xml
@@ -70,11 +70,8 @@
   <string name="notif_dismiss">Abweisen</string>
   <string name="notif_reply">Antworten</string>
   <string name="notif_incoming_file_transfer_title">Einkommende Datei von %1$s</string>
-  <string name="notif_incoming_file_transfer">Jemand möchte dir eine Datei senden</string>
   <string name="notif_outgoing_file_transfer_title">Sende Datei an %1$s</string>
-  <string name="notif_outgoing_file_transfer">Jemand möchte dir eine Datei senden</string>
   <string name="notif_incoming_picture">Bild von %1$s</string>
-  <string name="action_open">Öffnen</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Sie:</string>
   <string name="action_call_hangup">Auflegen</string>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
index 7698e3e6187fcbeeeed10935f741386d5c2e6219..c461130ee8e16b69e351fc792c0aa9ad32b020f0 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
@@ -130,6 +130,7 @@ Sie können Ihr Konto später ändern.</string>
   <string name="account_status_online">Online</string>
   <string name="account_status_unknown">Unbekannt</string>
   <string name="account_status_offline">Offline</string>
+  <string name="account_status_error">Fehler</string>
   <!--Create account-->
   <string name="account_creation_home">Willkommen bei Jami</string>
   <!--Edit profile-->
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 9351dc7f1054d21c3d7c8f12daaa926ce056ef2c..581b6555d726fa316c9fdb67219882ae1640cd22 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -78,12 +78,16 @@
   <string name="notif_dismiss">Verwerfen</string>
   <string name="notif_reply">Antworten</string>
   <string name="notif_incoming_file_transfer_title">Eingehende Datei von %1$s</string>
-  <string name="notif_incoming_file_transfer">Jemand möchte Ihnen eine Datei schicken</string>
   <string name="notif_outgoing_file_transfer_title">Datei an %1$s senden</string>
-  <string name="notif_outgoing_file_transfer">Jemand möchte Ihnen eine Datei schicken</string>
   <string name="notif_incoming_picture">Bild von %1$s</string>
-  <string name="action_open">Öffnen</string>
   <string name="notif_sync_title">Daten synchronisieren...</string>
+  <string name="notif_location_title">Standort mit %1$s teilen</string>
+  <string name="location_share_contact">%1$s teilt den Standort mit dir</string>
+  <string name="notif_location_multi_title">Geteilter Standort mit %1$d Kontakten</string>
+  <string name="notif_location_remaining">%1$d verbleibende Minuten</string>
+  <string name="notif_location_action_stop">Standort teilen beenden</string>
+  <string name="location_share_action_start">Teilen starten</string>
+  <string name="location_share_action_stop">Teilen beenden</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Sie:</string>
   <string name="action_call_hangup">Auflegen</string>
@@ -117,6 +121,7 @@
   <string name="hist_file_received">Datei erhalten</string>
   <string name="conversation_send_audio">Audioaufzeichnung starten</string>
   <string name="conversation_send_video">Videoaufzeichnung starten</string>
+  <string name="conversation_share_location">Standort teilen</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera Berechtigung</string>
   <string name="permission_dialog_camera_message">Für Video-Konversationen benötigt die Anwendung Zugriff auf die Kamera. Bitte erteilen Sie diese Berechtigung.</string>
@@ -162,6 +167,7 @@
   <string name="block_contact_dialog_title">%1$s blockieren?</string>
   <string name="block_contact_dialog_message">%1$s wird nicht in der Lage sein, Sie zu kontaktieren, bis Sie die Blockierung entfernen.</string>
   <string name="block_contact_completed">%1$s wurde blockiert.</string>
+  <string name="conversation_contact_is_typing">Kontakt tippt...</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">%1$s hinzufügen?</string>
   <string name="prompt_new_password">Neues Passwort</string>
@@ -178,13 +184,13 @@
   <string name="wizard_skip">Überspringen</string>
   <!--MenuHeaderView-->
   <string name="profile">Profil</string>
-  <string name="profile_message_warning">Ihr Profil wird nur mit Ihren Kontakten geteilt</string>
+  <string name="profile_message_warning">Dein Profil wird nur mit deinen Kontakten geteilt</string>
   <string name="open_the_gallery">Galerie öffnen</string>
   <string name="take_a_photo">Foto machen</string>
   <string name="profile_name_hint">Name eingeben (optional)</string>
   <!--Share fragment-->
   <string name="share_message">Diesen Code mit Jami scannen</string>
-  <string name="share_message_no_account">Bitte wählen Sie ein Konto aus.</string>
+  <string name="share_message_no_account">Bitte wähle ein Konto zum Teilen aus.</string>
   <string name="share_your_account_information">Teile meine Kontaktinformationen</string>
   <string name="share_label">Teilen</string>
   <string name="generic_error_migration">Fehler</string>
@@ -198,12 +204,12 @@
   <string name="contact_request_msg">Du hast %1$s Kontaktanfragen</string>
   <string name="contact_request_account">Für %1$s</string>
   <string name="no_requests">0 Kontaktanfragen</string>
-  <string name="message_contact_not_trusted_yet">%s ist noch nicht in Ihrer Kontaktliste.\nDiese Kontaktanfrage annehmen oder ablehnen?</string>
-  <string name="message_contact_not_trusted">%s ist nicht in Ihrer Kontaktliste.\nNeuen Kontakt hinzufügen?</string>
+  <string name="message_contact_not_trusted_yet">%s ist noch nicht in deiner Kontaktliste.\nDiese Kontaktanfrage annehmen oder ablehnen?</string>
+  <string name="message_contact_not_trusted">%s ist nicht in deiner Kontaktliste.\nNeuen Kontakt hinzufügen?</string>
   <!--Send contact requests-->
   <string name="send_request_button">Senden</string>
   <string name="send_request_title">Sende eine Kontaktanfrage</string>
-  <string name="send_request_msg">Sie müssen eine Kontaktanfrage senden, um mit diesem Benutzer zu kommunizieren. Solange Ihr Kontakt die Anforderung nicht akzeptiert hat, können Sie Nachrichten senden, aber Ihr Kontakt kann diese nicht beantworten.</string>
+  <string name="send_request_msg">Du musst eine Kontaktanfrage senden, um mit diesem Benutzer zu kommunizieren. Solange dein Kontakt die Anfrage nicht akzeptiert hat, kannst du Nachrichten senden, aber er wird nicht in der Lage sein, zu antworten.</string>
   <!--Blacklist-->
   <string name="no_blocked_contact">0 blockierte Kontakte</string>
   <!--Smartlist-->
@@ -245,13 +251,19 @@
   <string name="menu_message_cancel">Nachricht abbrechen</string>
   <string name="menu_delete">Löschen</string>
   <string name="pref_darkTheme_title">Dunkles Design</string>
-  <string name="pref_darkTheme_summary">Aktivieren Sie immer das dunkle Design, anstatt das Systemverhalten zu verwenden</string>
+  <string name="pref_darkTheme_summary">Immer das dunkle Design aktivieren, anstatt das Systemverhalten zu verwenden</string>
   <!--Bottom Navigation-->
   <string name="navigation_item_conversation">Unterhaltungen</string>
   <string name="navigation_item_contact_request">Kontaktanfragen</string>
   <string name="navigation_item_account">Konto</string>
   <!--TV-->
+  <string name="tv_send_audio_dialog_message">Audionachricht senden?</string>
   <string name="tv_audio_play">Abspielen</string>
   <string name="tv_audio_pause">Pause</string>
   <string name="tv_dialog_send">Senden</string>
+  <string name="tv_audio_recording">Aufnahme...</string>
+  <string name="tv_send_text">Text senden</string>
+  <string name="tv_send_audio">Audio senden</string>
+  <string name="tv_send_video">Video senden</string>
+  <string name="tv_clear_history">Verlauf leeren</string>
 </resources>
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 4422877c39f88592c6f4e58fbc49eae2e7a19023..4df766509eebcc13ffbd48a04ac1fbc096c734aa 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
@@ -193,6 +193,7 @@ Sie können ihr Konto später bearbeiten</string>
   <string name="account_status_online">Online</string>
   <string name="account_status_unknown">Unbekannt</string>
   <string name="account_status_offline">Offline</string>
+  <string name="account_status_error">Fehler</string>
   <!--Create account-->
   <string name="account_creation_home">Willkommen bei Jami</string>
   <string name="account_creation_profile">Erstellen Sie Ihr Profil</string>
diff --git a/ring-android/app/src/main/res/values-el/strings_account.xml b/ring-android/app/src/main/res/values-el/strings_account.xml
index 07c22b805c55143ab7598ad61bae84a24ebd769d..8fd0cae4d4f1423ebf244512d5ee5f042c161adf 100644
--- a/ring-android/app/src/main/res/values-el/strings_account.xml
+++ b/ring-android/app/src/main/res/values-el/strings_account.xml
@@ -58,6 +58,7 @@
   <string name="invalid_username">Μη έγκυρο όνομα χρήστη</string>
   <string name="account_status_connecting">Συνδέεται</string>
   <string name="account_status_unknown">Άγνωστοι</string>
+  <string name="account_status_error">Σφάλμα</string>
   <!--Create account-->
   <!--Edit profile-->
   <!--Devices-->
diff --git a/ring-android/app/src/main/res/values-eo/strings_account.xml b/ring-android/app/src/main/res/values-eo/strings_account.xml
index 50a8cd5257b59f556b58c9369e38fda093426889..b0adcc004e5455483920f7ecc03187f422adf125 100644
--- a/ring-android/app/src/main/res/values-eo/strings_account.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_account.xml
@@ -97,6 +97,7 @@
   <string name="username_already_taken">Uzantnomo jam prenita</string>
   <string name="invalid_username">Nevalida uzantnomo</string>
   <string name="account_status_unknown">Nekonata</string>
+  <string name="account_status_error">Eraro</string>
   <!--Create account-->
   <!--Edit profile-->
   <!--Devices-->
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 24eb07c4158adc19b1caa21f38f1eb1e3e6d0621..648b55ea5eb7e5b5593df608856ec72aa6d44409 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
@@ -78,12 +78,16 @@
   <string name="notif_dismiss">Rechazar</string>
   <string name="notif_reply">Responder</string>
   <string name="notif_incoming_file_transfer_title">Archivo entrante de %1$s</string>
-  <string name="notif_incoming_file_transfer">Alguien quiere enviarte un archivo</string>
   <string name="notif_outgoing_file_transfer_title">Enviando archivo a %1$s</string>
-  <string name="notif_outgoing_file_transfer">Alguien quiere enviarte un archivo</string>
   <string name="notif_incoming_picture">Imagen de %1$s</string>
-  <string name="action_open">Abrir</string>
   <string name="notif_sync_title">Sincronizando datos...</string>
+  <string name="notif_location_title">Compartir ubicación con %1$s</string>
+  <string name="location_share_contact">%1$s está compartiendo su ubicación con vos</string>
+  <string name="notif_location_multi_title">Compartiendo ubicación con %1$d contactos</string>
+  <string name="notif_location_remaining">%1$d minutos restantes</string>
+  <string name="notif_location_action_stop">Dejar de compartir ubicación</string>
+  <string name="location_share_action_start">Comenzar a compartir</string>
+  <string name="location_share_action_stop">Dejar de compartir</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Vos:</string>
   <string name="action_call_hangup">Colgar</string>
@@ -117,6 +121,7 @@
   <string name="hist_file_received">Archivo recibido</string>
   <string name="conversation_send_audio">Grabar clip de audio</string>
   <string name="conversation_send_video">Grabar clip de video</string>
+  <string name="conversation_share_location">Compartir ubicación</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permiso de cámara</string>
   <string name="permission_dialog_camera_message">Las videollamadas requieren el permiso de cámara para funcionar. Considerá activarlo.</string>
@@ -162,6 +167,7 @@
   <string name="block_contact_dialog_title">¿Bloquear a %1$s?</string>
   <string name="block_contact_dialog_message">%1$s no podrá contactarte a menos que lo desbloquees.</string>
   <string name="block_contact_completed">%1$s ha sido bloqueado.</string>
+  <string name="conversation_contact_is_typing">Escribiendo...</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">¿Añadir a %1$s?</string>
   <string name="prompt_new_password">Nueva contraseña</string>
@@ -251,6 +257,13 @@
   <string name="navigation_item_contact_request">Solicitudes de contacto</string>
   <string name="navigation_item_account">Cuenta</string>
   <!--TV-->
+  <string name="tv_send_audio_dialog_message">¿Enviar mensaje de audio?</string>
   <string name="tv_audio_play">Reproducir</string>
+  <string name="tv_audio_pause">Pausar</string>
   <string name="tv_dialog_send">Enviar</string>
+  <string name="tv_audio_recording">Grabando...</string>
+  <string name="tv_send_text">Enviar texto</string>
+  <string name="tv_send_audio">Enviar audio</string>
+  <string name="tv_send_video">Enviar video</string>
+  <string name="tv_clear_history">Borrar historial</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings_account.xml b/ring-android/app/src/main/res/values-es-rAR/strings_account.xml
index 31124baf278f5d7c011bd343ffc4444add1f68cd..37df4b074f7506a72add2e98382bcafba294810f 100644
--- a/ring-android/app/src/main/res/values-es-rAR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-es-rAR/strings_account.xml
@@ -183,6 +183,7 @@ Podrá editar su cuenta más tarde.</string>
   <string name="account_status_online">En línea</string>
   <string name="account_status_unknown">Desconocido</string>
   <string name="account_status_offline">Desconectado</string>
+  <string name="account_status_error">Error</string>
   <!--Create account-->
   <string name="account_creation_home">Bienvenido a Jami</string>
   <string name="account_creation_profile">Creá tu perfil</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 53e90bff611af0290e9af0bd25af5ab3f3ca7619..1637f6792137291afbfe0545e2065d2704d168dc 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -79,12 +79,16 @@
   <string name="notif_dismiss">Descartar</string>
   <string name="notif_reply">Responder</string>
   <string name="notif_incoming_file_transfer_title">Archivo entrante de %1$s</string>
-  <string name="notif_incoming_file_transfer">Alguien quiere enviarle un archivo</string>
   <string name="notif_outgoing_file_transfer_title">Enviando archivo a %1$s</string>
-  <string name="notif_outgoing_file_transfer">Alguien quiere enviarle un archivo</string>
   <string name="notif_incoming_picture">Imagen de%1$s</string>
-  <string name="action_open">Abrir</string>
   <string name="notif_sync_title">Sincronizando datos...</string>
+  <string name="notif_location_title">Compartir ubicación con %1$s</string>
+  <string name="location_share_contact">%1$s está compartiendo su ubicación contigo</string>
+  <string name="notif_location_multi_title">Compartiendo ubicación con %1$d contactos</string>
+  <string name="notif_location_remaining">%1$d minutos restantes</string>
+  <string name="notif_location_action_stop">Dejar de compartir ubicación</string>
+  <string name="location_share_action_start">Comenzar a compartir</string>
+  <string name="location_share_action_stop">Dejar de compartir</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Tú:</string>
   <string name="action_call_hangup">Colgar</string>
@@ -118,6 +122,7 @@
   <string name="hist_file_received">Archivo recibido</string>
   <string name="conversation_send_audio">Grabar clip de audio</string>
   <string name="conversation_send_video">Grabar clip de vídeo</string>
+  <string name="conversation_share_location">Comparte tu ubicación</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permiso de cámara</string>
   <string name="permission_dialog_camera_message">Las conversaciones con vídeo requieren utilizar la cámara. Considera conceder este permiso.</string>
@@ -163,6 +168,7 @@
   <string name="block_contact_dialog_title">¿Bloquear a %1$s?</string>
   <string name="block_contact_dialog_message">%1$s no podrá cotactar contigo hasta que lo desbloquees.</string>
   <string name="block_contact_completed">%1$s fue bloqueado.</string>
+  <string name="conversation_contact_is_typing">Escribiendo...</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Añadir %1$s?</string>
   <string name="prompt_new_password">Contraseña nueva</string>
@@ -252,7 +258,13 @@
   <string name="navigation_item_contact_request">Solicitudes de contacto</string>
   <string name="navigation_item_account">Cuenta</string>
   <!--TV-->
+  <string name="tv_send_audio_dialog_message">¿Enviar mensaje de audio?</string>
   <string name="tv_audio_play">Reproducir</string>
   <string name="tv_audio_pause">Pausar</string>
   <string name="tv_dialog_send">Enviar</string>
+  <string name="tv_audio_recording">Grabando...</string>
+  <string name="tv_send_text">Enviar texto</string>
+  <string name="tv_send_audio">Enviar audio</string>
+  <string name="tv_send_video">Enviar video</string>
+  <string name="tv_clear_history">Limpiar historial</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-es/strings_account.xml b/ring-android/app/src/main/res/values-es/strings_account.xml
index 7eb5b1988528e6450aae4fd3b30c649dadd97f1c..6d9fb9ef8efd13c7a2a57eb4c98a996aa4f18e12 100644
--- a/ring-android/app/src/main/res/values-es/strings_account.xml
+++ b/ring-android/app/src/main/res/values-es/strings_account.xml
@@ -95,6 +95,7 @@ Puedes editar tu cuenta luego</string>
   <string name="account_proxy_label">Proxy DHT</string>
   <string name="account_proxy_enable_label">Usar proxy DHT</string>
   <string name="account_proxy_server_label">Dirección proxy DHT</string>
+  <string name="account_proxy_server_list_label">URL del listado de proxy DHT</string>
   <string name="account_peer_discovery_label">Descubrimiento local de pares</string>
   <string name="account_peer_discovery_enable_label">Habilitar descubrimiento local de pares</string>
   <string name="account_peer_discovery_enable_summary">Conectarse a otros nodos DHT que se anuncian en nuestra red local</string>
@@ -192,6 +193,7 @@ Puedes editar tu cuenta luego</string>
   <string name="account_status_online">En línea</string>
   <string name="account_status_unknown">Desconocido</string>
   <string name="account_status_offline">Desconectado</string>
+  <string name="account_status_error">Error</string>
   <!--Create account-->
   <string name="account_creation_home">Bienvenido a Jami</string>
   <string name="account_creation_profile">Crea tu perfil</string>
diff --git a/ring-android/app/src/main/res/values-eu/strings.xml b/ring-android/app/src/main/res/values-eu/strings.xml
index 9fa694ba516d2406c20c06e24ef41b15a1a0ada6..fb86ab6b1ceae41155aadad96bb33159d56430c1 100644
--- a/ring-android/app/src/main/res/values-eu/strings.xml
+++ b/ring-android/app/src/main/res/values-eu/strings.xml
@@ -2,7 +2,7 @@
 <resources>
   <!--About-->
   <string name="feedback_section">Iruzkinak</string>
-  <string name="report"><u>Bidali gaitzazu e-mail bat</u></string>
+  <string name="report"><u>Bidal iezaguzu posta elektroniko bat</u></string>
   <string name="section_license">Lizentzia</string>
   <string name="sponsor_section">Jami Software librea da, garatzaile eta babesleak: </string>
   <string name="copyright_section">Copyright</string>
@@ -18,6 +18,7 @@
   <!--About dialog-->
   <string name="developed_by">Garatzaileak:</string>
   <string name="designed_by">Diseinatzaileak:</string>
+  <string name="ringtones_by">noren partez txirrinak : </string>
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Ez dago sare-konexiorik</string>
@@ -45,6 +46,7 @@
     <item quantity="other">%d elkarrizketa</item>
   </plurals>
   <!--ContactList Fragment-->
+  <string name="searchbar_hint">Bilatze-barreko alhoku</string>
   <string name="choose_number">Hautatu zenbaki bat</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
@@ -72,11 +74,8 @@
   <string name="notif_dismiss">Baztertu</string>
   <string name="notif_reply">Erantzun</string>
   <string name="notif_incoming_file_transfer_title">%1$s erabiltzailetik fitxategia jasotzen</string>
-  <string name="notif_incoming_file_transfer">Norbaitek fitxategi bat bidali nahi dizu</string>
   <string name="notif_outgoing_file_transfer_title">%1$s erabiltzaileari fitxategia bidaltzen</string>
-  <string name="notif_outgoing_file_transfer">Norbaitek fitxategi bat bidali nahi dizu</string>
   <string name="notif_incoming_picture">%1$s erabiltzaileak bidalitako irudia</string>
-  <string name="action_open">Ireki</string>
   <string name="notif_sync_title">Datuak sinkronizatzen...</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Zuk:</string>
@@ -181,14 +180,25 @@
   <string name="search_results">Bilaketaren emaitzak</string>
   <string name="tv_contact_row_header">Kontaktuak</string>
   <string name="gallery_error_title">Ez da galeria aplikaziorik aurkitu</string>
+  <string name="gallery_error_message">Galeri-errorearen mezua</string>
+  <string name="generic_error">Errore generikoa</string>
   <!--File Transfer-->
   <string name="invalid_file">Fitxategi baliogabea</string>
   <string name="not_able_to_write_file">Ezin izan da fitxategia idatzi</string>
   <string name="file_transfer_status_unsupported">onartu gabea</string>
   <string name="file_transfer_status_ongoing">abioan</string>
   <string name="file_transfer_status_finished">amaituta</string>
+  <string name="file_transfer_status_closed_by_host">Ostalariak moztutakoa</string>
+  <string name="file_transfer_status_closed_by_peer">Pareak itxitakoa</string>
   <string name="file_transfer_status_invalid_pathname">bide-izen baliogabea</string>
+  <string name="file_transfer_status_unjoinable_peer">pareareakin harremanetan hastea ez da posible </string>
+  <string name="file_transfer_status_cancelled">baztertuta</string>
+  <string name="file_transfer_status_error">errorea</string>
+  <string name="file_transfer_status_timed_out">denbora-muga gaindituta</string>
+  <string name="file_saved_in">Fitxategi gordetuta</string>
   <string name="file_saved_successfully">Fitxategia ongi gorde da</string>
+  <string name="no_space_left_on_device">Ez dago espazio nahikorik gailuan</string>
+  <string name="title_media_viewer">Titulu-euskarriko ikusle</string>
   <string name="menu_file_open">Ireki fitxategia</string>
   <string name="menu_file_download">Deskargatu fitxategia</string>
   <string name="menu_file_save">Gorde fitxategia</string>
diff --git a/ring-android/app/src/main/res/values-eu/strings_account.xml b/ring-android/app/src/main/res/values-eu/strings_account.xml
index 67435c0786e670a7e6f535f27f48ca40155c18b1..7446f9fd1ca030d9c0fd5663e91304955171ed84 100644
--- a/ring-android/app/src/main/res/values-eu/strings_account.xml
+++ b/ring-android/app/src/main/res/values-eu/strings_account.xml
@@ -125,6 +125,7 @@
   <string name="account_status_online">Konektatuta</string>
   <string name="account_status_unknown">Ezezaguna</string>
   <string name="account_status_offline">Deskonektatuta</string>
+  <string name="account_status_error">Errorea</string>
   <!--Create account-->
   <string name="account_creation_home">Ongi etorri Jamira</string>
   <string name="account_creation_profile">Sortu zure profila</string>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings.xml b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
index d8c3258eb46c2ab4320997e386df45277dc50379..806954041f65cd1954ab3afed353b1fa448d2583 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
@@ -78,11 +78,8 @@
   <string name="notif_dismiss"> رد‌کردن</string>
   <string name="notif_reply">پاسخ</string>
   <string name="notif_incoming_file_transfer_title">فایل ورودی از%1$s</string>
-  <string name="notif_incoming_file_transfer">شخصی می‌خواهد یک فایل برای شما ارسال کند</string>
   <string name="notif_outgoing_file_transfer_title">ارسال فایل به %1$s</string>
-  <string name="notif_outgoing_file_transfer">شخصی می‌خواهد یک فایل برای شما ارسال کند</string>
   <string name="notif_incoming_picture">تصویر از%1$s</string>
-  <string name="action_open">باز کردن</string>
   <string name="notif_sync_title">در حال همگام‌سازی داده...</string>
   <string name="notif_location_title">اشتراک مکان با %1$s</string>
   <string name="location_share_contact">%1$s مکان را با شما به اشتراک می‌گذارد</string>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
index 4837d96f08ab637d42b45bcedb3e60a9ed1ecbe1..f6538364f36e847b268f30495add58d5d256f412 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
@@ -193,6 +193,7 @@
   <string name="account_status_online">آنلاین</string>
   <string name="account_status_unknown">ناشناخته</string>
   <string name="account_status_offline">آفلاین</string>
+  <string name="account_status_error">خطا</string>
   <!--Create account-->
   <string name="account_creation_home">به جمی خوش آمدید</string>
   <string name="account_creation_profile">پروفایل خود را بسازید</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 27c140d4bf10e8d187555614b17902f0043d59c8..903bf28e014abbce8acd70f5fbc0c5f612eeae1d 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -69,11 +69,8 @@
   <string name="notif_mark_as_read">Merkitse luetuksi</string>
   <string name="notif_reply">Vastaa</string>
   <string name="notif_incoming_file_transfer_title">Tuleva tiedosto käyttäjältä %1$s</string>
-  <string name="notif_incoming_file_transfer">Joku haluaa lähettää sinulle tiedoston</string>
   <string name="notif_outgoing_file_transfer_title">Lähetetään tiedosto käyttäjälle %1$s</string>
-  <string name="notif_outgoing_file_transfer">Joku haluaa lähettää sinulle tiedoston</string>
   <string name="notif_incoming_picture">Kuva käyttäjältä %1$s</string>
-  <string name="action_open">Avaa</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Sinä:</string>
   <string name="action_call_hangup">Katkaise puhelu</string>
diff --git a/ring-android/app/src/main/res/values-fi/strings_account.xml b/ring-android/app/src/main/res/values-fi/strings_account.xml
index cd3f0d1b36afa9ba8de73c2d3e3c23dbc258b381..cdeecba01d6d7237586ab95c1e691aafc46c219c 100644
--- a/ring-android/app/src/main/res/values-fi/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fi/strings_account.xml
@@ -87,6 +87,7 @@
   <string name="invalid_username">Käyttäjätunnus ei kelpaa</string>
   <string name="account_status_connecting">Yhdistää</string>
   <string name="account_status_unknown">Tuntematon</string>
+  <string name="account_status_error">Virhe</string>
   <!--Create account-->
   <string name="account_creation_home">Tervetuloa Jamiin</string>
   <string name="account_creation_profile">Tee profiilisi</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
index 9a5dcf17b7fcb807c9b9aea2d59ca2556138f2ed..f57e7604cbff4c2a66329a0758d327270641a34f 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
@@ -149,6 +149,7 @@ Vous pourrez modifier votre compte plus tard.</string>
   <string name="account_status_online">En ligne</string>
   <string name="account_status_unknown">Inconnu</string>
   <string name="account_status_offline">Hors ligne</string>
+  <string name="account_status_error">Erreur</string>
   <!--Create account-->
   <string name="account_creation_home">Bienvenu sur Jami</string>
   <string name="account_creation_profile">Créer votre profil</string>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings.xml b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
index 34583de2e23adca17d43a933a059741a96b89b10..5771881707a3c7ffddab8fa58b69a7874332f4fd 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
@@ -1,13 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About-->
+  <string name="feedback_section">Retour</string>
+  <string name="report">Envoyez-nous un e-mail</string>
+  <string name="section_license">Licence</string>
+  <string name="sponsor_section">Jami est un logiciel libre développé et soutenu par</string>
   <string name="copyright_section">droit d\'auteur</string>
   <string name="contribute_section">Contribuer</string>
   <string name="version_section">Version</string>
   <string name="no_email_app_installed">Aucun logiciel de messagerie n\'a été trouvé, merci d\'installer un logiciel de messagerie pour nous envoyer un rapport</string>
+  <string name="no_browser_app_installed">Aucun navigateur web trouvé, installez-en un pour voir cette page</string>
   <string name="email_chooser_title">Envoyer un courriel en utilisant...</string>
+  <string name="website_chooser_title">Voir le site web en utilisant...</string>
+  <string name="license">Ce logiciel est fourni en l\'état, sans garantie d\'aucune sorte. Pour plus de détails, se référer à la <u>GNU General Public License version 3 ou plus récente</u></string>
   <string name="description">Jami est un logiciel libre de communication universel qui respecte la vie privée et l\'intimité de ses utilisateurs.</string>
+  <string name="credits">Crédits</string>
+  <string name="call_service_description">Ce service est nécessaire pour permettre à vos appels de fonctionner en arrière-plan. Il ne s\'exécute qu\'au moment des appels.</string>
+  <string name="data_transfer_service_description">Ce service est nécessaire pour afficher des notifications persistantes lors des transferts de fichiers. Il ne s\'exécute que lors des transferts de fichiers.</string>
   <!--About dialog-->
+  <string name="developed_by">Développé par</string>
+  <string name="designed_by">Conçu par</string>
+  <string name="ringtones_by">Sonneries par</string>
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Aucune connexion au réseau n\'est possible</string>
@@ -20,9 +33,12 @@
   <string name="drawer_close">Fermer le panneau de navigation Android</string>
   <!--Sections-->
   <string name="menu_item_home">Accueil</string>
+  <string name="menu_item_contact_request">Demandes de contact</string>
   <string name="menu_item_accounts">Gérer des comptes</string>
+  <string name="menu_item_account">Gérer le compte</string>
   <string name="menu_item_settings">Réglages</string>
   <string name="menu_item_share">Partager mes contacts</string>
+  <string name="menu_item_about">À propos de Jami</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Composer un numéro </string>
   <!--History Fragment-->
@@ -33,27 +49,64 @@
     <item quantity="other">%d Conversations</item>
   </plurals>
   <!--ContactList Fragment-->
+  <string name="searchbar_hint">Chercher un nom ou un numéro de téléphone...</string>
   <string name="choose_number">Choisir un numéro de téléphone</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Appel entrant manqué</string>
+  <string name="notif_missed_outgoing_call">Appel sortant manqué</string>
   <string name="notif_incoming_call_title">Appel entrant de %1$s</string>
   <string name="notif_incoming_call">Appel entrant</string>
   <string name="notif_outgoing_call_title">Appel sortant à %1$s</string>
   <string name="notif_outgoing_call">Appel sortant</string>
+  <string name="notif_current_call_title">Appel en cours avec %1$s</string>
   <string name="notif_current_call">Appel en cours</string>
+  <string name="notif_channel_call_in_progress">Appel en cours</string>
+  <string name="notif_channel_calls">Appels</string>
+  <string name="notif_channel_missed_calls">Appels manqués</string>
+  <string name="notif_channel_incoming_calls">Appels entrants</string>
+  <string name="notif_channel_messages">Messages</string>
+  <string name="notif_channel_requests">Demandes</string>
+  <string name="notif_channel_file_transfer">Transfert de fichier</string>
+  <string name="notif_channel_sync">Synchronisation des données</string>
+  <string name="notif_channel_background_service">Service d\'arrière-plan</string>
+  <string name="notif_channel_background_service_descr">Autorise la réception d\'appels et de messages à n\'importe quel moment.</string>
+  <string name="notif_group_calls">Appels</string>
+  <string name="notif_background_service">Jami s\'exécute actuellement en arrière-plan</string>
+  <string name="notif_mark_as_read">Marquer comme lu</string>
+  <string name="notif_dismiss">Ignorer</string>
+  <string name="notif_reply">Répondre</string>
+  <string name="notif_incoming_file_transfer_title">Fichier en provenance de %1$s</string>
+  <string name="notif_outgoing_file_transfer_title">Envoi en cours à %1$s</string>
+  <string name="notif_incoming_picture">Image de %1$s</string>
+  <string name="notif_sync_title">Synchronisation des données en cours...</string>
+  <string name="notif_location_title">Partage de géolocalisation en cours avec %1$s</string>
+  <string name="location_share_contact">%1$s partage sa géolocalisation avec vous</string>
+  <string name="notif_location_multi_title">Partage de géolocalisation en cours avec %1$d contacts</string>
+  <string name="notif_location_remaining">%1$d minutes restantes</string>
+  <string name="notif_location_action_stop">Arrêter le partage de géolocalisation</string>
+  <string name="location_share_action_start">Commencer le partage</string>
+  <string name="location_share_action_stop">Arrêter le partage</string>
   <!--Call Fragment-->
-  <string name="you_txt_prefix">Toi</string>
+  <string name="you_txt_prefix">Vous:</string>
   <string name="action_call_hangup">Raccrocher</string>
   <string name="ongoing_call">Appel en cours</string>
   <string name="hist_in_call">Appel entrant de %1$s</string>
   <string name="hist_out_call">Appel sortant de %1$s</string>
+  <string name="start_error_title">Impossible de démarrer Jami !</string>
+  <string name="start_error_mic_required">Jami requiert la permission d\'accéder à votre microphone pour fonctionner.</string>
   <string name="action_call_accept">Prendre un appel</string>
   <string name="action_call_decline">Refuser</string>
+  <string name="action_call_mic_mute">Couper le micro</string>
   <string name="ab_action_speakerphone">Activer le haut-parleur</string>
   <string name="ab_action_contact_add">Ajouter dans les contacts</string>
+  <string name="ab_action_contact_add_question">Ajouter aux contacts ?</string>
+  <string name="hist_contact_added">Contact ajouté</string>
+  <string name="hist_invitation_received">Invitation reçue</string>
   <string name="ab_action_audio_call">Appel audio</string>
   <string name="ab_action_video_call">Appel vidéo</string>
+  <string name="ab_action_change_screen_orientation">Changer l\'orientation de l\'écran</string>
   <string name="share_via">Partager via</string>
   <string name="write_a_message">Écrire un message</string>
   <string name="scan_qr">Scanner un code QR</string>
@@ -61,58 +114,156 @@
   <!--Text messages-->
   <string name="send_message">Envoyer un message</string>
   <string name="message_sending">Envoi du message en cours</string>
-  <string name="time_just_now">maintenant</string>
+  <string name="message_failed">Échec</string>
+  <string name="time_just_now">Maintenant</string>
+  <string name="send_file">Envoyer le fichier</string>
+  <string name="hist_file_sent">Fichier envoyé</string>
+  <string name="hist_file_received">Fichier reçu</string>
+  <string name="conversation_send_audio">Enregistrer un message audio</string>
+  <string name="conversation_send_video">Enregistrer un message vidéo</string>
+  <string name="conversation_share_location">Partager la géolocalisation</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Autoriser la caméra</string>
   <string name="permission_dialog_camera_message">Les conversations en mode vidéo demandent à ce que les permissions soient accordées. Merci d\'activer les permissions.</string>
   <!--Ringtone activity-->
   <string name="ringtone_error_title">Erreur</string>
-  <string name="ringtone_error_format_not_supported">Ce format n\'est pas supporté</string>
+  <string name="ringtone_error_format_not_supported">Ce format n\'est pas supporté.</string>
+  <string name="ringtone_error_size_too_big">Ce fichier est trop lourd. Le poids maximal est de %1$dKo.</string>
+  <string name="ringtone_custom_prompt">Sélectionner une sonnerie personnalisée</string>
+  <string name="ringtone_custom_label">Personnaliser</string>
+  <string name="ringtone_jami_tones">Sonneries Jami</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Jami doit avoir la permission de \"Lire les contacts\" pour activer cette fonctionnalité. Veuillez la lui accorder.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Jami doit avoir la permission d\'\"Écrire un journal d\'appels\" pour activer cette fonctionnalité. Veuillez la lui accorder.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Merci de scanner le Code QR du compte que vous souhaitez ajouter.</string>
+  <string name="title_activity_qrcode">Partager mon compte</string>
+  <string name="error_scan_no_camera_permissions">La numérisation des codes QR a besoin des permissions d\'appareil photo pour fonctionner</string>
+  <string name="tab_code">Mon code</string>
+  <string name="tab_scan">Numériser le code</string>
   <!--Settings-->
-  <string name="clear_history_completed">L\'historique a été effacée</string>
+  <string name="clear_history_dialog_title">Effacer l\'historique ?</string>
+  <string name="clear_history_dialog_message">Cette action ne peut être annulée.</string>
+  <string name="clear_history_completed">L\'historique a été effacé.</string>
   <!--Conversation-->
+  <string name="conversation_details">Détails du contact</string>
   <string name="conversation_action_delete_this">Supprimer cette conversation</string>
-  <string name="conversation_action_delete_this_title">Voulez-vous supprimer cette conversation?</string>
-  <string name="conversation_action_delete_this_message">Cette action ne peut pas être annulée</string>
-  <string name="conversation_action_history_clear">Vider l\'historique</string>
-  <string name="conversation_action_remove_this">Supprimer contact</string>
+  <string name="conversation_action_delete_this_title">Voulez-vous supprimer cette conversation ?</string>
+  <string name="conversation_action_delete_this_message">Cette action ne peut pas être annulée.</string>
+  <string name="conversation_action_history_clear">Effacer l\'historique</string>
+  <string name="conversation_action_history_clear_title">Effacer l\'historique de conversation ?</string>
+  <string name="conversation_action_history_clear_message">Cela va effacer définitivement l\'historique de conversation.</string>
+  <string name="conversation_action_remove_this">Supprimer le contact</string>
+  <string name="conversation_action_remove_this_title">Supprimer ce contact ?</string>
+  <string name="conversation_action_remove_this_message">Cela supprimera le contact et effacera l\'historique de conversation.</string>
   <string name="conversation_action_copy_peer_number">Copier le numéro de téléphone</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s a été copié dans le presse-papier</string>
   <string name="conversation_action_select_peer_number">Choisir un numéro </string>
+  <string name="conversation_action_block_this">Bloquer le contact</string>
+  <string name="conversation_action_go_to_call">Revenir à l\'appel en cours</string>
+  <string name="conversation_open_file_error">Aucun application capable d\'ouvrir ce type de fichier n\'a été trouvée.</string>
+  <string name="clip_contact_uri">Adresse de contact</string>
+  <string name="block_contact_dialog_title">Bloquer %1$s ?</string>
+  <string name="block_contact_dialog_message">%1$s ne sera plus en mesure de 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">Le contact est en train d\'écrire...</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Ajouter %1$s ?</string>
   <string name="prompt_new_password">Nouveau mot de passe</string>
+  <string name="prompt_new_password_optional">Nouveau mot de passe (optionnel)</string>
   <string name="prompt_new_password_repeat">Saisir à nouveau le mot de passe</string>
   <string name="account_create_title">Créer un compte Jami</string>
   <string name="prompt_new_username">Saisir un nouveau nom d\'utilisateur</string>
+  <string name="help_password_choose">Choisir un mot de passe robuste dont vous vous rappellerez pour protéger votre compte Jami.</string>
+  <string name="help_password_enter">Entrez le mot de passe de votre compte Jami principal</string>
+  <string name="help_server_enter">Entrez l\'URL du serveur de gestion</string>
+  <string name="help_pin_enter">Saisissez le code PIN d\'un autre compte Jami configuré. Utilisez la fonction \"exporter le compte Jami\" pour obtenir un code PIN.</string>
   <string name="wizard_next">Suivant</string>
   <string name="wizard_back">Retour</string>
+  <string name="wizard_skip">Passer</string>
   <!--MenuHeaderView-->
   <string name="profile">Profil</string>
+  <string name="profile_message_warning">Votre profil n\'est partagé qu\'avec vos contacts</string>
   <string name="open_the_gallery">Ouvrir la galerie</string>
   <string name="take_a_photo">Prendre une photo</string>
+  <string name="profile_name_hint">Entrez votre nom (optionnel)</string>
   <!--Share fragment-->
+  <string name="share_message">Numériser ce code avec Jami</string>
   <string name="share_message_no_account">Sélectionnez un compte à partager.</string>
   <string name="share_your_account_information">Partager mes coordonnées</string>
+  <string name="share_label">Partager</string>
   <string name="generic_error_migration">Erreur</string>
   <string name="generic_error_migration_message">Une erreur est survenue lors de la migration</string>
+  <string name="title_share_with">Partager avec...</string>
   <!--Pending contact requests-->
   <string name="accept">Accepter</string>
   <string name="refuse">Refuser</string>
+  <string name="block">Bloquer</string>
+  <string name="contact_request_title">Nouvelle demande de contact</string>
+  <string name="contact_request_msg">Vous avez %1$s demandes de contact</string>
+  <string name="contact_request_account">Pour %1$s</string>
+  <string name="no_requests">0 demande de contact</string>
+  <string name="message_contact_not_trusted_yet">%s n\'est pas encore dans vos contacts.\nAcceptez-vous ou non cette demande de contact ?</string>
+  <string name="message_contact_not_trusted">%s n\'est pas dans vos contacts.\nAjouter un nouveau contact ?</string>
   <!--Send contact requests-->
+  <string name="send_request_button">Envoyer</string>
+  <string name="send_request_title">Envoyer une demande de contact</string>
+  <string name="send_request_msg">Vous devez envoyer une demande de contact pour communiquer avec cet utilisateur. Tant que votre contact n\'aura pas accepté la demande, vous pouvez lui envoyer des messages mais il ne pourra pas y répondre.</string>
   <!--Blacklist-->
+  <string name="no_blocked_contact">0 contact bloqué</string>
   <!--Smartlist-->
+  <string name="no_contact_request">Aucune demande de contact envoyée</string>
+  <string name="contact_request_sent">Demande de contact envoyée</string>
+  <string name="start_conversation">Démarrer la conversation</string>
+  <string name="search_results">Résultats de recherche</string>
   <string name="tv_contact_row_header">Contacts</string>
+  <string name="gallery_error_title">Aucune application de galerie trouvée</string>
+  <string name="gallery_error_message">Aucune application trouvée sur l\'appareil pour ouvrir la galerie</string>
+  <string name="generic_error">Une erreur inconnue a eu lieu</string>
   <!--File Transfer-->
+  <string name="invalid_file">Fichier invalide</string>
+  <string name="not_able_to_write_file">Impossible d\'écrire le fichier</string>
+  <string name="file_transfer_status_created">initialisation du transfert</string>
+  <string name="file_transfer_status_unsupported">non supporté</string>
+  <string name="file_transfer_status_wait_peer_acceptance">en attente d\'acceptation par le pair</string>
+  <string name="file_transfer_status_wait_host_acceptance">en attente d\'acceptation par l\'hôte</string>
+  <string name="file_transfer_status_ongoing">en cours</string>
+  <string name="file_transfer_status_finished">terminé</string>
+  <string name="file_transfer_status_closed_by_host">fermé par l\'hôte</string>
+  <string name="file_transfer_status_closed_by_peer">fermé par le pair</string>
+  <string name="file_transfer_status_invalid_pathname">chemin invalide</string>
+  <string name="file_transfer_status_unjoinable_peer">pair injoignable</string>
+  <string name="file_transfer_status_cancelled">annulé</string>
+  <string name="file_transfer_status_error">échoué à cause d\'une erreur</string>
+  <string name="file_transfer_status_timed_out">temps dépassé</string>
+  <string name="file_saved_in">Fichier enregistré dans %s</string>
+  <string name="file_saved_successfully">Fichier enregistré avec succès</string>
+  <string name="no_space_left_on_device">Pas d\'espace disponible sur l\'appareil</string>
+  <string name="title_media_viewer">Visionneuse</string>
+  <string name="menu_file_open">Ouvrir le fichier</string>
+  <string name="menu_file_download">Télécharger le fichier</string>
+  <string name="menu_file_save">Enregistrer le fichier</string>
+  <string name="menu_file_delete">Supprimer le fichier</string>
+  <string name="menu_file_share">Partager le fichier</string>
   <string name="menu_message_copy">Copier</string>
+  <string name="menu_message_delete">Supprimer le message</string>
+  <string name="menu_message_cancel">Annuler le message</string>
   <string name="menu_delete">Supprimer</string>
+  <string name="pref_darkTheme_title">Thème sombre</string>
+  <string name="pref_darkTheme_summary">Toujours activer le thème sombre plutôt que d\'utiliser les paramètres du système</string>
   <!--Bottom Navigation-->
-  <string name="navigation_item_conversation">Conversation</string>
-  <string name="navigation_item_account">compte</string>
+  <string name="navigation_item_conversation">Conversations</string>
+  <string name="navigation_item_contact_request">Demandes de contact</string>
+  <string name="navigation_item_account">Compte</string>
   <!--TV-->
-  <string name="tv_audio_play">jouer</string>
+  <string name="tv_send_audio_dialog_message">Envoyer un message audio ?</string>
+  <string name="tv_audio_play">Jouer</string>
   <string name="tv_audio_pause">Pause</string>
+  <string name="tv_dialog_send">Envoyer</string>
+  <string name="tv_audio_recording">Enregistrement en cours...</string>
+  <string name="tv_send_text">Envoyer du texte</string>
+  <string name="tv_send_audio">Envoyer de l\'audio</string>
+  <string name="tv_send_video">Envoyer de la vidéo</string>
+  <string name="tv_clear_history">effacer l\'historique</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml b/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
index 15505f670174478190cefdacb79a7acc01dd96d7..b76f456c3bbe76e628fa3759b27b0405316cbeb3 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
@@ -42,6 +42,7 @@
   <string name="account_connect_prompt_username">nom d\'utilisateur</string>
   <!--Name registration-->
   <string name="account_status_unknown">Inconnu</string>
+  <string name="account_status_error">Erreur</string>
   <!--Create account-->
   <string name="account_creation_home">Bienvenu sur Jami</string>
   <string name="account_creation_profile">Créez votre profil</string>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml b/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
index cedd2d5cb3b970ebcf5f4c1dc8d8b0c349b0edea..afb212142bfc3a177fe6e5be60538dddcce6ff89 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
@@ -21,6 +21,7 @@ along with this program; if not, write to the Free Software
 -->
 <resources>
     <string name="call_human_state_hungup">Terminé</string>
+    <string name="call_human_state_failure">Échec</string>
     <string name="call_human_state_hold">Patientez</string>
     <string name="call_human_state_over">Terminé</string>
     <!-- Conferences -->
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 c8a4404def23d6588f249948e98673ad309c8abb..845ee0187279952d459a8c11afcacb171e8d2439 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -78,12 +78,16 @@
   <string name="notif_dismiss">Rejeter</string>
   <string name="notif_reply">Répondre</string>
   <string name="notif_incoming_file_transfer_title">Réception d\'un fichier provenant de %1$s</string>
-  <string name="notif_incoming_file_transfer">Quelqu\'un souhaite vous envoyer un fichier</string>
   <string name="notif_outgoing_file_transfer_title">Envoie d\'un fichier à %1$s</string>
-  <string name="notif_outgoing_file_transfer">Quelqu\'un souhaite vous envoyer un fichier</string>
   <string name="notif_incoming_picture">Image de %1$s</string>
-  <string name="action_open">Ouvrir</string>
   <string name="notif_sync_title">Synchronisation des données...</string>
+  <string name="notif_location_title">Partage de la position avec %1$s</string>
+  <string name="location_share_contact">%1$s partage sa position avec vous</string>
+  <string name="notif_location_multi_title">Partage de la position avec %1$d contacts</string>
+  <string name="notif_location_remaining">%1$d minutes restantes</string>
+  <string name="notif_location_action_stop">Arrêter le partage de position</string>
+  <string name="location_share_action_start">Démarrer le partage</string>
+  <string name="location_share_action_stop">Arrêter le partage</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Vous :</string>
   <string name="action_call_hangup">Raccrochez</string>
@@ -117,6 +121,7 @@
   <string name="hist_file_received">Fichier reçu</string>
   <string name="conversation_send_audio">Envoyer un message vocal</string>
   <string name="conversation_send_video">Envoyer un message vidéo</string>
+  <string name="conversation_share_location">Partager votre position</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permission d\'accès à la caméra</string>
   <string name="permission_dialog_camera_message">Les conversation vidéo nécessitent la permission d\'utiliser l\'objectif. Merci de l\'autoriser.</string>
@@ -162,6 +167,7 @@
   <string name="block_contact_dialog_title">Bloquer %1$s ?</string>
   <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>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Ajouter %1$s ?</string>
   <string name="prompt_new_password">Nouveau mot de passe</string>
@@ -251,7 +257,13 @@
   <string name="navigation_item_contact_request">Invitations</string>
   <string name="navigation_item_account">Compte</string>
   <!--TV-->
+  <string name="tv_send_audio_dialog_message">Envoyer le message audio ?</string>
   <string name="tv_audio_play">Lire</string>
   <string name="tv_audio_pause">Pause</string>
   <string name="tv_dialog_send">Envoyer</string>
+  <string name="tv_audio_recording">Enregistrement...</string>
+  <string name="tv_send_text">Envoyer un texte</string>
+  <string name="tv_send_audio">Envoyer le message audio </string>
+  <string name="tv_send_video">Envoyer la vidéo</string>
+  <string name="tv_clear_history">Effacer l\'historique</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings_account.xml b/ring-android/app/src/main/res/values-fr/strings_account.xml
index 661d9e7c6eca1cf50384fd90880cbc0a3502a110..9c27ed704aab0d2f29579ae1fe145878cc55b675 100644
--- a/ring-android/app/src/main/res/values-fr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_account.xml
@@ -195,6 +195,7 @@ Vous pouvez modifier votre compte plus tard.</string>
   <string name="account_status_online">En ligne</string>
   <string name="account_status_unknown">Inconnu</string>
   <string name="account_status_offline">Déconnecté</string>
+  <string name="account_status_error">Erreur</string>
   <!--Create account-->
   <string name="account_creation_home">Bienvenu sur Jami</string>
   <string name="account_creation_profile">Créer votre profil</string>
diff --git a/ring-android/app/src/main/res/values-he/strings_account.xml b/ring-android/app/src/main/res/values-he/strings_account.xml
index d29bfaca87d36b818093198fe6d3d038aa291488..076885953e250b745fa658dc4d252ceff806226d 100644
--- a/ring-android/app/src/main/res/values-he/strings_account.xml
+++ b/ring-android/app/src/main/res/values-he/strings_account.xml
@@ -67,6 +67,7 @@
   <!--Name registration-->
   <string name="account_status_connecting">מתחבר</string>
   <string name="account_status_unknown">לא מוכר</string>
+  <string name="account_status_error">שגיאה</string>
   <!--Create account-->
   <!--Edit profile-->
   <!--Devices-->
diff --git a/ring-android/app/src/main/res/values-hr/strings.xml b/ring-android/app/src/main/res/values-hr/strings.xml
index 8d34435c651d003733ce7a67a73d7119f3e51397..3f11474c3f61980d40af06c4c6d3675f03699062 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -67,10 +67,7 @@
   <string name="notif_mark_as_read">Označi kao pročitano</string>
   <string name="notif_reply">Odgovori</string>
   <string name="notif_incoming_file_transfer_title">Dolazna datoteka od %1$s</string>
-  <string name="notif_incoming_file_transfer">Netko vam želi poslati datoteku</string>
   <string name="notif_outgoing_file_transfer_title">Slanje datoteke za %1$s</string>
-  <string name="notif_outgoing_file_transfer">Netko vam želi poslati datoteku</string>
-  <string name="action_open">Otvori</string>
   <string name="notif_sync_title">Sinkroniziram podatke...</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Ti:</string>
diff --git a/ring-android/app/src/main/res/values-hr/strings_account.xml b/ring-android/app/src/main/res/values-hr/strings_account.xml
index 9fe132b51f7b83dc4b28fb81d036d2108e4bc68e..f544e38a3b9851d37bbf94b5b6fe1be1174b6a66 100644
--- a/ring-android/app/src/main/res/values-hr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hr/strings_account.xml
@@ -94,6 +94,7 @@ Moćete urediti vaš račun kasnije</string>
   <!--Name registration-->
   <string name="account_status_connecting">Spajanje</string>
   <string name="account_status_unknown">Nepoznato</string>
+  <string name="account_status_error">Greška</string>
   <!--Create account-->
   <string name="account_creation_home">Dobrodošli u Jami</string>
   <string name="account_creation_profile">Napravite vaš profil</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 240e1cd85b8d9110e2d55f7f91c7251466d133db..f68974499eb8921069b60b4d8a1d86b593d78956 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -3,7 +3,7 @@
   <!--About-->
   <string name="feedback_section">Visszajelzés</string>
   <string name="report"><u>Küldjön nekünk e-mailt</u></string>
-  <string name="section_license">Licenc</string>
+  <string name="section_license">Licensz</string>
   <string name="sponsor_section">A Jami egy szabad szoftver, amelynek fejlesztője és támogatója:</string>
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Közreműködés</string>
@@ -46,7 +46,7 @@
   <!--Home Fragment-->
   <plurals name="home_conferences_title">
     <item quantity="one">%d beszélgetés</item>
-    <item quantity="other">%dtársalgás</item>
+    <item quantity="other">%dbeszélgetés</item>
   </plurals>
   <!--ContactList Fragment-->
   <string name="searchbar_hint">Név vagy telefonszám keresése…</string>
@@ -70,33 +70,30 @@
   <string name="notif_channel_requests">Kérések</string>
   <string name="notif_channel_file_transfer">Fájlátvitel</string>
   <string name="notif_channel_sync">Adatok összehangolása</string>
-  <string name="notif_channel_background_service">Háttérben futó szolgáltatás</string>
+  <string name="notif_channel_background_service">Háttérfolyamat</string>
   <string name="notif_channel_background_service_descr">Bejövő hívások és üzenetek engedélyezése bármikor.</string>
   <string name="notif_group_calls">Hívások</string>
-  <string name="notif_background_service">Jami jelenleg fut a háttérben</string>
+  <string name="notif_background_service">Jami jelenleg a háttérben fut</string>
   <string name="notif_mark_as_read">Megjelölés olvasottként</string>
   <string name="notif_dismiss">Elutasítás</string>
   <string name="notif_reply">Válasz</string>
   <string name="notif_incoming_file_transfer_title">Bejövő fájl innen%1$s</string>
-  <string name="notif_incoming_file_transfer">Valaki szeretne küldeni egy fájlt Önnek</string>
   <string name="notif_outgoing_file_transfer_title">Fájl küldése %1$s</string>
-  <string name="notif_outgoing_file_transfer">Valaki szeretne küldeni egy fájlt Önnek</string>
   <string name="notif_incoming_picture">%1$sképe</string>
-  <string name="action_open">Megnyitás</string>
   <string name="notif_sync_title">Adatok összehangolása…</string>
-  <string name="notif_location_title">Helymeghatározási információk osztás a következővel: %1$s</string>
-  <string name="location_share_contact">%1$s a helymeghatározási információk megosztástja Önnel</string>
-  <string name="notif_location_multi_title">Helymeghatározási információk osztása %1$d kapcsolattal</string>
+  <string name="notif_location_title">Tartózkodási hely megosztása vele: %1$s</string>
+  <string name="location_share_contact">%1$s megosztja veled a tartózkodási helyét</string>
+  <string name="notif_location_multi_title">Tartózkodási hely megosztása velük: %1$d</string>
   <string name="notif_location_remaining">%1$d perc van hátra</string>
-  <string name="notif_location_action_stop">Helymeghatározási információk osztás leállítása</string>
+  <string name="notif_location_action_stop">Tarzózkodási hely megosztásának leállítása</string>
   <string name="location_share_action_start">Megosztás indítása</string>
   <string name="location_share_action_stop">Megosztás leállítása</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Ön:</string>
   <string name="action_call_hangup">Hívás befejezése</string>
   <string name="ongoing_call">Folyamatban lévő hívás</string>
-  <string name="hist_in_call">Bejövő hívás ennyi ideje: %1$s</string>
-  <string name="hist_out_call">Kimenő hívás ennyi ideje: %1$s</string>
+  <string name="hist_in_call">Bejövő hívás (%1$s)</string>
+  <string name="hist_out_call">Kimenő hívás (%1$s)</string>
   <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>
@@ -124,10 +121,10 @@
   <string name="hist_file_received">Fájl érkezett</string>
   <string name="conversation_send_audio">Hangüzenet felvétele</string>
   <string name="conversation_send_video">Videóüzenet felvétele</string>
-  <string name="conversation_share_location">Helymeghatározási információk megosztása</string>
+  <string name="conversation_share_location">Tartózkodási hely megosztása</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kameraengedély</string>
-  <string name="permission_dialog_camera_message">A videótársalgások működéséhez szükséges a kamera engedély. Fontolja meg az engedélyezését!</string>
+  <string name="permission_dialog_camera_message">A videóhívások működéséhez szükséges a kamera engedély. Fontolja meg az engedélyezését!</string>
   <!--Ringtone activity-->
   <string name="ringtone_error_title">Hiba</string>
   <string name="ringtone_error_format_not_supported">Ez a formátum nem támogatott</string>
@@ -141,7 +138,7 @@
   <string name="permission_dialog_write_call_log_message">A Jaminak szüksége van a „Hívásnapló írása” engedélyre. Kérjük, engedélyezze.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Olvassa be a hozzáadandó fiók QR-kódját.</string>
-  <string name="title_activity_qrcode">Fiókomat megosztása</string>
+  <string name="title_activity_qrcode">Azonosítóm megosztása</string>
   <string name="error_scan_no_camera_permissions">A QR-beolvasása működéséhez szükséges a fényképezőgép elérés engedélyezése</string>
   <string name="tab_code">Saját kód</string>
   <string name="tab_scan">Kód beolvasása</string>
@@ -151,15 +148,15 @@
   <string name="clear_history_completed">Az előzmények törölve.</string>
   <!--Conversation-->
   <string name="conversation_details">Elérhetőségei</string>
-  <string name="conversation_action_delete_this">Társalgás törlése</string>
-  <string name="conversation_action_delete_this_title">Törli ezt a társalgást?</string>
+  <string name="conversation_action_delete_this">Beszélgetés törlése</string>
+  <string name="conversation_action_delete_this_title">Törli ezt a beszélgetést?</string>
   <string name="conversation_action_delete_this_message">Ez a művelet nem vonható vissza.</string>
   <string name="conversation_action_history_clear">Előzmények törlése</string>
-  <string name="conversation_action_history_clear_title">Törli a társalgás előzményeit?</string>
-  <string name="conversation_action_history_clear_message">Ez minden bizonnyal törli a társalgás előzményeit.</string>
+  <string name="conversation_action_history_clear_title">Törli a beszélgetés előzményeit?</string>
+  <string name="conversation_action_history_clear_message">Ez törölni fogja a beszélgetések előzményeit.</string>
   <string name="conversation_action_remove_this">Kapcsolat törlése</string>
   <string name="conversation_action_remove_this_title">Kapcsolat törlése?</string>
-  <string name="conversation_action_remove_this_message">Ez törli a kapcsolatot és egyértelműen törli a társalgás előzményeit.</string>
+  <string name="conversation_action_remove_this_message">Ez törölni fogja a kapcsolatot és a hozzá kapcsolódó beszélgetések előzményeit</string>
   <string name="conversation_action_copy_peer_number">Szám másolása</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s a vágólapra másolva</string>
   <string name="conversation_action_select_peer_number">Válasszon egy számot</string>
@@ -176,7 +173,7 @@
   <string name="prompt_new_password">Új jelszó</string>
   <string name="prompt_new_password_optional">Új jelszó (választható)</string>
   <string name="prompt_new_password_repeat">Új jelszó még egyszer</string>
-  <string name="account_create_title">Jami fiók létrehozása</string>
+  <string name="account_create_title">Jami-fiók létrehozása</string>
   <string name="prompt_new_username">Új felhasználónév megadása</string>
   <string name="help_password_choose">Válasszon erős jelszót, amelyre emlékezni fog, hogy megvédje a Jami fiókját.</string>
   <string name="help_password_enter">Adja meg a fő Jami fiókja jelszót</string>
@@ -206,7 +203,7 @@
   <string name="contact_request_title">Új kapcsolatkérelem</string>
   <string name="contact_request_msg">%1$s kapcsolatkérelme van</string>
   <string name="contact_request_account">Ehhez: %1$s</string>
-  <string name="no_requests">0 kapcsolatkérelem</string>
+  <string name="no_requests">Nincs kapcsolatkérelem</string>
   <string name="message_contact_not_trusted_yet">%smég nincs a kapcsolatban Önnel.\nAkkor elfogadja vagy elutasítja ezt a felkérést?</string>
   <string name="message_contact_not_trusted">%snincs a kapcsolataiban.\nÚj kapcsolat hozzáadása?</string>
   <!--Send contact requests-->
@@ -218,7 +215,7 @@
   <!--Smartlist-->
   <string name="no_contact_request">Nincs elküldött kapcsolatkérelem</string>
   <string name="contact_request_sent">Kapcsolatkérelem elküldve</string>
-  <string name="start_conversation">Társalgás indítása</string>
+  <string name="start_conversation">Beszélgetés indítása</string>
   <string name="search_results">Keresési eredmények</string>
   <string name="tv_contact_row_header">Kapcsolatok</string>
   <string name="gallery_error_title">Nem található Galéria alkalmazás</string>
@@ -236,7 +233,7 @@
   <string name="file_transfer_status_closed_by_host">bezárva a fogadóval</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">páratlan</string>
+  <string name="file_transfer_status_unjoinable_peer">egyenrangú nem csatlakoztatható</string>
   <string name="file_transfer_status_cancelled">megszakítva</string>
   <string name="file_transfer_status_error">hiba miatt nem sikerült</string>
   <string name="file_transfer_status_timed_out">időtúllépés</string>
@@ -256,8 +253,8 @@
   <string name="pref_darkTheme_title">Sötét téma</string>
   <string name="pref_darkTheme_summary">A rendszer viselkedése helyett mindig engedélyezze a sötét témát</string>
   <!--Bottom Navigation-->
-  <string name="navigation_item_conversation">Társalgások</string>
-  <string name="navigation_item_contact_request">Kapcsolat kérelmek</string>
+  <string name="navigation_item_conversation">Beszélgetések</string>
+  <string name="navigation_item_contact_request">Kapcsolatkérelmek</string>
   <string name="navigation_item_account">Fiók</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">Hangüzenet küldése?</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 c556d4510d20a837e327ca5bb752e15ac079e871..56d1887e6d536426fbec46e21bc80c2b6707c5f5 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
@@ -2,103 +2,103 @@
 <resources>
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">Törlés</string>
-  <string name="ic_advanced_menu">Haladó beállítások</string>
+  <string name="ic_advanced_menu">Speciális beállítások</string>
   <string name="ic_blacklist_menu">Letiltott kapcsolatok</string>
   <!--Strings related to account creation-->
-  <string name="add_ring_account_title">Jami fiók hozzáadása</string>
-  <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="add_ring_account_title">Jami-fiók hozzáadása</string>
+  <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_username">Felhasználónév</string>
   <string name="prompt_password">Jelszó</string>
   <string name="action_create">Fiók létrehozása</string>
   <string name="action_create_short">Létrehozás</string>
-  <string name="action_register">Bejegyez</string>
+  <string name="action_register">Regisztráció</string>
   <string name="action_settings">Beállítások</string>
-  <string name="error_field_required">Ez a mező szükséges</string>
+  <string name="error_field_required">Ez a mező kötelező</string>
   <string name="dialog_wait_create">Fiók hozzáadása</string>
-  <string name="dialog_wait_create_details">Várjon amíg az új fiókja hozzáadásra kerül…</string>
+  <string name="dialog_wait_create_details">Várjon, amíg az új fiókja hozzáadásra kerül…</string>
   <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.
-        Csak közvetlen IP hívásokat tud majd indítani és fogadni.
+  <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.
+        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>
-  <string name="help_ring">A Jami fiók lehetővé teszi az emberek biztonságos elérését kapcsolaton egy teljesen elosztott hálózaton keresztül.</string>
-  <string name="help_sip_title">SIP fiók hozzáadása</string>
-  <string name="help_sip">Meglévő SIP fiók beállítása.</string>
-  <string name="create_sip_account">SIP fiók hozzáadása</string>
+  <string name="account_type_ip2ip">IP-fiók</string>
+  <string name="help_ring">A Jami-fiók lehetővé teszi az emberek biztonságos elérését egy egyenrangú, teljesen elosztott hálózaton keresztül.</string>
+  <string name="help_sip_title">SIP-fiók hozzáadása</string>
+  <string name="help_sip">Meglévő SIP- fiók beállítása.</string>
+  <string name="create_sip_account">SIP-fiók hozzáadása</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Fiók törlése?</string>
   <string name="account_delete_dialog_message">Ez a művelet nem vonható vissza.</string>
   <!--AccountManagementFragment-->
-  <string name="empty_account_list">Nincs bejegyzett fiók</string>
+  <string name="empty_account_list">Fiók nincs bejegyezve</string>
   <string name="normal_accounts_titles">Fiókok</string>
-  <string name="normal_devices_titles">A Jami fiókhoz kapcsolódó ismert eszközök</string>
+  <string name="normal_devices_titles">A Jami-fiókhoz kapcsolt ismert eszközök</string>
   <string name="account_device_revoke">Eszköz visszavonása</string>
-  <string name="account_device_revocation_success_title">Siker</string>
-  <string name="account_device_revocation_success">Az eszköz most visszavonásra került!</string>
-  <string name="account_device_revocation_error_title">Az eszköz visszavonhatatlan</string>
+  <string name="account_device_revocation_success_title">Sikeres</string>
+  <string name="account_device_revocation_success">Az eszköz most visszavonásra került.</string>
+  <string name="account_device_revocation_error_title">Az eszköz nem vonható vissza</string>
   <string name="account_device_revocation_wrong_password">Hibás jelszó.</string>
   <string name="account_device_revocation_unknown_device">Ismeretlen eszköz.</string>
   <string name="account_device_revocation_error_unknown">Ismeretlen hiba.</string>
   <string name="account_password_change">Jelszó megváltoztatása</string>
   <string name="account_password_set">Jelszó beállítása</string>
-  <string name="account_password_change_wait_message">Fiók jelszó megváltoztatása, kis türelmet…</string>
+  <string name="account_password_change_wait_message">Fiókjelszó megváltoztatása</string>
   <!--Basic Details-->
   <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ók név</string>
+  <string name="account_alias_label">Fióknév</string>
   <string name="account_hostname_label">Kiszolgálónév</string>
-  <string name="account_bootstrap_label">Betöltés</string>
+  <string name="account_bootstrap_label">Bootstrap</string>
   <string name="account_username_label">Felhasználónév</string>
   <string name="account_password_label">Jelszó</string>
   <string name="account_optionnal_category">Választható beállítások</string>
   <string name="account_useragent_label">Felhasználói ügynök</string>
-  <string name="account_autoanswer_label">Önműködő válasz</string>
+  <string name="account_autoanswer_label">Automatikus válasz</string>
   <string name="account_upnp_label">UPnP engedélyezése</string>
-  <string name="account_proxy_field">Meghatalmazott</string>
+  <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
   <string name="account_audio_label">Hang</string>
   <string name="account_preferences_media_tab">Média</string>
-  <string name="account_ringtone_label">Csengőhang</string>
+  <string name="account_ringtone_label">Csengőhangok</string>
   <string name="account_ringtone_enabled_label">Csengőhangok aktiválása</string>
   <string name="account_ringtone_path_label">Csengőhang útvonal</string>
   <string name="account_ringtone_custom_label">Egyéni csengőhang használata</string>
   <string name="account_ringtone_title">Csengőhang kiválasztása</string>
-  <string name="account_ringtone_summary">Csengőhang tallózása</string>
+  <string name="account_ringtone_summary">Válasszon csengőhangot, vagy keresse ki a sajátját</string>
   <!--Video Details-->
   <string name="account_video_label">Videó</string>
   <string name="account_video_enable">Videó engedélyezése</string>
   <!--Advanced Details-->
-  <string name="account_preferences_advanced_tab">Haladó</string>
-  <string name="account_dht_public_in_calls_label">Engedélyezze az ismeretlen kapcsolatok bejövő hívásait</string>
-  <string name="account_registration_exp_label">Bejegyeztetés lejárta</string>
-  <string name="account_local_interface_label">Helyi felület</string>
-  <string name="account_local_port_label">Helyi kikötő</string>
+  <string name="account_preferences_advanced_tab">Speciális</string>
+  <string name="account_dht_public_in_calls_label">Az ismeretlen kapcsolatoktól érkező bejövő hívások engedélyezése</string>
+  <string name="account_registration_exp_label">Regisztráció lejárata</string>
+  <string name="account_local_interface_label">Helyi csatoló</string>
+  <string name="account_local_port_label">Helyi port</string>
   <string name="account_stun_enable_label">STUN használata</string>
-  <string name="account_stun_server_label">STUN kiszolgáló</string>
-  <string name="account_accept_files">A bejövő fájlok önműködő elfogadása</string>
-  <string name="account_accept_files_max_size">A maximális fájlméret az önműködő elfogadáshoz</string>
-  <string name="account_accept_files_never">Soha sem elfogadja önműködően</string>
-  <string name="account_accept_files_always">Mindig elfogadja önműködően</string>
+  <string name="account_stun_server_label">STUN-kiszolgáló</string>
+  <string name="account_accept_files">A bejövő fájlok automatikus elfogadása</string>
+  <string name="account_accept_files_max_size">Az automatikus elfogadás legnagyobb fájlmérete</string>
+  <string name="account_accept_files_never">Soha sem fogadja el automatikusan</string>
+  <string name="account_accept_files_always">Mindig fogadja el automatikusan</string>
   <string name="size_mb">%1$d MB</string>
   <string name="account_turn_enable_label">TURN használata</string>
-  <string name="account_turn_server_label">TURN kiszolgáló</string>
+  <string name="account_turn_server_label">TURN-kiszolgáló</string>
   <string name="account_turn_username_label">TURN felhasználónév</string>
   <string name="account_turn_password_label">TURN jelszó</string>
-  <string name="account_published_same_as_local_label">Közzététel, mint helyi</string>
-  <string name="account_published_port_label">Közzétett kikötő</string>
+  <string name="account_published_same_as_local_label">Helyiként közzétéve</string>
+  <string name="account_published_port_label">Közzétett port</string>
   <string name="account_published_address_label">Nyilvános cím</string>
-  <string name="account_proxy_label">DHT-meghatalmazott</string>
-  <string name="account_proxy_enable_label">DHT-meghatalmazott használata</string>
-  <string name="account_proxy_server_label">DHT-meghatalmazott címe</string>
-  <string name="account_proxy_server_list_label">DHT-meghatalmazott lista URL-je</string>
-  <string name="account_peer_discovery_label">Helyi egyenrangú felfedezés</string>
-  <string name="account_peer_discovery_enable_label">Helyi egyenrangú felfedezés engedélyezése</string>
-  <string name="account_peer_discovery_enable_summary">Csatlakozzon más DHT-csomópontokhoz, amelyek a helyi hálózaton hirdetik</string>
+  <string name="account_proxy_label">DHT proxy</string>
+  <string name="account_proxy_enable_label">DHT proxy használata</string>
+  <string name="account_proxy_server_label">DHT proxy címe</string>
+  <string name="account_proxy_server_list_label">DHT proxy lista URL-je</string>
+  <string name="account_peer_discovery_label">Helyi partnerfelfedezés</string>
+  <string name="account_peer_discovery_enable_label">Helyi pertnerfelfedezés engedélyezése</string>
+  <string name="account_peer_discovery_enable_summary">Csatlakozás más DHT-csomópontokhoz, amelyek a helyi hálózaton hirdetnek</string>
   <!--Security Details-->
   <string name="account_credentials_label">Hitelesítő adatok</string>
   <string name="account_credentials_edit">Hitelesítő adatok szerkesztése</string>
@@ -107,25 +107,25 @@
   <string name="account_preferences_security_tab">Biztonság</string>
   <!--SIP-->
   <!--TLS Details-->
-  <string name="account_tls_transport_switch_label">TLS szállítás használata</string>
-  <string name="account_tls_port_label">TLS hallgató kikötő</string>
-  <string name="account_tls_certificate_list_label">Tanúsítványkibocsátó</string>
+  <string name="account_tls_transport_switch_label">TLS titkosítás használata</string>
+  <string name="account_tls_port_label">TLS figyelő port</string>
+  <string name="account_tls_certificate_list_label">Tanúsítványkibocsátók</string>
   <string name="account_tls_certificate_file_label">Tanúsítvány fájl</string>
-  <string name="account_tls_private_key_file_label">Személyes kulcs fájl</string>
-  <string name="account_tls_password_label">Személyes kulcs jelszó</string>
+  <string name="account_tls_private_key_file_label">Személyeskulcs-fájl</string>
+  <string name="account_tls_password_label">Személyes kulcs jelszava</string>
   <string name="account_tls_method_label">TLS eljárás</string>
   <string name="account_tls_ciphers_label">TLS kódolások</string>
-  <string name="account_tls_server_name_label">Kiszolgáló név</string>
-  <string name="account_tls_verify_server_label">A kiszolgáló ellenőrizése </string>
+  <string name="account_tls_server_name_label">Kiszolgálónév</string>
+  <string name="account_tls_verify_server_label">Kiszolgáló ellenőrzése</string>
   <string name="account_tls_verify_client_label">Ügyfél ellenőrzése</string>
   <string name="account_tls_negotiation_timeout_sec">Tárgyalási időtartam (másodperc)</string>
-  <string name="account_rtp_max_port">Maximum</string>
-  <string name="account_rtp_min_port">Minimum</string>
-  <string name="account_rtp_port_range">Hang RTP-kikötő tartomány</string>
+  <string name="account_rtp_max_port">Legfeljebb</string>
+  <string name="account_rtp_min_port">Legalább</string>
+  <string name="account_rtp_port_range">Hang RTP-porttartomány</string>
   <!--restore/backup-->
   <string name="account_new_device_password">Adja meg a főjelszót a fiók feloldásához</string>
   <string name="error_password_char_count">Legalább 6 karakter</string>
-  <string name="error_passwords_not_equals">A jelszók nem egyeznek</string>
+  <string name="error_passwords_not_equals">A jelszavak nem egyeznek</string>
   <string name="export_account_wait_title">Kérem várjon…</string>
   <string name="export_account_wait_message">Fiókadatok exportálása</string>
   <string name="account_export_file">Fiók biztonsági mentése</string>
@@ -133,86 +133,87 @@
   <string name="account_export_end_network_title">Hálózati hiba</string>
   <string name="account_export_end_network_message">Nem sikerült exportálni a fiókot a hálózaton. Ellenőrizze a kapcsolatot.</string>
   <string name="account_export_end_error_title">Hiba</string>
-  <string name="account_export_end_error_message">Fiók exportálása nem sikerült. Ismeretlen hiba történt.</string>
-  <string name="account_enter_password">A jelszó megadása</string>
-  <string name="account_share_body">Lépjen kapcsolatba velem „%1$s” a Jami elosztott közlés emelvény használatával: %2$s</string>
-  <string name="account_share_body_with_username">Lépjen kapcsolatba velem „%1$s” vagy a nyilvános felhasználónév „%2$s” a Jami elosztott közlés emelvény használatával: %3$s</string>
-  <string name="account_contact_me">Lépjen kapcsolatba velem a Jami-n!</string>
+  <string name="account_export_end_error_message">A fiók nem exportálása nem sikerült. Ismeretlen hiba történt.</string>
+  <string name="account_enter_password">Adja meg a jelszót</string>
+  <string name="account_share_body">Lépjen velem kapcsolatba a(z) „%1$s” használatával, a Jami elosztott kommunikációs platformon: %2$s</string>
+  <string name="account_share_body_with_username">Lépjen velem kapcsolatba a(z) „%1$s” vagy a nyilvános felhasználónevem („%2$s”) használatával, a Jami elosztott kommunikációs platformon: %3$s</string>
+  <string name="account_contact_me">Lépjen velem kapcsolatba a Jamin!</string>
   <string name="update_account">Fiók frissítése</string>
-  <string name="account_migration">Jami fiókja frissíthető.\ nKérjük hogy, adja meg a jelszót.</string>
-  <string name="ring_account">Jami fiók</string>
+  <string name="account_migration">Jami-fiókja frissíthető.\nAdja meg a jelszavát.</string>
+  <string name="ring_account">Jami-fiók</string>
   <string name="ring_account_identity">Személyazonosság</string>
-  <string name="account_migration_title_dialog">Fiók áttelepítés</string>
-  <string name="account_migration_message_dialog">A fiókjait frissíteni kell. Szeretne a fiók kezelési lapra menni a művelet elvégzéséhez?</string>
+  <string name="account_migration_title_dialog">Fiók áttelepítése</string>
+  <string name="account_migration_message_dialog">A fiókjait frissíteni kell. Szeretne a fiókkezelési lapra ugrani a művelet elvégzéséhez?</string>
   <string name="account_update_needed">Frissítés szükséges</string>
   <string name="account_cannot_be_found_title">A fiók nem található</string>
-  <string name="account_cannot_be_found_message">Nem található a fiók a Jami hálózatában. Győződjön meg róla, hogy a meglévő eszközön a Jami-t exportálták és a hitelesítő adatok helyesek voltak.</string>
+  <string name="account_cannot_be_found_message">Nem található a fiók a Jami hálózatában.\nGyőződjön meg róla, hogy a meglévő eszközön a Jamit exportálták-e, és hogy a hitelesítő adatok helyesek voltak-e.</string>
   <string name="account_sip_cannot_be_registered_message">Folytathatja a fiók létrehozásának folyamatát vagy itt szerkesztheti adatait. A fiókbeállítások később is szerkeszthetők.</string>
-  <string name="account_no_network_title">Nem tud csatlakozni a hálózathoz</string>
-  <string name="account_no_network_message">Nem sikerült hozzáadni a fiókot mert a Jami nem tudott csatlakozni az elosztott hálózathoz. Ellenőrizze az eszköz csatlakoztatását.</string>
-  <string name="account_device_added_title">Fiók eszköz hozzáadva</string>
-  <string name="account_device_added_message">Sikeresen beállította a Jami fiókját ezen az eszközön.</string>
-  <string name="account_device_updated_title">A fiók eszköz frissítve</string>
-  <string name="account_device_updated_message">Sikeresen frissítette a Jami fiókját.</string>
-  <string name="account_cannot_be_updated_message">A fiók eszköz nem frissíthető. Kérjük hogy, ellenőrizze a jelszavát.</string>
-  <string name="account_sip_success_title">SIP-fiók bejegyzett</string>
-  <string name="account_sip_success_message">Sikeresen bejegyezte a SIP-fiókját.</string>
-  <string name="account_sip_register_anyway">Bejegyeztetés egyébként</string>
-  <string name="account_link_device">Csatlakozás más eszközről</string>
-  <string name="account_link_button">Csatlakozás a hálózatról</string>
-  <string name="account_link_archive_button">Csatlakozás a biztonsági mentésből</string>
+  <string name="account_no_network_title">Nem lehet csatlakozni a hálózathoz</string>
+  <string name="account_no_network_message">Nem sikerült hozzáadni a fiókot, mert a Jami nem tudott csatlakozni az elosztott hálózathoz. Ellenőrizze az eszköz kapcsolatát.</string>
+  <string name="account_device_added_title">Fiókeszköz hozzáadva</string>
+  <string name="account_device_added_message">Sikeresen beállította a Jami-fiókját ezen az eszközön.</string>
+  <string name="account_device_updated_title">A fiókeszköz frissítve</string>
+  <string name="account_device_updated_message">Sikeresen frissítette a Jami-fiókját.</string>
+  <string name="account_cannot_be_updated_message">A fiókeszköz nem frissíthető. Ellenőrizze a jelszavát.</string>
+  <string name="account_sip_success_title">SIP-fiók regisztrálva</string>
+  <string name="account_sip_success_message">Sikeresen regisztrálta a SIP-fiókját.</string>
+  <string name="account_sip_register_anyway">Regisztráció mindenképp</string>
+  <string name="account_link_device">Kapcsolódás más eszközről</string>
+  <string name="account_link_button">Kapcsolódás a hálózatról</string>
+  <string name="account_link_archive_button">Kapcsolódás biztonsági mentésből</string>
   <string name="account_link_prompt_pin">PIN-kód megadása</string>
-  <string name="account_new_button">Jami fiók létrehozása</string>
-  <string name="account_link_export_button">Másik eszköz összekapcsolása ehhez a fiókhoz</string>
-  <string name="account_link_export_info">Ha ezt a fiókot más eszközökön szeretné használni, először meg kell jeleníteni a Jami-n. Ez létrehoz egy PIN-kódot, amelyet meg kell adnia az új eszközön a fiók beállításához. A PIN-kód 10 percig érvényes.</string>
+  <string name="account_new_button">Jami-fiók létrehozása</string>
+  <string name="account_link_export_button">Másik eszköz fiókhoz kapcsolása</string>
+  <string name="account_link_export_info">Ha ezt a fiókot más eszközökön szeretné használni, először meg kell jeleníteni a Jamin. Ez létrehoz egy PIN-kódot, amelyet meg kell adnia az új eszközön a fiók beállításához. A PIN-kód 10 percig érvényes.</string>
   <string name="account_start_export_button">PIN-kód létrehozása</string>
-  <string name="account_end_export_button">Bezárás</string>
-  <string name="account_end_export_infos">A PIN-kódja:\n\n%%\n\nA folyamat befejezéséhez meg kell nyitnia a Jami-t az új eszközön. Hozzon létre egy új fiókot az „Eszköz összekapcsolása egy fiókhoz” opcióval. A PIN-kódja 10 percig érvényes.</string>
-  <string name="account_link_export_info_light">Ha ezt a fiókot más eszközökön szeretné használni, először meg kell jeleníteni a Jami-n. Ez létrehoz egy PIN-kódot, amelyet meg kell adnia az új eszközön a fiók beállításához. A PIN-kód 10 percig érvényes.</string>
+  <string name="account_end_export_button">bezárás</string>
+  <string name="account_end_export_infos">A PIN-kódja:\n\n%%\n\nA folyamat befejezéséhez meg kell nyitnia a Jamit az új eszközön. Hozzon létre egy új fiókot az „Eszköz hozzákapcsolása egy fiókhoz” lehetőséggel. A PIN-kódja 10 percig érvényes.</string>
+  <string name="account_link_export_info_light">Ha ezt a fiókot más eszközökön szeretné használni, először meg kell jeleníteni a Jamin. Ez létrehoz egy PIN-kódot, amelyet meg kell adnia az új eszközön a fiók beállításához. A PIN-kód 10 percig érvényes.</string>
   <string name="account_export_title">Eszközök hozzáadása</string>
-  <string name="account_connect_server_button">Csatlakozás a felügyeleti kiszolgálóhoz</string>
+  <string name="account_connect_server_button">Kapcsolódás a felügyeleti kiszolgálóhoz</string>
   <string name="account_connect_button">Kapcsolódás</string>
   <string name="prompt_server">A Jami felügyeleti kiszolgáló URL-je</string>
-  <string name="help_credentials_enter">Írja be a szervezet hitelesítő adatait</string>
-  <string name="help_connect_password_enter">Írja be a szervezet jelszavát</string>
+  <string name="help_credentials_enter">Adja meg a szervezet hitelesítő adatait</string>
+  <string name="help_connect_password_enter">Adja meg a szervezet jelszavát</string>
   <string name="account_connect_prompt_username">Felhasználónév</string>
   <!--Name registration-->
-  <string name="error_username_empty">Felhasználónév megadása</string>
-  <string name="no_registered_name_for_account">Nincs bejegyzett név talált erre a fiókra</string>
-  <string name="username_available">A felhasználónév elérhető!</string>
-  <string name="register_name">Bejegyeztetés név</string>
-  <string name="trying_to_register_name">A név bejegyeztetésének kipróbálása</string>
-  <string name="registered_username">Bejegyzett felhasználónév</string>
-  <string name="register_username">Nyilvános felhasználónév bejegyeztetése (ajánlott)</string>
-  <string name="username_already_taken">A felhasználónév már regisztrálva van</string>
+  <string name="error_username_empty">Adjon meg egy felhasználónevet</string>
+  <string name="no_registered_name_for_account">Nem található regisztrált név ehhez a fiókhoz</string>
+  <string name="username_available">A felhasználónév elérhető.</string>
+  <string name="register_name">Név regisztrációja</string>
+  <string name="trying_to_register_name">A név regisztrációjának megkísérlése</string>
+  <string name="registered_username">Felhasználónév regisztrálva</string>
+  <string name="register_username">Nyilvános felhasználónév regisztrációja (ajánlott)</string>
+  <string name="username_already_taken">A felhasználónév már foglalt</string>
   <string name="invalid_username">Érvénytelen felhasználónév</string>
   <string name="unknown_error">Ismeretlen hiba történt. Ellenőrizze a hálózati kapcsolatot.</string>
-  <string name="looking_for_username_availability">A felhasználónév rendelkezésre állás keresése…</string>
+  <string name="looking_for_username_availability">A felhasználónév rendelkezésre állásának keresése…</string>
   <string name="account_status_connecting">Kapcsolódás</string>
-  <string name="account_status_connection_error">Csatlakozási hiba</string>
+  <string name="account_status_connection_error">Kapcsolódási hiba</string>
   <string name="account_status_online">Elérhető</string>
   <string name="account_status_unknown">Ismeretlen</string>
-  <string name="account_status_offline">Nem elérhető</string>
+  <string name="account_status_offline">Nem érhető el</string>
+  <string name="account_status_error">Hiba</string>
   <!--Create account-->
-  <string name="account_creation_home">Isten hozott!</string>
+  <string name="account_creation_home">Üdvözli a Jami</string>
   <string name="account_creation_profile">Saját profil létrehozása</string>
-  <string name="account_creation_ring">Jami fiók létrehozása</string>
-  <string name="account_link_title">Eszköz összekapcsolása</string>
-  <string name="account_sip_cannot_be_registered">A fiók nem bejegyeztethető</string>
+  <string name="account_creation_ring">Jami-fiók létrehozása</string>
+  <string name="account_link_title">Eszköz hozzákapcsolása</string>
+  <string name="account_sip_cannot_be_registered">A fiók nem regisztrálható</string>
   <!--Edit profile-->
   <string name="account_edit_profile">Profil szerkesztése</string>
   <!--Devices-->
   <string name="account_revoke_device_hint">Adja meg a jelszót a megerősítéshez</string>
-  <string name="enter_password">A jelszó megadása</string>
+  <string name="enter_password">Adja meg a jelszót</string>
   <string name="revoke_device_title">Eszköz visszavonása</string>
-  <string name="revoke_device_message">Biztosan vissza szeretné vonni %1$s?</string>
-  <string name="revoke_device_wait_title">Kérem váronj…</string>
+  <string name="revoke_device_message">Biztos, hogy visszavonja: %1$s?</string>
+  <string name="revoke_device_wait_title">Kérem várjon…</string>
   <string name="revoke_device_wait_message">Eszköz visszavonása</string>
   <string name="rename_device_title">Eszköz átnevezése</string>
-  <string name="rename_device_message">Válasszon egy új nevet, amely azonosítja ezt az eszközt a Jami fiókjában</string>
+  <string name="rename_device_message">Válasszon egy új nevet, amely azonosítja ezt az eszközt a Jami-fiókjában</string>
   <string name="rename_device_button">Eszköz átnevezése</string>
   <string name="account_rename_device_hint">Válasszon új eszköznevet</string>
   <string name="account_device_name_empty">Az eszköz neve nem lehet üres</string>
   <string name="account_device_this_indicator">ez az eszköz</string>
-  <string name="account_disabled_indicator">Tiltva</string>
+  <string name="account_disabled_indicator">letiltva</string>
 </resources>
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 7e3f7a3d14bce5225887990dc8f1dd5fb8a252b9..fea7135f65ea74fa578ca20c9a6b59a3c4a9f6d1 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
@@ -21,8 +21,8 @@ along with this program; if not, write to the Free Software
 -->
 <resources>
     <!-- Call error -->
-    <string name="call_error_no_microphone">Hívás törölve. Mikrofon nem található.</string>
-    <string name="call_error_no_camera_no_microphone">Hívás törölve. Kamera vagy mikrofon nem található.</string>
+    <string name="call_error_no_microphone">Hívás megszakítva. Nem található mikrofon.</string>
+    <string name="call_error_no_camera_no_microphone">Hívás megszakítva. Nem található kamera vagy mikrofon.</string>
 
     <!-- SipCalls -->
     <string name="call_human_state_searching">Keresés</string>
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 f67fc6cb560ae26584704b0fbea9950783b47848..95c9d51116d9f9ca8a440a509ad0820be174a302 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
@@ -7,21 +7,21 @@
   <string name="pref_category_privacy">Adatvédelem</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">Leküldéses értesítések</string>
+  <string name="pref_pushNotifications_title">Push-értesítések</string>
   <string name="pref_pushNotifications_summary">Használja a Google kiszolgálóit a háttérben lévő hívások és üzenetek fogadásához</string>
-  <string name="pref_video_advanced_title">Részletes videó beállításai</string>
+  <string name="pref_video_advanced_title">Részletes videóbeállítások</string>
   <string name="pref_video_advanced_summary">Videó bitsebesség és felbontás módosítása. Kísérleti jellemzők elérése.</string>
   <string name="pref_hd_summary">Engedélyezze a HD videó küldését</string>
-  <string name="pref_hwEncode_title">Gyorsított kódolás engedélyezése</string>
+  <string name="pref_hwEncode_title">Hardveres gyorsítás</string>
   <string name="pref_hwEncode_summary">Kísérleti jellemző</string>
   <string name="pref_systemContacts_title">Rendszer kapcsolatainak használata</string>
   <string name="pref_systemContacts_summary">A rendszer kapcsolatainak használata a hívó adatainak megjelenítéséhez.</string>
-  <string name="pref_systemDialer_title">Helyezzen rendszerhívásokat a Jami programmal</string>
+  <string name="pref_systemDialer_title">Jami használata telefonhívásokhoz</string>
   <string name="pref_systemDialer_summary">A Jami használata a telefonhívásokhoz, ha az lehetséges.</string>
-  <string name="pref_startOnBoot_title">Indítása bejelentkezéskor</string>
+  <string name="pref_startOnBoot_title">Jami betöltése a telefon indításával</string>
   <string name="pref_startOnBoot_summary">Indítása bejelentkezéskor</string>
   <string name="pref_clearHistory_title">Előzmények törlése</string>
-  <string name="pref_clearHistory_summary">Minden társalgás előzményének törlése. Ez a művelet nem vonható vissza.</string>
-  <string name="pref_persistNotification_title">Fut a háttérben</string>
-  <string name="pref_persistNotification_summary">A háttérben futó hívások és üzenetek fogadása engedélyezett.</string>
+  <string name="pref_clearHistory_summary">Minden beszélgetés előzmény törlése. Ez a művelet nem vonható vissza.</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>
 </resources>
diff --git a/ring-android/app/src/main/res/values-id/strings_account.xml b/ring-android/app/src/main/res/values-id/strings_account.xml
index b3019c9fe08440a14d2c978ba75e2827ea57a4fe..a695ac58c4398f32a06c84baebad905f0554dbf6 100644
--- a/ring-android/app/src/main/res/values-id/strings_account.xml
+++ b/ring-android/app/src/main/res/values-id/strings_account.xml
@@ -17,6 +17,7 @@
   <string name="account_export_end_error_title">Eror</string>
   <!--Name registration-->
   <string name="account_status_unknown">Tidak diketahui</string>
+  <string name="account_status_error">Galat</string>
   <!--Create account-->
   <!--Edit profile-->
   <!--Devices-->
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 b25d61fa9bcf852bcbd65f7b041eb6f96538aaa5..0118cd9df1683c717f60b018eee5fdd29aa487e6 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
@@ -78,12 +78,16 @@
   <string name="notif_dismiss">Tralascia</string>
   <string name="notif_reply">Rispondi</string>
   <string name="notif_incoming_file_transfer_title">File in arrivo da %1$s</string>
-  <string name="notif_incoming_file_transfer">Qualcuno vuole inviarti un file</string>
   <string name="notif_outgoing_file_transfer_title">Invio file a %1$s</string>
-  <string name="notif_outgoing_file_transfer">Qualcuno vuole inviarti un file</string>
   <string name="notif_incoming_picture">Immagine da %1$s</string>
-  <string name="action_open">Apri</string>
   <string name="notif_sync_title">Sincronizzazione dei dati ...</string>
+  <string name="notif_location_title">Condivisione della posizione con %1$s</string>
+  <string name="location_share_contact">%1$s sta condividendo la posizione con te</string>
+  <string name="notif_location_multi_title">Condivisione della posizione con i%1$d contatti</string>
+  <string name="notif_location_remaining">%1$d minuti rimanenti</string>
+  <string name="notif_location_action_stop">Interrompere condivisione della posizione</string>
+  <string name="location_share_action_start">Inizia a condividere</string>
+  <string name="location_share_action_stop">Ferma condivisione</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Tu:</string>
   <string name="action_call_hangup">Chiudi</string>
@@ -117,6 +121,7 @@
   <string name="hist_file_received">File recevuto</string>
   <string name="conversation_send_audio">Registra clip audio</string>
   <string name="conversation_send_video">Registra video</string>
+  <string name="conversation_share_location">Condividi posizione</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permesso videocamera</string>
   <string name="permission_dialog_camera_message">Le videochiamate hanno bisogna del permesso per accedere alla videocamera. Se lo desideri, attivalo.</string>
@@ -162,6 +167,7 @@
   <string name="block_contact_dialog_title">Blocca %1$s?</string>
   <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>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Aggiungi %1$s?</string>
   <string name="prompt_new_password">Nuova password</string>
@@ -251,7 +257,13 @@
   <string name="navigation_item_contact_request">Richiesta di contatto</string>
   <string name="navigation_item_account">Account</string>
   <!--TV-->
+  <string name="tv_send_audio_dialog_message">Invia un messaggio audio?</string>
   <string name="tv_audio_play">Avvia</string>
   <string name="tv_audio_pause">Pausa</string>
   <string name="tv_dialog_send">Invia</string>
+  <string name="tv_audio_recording">Registrazione...</string>
+  <string name="tv_send_text">Invia testo</string>
+  <string name="tv_send_audio">Invia audio</string>
+  <string name="tv_send_video">Invia video</string>
+  <string name="tv_clear_history">cancella cronologia</string>
 </resources>
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 105946984fce14475a1bd0c926e20391585b4f55..f692680d81240c3fb8eb3e5d4b74911dfd1f5973 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
@@ -193,6 +193,7 @@ Potrai modificare il tuo account successivamente</string>
   <string name="account_status_online">In linea</string>
   <string name="account_status_unknown">Sconosciuto</string>
   <string name="account_status_offline">Disconnesso</string>
+  <string name="account_status_error">Errore</string>
   <!--Create account-->
   <string name="account_creation_home">Benvenuto in Jami</string>
   <string name="account_creation_profile">Crea il tuo profilo</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 804e418cfd6697f5181228a09e408da101b9107e..49d26a3824bccee43a1de2359c99f686bddee4f9 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -49,6 +49,7 @@
     <item quantity="other">%d Conversazioni</item>
   </plurals>
   <!--ContactList Fragment-->
+  <string name="searchbar_hint">Cerca un nome o un numero di telefono...</string>
   <string name="choose_number">Scegli un numero</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
@@ -68,6 +69,7 @@
   <string name="notif_channel_messages">Messaggi</string>
   <string name="notif_channel_requests">Richieste</string>
   <string name="notif_channel_file_transfer">Trasferimento file</string>
+  <string name="notif_channel_sync">Sincronizzazione dati</string>
   <string name="notif_channel_background_service">Servizio in background</string>
   <string name="notif_channel_background_service_descr">Consente di ricevere chiamate e messaggi in qualsiasi momento.</string>
   <string name="notif_group_calls">Chiamate</string>
@@ -76,11 +78,13 @@
   <string name="notif_dismiss">Ignora</string>
   <string name="notif_reply">Rispondi</string>
   <string name="notif_incoming_file_transfer_title">File in arrivo da %1$s</string>
-  <string name="notif_incoming_file_transfer">Qualcuno vuole inviarti un file</string>
   <string name="notif_outgoing_file_transfer_title">Invio file a %1$s</string>
-  <string name="notif_outgoing_file_transfer">Qualcuno vuole inviarti un file</string>
   <string name="notif_incoming_picture">Foto da %1$s</string>
-  <string name="action_open">Apri</string>
+  <string name="notif_sync_title">Sincronizzazione dati in corso...</string>
+  <string name="notif_location_title">Condividi la posizione con %1$s</string>
+  <string name="location_share_contact">%1$s sta condividendo la posizione con te. </string>
+  <string name="notif_location_multi_title">Condivisione posizione con %1$d contatti</string>
+  <string name="notif_location_remaining">%1$d minuti rimanenti</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Tu:</string>
   <string name="action_call_hangup">Riattacca</string>
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 97b6866581e073cc187a598e8d2d7d79e5ad4c91..c8d5c5245374b9920bc90a2acb7363e409aab3e2 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
@@ -152,6 +152,7 @@ Si potra modificare questo account più tardi.</string>
   <string name="account_status_online">Online</string>
   <string name="account_status_unknown">Sconosciuto</string>
   <string name="account_status_offline">Offline</string>
+  <string name="account_status_error">Errore</string>
   <!--Create account-->
   <string name="account_creation_home">Benvenuto in Jami</string>
   <string name="account_creation_profile">Crea il tuo profilo</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 2bda63b67403a95537ee87466a52cf0bd46f66b9..4e9f05b42bc54adb3bdff50151a4463c313a2fc6 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
@@ -25,7 +25,7 @@ along with this program; if not, write to the Free Software
     <string name="call_error_no_camera_no_microphone">Chiamata cancellata. Nessuna camera o microfono rilevato.</string>
 
     <!-- SipCalls -->
-    <string name="call_human_state_searching">In ricerca</string>
+    <string name="call_human_state_searching">Ricerca in corso...</string>
     <string name="call_human_state_incoming">In arrivo</string>
     <string name="call_human_state_connecting">Connessione in corso </string>
     <string name="call_human_state_ringing">Suonando</string>
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 b93ebd39c303b48daa35a363fc20b9ffec50cc78..e361fbbdf09cef58a17da533aed99c86d50012af 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
@@ -7,7 +7,7 @@
   <string name="pref_category_privacy">Privacy</string>
   <string name="pref_mobileData_title">Traffico dati mobile</string>
   <string name="pref_mobileData_summary">Attiva Jami sulle reti 3G/LTE in aggiunta al Wi-Fi</string>
-  <string name="pref_pushNotifications_title">Push notifiche</string>
+  <string name="pref_pushNotifications_title">Notifiche push</string>
   <string name="pref_pushNotifications_summary">Usa i server Google per ricevere chiamate/messaggi in background</string>
   <string name="pref_video_advanced_title">Impostazioni video avanzate</string>
   <string name="pref_video_advanced_summary">Cambia il bitrate del video, la risoluzione e accedi alle funzioni sperimentali</string>
@@ -19,7 +19,7 @@
   <string name="pref_systemDialer_title">Effettua le chiamate di sistema usando Jami</string>
   <string name="pref_systemDialer_summary">Usa Jami per effettuare le chiamate di sistema quando possibile.</string>
   <string name="pref_startOnBoot_title">Avvia Jami all\'avvio del sistema</string>
-  <string name="pref_startOnBoot_summary">Esegui Jami in background quando il sistema si avvia.</string>
+  <string name="pref_startOnBoot_summary">Esegui Jami in background all\'avvio del sistema.</string>
   <string name="pref_clearHistory_title">Cancella cronologia</string>
   <string name="pref_clearHistory_summary">Elimina la cronologia di tutte le conversazioni. Questa azione non può essere annullata.</string>
   <string name="pref_persistNotification_title">Esegui in background</string>
diff --git a/ring-android/app/src/main/res/values-ja/strings.xml b/ring-android/app/src/main/res/values-ja/strings.xml
index 362c2be2e9669f02257fd1e1b953706b698a8db3..ed2425d1f1f6b810ed0f364d8f3748ab1ef2bbc7 100644
--- a/ring-android/app/src/main/res/values-ja/strings.xml
+++ b/ring-android/app/src/main/res/values-ja/strings.xml
@@ -45,7 +45,7 @@
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
   <plurals name="home_conferences_title">
-    <item quantity="other">%d 会話</item>
+    <item quantity="other">%d 件の会話</item>
   </plurals>
   <!--ContactList Fragment-->
   <string name="searchbar_hint">名前または電話番号で検索</string>
@@ -77,12 +77,15 @@
   <string name="notif_dismiss">退出</string>
   <string name="notif_reply">返事</string>
   <string name="notif_incoming_file_transfer_title">%1$sからのファイル受信</string>
-  <string name="notif_incoming_file_transfer">ファイルを送信したい人がいます</string>
   <string name="notif_outgoing_file_transfer_title">%1$sへのファイル送信</string>
-  <string name="notif_outgoing_file_transfer">ファイルを送信したい人がいます</string>
   <string name="notif_incoming_picture">%1$sからの画像</string>
-  <string name="action_open">開く</string>
   <string name="notif_sync_title">データの同期中</string>
+  <string name="notif_location_title">現在地を次の連絡先に共有中: %1$s</string>
+  <string name="location_share_contact">%1$s があなたに現在地を共有中です</string>
+  <string name="notif_location_remaining">残り %1$d 分</string>
+  <string name="notif_location_action_stop">現在地の共有を停止</string>
+  <string name="location_share_action_start">共有を開始</string>
+  <string name="location_share_action_stop">共有を停止</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">あなた:</string>
   <string name="action_call_hangup">通話終了</string>
@@ -103,7 +106,7 @@
   <string name="ab_action_video_call">ビデオ通話</string>
   <string name="ab_action_change_screen_orientation">画面の向きを変更</string>
   <string name="share_via">共有...</string>
-  <string name="write_a_message">メッセージを書く</string>
+  <string name="write_a_message">メッセージを入力</string>
   <string name="scan_qr">QR コードをスキャン</string>
   <string name="ab_action_flipcamera">カメラを押す</string>
   <!--Text messages-->
@@ -116,6 +119,7 @@
   <string name="hist_file_received">ファイルを受信しました</string>
   <string name="conversation_send_audio">音声の録音</string>
   <string name="conversation_send_video">ビデオの録画</string>
+  <string name="conversation_share_location">現在地の共有</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">カメラのアクセス許可</string>
   <string name="permission_dialog_camera_message">ビデオ会話ではカメラが動作するためにアクセス許可が必要です。 有効にすることを検討してください。</string>
@@ -131,6 +135,9 @@
   <string name="permission_dialog_write_call_log_message">Jamiは着信履歴へのアクセスが必要です。権限を許可してください。</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">追加したいアカウントの QR コートをスキャンしてください。</string>
+  <string name="title_activity_qrcode">アカウントの共有</string>
+  <string name="tab_code">自分のコード</string>
+  <string name="tab_scan">スキャン</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">履歴を削除しますか?</string>
   <string name="clear_history_dialog_message">この操作は取り消しできません</string>
@@ -147,17 +154,21 @@
   <string name="conversation_action_copy_peer_number">番号をコピー</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s をクリップボードにコピーしました</string>
   <string name="conversation_action_select_peer_number">番号を選択</string>
+  <string name="conversation_action_block_this">ブロックした連絡先</string>
   <string name="clip_contact_uri">連絡先</string>
   <string name="block_contact_dialog_title">%1$sをブロックしますか?</string>
   <string name="block_contact_dialog_message">%1$sはあなたがブロックを解除するまで連絡できません。</string>
   <string name="block_contact_completed">%1$sをブロックしました。</string>
+  <string name="conversation_contact_is_typing">相手が入力中…</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">%1$sを追加しますか?</string>
   <string name="prompt_new_password">新しいパスワード</string>
   <string name="prompt_new_password_optional">新しいパスワード(オプション)</string>
-  <string name="prompt_new_password_repeat">新しいパスワードの繰り返し</string>
+  <string name="prompt_new_password_repeat">新しいパスワードの確認</string>
   <string name="account_create_title">Jamiアカウントを作成</string>
   <string name="prompt_new_username">新しいユーザー名を入力してください</string>
+  <string name="help_password_choose">あなたのJamiアカウントを守るために強固なパスワードを設定してください。また、このパスワードを忘れないでください。</string>
+  <string name="help_password_enter">現在のJamiアカウントのパスワード</string>
   <string name="wizard_next">次へ</string>
   <string name="wizard_back">戻る</string>
   <string name="wizard_skip">スキップ</string>
@@ -166,8 +177,9 @@
   <string name="profile_message_warning">あなたのプロフィールは連絡先とのみ共有されます</string>
   <string name="open_the_gallery">ギャラリーを開く</string>
   <string name="take_a_photo">写真を撮る</string>
-  <string name="profile_name_hint">名前を入力してください (オプション)</string>
+  <string name="profile_name_hint">名前を入力... (任意)</string>
   <!--Share fragment-->
+  <string name="share_message">このコードをJamiでスキャンしてください</string>
   <string name="share_message_no_account">共有するアカウントを選択してください。</string>
   <string name="share_your_account_information">連絡先情報を共有</string>
   <string name="share_label">共有</string>
@@ -180,12 +192,12 @@
   <string name="contact_request_title">新しい連絡先リクエスト</string>
   <string name="contact_request_msg">%1$s の連絡先リクエストがあります</string>
   <string name="contact_request_account">%1$s に</string>
-  <string name="no_requests">0 の連絡先リクエスト</string>
+  <string name="no_requests">0 件の連絡先リクエスト</string>
   <!--Send contact requests-->
   <string name="send_request_button">送信</string>
   <string name="send_request_title">連絡先リクエストを送信</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 のブロックした連絡先</string>
+  <string name="no_blocked_contact">0 件のブロックした連絡先</string>
   <!--Smartlist-->
   <string name="no_contact_request">連絡先のリクエストは送信していません</string>
   <string name="contact_request_sent">連絡先のリクエストを送信しました</string>
@@ -208,11 +220,19 @@
   <string name="menu_message_delete">メッセージを削除</string>
   <string name="menu_message_cancel">メッセージをキャンセル</string>
   <string name="menu_delete">削除</string>
+  <string name="pref_darkTheme_title">ダークテーマ</string>
+  <string name="pref_darkTheme_summary">システムの設定を使用するのではなく、常にダークテーマを有効にします</string>
   <!--Bottom Navigation-->
   <string name="navigation_item_conversation">会話</string>
   <string name="navigation_item_contact_request">連絡先のリクエスト</string>
   <string name="navigation_item_account">アカウント</string>
   <!--TV-->
   <string name="tv_audio_play">再生</string>
+  <string name="tv_audio_pause">一時停止</string>
   <string name="tv_dialog_send">送信</string>
+  <string name="tv_audio_recording">録音中...</string>
+  <string name="tv_send_text">テキストの送信</string>
+  <string name="tv_send_audio">音声の送信</string>
+  <string name="tv_send_video">ビデオを送信</string>
+  <string name="tv_clear_history">履歴を削除</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ja/strings_account.xml b/ring-android/app/src/main/res/values-ja/strings_account.xml
index 28febc4da234a3e719a666586450a698725e732a..1c8cde52e32e414ab56cb4bf1a80a850bc18777e 100644
--- a/ring-android/app/src/main/res/values-ja/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ja/strings_account.xml
@@ -5,12 +5,14 @@
   <string name="ic_advanced_menu">詳細設定</string>
   <string name="ic_blacklist_menu">ブロックした連絡先</string>
   <!--Strings related to account creation-->
+  <string name="add_ring_account_title">Jamiアカウントを追加</string>
   <string name="add_sip_account_title">SIPアカウントを追加</string>
   <string name="prompt_alias">別名</string>
   <string name="prompt_hostname">ホスト名</string>
   <string name="prompt_username">ユーザー名</string>
   <string name="prompt_password">パスワード</string>
   <string name="action_create">アカウント作成</string>
+  <string name="action_create_short">作成</string>
   <string name="action_register">登録</string>
   <string name="action_settings">設定</string>
   <string name="error_field_required">このフィールドは入力必須です</string>
@@ -23,6 +25,7 @@
 これは、直接のIP呼び出しによる発着信しかできません。
 アカウントを後で編集してください。</string>
   <string name="account_type_ip2ip">IPアカウント</string>
+  <string name="help_ring">Jamiアカウントを使用すると、完全に分散したネットワークを介してピアツーピアで安全に人々と連絡を取ることが出来ます。</string>
   <string name="help_sip_title">SIPアカウントを追加</string>
   <string name="help_sip">既存のSIPアカウントを設定</string>
   <string name="create_sip_account">SIPアカウントを追加</string>
@@ -32,6 +35,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">アカウントが登録されていません</string>
   <string name="normal_accounts_titles">アカウント</string>
+  <string name="normal_devices_titles">このJamiアカウントにリンクされている既知のデバイス</string>
   <string name="account_device_revoke">デバイスを取り消し</string>
   <string name="account_device_revocation_success_title">成功</string>
   <string name="account_device_revocation_success">デバイスを取り消しました!</string>
@@ -39,6 +43,7 @@
   <string name="account_device_revocation_wrong_password">パスワードが間違っています。</string>
   <string name="account_device_revocation_unknown_device">不明なデバイス。</string>
   <string name="account_device_revocation_error_unknown">不明なエラー。</string>
+  <string name="account_password_change">パスワードを変更</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">全般</string>
   <string name="account_basic_category">基本設定</string>
@@ -64,18 +69,29 @@
   <string name="account_video_enable">動画を有効化</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">詳細</string>
+  <string name="account_dht_public_in_calls_label">未知の連絡先からの着信を許可</string>
   <string name="account_registration_exp_label">登録の有効期限切れ</string>
   <string name="account_local_interface_label">ローカルインターフェイス</string>
   <string name="account_local_port_label">ローカルポート</string>
   <string name="account_stun_enable_label">Stunを使用</string>
   <string name="account_stun_server_label">Stunサーバー</string>
+  <string name="account_accept_files_max_size">自動で許可する最大ファイルサイズ</string>
+  <string name="account_accept_files_never">常に自動では許可しない</string>
+  <string name="account_accept_files_always">常に自動で許可</string>
+  <string name="size_mb">%1$d MB</string>
   <string name="account_turn_enable_label">TURNを使用</string>
   <string name="account_turn_server_label">TURNサーバー</string>
   <string name="account_turn_username_label">TURNのユーザー名</string>
   <string name="account_turn_password_label">TURNのパスワード</string>
-  <string name="account_published_same_as_local_label">ローカルと同じものを発行しました</string>
+  <string name="account_published_same_as_local_label">ローカルと同じものを発行</string>
   <string name="account_published_port_label">発行されたポート番号</string>
   <string name="account_published_address_label">発行されたアドレス</string>
+  <string name="account_proxy_label">DHTプロキシ</string>
+  <string name="account_proxy_enable_label">DHTプロキシを使う</string>
+  <string name="account_proxy_server_label">DHTプロキシアドレス</string>
+  <string name="account_peer_discovery_label">ローカルピアの発見</string>
+  <string name="account_peer_discovery_enable_label">ローカルピアの発見を有効化</string>
+  <string name="account_peer_discovery_enable_summary">ローカルネットワーク上の他のDHTノードに接続します</string>
   <!--Security Details-->
   <string name="account_credentials_label">ログイン情報</string>
   <string name="account_credentials_edit">ログイン情報を編集</string>
@@ -112,6 +128,7 @@
   <string name="account_export_end_error_message">アカウントをエクスポートできませんでした。 不明なエラーが発生しました。</string>
   <string name="account_enter_password">パスワードを入力してください</string>
   <string name="update_account">アカウントの更新</string>
+  <string name="ring_account">Jamiアカウント</string>
   <string name="ring_account_identity">ID</string>
   <string name="account_migration_title_dialog">アカウントの移行</string>
   <string name="account_migration_message_dialog">アカウントを更新する必要があります。 アカウント管理画面に移動して、この操作を実行しますか?</string>
@@ -125,17 +142,25 @@
   <string name="account_sip_success_title">SIP アカウントを登録しました</string>
   <string name="account_sip_success_message">SIPアカウントを正常に登録しました。</string>
   <string name="account_sip_register_anyway">とにかく登録する</string>
+  <string name="account_link_device">別のデバイスから接続</string>
+  <string name="account_link_button">ネットワークから接続</string>
+  <string name="account_link_archive_button">バックアップから接続</string>
   <string name="account_link_prompt_pin">PINを入力してください</string>
   <string name="account_new_button">Jamiアカウントを作成</string>
   <string name="account_link_export_button">別のデバイスをこのアカウントへリンク</string>
+  <string name="account_link_export_info">別のデバイスでこのアカウントを使用するには、最初にJamiでそれを公開する必要があります。これにより、アカウントを設定するために新しいデバイスに入力するためのPINコードが生成されます。PINコードの有効期限は10分間です。</string>
+  <string name="account_start_export_button">PINを生成</string>
   <string name="account_end_export_button">閉じる</string>
+  <string name="account_link_export_info_light">別のデバイスでこのアカウントを使用するには、最初にJamiでそれを公開する必要があります。これにより、アカウントを設定するために新しいデバイスに入力するためのPINコードが生成されます。PINコードの有効期限は10分間です。</string>
+  <string name="account_connect_button">接続</string>
   <string name="account_connect_prompt_username">ユーザー名</string>
   <!--Name registration-->
   <string name="error_username_empty">ユーザー名を入力してください</string>
   <string name="no_registered_name_for_account">このアカウントの登録名が見つかりません</string>
   <string name="register_name">登録名</string>
   <string name="trying_to_register_name">名前を登録しようとしています</string>
-  <string name="registered_username">登録された名前</string>
+  <string name="registered_username">登録名</string>
+  <string name="register_username">公開ユーザー名を登録 (推奨)</string>
   <string name="username_already_taken">名前はすでに取得されています</string>
   <string name="invalid_username">無効なユーザー名</string>
   <string name="looking_for_username_availability">利用可能なユーザー名を検索中…</string>
@@ -144,11 +169,15 @@
   <string name="account_status_online">オンライン</string>
   <string name="account_status_unknown">不明</string>
   <string name="account_status_offline">オフライン</string>
+  <string name="account_status_error">エラー</string>
   <!--Create account-->
+  <string name="account_creation_home">Jamiへようこそ</string>
   <string name="account_creation_profile">プロフィールを作成</string>
+  <string name="account_creation_ring">Jamiアカウントを作成</string>
   <string name="account_link_title">このデバイスをリンク</string>
   <string name="account_sip_cannot_be_registered">アカウントを登録できません</string>
   <!--Edit profile-->
+  <string name="account_edit_profile">プロフィールを編集</string>
   <!--Devices-->
   <string name="account_revoke_device_hint">確認のパスワードを入力</string>
   <string name="enter_password">パスワードを入力してください</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings.xml b/ring-android/app/src/main/res/values-lt/strings.xml
index 3d1addec890042ebaa1c2f3e1c9d8e10ab02cf70..366e5ddad37594d9b342a67e905da0ab3e1b066a 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -69,11 +69,8 @@
   <string name="notif_mark_as_read">Žymėti kaip skaitytą</string>
   <string name="notif_reply">Atsakyti</string>
   <string name="notif_incoming_file_transfer_title">Gaunamas failas nuo %1$s</string>
-  <string name="notif_incoming_file_transfer">Kažkas nori išsiųsti jums failą</string>
   <string name="notif_outgoing_file_transfer_title">Siunčiamas failas naudotojui %1$s</string>
-  <string name="notif_outgoing_file_transfer">Kažkas nori išsiųsti jums failą</string>
   <string name="notif_incoming_picture">Paveikslas nuo %1$s</string>
-  <string name="action_open">Atverti</string>
   <string name="notif_sync_title">Sinchronizuojami duomenys…</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Jūs:</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings_account.xml b/ring-android/app/src/main/res/values-lt/strings_account.xml
index 35524e311f1ee1749991f96e17cdd71b44196994..2a954acd2ee50742e609c39042a09763117ca65d 100644
--- a/ring-android/app/src/main/res/values-lt/strings_account.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_account.xml
@@ -175,6 +175,7 @@ Vėliau, galėsite pataisyti savo paskyros informaciją</string>
   <string name="account_status_online">Prisijungęs</string>
   <string name="account_status_unknown">Nežinomas</string>
   <string name="account_status_offline">Atsijungęs</string>
+  <string name="account_status_error">Klaida</string>
   <!--Create account-->
   <string name="account_creation_home">Sveiki atvykę į Jami</string>
   <string name="account_creation_profile">Susikurkite savo profilį</string>
diff --git a/ring-android/app/src/main/res/values-ms/strings_account.xml b/ring-android/app/src/main/res/values-ms/strings_account.xml
index 7a595ba23ba8c21f2c46e552627a05b31f2bfd66..196b14631fb20949e3cdc2d83eecfba0347c9457 100644
--- a/ring-android/app/src/main/res/values-ms/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ms/strings_account.xml
@@ -119,6 +119,7 @@ Anda masih akan dapat mengubah maklumat akaun anda pada masa hadapan</string>
   <string name="invalid_username">Nama pengguna tidak sah</string>
   <string name="account_status_connecting">Menyambung</string>
   <string name="account_status_unknown">Tidak diketahui</string>
+  <string name="account_status_error">Gagal</string>
   <!--Create account-->
   <!--Edit profile-->
   <!--Devices-->
diff --git a/ring-android/app/src/main/res/values-nb/strings.xml b/ring-android/app/src/main/res/values-nb/strings.xml
index 1c58a5b59ee06f3a9a1ae7883ca5c6306d1cceeb..38a9da3c945837b1b165bb3ec3eb422f71e62725 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -70,11 +70,8 @@
   <string name="notif_dismiss">Avvis</string>
   <string name="notif_reply">Svar</string>
   <string name="notif_incoming_file_transfer_title">Innkommende fil fra %1$s</string>
-  <string name="notif_incoming_file_transfer">Noen ønsker å sende deg ei fil</string>
   <string name="notif_outgoing_file_transfer_title">Sender fil til %1$s</string>
-  <string name="notif_outgoing_file_transfer">Noen ønsker å sende deg ei fil</string>
   <string name="notif_incoming_picture">Bilde fra %1$s</string>
-  <string name="action_open">Åpne</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Deg:</string>
   <string name="action_call_hangup">Legg på</string>
diff --git a/ring-android/app/src/main/res/values-nb/strings_account.xml b/ring-android/app/src/main/res/values-nb/strings_account.xml
index 3f488b516012175fe4aa9d4b7bd5fa2e102d0891..38a06d57cf17b0b9422e3a7a77c09cf7e5178d84 100644
--- a/ring-android/app/src/main/res/values-nb/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_account.xml
@@ -153,6 +153,7 @@ Du kan endre kontoen din senere</string>
   <string name="account_status_online">Tilkoblet</string>
   <string name="account_status_unknown">Ukjent</string>
   <string name="account_status_offline">Frakoblet</string>
+  <string name="account_status_error">Feil</string>
   <!--Create account-->
   <string name="account_creation_home">Velkommen til Jami</string>
   <string name="account_creation_profile">Opprett din profil</string>
diff --git a/ring-android/app/src/main/res/values-nb/strings_preferences.xml b/ring-android/app/src/main/res/values-nb/strings_preferences.xml
index bc88517958d8b38a11c6c7cfc84a674cb36a71f1..d64f60ae0635e4631d889832617c0b239265c3d3 100644
--- a/ring-android/app/src/main/res/values-nb/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_preferences.xml
@@ -9,6 +9,8 @@
   <string name="pref_mobileData_summary">Tillat Jami på 3G/LTE-nettverk i tillegg til Wi-Fi</string>
   <string name="pref_pushNotifications_title">Push-merknader</string>
   <string name="pref_pushNotifications_summary">Bruk Google-tjenere til å tillate mottak av samtaler/meldinger i bakgrunnen</string>
+  <string name="pref_video_advanced_title">Avanserte innstillinger for video</string>
+  <string name="pref_video_advanced_summary">Endre videobitrate og oppløsning, samt få tilgang til eksperimentelle funksjoner</string>
   <string name="pref_hd_summary">Aktiver sending av HD-video</string>
   <string name="pref_hwEncode_title">Aktiver aksellerert koding</string>
   <string name="pref_hwEncode_summary">Eksperimentelt valg</string>
@@ -19,6 +21,7 @@
   <string name="pref_startOnBoot_title">Start Jami ved oppstart</string>
   <string name="pref_startOnBoot_summary">Kjør Jami i bakgrunnen når systemet starter.</string>
   <string name="pref_clearHistory_title">Slett historikk</string>
+  <string name="pref_clearHistory_summary">Tøm samtalehistorikken. Denne handlingen kan ikke angres.</string>
   <string name="pref_persistNotification_title">Kjør i bakgrunnen</string>
   <string name="pref_persistNotification_summary">Tillater kjøring i bakgrunnen for å motta samtaler og meldinger.</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings.xml b/ring-android/app/src/main/res/values-nl-rBE/strings.xml
index 41f0164b3aeb3e0bfd83a6c15cc773a3c4774c39..731cf258818714889a6520d40c69a0ac12caccdf 100644
--- a/ring-android/app/src/main/res/values-nl-rBE/strings.xml
+++ b/ring-android/app/src/main/res/values-nl-rBE/strings.xml
@@ -76,11 +76,8 @@
   <string name="notif_dismiss">Negeren</string>
   <string name="notif_reply">Beantwoorden</string>
   <string name="notif_incoming_file_transfer_title">Inkomend bestand van %1$s</string>
-  <string name="notif_incoming_file_transfer">Iemand wilt u een bestand sturen</string>
   <string name="notif_outgoing_file_transfer_title">Bestand wordt verstuurd naar %1$s</string>
-  <string name="notif_outgoing_file_transfer">Iemand wilt u een bestand sturen</string>
   <string name="notif_incoming_picture">Afbeelding van %1$s</string>
-  <string name="action_open">Openen</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">U:</string>
   <string name="action_call_hangup">Ophangen</string>
diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml b/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml
index 2a13f0f1b1516fc3b05edb5586141f96ccf89169..21107c34af3c6d360cdb8f42983aebb0557dd250 100644
--- a/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml
@@ -183,6 +183,7 @@ U kunt uw account later bewerken</string>
   <string name="account_status_online">Online</string>
   <string name="account_status_unknown">Onbekend</string>
   <string name="account_status_offline">Offline</string>
+  <string name="account_status_error">Fout</string>
   <!--Create account-->
   <string name="account_creation_home">Welkom bij Jami</string>
   <string name="account_creation_profile">Maak uw profiel aan</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings.xml b/ring-android/app/src/main/res/values-nl/strings.xml
index c1869d0c5607e6284b95e5b117f0fce8bfb2aebf..fcf0a0b1550d6f2dadabadcd0e3fce8d6ffd1e6e 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -76,11 +76,8 @@
   <string name="notif_dismiss">Negeren</string>
   <string name="notif_reply">Beantwoorden</string>
   <string name="notif_incoming_file_transfer_title">Inkomend bestand van %1$s</string>
-  <string name="notif_incoming_file_transfer">Iemand wilt u een bestand sturen</string>
   <string name="notif_outgoing_file_transfer_title">Bestand wordt verstuurd naar %1$s</string>
-  <string name="notif_outgoing_file_transfer">Iemand wilt u een bestand sturen</string>
   <string name="notif_incoming_picture">Afbeelding van %1$s</string>
-  <string name="action_open">Openen</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">U:</string>
   <string name="action_call_hangup">Ophangen</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings_account.xml b/ring-android/app/src/main/res/values-nl/strings_account.xml
index eb00749026669af84058e76a7ae2d9c5872861cf..c6e9bd8361567fa09cad9eca89798fc47eb5aea9 100644
--- a/ring-android/app/src/main/res/values-nl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_account.xml
@@ -183,6 +183,7 @@ U kunt uw account later bewerken</string>
   <string name="account_status_online">Online</string>
   <string name="account_status_unknown">Onbekend</string>
   <string name="account_status_offline">Offline</string>
+  <string name="account_status_error">Fout</string>
   <!--Create account-->
   <string name="account_creation_home">Welkom bij Jami</string>
   <string name="account_creation_profile">Maak uw profiel aan</string>
diff --git a/ring-android/app/src/main/res/values-pa/strings.xml b/ring-android/app/src/main/res/values-pa/strings.xml
index fbf2c5dcd5ddfd8c63f00b416172503d1d6afe3e..9970460cf9a740609625660b23998f48bb0e35f3 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -70,11 +70,8 @@
   <string name="notif_dismiss">ਖਾਰਜ ਕਰੋ</string>
   <string name="notif_reply">ਜਵਾਬ ਦਿਓ</string>
   <string name="notif_incoming_file_transfer_title">%1$s ਤੋਂ ਆਉਂਦੀ ਫ਼ਾਈਲ</string>
-  <string name="notif_incoming_file_transfer">ਕੋਈ ਤੁਹਾਨੂੰ ਫ਼ਾਈਲ ਭੇਜਣੀ ਚਾਹੁੰਦਾ ਹੈ</string>
   <string name="notif_outgoing_file_transfer_title">%1$s ਨੂੰ ਫ਼ਾਈਲ ਭੇਜੀ ਜਾ ਰਹੀ ਹੈ</string>
-  <string name="notif_outgoing_file_transfer">ਕੋਈ ਤੁਹਾਨੂੰ ਫ਼ਾਈਲ ਭੇਜਣੀ ਚਾਹੁੰਦਾ ਹੈ</string>
   <string name="notif_incoming_picture">%1$s ਵੱਲੋਂ ਤਸਵੀਰ</string>
-  <string name="action_open">ਖੋਲ੍ਹੋ</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">ਤੁਸੀਂ:</string>
   <string name="action_call_hangup">ਕਾਲ ਕੱਟੋ</string>
diff --git a/ring-android/app/src/main/res/values-pa/strings_account.xml b/ring-android/app/src/main/res/values-pa/strings_account.xml
index 1720bb62e3a315c72fbf225b998a907c6b54b929..66479ca8afd0c457de05db2a854d32a8758ed2f3 100644
--- a/ring-android/app/src/main/res/values-pa/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pa/strings_account.xml
@@ -173,6 +173,7 @@
   <string name="account_status_online">ਆਨਲਾਈਨ</string>
   <string name="account_status_unknown">ਅਣਪਛਾਤਾ</string>
   <string name="account_status_offline">ਆਫ਼ਲਾਈਨ</string>
+  <string name="account_status_error">ਗੜਬੜ</string>
   <!--Create account-->
   <string name="account_creation_home">Jami ਵਿੱਚ ਜੀ ਆਇਆਂ ਨੂੰ</string>
   <string name="account_creation_profile">ਆਪਣਾ ਪ੍ਰੋਫਾਈਲ ਬਣਾਓ</string>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings.xml b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
index 679fb16b4ea21542099127ca6c91e5cc83681e8f..bbb566390e5b5764c33b80859f111485ca863654 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
@@ -74,11 +74,8 @@
   <string name="notif_dismiss">Odrzuć</string>
   <string name="notif_reply">Odpowiedz</string>
   <string name="notif_incoming_file_transfer_title">Przychodzący plik od %1$s</string>
-  <string name="notif_incoming_file_transfer">Ktoś chce wysłać Ci plik</string>
   <string name="notif_outgoing_file_transfer_title">Wysyłanie pliku do %1$s</string>
-  <string name="notif_outgoing_file_transfer">Ktoś chce wysłać Ci plik</string>
   <string name="notif_incoming_picture">Obrazek od %1$s</string>
-  <string name="action_open">Otwórz</string>
   <string name="notif_sync_title">Synchronizowanie danych...</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Ty:</string>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml b/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml
index 4f06b0e9e82c87d3360feb2f208568bdca088bc4..ded6e43f6353f089287b2401d0553dc8b45378c1 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml
@@ -158,6 +158,7 @@ Możesz edytować swoje konto później</string>
   <string name="account_status_online">Online</string>
   <string name="account_status_unknown">Nieznane</string>
   <string name="account_status_offline">Offline</string>
+  <string name="account_status_error">Błąd</string>
   <!--Create account-->
   <string name="account_creation_home">Witaj w Jami</string>
   <string name="account_creation_profile">Stwórz swój profil</string>
diff --git a/ring-android/app/src/main/res/values-pl/strings.xml b/ring-android/app/src/main/res/values-pl/strings.xml
index a229546aa84e0b9203785ae606dc99d8ea1e7e18..c63c2165d97012d8b72951fc7a73a00fab62862c 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -75,11 +75,8 @@
   <string name="notif_dismiss">Odrzuć</string>
   <string name="notif_reply">Odpowiedz</string>
   <string name="notif_incoming_file_transfer_title">Przychodzący plik od %1$s</string>
-  <string name="notif_incoming_file_transfer">Ktoś chce wysłać Ci plik</string>
   <string name="notif_outgoing_file_transfer_title">Wysyłanie pliku do %1$s</string>
-  <string name="notif_outgoing_file_transfer">Ktoś chce wysłać Ci plik</string>
   <string name="notif_incoming_picture">Obrazek od %1$s</string>
-  <string name="action_open">Otwórz</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Ty:</string>
   <string name="action_call_hangup">Rozłącz się</string>
diff --git a/ring-android/app/src/main/res/values-pl/strings_account.xml b/ring-android/app/src/main/res/values-pl/strings_account.xml
index 7cfb34847cfbbfb02a39286eff563e1c61e336aa..0c7a5bf1fb4195864641c71dc83d1a7ff7d28e99 100644
--- a/ring-android/app/src/main/res/values-pl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pl/strings_account.xml
@@ -175,6 +175,7 @@ Możesz edytować swoje konto później</string>
   <string name="account_status_online">Online</string>
   <string name="account_status_unknown">Nieznane</string>
   <string name="account_status_offline">Offline</string>
+  <string name="account_status_error">Błąd</string>
   <!--Create account-->
   <string name="account_creation_home">Witaj w Jami</string>
   <string name="account_creation_profile">Stwórz swój profil</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings.xml b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
index 28eea9fa05f62b79c407f2de83a834218a53ef1a..6d070980b8b5028e24a9920ab055e4875176f73e 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
@@ -71,11 +71,8 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recente</u><
   <string name="notif_dismiss">Dispensar</string>
   <string name="notif_reply">Responder</string>
   <string name="notif_incoming_file_transfer_title">Recebendo arquivo de %1$s</string>
-  <string name="notif_incoming_file_transfer">Alguém quer enviar um arquivo</string>
   <string name="notif_outgoing_file_transfer_title">Enviando arquivo para %1$s</string>
-  <string name="notif_outgoing_file_transfer">Alguém quer enviar um arquivo</string>
   <string name="notif_incoming_picture">Foto de %1$s</string>
-  <string name="action_open">Abrir</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Você:</string>
   <string name="action_call_hangup">Desligar</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
index b4c902757662a1907a2cb63b1d008329bfd6a796..7145a059463f1da35bad42e0002606b9680496b7 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
@@ -167,6 +167,7 @@
   <string name="account_status_online">Online</string>
   <string name="account_status_unknown">Desconhecido</string>
   <string name="account_status_offline">Offline</string>
+  <string name="account_status_error">Erro</string>
   <!--Create account-->
   <string name="account_creation_home">Bem-vindo ao Jami</string>
   <string name="account_creation_profile">Criar um Perfil</string>
diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings.xml b/ring-android/app/src/main/res/values-pt-rPT/strings.xml
index c8be532b4c553653c08c2af166be5d6558116fc8..2130a8dd993b45dc04cca78e54e24c7f08ed82b0 100644
--- a/ring-android/app/src/main/res/values-pt-rPT/strings.xml
+++ b/ring-android/app/src/main/res/values-pt-rPT/strings.xml
@@ -73,11 +73,8 @@
   <string name="notif_dismiss">Dispensar</string>
   <string name="notif_reply">Responder</string>
   <string name="notif_incoming_file_transfer_title">A receber ficheiro de %1$s</string>
-  <string name="notif_incoming_file_transfer">Alguém quer enviar-lhe um ficheiro</string>
   <string name="notif_outgoing_file_transfer_title">A enviar ficheiro para %1$s</string>
-  <string name="notif_outgoing_file_transfer">Alguém quer enviar-lhe um ficheiro</string>
   <string name="notif_incoming_picture">Foto de %1$s</string>
-  <string name="action_open">Abrir</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Você:</string>
   <string name="action_call_hangup">Desligar</string>
diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml b/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml
index c9a4549c2a7dc0715570032004a57c0b274796af..8c167cf547f21c6454f604323af350dde0f1177e 100644
--- a/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml
@@ -175,6 +175,7 @@
   <string name="account_status_online">Ligado</string>
   <string name="account_status_unknown">Desconhecido</string>
   <string name="account_status_offline">Desligado</string>
+  <string name="account_status_error">Erro</string>
   <!--Create account-->
   <string name="account_creation_home">Bem-vindo ao Jami</string>
   <string name="account_creation_profile">Criar o seu perfil</string>
diff --git a/ring-android/app/src/main/res/values-pt/strings.xml b/ring-android/app/src/main/res/values-pt/strings.xml
index c8be532b4c553653c08c2af166be5d6558116fc8..2130a8dd993b45dc04cca78e54e24c7f08ed82b0 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -73,11 +73,8 @@
   <string name="notif_dismiss">Dispensar</string>
   <string name="notif_reply">Responder</string>
   <string name="notif_incoming_file_transfer_title">A receber ficheiro de %1$s</string>
-  <string name="notif_incoming_file_transfer">Alguém quer enviar-lhe um ficheiro</string>
   <string name="notif_outgoing_file_transfer_title">A enviar ficheiro para %1$s</string>
-  <string name="notif_outgoing_file_transfer">Alguém quer enviar-lhe um ficheiro</string>
   <string name="notif_incoming_picture">Foto de %1$s</string>
-  <string name="action_open">Abrir</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Você:</string>
   <string name="action_call_hangup">Desligar</string>
diff --git a/ring-android/app/src/main/res/values-pt/strings_account.xml b/ring-android/app/src/main/res/values-pt/strings_account.xml
index 78b5eb0e66826a7e49adb130a59ca9382a03eaeb..e19a28b418ca9ccb249ed8fc1029e2c4134e3a29 100644
--- a/ring-android/app/src/main/res/values-pt/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt/strings_account.xml
@@ -175,6 +175,7 @@
   <string name="account_status_online">Ligado</string>
   <string name="account_status_unknown">Desconhecido</string>
   <string name="account_status_offline">Desligado</string>
+  <string name="account_status_error">Erro</string>
   <!--Create account-->
   <string name="account_creation_home">Bem-vindo ao Jami</string>
   <string name="account_creation_profile">Criar o seu perfil</string>
diff --git a/ring-android/app/src/main/res/values-ro/strings.xml b/ring-android/app/src/main/res/values-ro/strings.xml
index 21e0f36c46ffcd77f88fb4a764a8d066146707a0..20ce91d41f28d1f2eff2079f0792719e9906ea0f 100644
--- a/ring-android/app/src/main/res/values-ro/strings.xml
+++ b/ring-android/app/src/main/res/values-ro/strings.xml
@@ -57,7 +57,6 @@
   <string name="notif_channel_messages">Mesaje</string>
   <string name="notif_channel_requests">Cereri</string>
   <string name="notif_group_calls">Apeluri</string>
-  <string name="action_open">Deschide</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Tu:</string>
   <string name="action_call_hangup">Închide</string>
diff --git a/ring-android/app/src/main/res/values-ro/strings_account.xml b/ring-android/app/src/main/res/values-ro/strings_account.xml
index 486ad6734819744e0866e6e10409b9ca2361958c..f574eb0ff69de8260c097eab800743adae2a16de 100644
--- a/ring-android/app/src/main/res/values-ro/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ro/strings_account.xml
@@ -57,6 +57,7 @@
   <!--Name registration-->
   <string name="account_status_connecting">Se conectează</string>
   <string name="account_status_unknown">Necunoscut</string>
+  <string name="account_status_error">Eroare</string>
   <!--Create account-->
   <!--Edit profile-->
   <!--Devices-->
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings.xml b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
index a5a3f760252a740974d5b93d99bb6467ed470944..3377a90f9ed787c832d5ef0a051bd464ab10482a 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
@@ -80,11 +80,8 @@
   <string name="notif_dismiss">Сбросить</string>
   <string name="notif_reply">Ответить</string>
   <string name="notif_incoming_file_transfer_title">Входящий файл от %1$s</string>
-  <string name="notif_incoming_file_transfer">Кто-то хочет отправить вам файл</string>
   <string name="notif_outgoing_file_transfer_title">Отправка файла %1$s</string>
-  <string name="notif_outgoing_file_transfer">Кто-то хочет отправить вам файл</string>
   <string name="notif_incoming_picture">Изображение от %1$s</string>
-  <string name="action_open">Открыть</string>
   <string name="notif_sync_title">Синхронизация данных...</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Вы</string>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
index d1c8e7ba48587fc5a34b91fcc548e184a7e7b081..cf96bf8e40760f029eb57702d7b280d70472d287 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
@@ -183,6 +183,7 @@
   <string name="account_status_online">В сети</string>
   <string name="account_status_unknown">Неизвестно</string>
   <string name="account_status_offline">Не в сети</string>
+  <string name="account_status_error">Ошибка</string>
   <!--Create account-->
   <string name="account_creation_home">Добро пожаловать в Jami</string>
   <string name="account_creation_profile">Создать свой профиль</string>
diff --git a/ring-android/app/src/main/res/values-ru/strings.xml b/ring-android/app/src/main/res/values-ru/strings.xml
index 0392667a923a4f86b71aaec3996b2c390e04b4d9..2d12850cee5644a915ce997bd2698f6a4d7ec79f 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -80,11 +80,8 @@
   <string name="notif_dismiss">Отклонить</string>
   <string name="notif_reply">Ответить</string>
   <string name="notif_incoming_file_transfer_title">Входящий файл от %1$s</string>
-  <string name="notif_incoming_file_transfer">Кто-то хочет отправить вам файл</string>
   <string name="notif_outgoing_file_transfer_title">Отправка файла %1$s</string>
-  <string name="notif_outgoing_file_transfer">Кто-то хочет отправить вам файл</string>
   <string name="notif_incoming_picture">Изображение от %1$s</string>
-  <string name="action_open">Открыть</string>
   <string name="notif_sync_title">Синхронизация данных...</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Вы:</string>
diff --git a/ring-android/app/src/main/res/values-ru/strings_account.xml b/ring-android/app/src/main/res/values-ru/strings_account.xml
index 08752c3e8b7daac1df4796002c6fcb40ef4c5d4f..105050746d6479399025efe385630010402b38b8 100644
--- a/ring-android/app/src/main/res/values-ru/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_account.xml
@@ -192,6 +192,7 @@
   <string name="account_status_online">В сети</string>
   <string name="account_status_unknown">Неизвестно</string>
   <string name="account_status_offline">Не в сети</string>
+  <string name="account_status_error">Ошибка</string>
   <!--Create account-->
   <string name="account_creation_home">Добро пожаловать в Jami</string>
   <string name="account_creation_profile">Создайте свой профиль</string>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings.xml b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
index 9a69be94ffea0f7821c6ae54f81a23beb6bf6fdc..04c6de6874ca966086f6f38671bbbbc2fb87694d 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
@@ -72,11 +72,8 @@
   <string name="notif_dismiss">Odmietnuť</string>
   <string name="notif_reply">Odpovedať</string>
   <string name="notif_incoming_file_transfer_title">Prichádzajúci súbor od %1$s</string>
-  <string name="notif_incoming_file_transfer">Niekto sa vám snaží poslať súbor</string>
   <string name="notif_outgoing_file_transfer_title">Posielanie súboru na %1$s</string>
-  <string name="notif_outgoing_file_transfer">Niekto sa vám snaží poslať súbor</string>
   <string name="notif_incoming_picture">Obrázok od %1$s</string>
-  <string name="action_open">Otvoriť</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Vy:</string>
   <string name="action_call_hangup">Zložiť</string>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml b/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
index dba7ebe0dc6252a4e1861a36abd6ed5ec8219e6f..c8e9656e127796ec0c2e955a1f1aec6bfccb9108 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
@@ -173,6 +173,7 @@
   <string name="account_status_online">Online</string>
   <string name="account_status_unknown">Neznámy</string>
   <string name="account_status_offline">Offline</string>
+  <string name="account_status_error">Chyba</string>
   <!--Create account-->
   <string name="account_creation_home">Vitajte v Jami</string>
   <string name="account_creation_profile">Vytvorte si váš profil</string>
diff --git a/ring-android/app/src/main/res/values-sl/strings_account.xml b/ring-android/app/src/main/res/values-sl/strings_account.xml
index 78c4c398dffacb2166638d2f783d9f1c783bc620..45d37bf54ceb06a6653df5cb58e166215552bb80 100644
--- a/ring-android/app/src/main/res/values-sl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sl/strings_account.xml
@@ -127,6 +127,7 @@
   <string name="account_status_online">Povezan</string>
   <string name="account_status_unknown">Neznano</string>
   <string name="account_status_offline">Odjavljen</string>
+  <string name="account_status_error">Napaka</string>
   <!--Create account-->
   <string name="account_creation_profile">Ustvari svoj profil</string>
   <string name="account_link_title">Poveži to naoravo</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 0d481efd8b666791bff1520bc96b2830be6da917..185fa1539db3d712b8432c79da3505b966c59c65 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
@@ -78,11 +78,8 @@
   <string name="notif_dismiss">Hidhe Tej</string>
   <string name="notif_reply">Përgjigjuni</string>
   <string name="notif_incoming_file_transfer_title">Kartelë ardhëse nga %1$s</string>
-  <string name="notif_incoming_file_transfer">Dikush dëshiron t\’ju dërgojë një kartelë</string>
   <string name="notif_outgoing_file_transfer_title">Po dërgohet kartelë te %1$s</string>
-  <string name="notif_outgoing_file_transfer">Dikush dëshiron t\’ju dërgojë një kartelë</string>
   <string name="notif_incoming_picture">Foto nga %1$s</string>
-  <string name="action_open">Hape</string>
   <string name="notif_sync_title">Po njëkohësohen të dhëna…</string>
   <string name="notif_location_title">Ndarje vendndodhjeje me %1$s</string>
   <string name="location_share_contact">%1$s po ju tregon vendndodhjen</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
index fc2e263d2da761a94f3616dae7c41b181d6f8db2..34587c2bbf6897543bb6fc3cb5dae35c7ac9193e 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
@@ -192,6 +192,7 @@
   <string name="account_status_online">Në linjë</string>
   <string name="account_status_unknown">E panjohur</string>
   <string name="account_status_offline">Jo në linjë</string>
+  <string name="account_status_error">Gabim</string>
   <!--Create account-->
   <string name="account_creation_home">Mirë se vini te Jami</string>
   <string name="account_creation_profile">Krijoni profilin tuaj</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings.xml b/ring-android/app/src/main/res/values-sv/strings.xml
index 4b580eae682e279c23dd5c713b6a90a3bfdf3593..7e663da90fbdf17527b68737a57e31be305f24b6 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -74,11 +74,8 @@
   <string name="notif_dismiss">Avfärda</string>
   <string name="notif_reply">Svara</string>
   <string name="notif_incoming_file_transfer_title">Inkommande fil från %1$s</string>
-  <string name="notif_incoming_file_transfer">Någon vill skicka en fil till dig</string>
   <string name="notif_outgoing_file_transfer_title">Skickar fil till %1$s</string>
-  <string name="notif_outgoing_file_transfer">Någon vill skicka en fil till dig</string>
   <string name="notif_incoming_picture">Bild från %1$s</string>
-  <string name="action_open">Oppna</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Du:</string>
   <string name="action_call_hangup">Lägg på</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings_account.xml b/ring-android/app/src/main/res/values-sv/strings_account.xml
index 76e242167ffbe826ea7b5699bcc4157e5b9bef33..a2cb331e85d9c885d6e938b1da1762bc7f1c9df9 100644
--- a/ring-android/app/src/main/res/values-sv/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_account.xml
@@ -175,6 +175,7 @@ Du kan ändra kontot senare.</string>
   <string name="account_status_online">Uppkopplad</string>
   <string name="account_status_unknown">Okänd</string>
   <string name="account_status_offline">Nerkopplad</string>
+  <string name="account_status_error">Fel</string>
   <!--Create account-->
   <string name="account_creation_home">Välkommen till Jami!</string>
   <string name="account_creation_profile">Skapa din profil</string>
diff --git a/ring-android/app/src/main/res/values-tr/strings.xml b/ring-android/app/src/main/res/values-tr/strings.xml
index d3295ceb1290c09ad1796667485f25639c3b2100..29a649c043fdb87c15a1ee0e4163990ee6a8872a 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -73,11 +73,8 @@
   <string name="notif_dismiss">Reddet</string>
   <string name="notif_reply">Yanıtla</string>
   <string name="notif_incoming_file_transfer_title">%1$s\'dan gelen dosya</string>
-  <string name="notif_incoming_file_transfer">Birisi sana bir dosya göndermek istiyor</string>
   <string name="notif_outgoing_file_transfer_title">%1$s\'e dosya gönderme</string>
-  <string name="notif_outgoing_file_transfer">Birisi sana bir dosya göndermek istiyor</string>
   <string name="notif_incoming_picture">%1$s\'dan resim</string>
-  <string name="action_open">Açık</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Sen:</string>
   <string name="action_call_hangup">Kapat</string>
diff --git a/ring-android/app/src/main/res/values-tr/strings_account.xml b/ring-android/app/src/main/res/values-tr/strings_account.xml
index 511efef8c13da9f4e7b4783acfcb841743368b86..ecb16c6609be17048cd4f8b2b03bbcde5968ed5f 100644
--- a/ring-android/app/src/main/res/values-tr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_account.xml
@@ -167,6 +167,7 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string>
   <string name="account_status_online">Çevrimiçi</string>
   <string name="account_status_unknown">Bilinmeyen</string>
   <string name="account_status_offline">Çevrimdışı</string>
+  <string name="account_status_error">Hata</string>
   <!--Create account-->
   <string name="account_creation_home">Jami\'ye Hoşgeldiniz</string>
   <string name="account_creation_profile">Profilinizi oluşturun</string>
diff --git a/ring-android/app/src/main/res/values-uk/strings.xml b/ring-android/app/src/main/res/values-uk/strings.xml
index 640e0e0838c78d2a0915589ea22e3ae05d3d6b93..5479d63e8c4f0179ec8ea40ec5ce59632fd1ee4c 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -72,11 +72,8 @@
   <string name="notif_dismiss">Відхилити</string>
   <string name="notif_reply">Відповісти</string>
   <string name="notif_incoming_file_transfer_title">Вхідний файл від %1$s</string>
-  <string name="notif_incoming_file_transfer">Хтось хоче вислати вам файл</string>
   <string name="notif_outgoing_file_transfer_title">Надсилаємо файл до %1$s </string>
-  <string name="notif_outgoing_file_transfer">Хтось хоче вислати вам файл</string>
   <string name="notif_incoming_picture">Картинка від %1$s</string>
-  <string name="action_open">Відкрити</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Ви:</string>
   <string name="action_call_hangup">Зупинити</string>
diff --git a/ring-android/app/src/main/res/values-uk/strings_account.xml b/ring-android/app/src/main/res/values-uk/strings_account.xml
index ba52eeebb2fe2ea8b79cfa519dfe1dba67532ffa..e28289673457006bf79c3632d638d83cc5c67369 100644
--- a/ring-android/app/src/main/res/values-uk/strings_account.xml
+++ b/ring-android/app/src/main/res/values-uk/strings_account.xml
@@ -163,6 +163,7 @@
   <string name="account_status_online">У мережі</string>
   <string name="account_status_unknown">Невідомий</string>
   <string name="account_status_offline">Поза мережею</string>
+  <string name="account_status_error">Помилка</string>
   <!--Create account-->
   <string name="account_creation_home">Вітаємо в Джамі</string>
   <string name="account_creation_profile">Створіть ваш профіль</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 fb6696bd2b0616be72959764695ea69e8f34d3f2..a18f9392e2be414f4b304593b35a9596a859c753 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
@@ -77,12 +77,16 @@
   <string name="notif_dismiss">解散</string>
   <string name="notif_reply">回复</string>
   <string name="notif_incoming_file_transfer_title">从%1$s收到的文件</string>
-  <string name="notif_incoming_file_transfer">有人想给你发送一个文件</string>
   <string name="notif_outgoing_file_transfer_title">发送文件到%1$s</string>
-  <string name="notif_outgoing_file_transfer">有人想给你发送一个文件</string>
   <string name="notif_incoming_picture">来自%1$s的图片</string>
-  <string name="action_open">打开</string>
   <string name="notif_sync_title">正在同步数据...</string>
+  <string name="notif_location_title">正与%1$s分享位置</string>
+  <string name="location_share_contact">%1$s正与你分享位置</string>
+  <string name="notif_location_multi_title">正与%1$d联系人分享位置</string>
+  <string name="notif_location_remaining">剩余%1$d分钟</string>
+  <string name="notif_location_action_stop">停止分享位置</string>
+  <string name="location_share_action_start">开始分享</string>
+  <string name="location_share_action_stop">停止分享</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">你:</string>
   <string name="action_call_hangup">挂断</string>
@@ -116,6 +120,7 @@
   <string name="hist_file_received">文件已接收</string>
   <string name="conversation_send_audio">录制音频片段</string>
   <string name="conversation_send_video">录制视频片段</string>
+  <string name="conversation_share_location">分享位置</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">摄像头使用权限</string>
   <string name="permission_dialog_camera_message">视频会话需要使用摄像头,请设置相应权限。</string>
@@ -161,6 +166,7 @@
   <string name="block_contact_dialog_title">屏蔽%1$s?</string>
   <string name="block_contact_dialog_message">你将不能联系%1$s直到你解除屏蔽。</string>
   <string name="block_contact_completed">%1$s已被屏蔽。</string>
+  <string name="conversation_contact_is_typing">联系人正在输入...</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">添加%1$s?</string>
   <string name="prompt_new_password">新密码</string>
@@ -250,7 +256,13 @@
   <string name="navigation_item_contact_request">联系人请求</string>
   <string name="navigation_item_account">帐户</string>
   <!--TV-->
+  <string name="tv_send_audio_dialog_message">发送音频消息?</string>
   <string name="tv_audio_play">播放</string>
   <string name="tv_audio_pause">暂停</string>
   <string name="tv_dialog_send">发送</string>
+  <string name="tv_audio_recording">正在录音...</string>
+  <string name="tv_send_text">发送文本</string>
+  <string name="tv_send_audio">发送音频</string>
+  <string name="tv_send_video">发送视频</string>
+  <string name="tv_clear_history">清除历史</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
index d5dc1e7e2820ff490b7f5aa623ddde01fb8c75dd..ddd20a95cb5b4d4702d14e497a7acff22f42e14e 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
@@ -95,6 +95,7 @@
   <string name="account_proxy_label">DHT代理</string>
   <string name="account_proxy_enable_label">使用DHT代理</string>
   <string name="account_proxy_server_label">DHT代理地址</string>
+  <string name="account_proxy_server_list_label">DHT代理列表URL </string>
   <string name="account_peer_discovery_label">本地对等方发现</string>
   <string name="account_peer_discovery_enable_label">启用本地对等方发现</string>
   <string name="account_peer_discovery_enable_summary">连接至在本地网络宣告的DHT节点</string>
@@ -192,6 +193,7 @@
   <string name="account_status_online">在线</string>
   <string name="account_status_unknown">未知</string>
   <string name="account_status_offline">离线</string>
+  <string name="account_status_error">错误</string>
   <!--Create account-->
   <string name="account_creation_home">欢迎来到Jami</string>
   <string name="account_creation_profile">创建您的帐户资料</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 caaea194c3619b85d0201ce058b575bd803eb001..4c0aae5d983e1a5de2334f69e01bc0f33ca57bb5 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
@@ -77,11 +77,8 @@
   <string name="notif_dismiss">忽略</string>
   <string name="notif_reply">回覆</string>
   <string name="notif_incoming_file_transfer_title">從 %1$s 而來的檔案</string>
-  <string name="notif_incoming_file_transfer">有人想要傳送檔案給您</string>
   <string name="notif_outgoing_file_transfer_title">傳送檔案給 %1$s</string>
-  <string name="notif_outgoing_file_transfer">有人想要傳送檔案給您</string>
   <string name="notif_incoming_picture">圖片從 %1$s</string>
-  <string name="action_open">開啟</string>
   <string name="notif_sync_title">正在同步資料……</string>
   <string name="notif_location_title">正在與 %1$s 分享位置</string>
   <string name="location_share_contact">%1$s 正在與您分享位置</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
index cfe124f0d2a38918b99cb60dc573902c1b6db45d..e8a0f047d06cac7d8acdd17fbe9100b7c6d527b6 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
@@ -193,6 +193,7 @@
   <string name="account_status_online">線上</string>
   <string name="account_status_unknown">未知</string>
   <string name="account_status_offline">離線</string>
+  <string name="account_status_error">錯誤</string>
   <!--Create account-->
   <string name="account_creation_home">歡迎來到 Jami</string>
   <string name="account_creation_profile">建立您的檔案</string>