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 7dc97ef..3185c99 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -84,4 +84,5 @@
   <!--Blacklist-->
   <!--Smartlist-->
   <string name="tv_contact_row_header">الاتصالات</string>
+  <!--File Transfer-->
 </resources>
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 5974eae..bf6a4f3 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -150,4 +150,5 @@
   <string name="contact_request_sent">Заявката за свързване с нов контакт е изпратена</string>
   <string name="search_results">Резултати от търсенето</string>
   <string name="tv_contact_row_header">Контакти</string>
+  <!--File Transfer-->
 </resources>
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 42b6856..e904ef0 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -148,4 +148,5 @@
   <string name="contact_request_sent">S\'ha enviat una petició de contacte</string>
   <string name="search_results">Resultats de cerca</string>
   <string name="tv_contact_row_header">Contactes</string>
+  <!--File Transfer-->
 </resources>
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 26c699f..9b6220d 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
@@ -148,4 +148,5 @@
   <string name="no_contact_request">Neposlána žádná žádost o kontakt</string>
   <string name="contact_request_sent">Poslána žádost o kontakt</string>
   <string name="tv_contact_row_header">Kontakty</string>
+  <!--File Transfer-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings.xml b/ring-android/app/src/main/res/values-da-rDK/strings.xml
index 452efa7..fd63480 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings.xml
@@ -153,4 +153,5 @@
   <string name="tv_contact_row_header">Kontakter</string>
   <string name="gallery_error_title">Ingen Galleri-applikation fundet</string>
   <string name="gallery_error_message">Der blev ikke funden nogen applikation på enheden der kan vise Galleriet</string>
+  <!--File Transfer-->
 </resources>
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 a8274be..1a55006 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
@@ -148,4 +148,5 @@
   <string name="no_contact_request">Keine Kontaktanfrage verschickt</string>
   <string name="contact_request_sent">Kontaktanfrage verschickt</string>
   <string name="tv_contact_row_header">Kontakte</string>
+  <!--File Transfer-->
 </resources>
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 bb1f53f..6cce3c4 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -158,4 +158,5 @@
   <string name="gallery_error_title">Keine Galerie App gefunden</string>
   <string name="gallery_error_message">Auf dem Gerät wurde keine Applikation gefunden um die Galerie zu öffnen</string>
   <string name="generic_error">Ein unbekannter Fehler ist aufgetreten</string>
+  <!--File Transfer-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-el/strings.xml b/ring-android/app/src/main/res/values-el/strings.xml
index 6faba18..3a8dffc 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -146,4 +146,5 @@
   <string name="contact_request_sent">Αίτημα επαφής εστάλει</string>
   <string name="search_results">Αποτελέσματα αναζήτησης</string>
   <string name="tv_contact_row_header">Επαφές</string>
+  <!--File Transfer-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-eo/strings.xml b/ring-android/app/src/main/res/values-eo/strings.xml
index bb86188..6a0ad80 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -101,4 +101,5 @@
   <!--Blacklist-->
   <!--Smartlist-->
   <string name="tv_contact_row_header">Kontaktoj</string>
+  <!--File Transfer-->
 </resources>
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
new file mode 100644
index 0000000..77fd918
--- /dev/null
+++ b/ring-android/app/src/main/res/values-es-rAR/strings.xml
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--About-->
+  <string name="feedback_section">Retroalimentación</string>
+  <string name="report">&lt;u&gt;Envianos un email&lt;/u&gt;</string>
+  <string name="section_license">Licencia</string>
+  <string name="sponsor_section">Ring es software libre desarrollado y soportado por</string>
+  <string name="copyright_section">Copyright</string>
+  <string name="contribute_section">Contribuya</string>
+  <string name="version_section">Versión</string>
+  <string name="no_email_app_installed">No se detectó una app de email, instale una para enviarnos un reporte</string>
+  <string name="no_browser_app_installed">No se detectó ningún navegador, instale uno para ver esta página</string>
+  <string name="email_chooser_title">Enviar mail con...</string>
+  <string name="website_chooser_title">Ver página con...</string>
+  <string name="license">Este programa se ofrece \"como es\", sin ningún tipo de garantía. Para detalles, vea
+&lt;u&gt;GNU General Public License versión 3 o posterior&lt;/u&gt;</string>
+  <string name="description">Ring es software libre para comunicación universal que respeta las libertades y privacidad de sus usuarios.</string>
+  <string name="credits">Créditos</string>
+  <!--About dialog-->
+  <string name="developed_by">Desarrollado por</string>
+  <string name="designed_by">Diseñado por</string>
+  <!--RingActivity-->
+  <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">Sin conexión a red</string>
+  <string name="error_mobile_network_available_but_disabled">Por favor permita el acceso a la red celular en el menú de opciones.</string>
+  <!--AB menus-->
+  <string name="ab_action_chat">Mensajes de texto</string>
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <!--Sections-->
+  <!--Dialing Fragment-->
+  <!--History Fragment-->
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <!--ContactList Fragment-->
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <!--Notifications-->
+  <!--Call Fragment-->
+  <!--Text messages-->
+  <!--MediaPreferenceFragment-->
+  <!--Read contacts permission-->
+  <!--Write call log permission-->
+  <!--QRCode Scan-->
+  <!--Settings-->
+  <string name="clear_history_dialog_message">Esta acción no puede deshacerse.</string>
+  <!--Conversation-->
+  <string name="conversation_action_delete_this_message">Esta acción no puede deshacerse.</string>
+  <!--Contacts-->
+  <!--MenuHeaderView-->
+  <!--Share fragment-->
+  <!--Pending contact requests-->
+  <!--Send contact requests-->
+  <!--Blacklist-->
+  <!--Smartlist-->
+  <!--File Transfer-->
+</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
new file mode 100644
index 0000000..12b0682
--- /dev/null
+++ b/ring-android/app/src/main/res/values-es-rAR/strings_account.xml
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Eliminar</string>
+  <string name="ic_advanced_menu">Opciones avanzadas</string>
+  <string name="ic_blacklist_menu">Contactos bloqueados</string>
+  <!--Strings related to account creation-->
+  <string name="add_ring_account_title">Añadir cuenta Ring</string>
+  <string name="add_sip_account_title">Añadir cuenta SIP</string>
+  <string name="ring_account_default_name">Cuenta Ring %1$s</string>
+  <string name="prompt_alias">Alias</string>
+  <string name="prompt_hostname">Nombre del anfitrión</string>
+  <string name="prompt_username">Nombre de usuario</string>
+  <string name="prompt_password">Contraseña</string>
+  <string name="action_create">Crear cuenta</string>
+  <string name="action_create_short">Crear</string>
+  <string name="action_register">Registrar</string>
+  <string name="error_field_required">Dato requerido</string>
+  <string name="dialog_wait_create">Añadiendo cuenta</string>
+  <string name="dialog_wait_create_details">Por favor aguarde mientras su nueva cuenta es añadida...</string>
+  <string name="dialog_wait_update">Actualizando cuenta</string>
+  <string name="dialog_wait_update_details">Por favor espere mientras su nueva cuenta es actualizada...</string>
+  <string name="dialog_warn_ip2ip_account_title">¿Crear una cuenta SIP vacía?</string>
+  <string name="dialog_warn_ip2ip_account_message">Está a punto de crear una cuenta SIP con un nombre de host no valido.
+Solo podrá realizar y recibir llamadas de ip directas.
+Podrá editar su cuenta más tarde.</string>
+  <string name="account_type_ip2ip">Cuenta IP</string>
+  <string name="help_ring">Una cuenta Ring le permite comunicarse con gente de forma segura a través de una red P2P totalmente distribuida.</string>
+  <string name="help_sip_title">Añada su cuenta SIP</string>
+  <string name="help_sip">Configure una cuenta SIP existente.</string>
+  <string name="create_sip_account">Añadir cuenta SIP</string>
+  <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">¿Eliminar cuenta?</string>
+  <string name="account_delete_dialog_message">Esta acción no puede deshacerse.</string>
+  <!--AccountManagementFragment-->
+  <string name="empty_account_list">No hay cuenta registrada</string>
+  <string name="normal_accounts_titles">Cuentas</string>
+  <string name="normal_devices_titles">Dispositivos conocidos enlazados a esta cuenta Ring</string>
+  <string name="account_device_revoke">Revocar dispositivo</string>
+  <string name="account_device_revocation_success_title">Éxito</string>
+  <string name="account_device_revocation_success">¡Se ha revocado el dispositivo!</string>
+  <string name="account_device_revocation_error_title">No se ha podido revocar el dispositivo</string>
+  <string name="account_device_revocation_wrong_password">Contraseña incorrecta.</string>
+  <string name="account_device_revocation_unknown_device">Dispositivo desconocido.</string>
+  <string name="account_device_revocation_error_unknown">Error desconocido.</string>
+  <!--Basic Details-->
+  <string name="account_preferences_basic_tab">General</string>
+  <string name="account_basic_category">Parámetros básicos</string>
+  <string name="account_alias_label">Nombre de cuenta</string>
+  <string name="account_hostname_label">Nombre del anfitrión</string>
+  <string name="account_bootstrap_label">Bootstrap</string>
+  <string name="account_username_label">Nombre de usuario</string>
+  <string name="account_password_label">Contraseña</string>
+  <string name="account_optionnal_category">Parámetros Opcionales</string>
+  <string name="account_upnp_label">Activar UPnP</string>
+  <string name="account_proxy_field">Proxy</string>
+  <!--Audio Details-->
+  <string name="account_audio_label">Audio</string>
+  <string name="account_preferences_media_tab">Medios</string>
+  <string name="account_ringtone_label">Tonos de llamada</string>
+  <string name="account_ringtone_enabled_label">Activar tonos de llamada</string>
+  <string name="account_ringtone_path_label">Ubicación del tono</string>
+  <string name="account_ringtone_custom_label">Usar tono de llamada personalizado</string>
+  <!--Video Details-->
+  <string name="account_video_label">Video</string>
+  <string name="account_video_enable">Permitir video</string>
+  <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">Avanzadas</string>
+  <string name="account_dht_public_in_calls_label">Recibir toda llamada/mensaje</string>
+  <string name="account_registration_exp_label">Caducidad del registro</string>
+  <string name="account_local_interface_label">Interfaz Local</string>
+  <string name="account_local_port_label">Puerto Local</string>
+  <string name="account_stun_enable_label">Usar STUN</string>
+  <string name="account_stun_server_label">Servidor STUN</string>
+  <string name="account_turn_enable_label">Usar TURN</string>
+  <string name="account_turn_server_label">Servidor TURN</string>
+  <string name="account_turn_username_label">Usuario TURN</string>
+  <string name="account_turn_password_label">Contraseña TURN</string>
+  <!--Security Details-->
+  <!--SRTP Details-->
+  <!--SIP-->
+  <!--TLS Details-->
+  <!--restore/backup-->
+  <!--Name registration-->
+  <!--Create account-->
+  <!--Edit profile-->
+  <!--Devices-->
+  <string name="revoke_device_title">Revocar dispositivo</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings_content_description.xml b/ring-android/app/src/main/res/values-es-rAR/strings_content_description.xml
new file mode 100644
index 0000000..8c01c3a
--- /dev/null
+++ b/ring-android/app/src/main/res/values-es-rAR/strings_content_description.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings for xml content description of images-->
+  <string name="contact_quick_call_description">Llamada Rápida</string>
+  <string name="contact_picture_description">Imagen de Contacto</string>
+  <string name="dial_numeric_pad">Teclado Numérico</string>
+  <string name="contact_unblock">Desbloquear</string>
+</resources>
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 14994ef..584e539 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -33,6 +33,7 @@
   <string name="menu_item_home">Inicio</string>
   <string name="menu_item_contact_request">Solicitudes de contacto</string>
   <string name="menu_item_accounts">Administrar cuentas</string>
+  <string name="menu_item_account">Administrar cuenta</string>
   <string name="menu_item_settings">Configuración</string>
   <string name="menu_item_share">Compartir mi contacto</string>
   <string name="menu_item_about">Acerca de Ring</string>
@@ -60,6 +61,9 @@
   <string name="notif_current_call_title">Llamada en curso con %1$s</string>
   <string name="notif_current_call">Llamada en curso</string>
   <string name="notif_channel_calls">Llamadas</string>
+  <string name="notif_channel_messages">Mensajes</string>
+  <string name="notif_channel_requests">Solicitudes</string>
+  <string name="notif_mark_as_read">Marcar como leído</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Tú:</string>
   <string name="action_call_hangup">Colgar</string>
@@ -111,6 +115,7 @@
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">¿Añadir %1$s ?</string>
   <string name="prompt_new_password">Contraseña nueva</string>
+  <string name="prompt_new_password_optional">Contraseña nueva (opcional)</string>
   <string name="prompt_new_password_repeat">Repite la nueva contraseña</string>
   <string name="account_create_title">Crear una cuenta en Ring</string>
   <string name="prompt_new_username">Ingresa un nuevo nombre de usuario</string>
@@ -150,4 +155,8 @@
   <string name="contact_request_sent">Solicitud de contacto enviada</string>
   <string name="search_results">Resultados de búsqueda</string>
   <string name="tv_contact_row_header">Contactos</string>
+  <string name="gallery_error_title">No se encontró una aplicación de galería</string>
+  <string name="gallery_error_message">No se encontró una aplicación en el dispositivo para abrir la galería</string>
+  <string name="generic_error">Ocurrió un error desconocido</string>
+  <!--File Transfer-->
 </resources>
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 3ce908f..de3d2f6 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
@@ -147,4 +147,5 @@
   <string name="no_contact_request">هیچ درخواست تماسی ارسال نشده</string>
   <string name="contact_request_sent">درخواست تماس ارسال شد</string>
   <string name="tv_contact_row_header">مخاطبان</string>
+  <!--File Transfer-->
 </resources>
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 60385bc..9bf8e77 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -105,4 +105,5 @@
   <!--Blacklist-->
   <!--Smartlist-->
   <string name="tv_contact_row_header">Yhteystiedot</string>
+  <!--File Transfer-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings.xml b/ring-android/app/src/main/res/values-fr-rBE/strings.xml
index 8b6dfdb..12376ec 100644
--- a/ring-android/app/src/main/res/values-fr-rBE/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rBE/strings.xml
@@ -31,4 +31,5 @@
   <!--Send contact requests-->
   <!--Blacklist-->
   <!--Smartlist-->
+  <!--File Transfer-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings.xml b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
index 17787f4..8e3de98 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
@@ -158,4 +158,5 @@
   <string name="gallery_error_title">Pas d\'application de Galleries trouvé</string>
   <string name="gallery_error_message">Pas d\'application trouvé dans l\'appareil pour ouvrir Galleries</string>
   <string name="generic_error">Une erreur inconnue s\'est produite</string>
+  <!--File Transfer-->
 </resources>
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 9ec84b6..6aea0a0 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
@@ -144,6 +144,7 @@
   <string name="account_new_button">Créer un compte Ring</string>
   <string name="account_link_export_button">Associer un autre appareil à ce compte</string>
   <string name="account_link_export_info">Pour utiliser ce compte sur d\'autres appareils, vous devez l\'exposer sur Ring en premier. Cela va généer un code NIP que vous devez entrer sur le nouveau appareil pour configurer un nouveau compte. Le NIP est valide pour 10 minutes.</string>
+  <string name="account_start_export_button">Générer le NIP</string>
   <string name="account_end_export_button">fermer</string>
   <string name="account_end_export_infos">Voici votre NIP :\n\n%%\n\nPour terminer le processus, lancez Ring sur le nouvel appareil, créez un nouveau compte avec l\'option \"Associer un appareil à un compte\" . Votre NIP est valide pour une durée de 10 minutes.</string>
   <string name="account_link_export_info_light">Pour utiliser ce compte sur d\'autres appareils, vous devez l\'exposer sur Ring en premier. Cela va généer un code NIP que vous devez entrer sur le nouveau appareil pour configurer un nouveau compte. Le NIP est valide pour 10 minutes.</string>
@@ -170,6 +171,7 @@
   <string name="account_link_title">Associer cet appareil</string>
   <string name="account_sip_cannot_be_registered">Impossible d\'enregistrer le compte</string>
   <!--Edit profile-->
+  <string name="account_edit_profile">Éditer votre profil</string>
   <!--Devices-->
   <string name="account_revoke_device_hint">Saisir mot de passe pour confirmer</string>
   <string name="enter_password">Entrer le mot de passe</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings.xml b/ring-android/app/src/main/res/values-fr-rCH/strings.xml
index 8b6dfdb..12376ec 100644
--- a/ring-android/app/src/main/res/values-fr-rCH/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rCH/strings.xml
@@ -31,4 +31,5 @@
   <!--Send contact requests-->
   <!--Blacklist-->
   <!--Smartlist-->
+  <!--File Transfer-->
 </resources>
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 d714827..77fb351 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
@@ -118,4 +118,5 @@
   <!--Send contact requests-->
   <!--Blacklist-->
   <!--Smartlist-->
+  <!--File Transfer-->
 </resources>
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 d3bf33c..df54760 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -63,10 +63,14 @@
   <string name="notif_channel_calls">Appels</string>
   <string name="notif_channel_messages">Messages</string>
   <string name="notif_channel_requests">Sollicitations</string>
+  <string name="notif_channel_file_transfer">Transfert de fichier</string>
   <string name="notif_mark_as_read">Marquer comme lu</string>
+  <string name="notif_incoming_file_transfer_title">Transfert de fichier entrant</string>
+  <string name="notif_incoming_file_transfer">Quelqu\'un souhaite vous envoyer un fichier</string>
+  <string name="action_open">Ouvrir</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Vous :</string>
-  <string name="action_call_hangup">Raccrocher</string>
+  <string name="action_call_hangup">Raccrochez</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>
@@ -74,7 +78,7 @@
   <string name="start_error_mic_required">Ring nécessite les permissions d\'accès au micro pour fonctionner.</string>
   <string name="action_call_accept">Répondre</string>
   <string name="action_call_decline">Décliner</string>
-  <string name="ab_action_speakerphone">Activer haut-parleur</string>
+  <string name="ab_action_speakerphone">Activer le haut-parleur</string>
   <string name="ab_action_contact_add">Ajouter aux contacts</string>
   <string name="ab_action_contact_add_question">Ajouter aux contacts ?</string>
   <string name="ab_action_audio_call">Appel audio</string>
@@ -88,11 +92,12 @@
   <string name="send_message">Envoyer le message</string>
   <string name="message_sending">Envoi du message</string>
   <string name="time_just_now">À l\'instant</string>
+  <string name="send_file">Envoyez un fichier</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>
   <string name="ringtone_error_title">Erreur</string>
-  <string name="ringtone_error_format_not_supported">Cette extension de fichier n\'est pas supportée.</string>
+  <string name="ringtone_error_format_not_supported">Ce format de fichier n\'est pas supporté.</string>
   <string name="ringtone_error_size_too_big">Ce fichier est trop gros. La taille maximale est de %1$iko.</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring a besoin d\'accéder en lecture à votre liste de contact. SVP autorisez-le.</string>
@@ -158,4 +163,18 @@
   <string name="gallery_error_title">Aucune application Gallery sur l\'appareil</string>
   <string name="gallery_error_message">Aucune application trouvé sur l\'appareil pour ouvrir Gallery</string>
   <string name="generic_error">Une étrange erreur s\'est produite</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">Attente de l\'autorisation du destinataire </string>
+  <string name="file_transfer_status_wait_host_acceptance">Attente de l\'autorisation de l\'appareil</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\'appareil</string>
+  <string name="file_transfer_status_closed_by_peer">fermé par l\'interlocuteur</string>
+  <string name="file_transfer_status_invalid_pathname">Chemin d\'accès invalide</string>
+  <string name="file_transfer_status_unjoinable_peer">interlocuteur injoignable</string>
+  <string name="file_saved_in">Fichier sauvegardé dans %s</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 a5a30c0..76928e6 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
@@ -81,6 +81,9 @@
   <string name="account_published_same_as_local_label">Identique aux paramètres locaux</string>
   <string name="account_published_port_label">Port de publication</string>
   <string name="account_published_address_label">Adresse de publication</string>
+  <string name="account_proxy_label">DHT mandataire</string>
+  <string name="account_proxy_enable_label"> Utiliser un serveur délégataire </string>
+  <string name="account_proxy_server_label">Adresse du DHT mandataire</string>
   <!--Security Details-->
   <string name="account_credentials_label">Identifiants</string>
   <string name="account_credentials_edit">Éditer les identifiants</string>
diff --git a/ring-android/app/src/main/res/values-fr/strings_preferences.xml b/ring-android/app/src/main/res/values-fr/strings_preferences.xml
index 9bdcf00..5b96696 100644
--- a/ring-android/app/src/main/res/values-fr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_preferences.xml
@@ -6,6 +6,8 @@
   <string name="pref_category_privacy">Privée</string>
   <string name="pref_mobileData_title">Données mobiles</string>
   <string name="pref_mobileData_summary">Autoriser Ring sur les réseaux mobiles en plus du Wi-fi.</string>
+  <string name="pref_pushNotifications_title">Notifications poussées</string>
+  <string name="pref_pushNotifications_summary">Utiliser les serveurs Google pour permettre de recevoir des appels et des messages en arrière plan.</string>
   <string name="pref_systemContacts_title">Utiliser les contacts de l\'appareil</string>
   <string name="pref_systemContacts_summary">Utiliser les contacts de l\'appareil pour afficher les détails du correspondant.</string>
   <string name="pref_systemDialer_title">Utiliser Ring par defaut pour les appels</string>
diff --git a/ring-android/app/src/main/res/values-he/strings.xml b/ring-android/app/src/main/res/values-he/strings.xml
index 5e73121..b2297f2 100644
--- a/ring-android/app/src/main/res/values-he/strings.xml
+++ b/ring-android/app/src/main/res/values-he/strings.xml
@@ -52,4 +52,5 @@
   <!--Blacklist-->
   <!--Smartlist-->
   <string name="tv_contact_row_header">אנשי קשר</string>
+  <!--File Transfer-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-hi-rIN/strings.xml b/ring-android/app/src/main/res/values-hi-rIN/strings.xml
index a01df75..991cb55 100644
--- a/ring-android/app/src/main/res/values-hi-rIN/strings.xml
+++ b/ring-android/app/src/main/res/values-hi-rIN/strings.xml
@@ -45,4 +45,5 @@
   <!--Send contact requests-->
   <!--Blacklist-->
   <!--Smartlist-->
+  <!--File Transfer-->
 </resources>
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 1be6628..ec91fad 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -128,4 +128,5 @@
   <string name="no_blocked_contact">0 blokiranih kontakata</string>
   <!--Smartlist-->
   <string name="tv_contact_row_header">Kontakti</string>
+  <!--File Transfer-->
 </resources>
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 b8c5962..19b8690 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -148,4 +148,5 @@
   <string name="no_contact_request">Nincs elküldött partnerkérelem</string>
   <string name="contact_request_sent">Partnerkérelem elküldve</string>
   <string name="tv_contact_row_header">Partnerek</string>
+  <!--File Transfer-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-id/strings.xml b/ring-android/app/src/main/res/values-id/strings.xml
index 592e960..b1a1b15 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -107,4 +107,5 @@
   <string name="no_blocked_contact">0 kontak diblokir</string>
   <!--Smartlist-->
   <string name="tv_contact_row_header">Kontak</string>
+  <!--File Transfer-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ig/strings.xml b/ring-android/app/src/main/res/values-ig/strings.xml
new file mode 100644
index 0000000..ce45c9e
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ig/strings.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--About-->
+  <string name="contribute_section">Nye aka</string>
+  <!--About dialog-->
+  <!--RingActivity-->
+  <!--AB menus-->
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <!--Sections-->
+  <!--Dialing Fragment-->
+  <!--History Fragment-->
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <!--ContactList Fragment-->
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <!--Notifications-->
+  <!--Call Fragment-->
+  <!--Text messages-->
+  <string name="send_message">Zie ozi</string>
+  <!--MediaPreferenceFragment-->
+  <!--Read contacts permission-->
+  <!--Write call log permission-->
+  <!--QRCode Scan-->
+  <!--Settings-->
+  <!--Conversation-->
+  <!--Contacts-->
+  <string name="wizard_next">Nke na-abịa</string>
+  <!--MenuHeaderView-->
+  <!--Share fragment-->
+  <!--Pending contact requests-->
+  <!--Send contact requests-->
+  <string name="send_request_button">Zie</string>
+  <!--Blacklist-->
+  <!--Smartlist-->
+  <!--File Transfer-->
+</resources>
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 2c48d72..2771b36 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
@@ -147,4 +147,5 @@
   <string name="no_contact_request">Nessuna richiesta di contatto inviata</string>
   <string name="contact_request_sent">Richiesta di contatto inviata</string>
   <string name="tv_contact_row_header">Contatti</string>
+  <!--File Transfer-->
 </resources>
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 81bfc5c..8a11e3e 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -33,6 +33,7 @@
   <string name="menu_item_home">Home</string>
   <string name="menu_item_contact_request">Richieste di contatto</string>
   <string name="menu_item_accounts">Gestisci profili</string>
+  <string name="menu_item_account">Gestione account</string>
   <string name="menu_item_settings">Impostazioni</string>
   <string name="menu_item_share">Condividi il mio contatto</string>
   <string name="menu_item_about">Info su Ring</string>
@@ -60,6 +61,13 @@
   <string name="notif_current_call_title">Chiamata in corso con %1$s</string>
   <string name="notif_current_call">Chiamata attiva</string>
   <string name="notif_channel_calls">Chiamate</string>
+  <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_mark_as_read">Segna come letto</string>
+  <string name="notif_incoming_file_transfer_title">File in arrivo</string>
+  <string name="notif_incoming_file_transfer">Qualcuno vuole inviarti un file</string>
+  <string name="action_open">Apri</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Tu</string>
   <string name="action_call_hangup">Riattacca</string>
@@ -84,6 +92,7 @@
   <string name="send_message">Invia messaggio</string>
   <string name="message_sending">Invio messaggio in corso...</string>
   <string name="time_just_now">Immediatamente</string>
+  <string name="send_file">Invia file</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Attivare videocamera</string>
   <string name="permission_dialog_camera_message">La videochiamata richiede l\'attivazione della videocamera. Concedi il permesso.</string>
@@ -111,6 +120,7 @@
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Aggiungi %1$s ?</string>
   <string name="prompt_new_password">Nuovo password</string>
+  <string name="prompt_new_password_optional">Nuova password (opzionale)</string>
   <string name="prompt_new_password_repeat">Ripeti la nuova password</string>
   <string name="account_create_title">Creare un account Ring</string>
   <string name="prompt_new_username">Inserisci il nuovo nome utente</string>
@@ -148,5 +158,23 @@
   <!--Smartlist-->
   <string name="no_contact_request">Nessuna richiesta di contatto inviata</string>
   <string name="contact_request_sent">Richiesta di contatto inviata</string>
+  <string name="search_results">Risultati Ricerca</string>
   <string name="tv_contact_row_header">Contatti</string>
+  <string name="gallery_error_title">Nessuna app Galleria trovata</string>
+  <string name="gallery_error_message">Nessuna applicazione trovata sul dispositivo per aprire la Galleria</string>
+  <string name="generic_error">È avvenuto un errore sconosciuto</string>
+  <!--File Transfer-->
+  <string name="invalid_file">File invalido</string>
+  <string name="not_able_to_write_file">Impossibile scrivere il file</string>
+  <string name="file_transfer_status_created">inizializzazione trasferimento</string>
+  <string name="file_transfer_status_unsupported">non supportato</string>
+  <string name="file_transfer_status_wait_peer_acceptance">in attesa approvazione del peer</string>
+  <string name="file_transfer_status_wait_host_acceptance">in attesa approvazione del host</string>
+  <string name="file_transfer_status_ongoing">in corso</string>
+  <string name="file_transfer_status_finished">finito</string>
+  <string name="file_transfer_status_closed_by_host">chiuso dal host</string>
+  <string name="file_transfer_status_closed_by_peer">chiuso dal peer</string>
+  <string name="file_transfer_status_invalid_pathname">Percorso non valido</string>
+  <string name="file_transfer_status_unjoinable_peer">peer non collegabile</string>
+  <string name="file_saved_in">File salvato in %s</string>
 </resources>
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 d88d953..2bdb136 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
@@ -20,6 +20,13 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- Call error -->
+    <string name="call_error_no_microphone">Chiamata cancellata. Nessun microfono rilevato.</string>
+    <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_incoming">In arrivo</string>
     <string name="call_human_state_connecting">Connessione in corso </string>
     <string name="call_human_state_ringing">Suonando</string>
     <string name="call_human_state_current">Parlando</string>
diff --git a/ring-android/app/src/main/res/values-it/strings_content_description.xml b/ring-android/app/src/main/res/values-it/strings_content_description.xml
index f172bf0..893ed1d 100644
--- a/ring-android/app/src/main/res/values-it/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-it/strings_content_description.xml
@@ -4,4 +4,5 @@
   <string name="contact_quick_call_description">Chiamata veloce</string>
   <string name="contact_picture_description">Foto del contatto</string>
   <string name="dial_numeric_pad">Tastiera numerica</string>
+  <string name="contact_unblock">Sblocca</string>
 </resources>
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 96d6b50..8a192ab 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
@@ -6,6 +6,8 @@
   <string name="pref_category_privacy">Privacy</string>
   <string name="pref_mobileData_title">Traffico dati mobile</string>
   <string name="pref_mobileData_summary">Attivare Ring su le rete 3G/LTE oltre che in Wi-Fi</string>
+  <string name="pref_pushNotifications_title">Push notifiche</string>
+  <string name="pref_pushNotifications_summary">Usa i server Google per ricevere chiamate/messaggi in background</string>
   <string name="pref_systemContacts_title">Usare i contatti del dispositivo</string>
   <string name="pref_systemContacts_summary">Usare i contatti del dispositivo per mostrare i dettagli di chi chiama. </string>
   <string name="pref_systemDialer_title">Usare Ring di default per le chiamate</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 e519ee4..2b54b9d 100644
--- a/ring-android/app/src/main/res/values-ja/strings.xml
+++ b/ring-android/app/src/main/res/values-ja/strings.xml
@@ -148,4 +148,5 @@
   <string name="no_contact_request">連絡先のリクエストは送信していません</string>
   <string name="contact_request_sent">連絡先のリクエストを送信しました</string>
   <string name="tv_contact_row_header">連絡先</string>
+  <!--File Transfer-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ko-rKR/strings.xml b/ring-android/app/src/main/res/values-ko-rKR/strings.xml
index 8b130dc..4883de8 100644
--- a/ring-android/app/src/main/res/values-ko-rKR/strings.xml
+++ b/ring-android/app/src/main/res/values-ko-rKR/strings.xml
@@ -34,4 +34,5 @@
   <!--Send contact requests-->
   <!--Blacklist-->
   <!--Smartlist-->
+  <!--File Transfer-->
 </resources>
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 47468c0..6ba175c 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -139,4 +139,5 @@
   <string name="no_contact_request">Jokia kontakto užklausa neišsiųsta</string>
   <string name="contact_request_sent">Kontakto užklausa išsiųsta</string>
   <string name="tv_contact_row_header">Kontaktai</string>
+  <!--File Transfer-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ms/strings.xml b/ring-android/app/src/main/res/values-ms/strings.xml
index eae57e9..0099184 100644
--- a/ring-android/app/src/main/res/values-ms/strings.xml
+++ b/ring-android/app/src/main/res/values-ms/strings.xml
@@ -115,4 +115,5 @@
   <!--Blacklist-->
   <!--Smartlist-->
   <string name="tv_contact_row_header">Kenalan</string>
+  <!--File Transfer-->
 </resources>
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 c83c148..6c0ba4f 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -158,4 +158,5 @@
   <string name="gallery_error_title">Fant ingen galleriprogrammer</string>
   <string name="gallery_error_message">Fant ingen programmer på enheten for åpning av galleri</string>
   <string name="generic_error">En ukjent feil inntraff</string>
+  <!--File Transfer-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings.xml b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
index 6c8c55f..326d5e4 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
@@ -48,4 +48,5 @@
   <!--Send contact requests-->
   <!--Blacklist-->
   <!--Smartlist-->
+  <!--File Transfer-->
 </resources>
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 ab290bc..b64d8b5 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -10,9 +10,9 @@
   <string name="version_section">Versie</string>
   <string name="no_email_app_installed">Geen e-mailapplicatie gevonden, installeer er een om ons een rapport te kunnen sturen</string>
   <string name="no_browser_app_installed">Geen webbrowsertoepassing gevonden, installeer er een om deze pagina te bekijken</string>
-  <string name="email_chooser_title">E-mail versturen met...</string>
-  <string name="website_chooser_title">Website bekijken met...</string>
-  <string name="license">Deze software wordt \"als zodanig\" aangeboden zonder enige garantie. Bekijk voor meer informatie
+  <string name="email_chooser_title">E-mail versturen met…</string>
+  <string name="website_chooser_title">Website bekijken met…</string>
+  <string name="license">Deze software wordt ‘als zodanig’ aangeboden zonder enige garantie. Bekijk voor meer informatie
 &lt;u&gt;GNU General Public License versie 3 of later&lt;/u&gt;</string>
   <string name="description">Ring is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigt.</string>
   <string name="credits">Credits</string>
@@ -22,7 +22,7 @@
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Geen netwerkverbinding</string>
-  <string name="error_mobile_network_available_but_disabled">Graag toegang geven tot mobiel netwerk in de instellingen.</string>
+  <string name="error_mobile_network_available_but_disabled">Geef toegang tot mobiel netwerk in de instellingen.</string>
   <!--AB menus-->
   <string name="ab_action_chat">Tekstberichten</string>
   <!--Left Drawer-->
@@ -47,7 +47,7 @@
     <item quantity="other">%d gesprekken</item>
   </plurals>
   <!--ContactList Fragment-->
-  <string name="searchbar_hint">Voer een naam of telefoonnummer in...</string>
+  <string name="searchbar_hint">Voer een naam of telefoonnummer in…</string>
   <string name="choose_number">Kies een nummer</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
@@ -63,7 +63,11 @@
   <string name="notif_channel_calls">Oproepen</string>
   <string name="notif_channel_messages">Berichten</string>
   <string name="notif_channel_requests">Verzoeken</string>
+  <string name="notif_channel_file_transfer">Bestandsoverdracht</string>
   <string name="notif_mark_as_read">Markeren als gelezen</string>
+  <string name="notif_incoming_file_transfer_title">Inkomende bestandsoverdracht</string>
+  <string name="notif_incoming_file_transfer">Iemand wil je een bestand sturen</string>
+  <string name="action_open">Openen</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Jij:</string>
   <string name="action_call_hangup">Ophangen</string>
@@ -86,8 +90,9 @@
   <string name="ab_action_flipcamera">Camera draaien</string>
   <!--Text messages-->
   <string name="send_message">Bericht versturen</string>
-  <string name="message_sending">Bericht wordt verstuurd...</string>
+  <string name="message_sending">Bericht wordt verstuurd…</string>
   <string name="time_just_now">Zojuist</string>
+  <string name="send_file">Bestand versturen</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Cameramachtiging</string>
   <string name="permission_dialog_camera_message">Videogesprekken vereisen machtiging voor gebruik van de camera. Gelieve te overwegen deze machtiging alsnog toe te kennen.</string>
@@ -95,7 +100,7 @@
   <string name="ringtone_error_format_not_supported">Dit formaat wordt niet ondersteund.</string>
   <string name="ringtone_error_size_too_big">Dit bestand is te groot. De maximale grootte is %1$ikB.</string>
   <!--Read contacts permission-->
-  <string name="permission_dialog_read_contacts_message">Ring vereist de \"Lees Contacten\" machtiging voor deze functie. Gelieve deze machtiging toe te kennen.</string>
+  <string name="permission_dialog_read_contacts_message">Ring vereist de ‘Contacten lezen’-machtiging voor deze functie. Gelieve deze machtiging toe te kennen.</string>
   <!--Write call log permission-->
   <string name="permission_dialog_write_call_log_message">Ring vereist de ‘Oproepgeschiedenis’-machtiging voor deze functie. Gelieve deze machtiging toe te kennen.</string>
   <!--QRCode Scan-->
@@ -121,7 +126,7 @@
   <string name="prompt_new_username">Voer nieuwe gebruikersnaam in</string>
   <string name="help_password_choose">Kies een sterk wachtwoord om je Ring-account te beschermen.</string>
   <string name="help_password_enter">Voer het hoofdwachtwoord van je Ring-account in</string>
-  <string name="help_pin_enter">Voer de pincode in vanuit je Ring-account die al is geconfigureerd op een ander apparaat. Gebruik de functie \"account exporteren naar de Ring\" om een pincode te verkrijgen.</string>
+  <string name="help_pin_enter">Voer de pincode in vanuit je Ring-account die al is geconfigureerd op een ander apparaat. Gebruik de functie ‘account exporteren naar de Ring’ om een pincode te verkrijgen.</string>
   <string name="wizard_next">Volgende</string>
   <string name="wizard_back">Terug</string>
   <!--MenuHeaderView-->
@@ -146,16 +151,30 @@
   <string name="no_requests">0 contactverzoeken</string>
   <!--Send contact requests-->
   <string name="send_request_button">Versturen</string>
-  <string name="send_request_title">Contactverzoek verzenden</string>
-  <string name="send_request_msg">Je moet een contactverzoek verzenden om met deze gebruiker te communiceren. Je kunt berichten versturen maar zolang de ander het verzoek niet aanvaardt zal deze ze niet kunnen lezen.</string>
+  <string name="send_request_title">Contactverzoek versturen</string>
+  <string name="send_request_msg">Je moet een contactverzoek versturen om met deze gebruiker te communiceren. Je kunt berichten versturen, maar zolang de ander het verzoek niet aanvaardt zal hij/zij deze niet kunnen lezen.</string>
   <!--Blacklist-->
   <string name="no_blocked_contact">0 geblokkeerde contacten</string>
   <!--Smartlist-->
-  <string name="no_contact_request">Geen contactverzoek verzonden</string>
-  <string name="contact_request_sent">Contactverzoek verzonden</string>
+  <string name="no_contact_request">Geen contactverzoek verstuurd</string>
+  <string name="contact_request_sent">Contactverzoek verstuurd</string>
   <string name="search_results">Zoekresultaten</string>
   <string name="tv_contact_row_header">Contacten</string>
   <string name="gallery_error_title">Geen Galerij-app gevonden</string>
   <string name="gallery_error_message">Geen app gevonden op dit apparaat om Galerij te openen</string>
   <string name="generic_error">Er is een onbekende fout opgetreden</string>
+  <!--File Transfer-->
+  <string name="invalid_file">Ongeldig bestand</string>
+  <string name="not_able_to_write_file">Kan bestand niet schrijven</string>
+  <string name="file_transfer_status_created">overdracht initialiseren</string>
+  <string name="file_transfer_status_unsupported">niet ondersteund</string>
+  <string name="file_transfer_status_wait_peer_acceptance">wachten op aanvaarding door peer</string>
+  <string name="file_transfer_status_wait_host_acceptance">wachten op aanvaarding door host</string>
+  <string name="file_transfer_status_ongoing">bezig</string>
+  <string name="file_transfer_status_finished">voltooid</string>
+  <string name="file_transfer_status_closed_by_host">gesloten door host</string>
+  <string name="file_transfer_status_closed_by_peer">gesloten door peer</string>
+  <string name="file_transfer_status_invalid_pathname">ongeldige padnaam</string>
+  <string name="file_transfer_status_unjoinable_peer">peer kan niet deelnemen</string>
+  <string name="file_saved_in">Bestand opgeslagen in %s</string>
 </resources>
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 1d4644f..6b3a940 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
@@ -17,9 +17,9 @@
   <string name="action_register">Registreren</string>
   <string name="error_field_required">Dit veld is verplicht</string>
   <string name="dialog_wait_create">Account wordt toegevoegd</string>
-  <string name="dialog_wait_create_details">Je nieuwe account wordt toegevoegd, even geduld...</string>
+  <string name="dialog_wait_create_details">Je nieuwe account wordt toegevoegd, even geduld…</string>
   <string name="dialog_wait_update">Account wordt bijgewerkt</string>
-  <string name="dialog_wait_update_details">Je account wordt bijgewerkt, even geduld...</string>
+  <string name="dialog_wait_update_details">Je account wordt bijgewerkt, even geduld…</string>
   <string name="dialog_warn_ip2ip_account_title">Lege SIP-account aanmaken?</string>
   <string name="dialog_warn_ip2ip_account_message">Je staat op het punt een SIP-account zonder geldige hostnaam toe te voegen.
 Je zal er enkel directe IP-oproepen mee kunnen maken en ontvangen.
@@ -81,6 +81,9 @@
   <string name="account_published_same_as_local_label">Gepubliceerd gelijk aan lokaal</string>
   <string name="account_published_port_label">Gepubliceerde poort</string>
   <string name="account_published_address_label">Gepubliceerd adres</string>
+  <string name="account_proxy_label">DHT-proxy</string>
+  <string name="account_proxy_enable_label">DHT-proxy gebruiken</string>
+  <string name="account_proxy_server_label">DHT-proxyadres</string>
   <!--Security Details-->
   <string name="account_credentials_label">Legitimatie</string>
   <string name="account_credentials_edit">Legitimatie wijzigen</string>
@@ -108,7 +111,7 @@
   <string name="account_new_device_password">Voer hoofdwachtwoord in om account te ontgrendelen</string>
   <string name="error_password_char_count">Minimaal 6 tekens</string>
   <string name="error_passwords_not_equals">Wachtwoorden komen niet overeen</string>
-  <string name="export_account_wait_title">Even geduld...</string>
+  <string name="export_account_wait_title">Even geduld…</string>
   <string name="export_account_wait_message">Nieuwe accountinformatie wordt gepubliceerd</string>
   <string name="account_export_end_decryption_message">Kon je account niet ontgrendelen met het opgegeven wachtwoord.</string>
   <string name="account_export_end_network_title">Netwerkfout</string>
@@ -146,7 +149,7 @@
   <string name="account_link_export_info">Om deze account op andere apparaten te gebruiken moet je deze eerst op Ring blootstellen. Er zal een pincode gegenereerd worden die je op het nieuwe apparaat invoert om de account in te stellen. De pincode is 10 minuten geldig.</string>
   <string name="account_start_export_button">Pincode genereren</string>
   <string name="account_end_export_button">sluiten</string>
-  <string name="account_end_export_infos">Je pincode is:\n\n%%\n\nOm het proces te voltooien open je Ring op het nieuwe apparaat. Maak een nieuwe account aan met \"Dit apparaat aan een account koppelen\". Je pincode is 10 minuten geldig.</string>
+  <string name="account_end_export_infos">Je pincode is:\n\n%%\n\nOm het proces te voltooien open je Ring op het nieuwe apparaat. Maak een nieuwe account aan met ‘Dit apparaat aan een account koppelen’. Je pincode is 10 minuten geldig.</string>
   <string name="account_link_export_info_light">Om deze account op andere apparaten te gebruiken moet je deze eerst op Ring blootstellen. Er zal een pincode gegenereerd worden die je op het nieuwe apparaat invoert om de account in te stellen. De pincode is 10 minuten geldig.</string>
   <string name="account_export_title">Apparaten toevoegen</string>
   <!--Name registration-->
@@ -177,7 +180,7 @@
   <string name="enter_password">Voer wachtwoord in</string>
   <string name="revoke_device_title">Apparaat terugtrekken</string>
   <string name="revoke_device_message">Weet je zeker dat je %1$s wil terugtrekken?</string>
-  <string name="revoke_device_wait_title">Even geduld...</string>
+  <string name="revoke_device_wait_title">Even geduld…</string>
   <string name="revoke_device_wait_message">Apparaat wordt teruggetrokken</string>
   <string name="rename_device_title">Dit apparaat hernoemen</string>
   <string name="rename_device_message">Kies een nieuwe naam om dit apparaat te identificeren in je Ring-account</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings_preferences.xml b/ring-android/app/src/main/res/values-nl/strings_preferences.xml
index e8aafe2..5a43ab0 100644
--- a/ring-android/app/src/main/res/values-nl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_preferences.xml
@@ -6,6 +6,8 @@
   <string name="pref_category_privacy">Privacy</string>
   <string name="pref_mobileData_title">Mobiele data</string>
   <string name="pref_mobileData_summary">Ring toestaan om 3G/LTE-netwerken te gebruiken naast Wi-Fi</string>
+  <string name="pref_pushNotifications_title">Pushmeldingen</string>
+  <string name="pref_pushNotifications_summary">Gebruik de servers van Google om oproepen/berichten in de achtergrond te kunnen ontvangen</string>
   <string name="pref_systemContacts_title">Systeemcontacten gebruiken</string>
   <string name="pref_systemContacts_summary">Systeemcontacten gebruiken om details beller te tonen</string>
   <string name="pref_systemDialer_title">Systeemoproepen plaatsen met Ring</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 34828fd..c4d05a5 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -34,4 +34,5 @@
   <!--Send contact requests-->
   <!--Blacklist-->
   <!--Smartlist-->
+  <!--File Transfer-->
 </resources>
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 39bd977..359610a 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
@@ -32,4 +32,5 @@
   <!--Send contact requests-->
   <!--Blacklist-->
   <!--Smartlist-->
+  <!--File Transfer-->
 </resources>
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 bd34e1f..1d177b6 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -33,6 +33,7 @@
   <string name="menu_item_home">Ekran główny</string>
   <string name="menu_item_contact_request">Zaproszenia</string>
   <string name="menu_item_accounts">Ustawienia kont</string>
+  <string name="menu_item_account">Zarządzaj kontem</string>
   <string name="menu_item_settings">Ustawienia</string>
   <string name="menu_item_share">Udostępnij mój kontakt</string>
   <string name="menu_item_about">O Ring</string>
@@ -62,6 +63,7 @@
   <string name="notif_current_call_title">Aktualna rozmowa z %1$s</string>
   <string name="notif_current_call">Aktualna rozmowa</string>
   <string name="notif_channel_calls">Rozmowy</string>
+  <string name="notif_channel_messages">Wiadomości</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Ty:</string>
   <string name="action_call_hangup">Rozłącz się</string>
@@ -113,6 +115,7 @@
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Dodać %1$s ?</string>
   <string name="prompt_new_password">Nowe hasło</string>
+  <string name="prompt_new_password_optional">Nowe hasło (opcjonalnie)</string>
   <string name="prompt_new_password_repeat">Powtórz nowe hasło</string>
   <string name="account_create_title">Stwórz konto Ring</string>
   <string name="prompt_new_username">Wprowadź nową nazwę użytkownika</string>
@@ -152,4 +155,5 @@
   <string name="contact_request_sent">Wysłano zaproszenie</string>
   <string name="search_results">Wyniki wyszukiwania</string>
   <string name="tv_contact_row_header">Kontakty</string>
+  <!--File Transfer-->
 </resources>
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 7203c59..0e84a39 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
@@ -143,13 +143,19 @@
   <string name="account_link_prompt_pin">Wprowadź PIN</string>
   <string name="account_new_button">Stwórz konto Ring</string>
   <string name="account_link_export_button">Połącz kolejne urządzenie z tym kontem</string>
+  <string name="account_link_export_info">Aby korzystać z tego konta na innych urządzeniach, musisz najpierw ujawnić je w Ring. To wygeneruje kod PIN, który musisz wprowadzić na nowym urządzeniu aby utworzyć konto. PIN jest ważny przez 10 minut. </string>
+  <string name="account_start_export_button">Generuj PIN</string>
   <string name="account_end_export_button">zamknij</string>
+  <string name="account_end_export_infos"> Twój PIN to:\n\n%%\n\nAby dokończyć proces, musisz otworzyć Ring na nowym urządzeniu. Stwórz nowe konto przez \"Połącz to urządzenie z kontem\". Twój PIN jest aktywny przez 10 minut. </string>
+  <string name="account_link_export_info_light">Aby korzystać z tego konta na innych urządzeniach, musisz najpierw ujawnić je w Ring. To wygeneruje kod PIN, który musisz wprowadzić na nowym urządzeniu aby utworzyć konto. PIN jest ważny przez 10 minut. </string>
+  <string name="account_export_title">Dodaj urządzenia</string>
   <!--Name registration-->
   <string name="error_username_empty">Wprowadź nazwę użytkownika</string>
   <string name="no_registered_name_for_account">Nie znaleziono żadnej nazwy zarejestrowanej dla tego konta </string>
   <string name="register_name">Zarejestruj nazwę</string>
   <string name="trying_to_register_name">Trwa próba rejestracji nazwy</string>
   <string name="registered_username">Zarejestruj nazwę użytkownika</string>
+  <string name="register_username">Zarejestruj publiczny login (zalecane)</string>
   <string name="username_already_taken">Nazwa użytkownika zajęta</string>
   <string name="invalid_username">Nieprawidłowa nazwa użytkownika</string>
   <string name="looking_for_username_availability">Sprawdzanie dostępności nazwy użytkownika...</string>
@@ -165,6 +171,7 @@
   <string name="account_link_title">Połącz to urządzenie</string>
   <string name="account_sip_cannot_be_registered">Nie można zarejestrować konta</string>
   <!--Edit profile-->
+  <string name="account_edit_profile">Edytuj swój profil</string>
   <!--Devices-->
   <string name="account_revoke_device_hint">Wprowadź hasło aby potwierdzić</string>
   <string name="enter_password">Wprowadź hasło</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 0a1c9df..80a2a9a 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
@@ -158,4 +158,5 @@
   <string name="gallery_error_title">Galeria de aplicativos não encontrada</string>
   <string name="gallery_error_message">Aplicativo não encontrado no dispositivo para abrir a Galeria</string>
   <string name="generic_error">Um erro desconhecido ocorreu</string>
+  <!--File Transfer-->
 </resources>
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 7cc9ab4..0a37a36 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -107,4 +107,5 @@
   <!--Blacklist-->
   <!--Smartlist-->
   <string name="tv_contact_row_header">Contatos</string>
+  <!--File Transfer-->
 </resources>
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 879d974..46b46ba 100644
--- a/ring-android/app/src/main/res/values-ro/strings.xml
+++ b/ring-android/app/src/main/res/values-ro/strings.xml
@@ -96,4 +96,5 @@
   <!--Send contact requests-->
   <!--Blacklist-->
   <!--Smartlist-->
+  <!--File Transfer-->
 </resources>
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 dcd50eb..3cf617b 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
@@ -107,4 +107,5 @@
   <!--Blacklist-->
   <!--Smartlist-->
   <string name="tv_contact_row_header">Контакты</string>
+  <!--File Transfer-->
 </resources>
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 e664d8d..9fc07c8 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -151,4 +151,5 @@
   <string name="no_contact_request">Нет отправленных запросов на добавление в контакты</string>
   <string name="contact_request_sent">Запрос на добавление в контакты отправлен</string>
   <string name="tv_contact_row_header">Контакты</string>
+  <!--File Transfer-->
 </resources>
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 303554a..42d8322 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
@@ -67,4 +67,5 @@
   <!--Blacklist-->
   <!--Smartlist-->
   <string name="tv_contact_row_header">Kontakty</string>
+  <!--File Transfer-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-sl/strings.xml b/ring-android/app/src/main/res/values-sl/strings.xml
index afbfdb1..0cad8d9 100644
--- a/ring-android/app/src/main/res/values-sl/strings.xml
+++ b/ring-android/app/src/main/res/values-sl/strings.xml
@@ -138,4 +138,5 @@
   <string name="no_contact_request">Ni bilo poslanih zahtev za stik</string>
   <string name="contact_request_sent">Zahteva za stik poslana</string>
   <string name="tv_contact_row_header">Stiki</string>
+  <!--File Transfer-->
 </resources>
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 370a0ef..4aea44b 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
@@ -154,4 +154,5 @@
   <string name="tv_contact_row_header">Kontakte</string>
   <string name="gallery_error_title">S\’u gjet aplikacion galerie</string>
   <string name="gallery_error_message">Në këtë pajisje s\’u gjet aplikacion për të hapur Galerinë</string>
+  <!--File Transfer-->
 </resources>
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 33ac913..b678cb8 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -63,7 +63,11 @@
   <string name="notif_channel_calls">Samtal</string>
   <string name="notif_channel_messages">Meddelanden</string>
   <string name="notif_channel_requests">Förfrågningar</string>
+  <string name="notif_channel_file_transfer">Filöverföring</string>
   <string name="notif_mark_as_read">Markera som läst</string>
+  <string name="notif_incoming_file_transfer_title">Inkommande filöverföring</string>
+  <string name="notif_incoming_file_transfer">Någon vill skicka en fil till dig</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>
@@ -88,6 +92,7 @@
   <string name="send_message">Skicka meddelande</string>
   <string name="message_sending">Skickar meddelande...</string>
   <string name="time_just_now">Just nu</string>
+  <string name="send_file">Skicka fil</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamerarättighet</string>
   <string name="permission_dialog_camera_message">Videokonversationer kräver kamerarättigheter. Överväg att aktivera det.</string>
@@ -158,4 +163,18 @@
   <string name="gallery_error_title">Ingen galleriapp hittades</string>
   <string name="gallery_error_message">Ingen app hittades på enheten, för att öppna Galleri</string>
   <string name="generic_error">Ett okänt fel inträffade</string>
+  <!--File Transfer-->
+  <string name="invalid_file">Ogiltig fil</string>
+  <string name="not_able_to_write_file">Kunde inte skriva fil</string>
+  <string name="file_transfer_status_created">Startar överföring</string>
+  <string name="file_transfer_status_unsupported">saknar stöd</string>
+  <string name="file_transfer_status_wait_peer_acceptance">väntar på motparts godkännande</string>
+  <string name="file_transfer_status_wait_host_acceptance">väntar på värddators godkännande</string>
+  <string name="file_transfer_status_ongoing">pågående</string>
+  <string name="file_transfer_status_finished">slutförd</string>
+  <string name="file_transfer_status_closed_by_host">stängd av värddatorn</string>
+  <string name="file_transfer_status_closed_by_peer">stängd av motpart</string>
+  <string name="file_transfer_status_invalid_pathname">ogiltigt sökvägsnamn</string>
+  <string name="file_transfer_status_unjoinable_peer">oanslutbar motpart</string>
+  <string name="file_saved_in">Fil sparad i %s</string>
 </resources>
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 5e1ed15..0847343 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
@@ -81,6 +81,9 @@
   <string name="account_published_same_as_local_label">Publicerad samma som lokal</string>
   <string name="account_published_port_label">Publicerad port</string>
   <string name="account_published_address_label">Publiserad adress</string>
+  <string name="account_proxy_label">DHT proxy</string>
+  <string name="account_proxy_enable_label">Använd DHT proxy</string>
+  <string name="account_proxy_server_label">DHT proxyadress</string>
   <!--Security Details-->
   <string name="account_credentials_label">Inloggningsuppgifter</string>
   <string name="account_credentials_edit">Redigera inloggningsuppgifter</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings_preferences.xml b/ring-android/app/src/main/res/values-sv/strings_preferences.xml
index d7a5a12..7dc3c5d 100644
--- a/ring-android/app/src/main/res/values-sv/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_preferences.xml
@@ -6,6 +6,8 @@
   <string name="pref_category_privacy">Sekretess</string>
   <string name="pref_mobileData_title">Mobildata</string>
   <string name="pref_mobileData_summary">Tillåt Ring på 3G/LTE-nätverk, som tillägg till WiFi</string>
+  <string name="pref_pushNotifications_title">Använd aviseringar</string>
+  <string name="pref_pushNotifications_summary">Använd Google-servrar för att ta emot samtal/meddelanden i bakgrunden</string>
   <string name="pref_systemContacts_title">Använd systemkontakter</string>
   <string name="pref_systemContacts_summary">Använd systemkontakter för att visa uppringaren info</string>
   <string name="pref_systemDialer_title">Använd Ring till systemsamtal</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 2c2a872..be0f322 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -149,4 +149,5 @@
   <string name="no_contact_request">Gönderilmiş bir iletişim isteği yok</string>
   <string name="contact_request_sent">İletişim isteği gönderildi</string>
   <string name="tv_contact_row_header">Kişiler</string>
+  <!--File Transfer-->
 </resources>
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 8eceb42..afbf6dc 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -12,6 +12,9 @@
   <string name="no_browser_app_installed">Не знайдено жодного браузера. Будь ласка, встановіть браузер, щоб переглянути цю сторінку.</string>
   <string name="email_chooser_title">Надіслати повідомлення за допомогою...</string>
   <string name="website_chooser_title">Переглянути сайт за допомогою...</string>
+  <string name="license">Це програмне забезпечення надається \"як є\", без будь-яких гарантій. Докладніше дивиться 
+&lt;u&gt;GNU General Public License version 3 or later&lt;/u&gt;</string>
+  <string name="description">Ring - це незалежне програмне забезпечення для спілкування, яке поважає свободу та конфіденційність своїх користувачів.</string>
   <string name="credits">Подяки</string>
   <!--About dialog-->
   <string name="developed_by">Розроблено</string>
@@ -138,4 +141,5 @@
   <!--Smartlist-->
   <string name="contact_request_sent">Запит контакту надіслано</string>
   <string name="tv_contact_row_header">Контакти</string>
+  <!--File Transfer-->
 </resources>
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 0276779..3af52e8 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
@@ -148,4 +148,5 @@
   <string name="contact_request_sent">联系人请求已发送</string>
   <string name="search_results">搜索结果</string>
   <string name="tv_contact_row_header">通讯录</string>
+  <!--File Transfer-->
 </resources>
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 ea9a6d4..a03409c 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
@@ -62,7 +62,11 @@
   <string name="notif_channel_calls">通話</string>
   <string name="notif_channel_messages">訊息</string>
   <string name="notif_channel_requests">請求</string>
+  <string name="notif_channel_file_transfer">檔案傳輸</string>
   <string name="notif_mark_as_read">標示為已讀</string>
+  <string name="notif_incoming_file_transfer_title">檔案傳入</string>
+  <string name="notif_incoming_file_transfer">有人想要傳送檔案給您</string>
+  <string name="action_open">開啟</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">你：</string>
   <string name="action_call_hangup">掛斷</string>
@@ -87,6 +91,7 @@
   <string name="send_message">傳送訊息</string>
   <string name="message_sending">正在傳送訊息...</string>
   <string name="time_just_now">剛剛</string>
+  <string name="send_file">傳送檔案</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">攝影機權限</string>
   <string name="permission_dialog_camera_message">視訊通話需要攝影機權限以正常運作。請考慮啟用它。</string>
@@ -157,4 +162,18 @@
   <string name="gallery_error_title">找不到相簿應用程式</string>
   <string name="gallery_error_message">在裝置上找不到可以開啟相簿的應用程式</string>
   <string name="generic_error">遇到未知的錯誤</string>
+  <!--File Transfer-->
+  <string name="invalid_file">無效的檔案</string>
+  <string name="not_able_to_write_file">無法寫入檔案</string>
+  <string name="file_transfer_status_created">正在初始化傳輸</string>
+  <string name="file_transfer_status_unsupported">不支援</string>
+  <string name="file_transfer_status_wait_peer_acceptance">正在等待對方接受</string>
+  <string name="file_transfer_status_wait_host_acceptance">正在等待主機接受</string>
+  <string name="file_transfer_status_ongoing">進行中</string>
+  <string name="file_transfer_status_finished">已結束</string>
+  <string name="file_transfer_status_closed_by_host">由主機關閉</string>
+  <string name="file_transfer_status_closed_by_peer">由對方關閉</string>
+  <string name="file_transfer_status_invalid_pathname">無效的路徑名稱</string>
+  <string name="file_transfer_status_unjoinable_peer">對方無法加入</string>
+  <string name="file_saved_in">檔案儲存在 %s</string>
 </resources>
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 f31b42d..3a26ac9 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
@@ -81,6 +81,9 @@
   <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>
   <!--Security Details-->
   <string name="account_credentials_label">憑證</string>
   <string name="account_credentials_edit">編輯憑證</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
index 5e9a898..6d07735 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
@@ -6,6 +6,8 @@
   <string name="pref_category_privacy">隱私</string>
   <string name="pref_mobileData_title">行動數據</string>
   <string name="pref_mobileData_summary">除了 Wi-Fi 之外，允許 Ring 在 3G/LTE 網路上使用</string>
+  <string name="pref_pushNotifications_title">推播通知</string>
+  <string name="pref_pushNotifications_summary">使用 Google 的伺服器以讓您可以在背景收到通話／訊息</string>
   <string name="pref_systemContacts_title">使用系統聯絡人</string>
   <string name="pref_systemContacts_summary">使用系統聯絡人顯示呼叫方的詳細資料</string>
   <string name="pref_systemDialer_title">使用Ring撥打系統的電話功能</string>
diff --git a/ring-android/app/src/main/res/values-zh/strings.xml b/ring-android/app/src/main/res/values-zh/strings.xml
index eb14a72..41d54a0 100644
--- a/ring-android/app/src/main/res/values-zh/strings.xml
+++ b/ring-android/app/src/main/res/values-zh/strings.xml
@@ -40,4 +40,5 @@
   <!--Blacklist-->
   <!--Smartlist-->
   <string name="tv_contact_row_header">聯絡人</string>
+  <!--File Transfer-->
 </resources>