diff --git a/jami-android/app/src/main/res/values-et/strings_account.xml b/jami-android/app/src/main/res/values-et/strings_account.xml
index 8324046d043d6b2a26436808a034b73dbb101250..d2126e465922008d3071a662c87a1d0448c2504f 100644
--- a/jami-android/app/src/main/res/values-et/strings_account.xml
+++ b/jami-android/app/src/main/res/values-et/strings_account.xml
@@ -8,244 +8,279 @@
   <string name="add_ring_account_title">Lisa kasutajakonto</string>
   <string name="add_sip_account_title">Lisa SIP-konto</string>
   <string name="ring_account_default_name">Jami kasutajakonto %1$s</string>
-  <string name="prompt_alias">Ãœldnimed</string>
-  <string name="prompt_hostname">Hostname</string>
+  <string name="prompt_alias">Alias</string>
+  <string name="prompt_hostname">Serveri nimi</string>
   <string name="prompt_username">Kasutajanimi</string>
-  <string name="prompt_password">Salaus</string>
-  <string name="action_create">Loe konto</string>
-  <string name="action_create_short">Looda</string>
-  <string name="action_register">Registreerimine</string>
-  <string name="action_settings">Seadused</string>
-  <string name="error_field_required">See välja on vajalik</string>
-  <string name="dialog_wait_create">Lisakontod</string>
-  <string name="dialog_wait_create_details">Palun oota, kuni teie uus konto lisatakse...</string>
-  <string name="dialog_wait_update">Päevastik</string>
-  <string name="dialog_wait_update_details">Palun oota, kuni teie uus konto uuendatakse...</string>
-  <string name="dialog_warn_ip2ip_account_title">Looda tühi SIP konto?</string>
-  <string name="dialog_warn_ip2ip_account_message">Sa oled valmis luua SIP konto ilma kehtiva võõrustaja nimega. Sa saad teha ja saada ainult otsest IP-kõnet. Saate oma konto hiljem muuta</string>
+  <string name="prompt_password">Salasõna</string>
+  <string name="action_create">Loo kasutajakonto</string>
+  <string name="action_create_short">Loo</string>
+  <string name="action_register">Registreeri</string>
+  <string name="action_settings">Seadistused</string>
+  <string name="error_field_required">See väli on nõutav</string>
+  <string name="dialog_wait_create">Lisame kasutajakontot</string>
+  <string name="dialog_wait_create_details">Palun oota, kuni sinu uus konto on lisatud...</string>
+  <string name="dialog_wait_update">Uuenda kasutajakontot</string>
+  <string name="dialog_wait_update_details">Palun oota, kuni sinu uue konto andmed on värskendatud...</string>
+  <string name="dialog_warn_ip2ip_account_title">Kas loome tühja SIP-konto?</string>
+  <string name="dialog_warn_ip2ip_account_message">Sa oled nüüd loomas SIP-kontot ilma teenindava serverita.
+Seega saad saad teha ja saada ainult otseseid IP-kõnesid.
+Saad oma kontot hiljem muuta</string>
   <string name="account_type_ip2ip">IP-konto</string>
-  <string name="help_ring">Jami konto võimaldab teil jõuda inimestega turvaliselt läbi täielikult jaotatud võrgu.</string>
-  <string name="help_sip_title">Lisage oma SIP konto</string>
-  <string name="help_sip">Konfigurada olemasolev SIP konto.</string>
-  <string name="create_sip_account">Lisada SIP konto</string>
+  <string name="help_ring">Jami konto kasutaja võimaldab sul suhelda inimestega turvaliselt läbi täielikult jaotatud võrgu.</string>
+  <string name="help_sip_title">Lisa oma SIP-konto</string>
+  <string name="help_sip">Seadista olemasolevat SIP-kontot.</string>
+  <string name="create_sip_account">Lisa SIP-konto</string>
   <!--Strings related to account deletion-->
-  <string name="account_delete_dialog_title">Kas kustutada konto?</string>
-  <string name="account_delete_dialog_message">Seda ei saa teha.</string>
+  <string name="account_delete_dialog_title">Kas kustutame kasutajakonto?</string>
+  <string name="account_delete_dialog_message">Seda toimingut ei saa tagasi pöörata.</string>
   <!--AccountManagementFragment-->
-  <string name="empty_account_list">Arvestus ei ole registreeritud</string>
-  <string name="normal_accounts_titles">Arvestused</string>
-  <string name="normal_devices_titles">Sisse ühendatud seadmed</string>
-  <string name="account_device_revoke">Kinnitusseadmed</string>
-  <string name="account_device_revocation_success_title">Edu</string>
-  <string name="account_device_revocation_success">Seadme on nüüd tühistatud!</string>
-  <string name="account_device_revocation_error_title">- Ma ei saa seadmet tagasi võtta.</string>
-  <string name="account_device_revocation_wrong_password">Valed parool.</string>
-  <string name="account_device_revocation_unknown_device">Tundmatu seadme.</string>
-  <string name="account_device_revocation_error_unknown">Tundmatu viga.</string>
-  <string name="account_password_change">Paraku paralleeli muutmine</string>
-  <string name="account_password_set">Lahjend seadmine</string>
-  <string name="account_password_summary">Hoia oma konto parooli.</string>
-  <string name="account_password_change_wait_message">Konto parooli muutmine</string>
+  <string name="empty_account_list">Kasutajakonto ei ole registreeritud</string>
+  <string name="normal_accounts_titles">Kasutajakontod</string>
+  <string name="normal_devices_titles">Seotud seadmed</string>
+  <string name="account_device_revoke">Eemalda seade</string>
+  <string name="account_device_revocation_success_title">Õnnestus</string>
+  <string name="account_device_revocation_success">Seade on nüüd eemaldatud seotud seadmete loendist!</string>
+  <string name="account_device_revocation_error_title">Seotud seadme eemaldamist ei saa tagasi pöörata</string>
+  <string name="account_device_revocation_wrong_password">Vigane salasõna.</string>
+  <string name="account_device_revocation_unknown_device">Tundmatu seade.</string>
+  <string name="account_device_revocation_error_unknown">Teadmata viga.</string>
+  <string name="account_password_change">Muuda salasõna</string>
+  <string name="account_password_set">Määra salasõna</string>
+  <string name="account_password_summary">Halda oma kasutajakonto salasõna.</string>
+  <string name="account_password_change_wait_message">Muudame kasutajakonto salasõna</string>
+  <string name="account_biometric_disable">Lülita biomeetriline tuvastamine välja</string>
+  <string name="account_biometric_set">Võta biomeetriline tuvastamine kasutusele</string>
+  <string name="account_biometric_summary">Halda oma kasutajakonto biomeetrilist tuvastamist.</string>
   <!--Basic Details-->
-  <string name="account_preferences_basic_tab">Ãœldne</string>
-  <string name="account_basic_category">Põhilised seadmed</string>
-  <string name="account_alias_label">Konton nimi</string>
-  <string name="account_hostname_label">Hostname</string>
-  <string name="account_bootstrap_label">Algatus</string>
-  <string name="account_username_label">Kasutaja nimi</string>
-  <string name="account_password_label">Salaus</string>
-  <string name="account_optionnal_category">Võimalised seaded</string>
-  <string name="account_useragent_label">Kasutajaagent</string>
-  <string name="account_autoanswer_label">Autotõhusa vastus</string>
-  <string name="account_rendezvous_label">Kohtumise moodi</string>
-  <string name="account_rendezvous_summary">Kohtumise moodis lisatakse sisselaskeid kõned konverentsisaali.</string>
-  <string name="account_upnp_label">UPnP aktiveerimine</string>
-  <string name="account_proxy_field">Vastutus</string>
+  <string name="account_preferences_basic_tab">Ãœldist</string>
+  <string name="account_basic_category">Põhiseadistused</string>
+  <string name="account_alias_label">Kasutajakonto nimi</string>
+  <string name="account_hostname_label">Serveri nimi</string>
+  <string name="account_bootstrap_label">Laadi mällu</string>
+  <string name="account_username_label">Kasutajanimi</string>
+  <string name="account_password_label">Salasõna</string>
+  <string name="account_optionnal_category">Täiendavad seadistused</string>
+  <string name="account_useragent_label">Rakenduse tunnusnimi</string>
+  <string name="account_autoanswer_label">Automaatne vastamine</string>
+  <string name="account_rendezvous_label">Koosoleku režiim</string>
+  <string name="account_rendezvous_summary">Koosolekurežiimiis lisatakse uued sisenevad kõned konverentsikõnele.</string>
+  <string name="account_upnp_label">Võta UPnP kasutusele</string>
+  <string name="account_proxy_field">Proksiserver</string>
   <!--Plugin Details-->
-  <string name="account_preference_plugin_tab">Plugins</string>
+  <string name="account_preference_plugin_tab">Pluginad</string>
   <!--Audio Details-->
   <string name="account_audio_label">Audio</string>
   <string name="account_preferences_media_tab">Meedia</string>
   <string name="account_ringtone_label">Helinad</string>
-  <string name="account_ringtone_enabled_label">Aktiveerige kõndide hääle.</string>
-  <string name="account_ringtone_path_label">Ringtone tee</string>
-  <string name="account_ringtone_custom_label">Kasutage kohandatud kõlingutoni</string>
-  <string name="account_ringtone_title">Vali kõlbelõna</string>
-  <string name="account_ringtone_summary">Vali kõlvitõne või vali oma</string>
+  <string name="account_ringtone_enabled_label">Võta helinad kasutusele</string>
+  <string name="account_ringtone_path_label">Helinafailide asukoht</string>
+  <string name="account_ringtone_custom_label">Kasuta kohandatud helinat</string>
+  <string name="account_ringtone_title">Vali helin</string>
+  <string name="account_ringtone_summary">Vali olemasolevate helinate hulgast või lisa enda oma</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
-  <string name="account_video_enable">Video aktiveerimine</string>
+  <string name="account_video_enable">Lülita video sisse</string>
   <!--Advanced Details-->
-  <string name="account_preferences_advanced_tab">Eelseisv</string>
-  <string name="account_read_receipts_label">Võimalda lugemisrecepti.</string>
-  <string name="account_read_receipts_summary">Saada ja saada kviitid, mis näitavad, et sõnum on näidatud.</string>
-  <string name="account_call_settings_title">Kõnesõnumite seaded</string>
-  <string name="account_dht_public_in_calls_label">Lase sisselaskeid kõnesid tundmatutest kontaktidest</string>
-  <string name="account_registration_exp_label">Registreerimine lõpeb</string>
-  <string name="account_local_interface_label">Kohalik kasutajaliideme</string>
-  <string name="account_local_port_label">Kohalik sadam</string>
-  <string name="account_stun_enable_label">Kasutage Stuni</string>
-  <string name="account_stun_server_label">Stun Server</string>
-  <string name="account_accept_files">Automaatselt aktsepteerida sisenevaid failid</string>
-  <string name="account_conversation_settings_title">Kõnelusseadmed</string>
-  <string name="account_accept_files_max_size">Maksimaalne automaatselt aktsepteeritav faili suurus</string>
-  <string name="account_accept_files_never">Ära kunagi automaatselt vastu võta</string>
-  <string name="account_accept_files_always">Võta alati automaatselt vastu</string>
-  <string name="size_mb">% 1$d MB</string>
-  <string name="account_turn_enable_label">Kasutage TURN</string>
-  <string name="account_turn_server_label">Turneeringu server</string>
-  <string name="account_turn_username_label">Kasutaja nimi TURN</string>
-  <string name="account_turn_password_label">VART-sõna</string>
+  <string name="account_preferences_advanced_tab">Täiendavad seadistused</string>
+  <string name="account_chat_settings_title">Vestkuse seadistused</string>
+  <string name="account_read_receipts_label">Võta lugemisteatised kasutusele</string>
+  <string name="account_read_receipts_summary">Lugemisteatised kinnitavad, et sõnumit on kuvatud.</string>
+  <string name="account_call_settings_title">Kõnede seadistused</string>
+  <string name="account_dht_public_in_calls_label">Luba kõnesid tundmatutelt kontaktidelt</string>
+  <string name="account_registration_exp_label">Registreerumise aegumine</string>
+  <string name="account_local_interface_label">Kohalik võrguliides</string>
+  <string name="account_local_port_label">Kohalik port</string>
+  <string name="account_stun_enable_label">Kasuta STUN\'i</string>
+  <string name="account_stun_server_label">STUN\'i server</string>
+  <string name="account_accept_files">Automaatselt nõustu saadetavate failide vastuvõtmisega</string>
+  <string name="account_conversation_settings_title">Vestluste seadistused</string>
+  <string name="account_accept_files_max_size">Automaatselt allalaaditava faili suuruse ülepiir</string>
+  <string name="account_accept_files_never">Ära kunagi nõustu automaatse allalaadimisega</string>
+  <string name="account_accept_files_always">Nõustu alati automaatse allalaadimisega</string>
+  <string name="size_mb">%1$d MB</string>
+  <string name="account_turn_enable_label">Kasuta TURN\'i</string>
+  <string name="account_turn_server_label">TURN\'i server</string>
+  <string name="account_turn_username_label">Kasutajanimi TURN\'i serveris</string>
+  <string name="account_turn_password_label">Salasõna TURN\'i serveris</string>
   <string name="account_published_same_as_local_label">Kohalikuga sama avaldatud</string>
-  <string name="account_published_port_label">Väljaandmine</string>
-  <string name="account_published_address_label">Väljaandmine</string>
-  <string name="disabled">Päris puudega</string>
-  <string name="enabled">Võimalus</string>
-  <string name="account_proxy_label">DHT-i esindaja</string>
-  <string name="account_proxy_enable_label">Kasutage DHT-i esindajat</string>
-  <string name="account_proxy_server_label">DHT-i esindaja aadress</string>
-  <string name="account_proxy_server_list_label">DHT proxy nimekirja URL</string>
-  <string name="account_sip_proxy_label">Vastutus</string>
-  <string name="account_peer_discovery_label">Kohalik eakaaslaste avastamine</string>
-  <string name="account_peer_discovery_enable_label">Võimalda kohalikku kaaslaste avastamist</string>
-  <string name="account_peer_discovery_enable_summary">Liidke teiste DHT-süsteemide võrgustikku.</string>
+  <string name="account_published_port_label">Avaldatav port</string>
+  <string name="account_published_address_label">Avaldatav aadress</string>
+  <string name="disabled">Väljalülitatud</string>
+  <string name="enabled">Sisselülitatud</string>
+  <string name="account_proxy_label">DHT proksiserver</string>
+  <string name="account_proxy_enable_label">Kasuta DHT proksiserverit</string>
+  <string name="account_proxy_server_label">DHT proksiserveri aadress</string>
+  <string name="account_proxy_server_list_label">DHT proksi url\'ide loend</string>
+  <string name="account_sip_proxy_label">Proksiserver</string>
+  <string name="account_peer_discovery_label">Kohalik võrdõigusvõrk</string>
+  <string name="account_peer_discovery_enable_label">Võimalda kohalikus võrgus võrdõigusvõrgu sõlmede tuvastamist</string>
+  <string name="account_peer_discovery_enable_summary">Loo ühendus DHT-sõlmedega kohalikus võrgus</string>
   <!--Security Details-->
-  <string name="account_credentials_label">Tähtisõnumid</string>
-  <string name="account_credentials_edit">Loetelu loetelu muutmine</string>
-  <string name="account_credentials_add">Lisada volitused</string>
+  <string name="account_credentials_label">Autentimistunnused</string>
+  <string name="account_credentials_edit">Muuda autentimistunnuseid</string>
+  <string name="account_credentials_add">Lisa autentimistunnuseid</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Turvalisus</string>
-  <string name="account_srtp_switch_label">Süüdides meediavoogid (SRTP)</string>
+  <string name="account_srtp_switch_label">Krüpti meediavood (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
-  <string name="account_tls_transport_switch_label">Kasuta TLS transpordi</string>
-  <string name="account_tls_port_label">TLS Kuulaja Port</string>
+  <string name="account_tls_transport_switch_label">Kasuta TLS-protokolli</string>
+  <string name="account_tls_port_label">Sissetulevate ühenduste TLS port</string>
   <string name="account_tls_certificate_list_label">Sertifitseerimisasutused</string>
-  <string name="account_tls_certificate_file_label">Sertifikaatide faili</string>
-  <string name="account_tls_private_key_file_label">Isikluslühi faili</string>
-  <string name="account_tls_password_label">Isikluslühi salasõna</string>
-  <string name="account_tls_method_label">TLS meetod</string>
-  <string name="account_tls_ciphers_label">TLS-sifirid</string>
+  <string name="account_tls_certificate_file_label">Sertifikaatide fail</string>
+  <string name="account_tls_private_key_file_label">Privaatvõtme fail</string>
+  <string name="account_tls_password_label">Privaatvõtme salasõna</string>
+  <string name="account_tls_method_label">TLS\'i meetod</string>
+  <string name="account_tls_ciphers_label">TLS\'i sifirid</string>
   <string name="account_tls_server_name_label">Serveri nimi</string>
-  <string name="account_tls_verify_server_label">Serveri kontrollimine</string>
-  <string name="account_tls_verify_client_label">Kliendi kontrollimine</string>
-  <string name="account_require_client_certificate_label">TLS nõuab kliendi sertifikaati</string>
-  <string name="account_tls_negotiation_timeout_sec">Läbirääkimiste aeg (sec)</string>
-  <string name="account_rtp_max_port">Maksimaalne</string>
-  <string name="account_rtp_min_port">Vähemus</string>
-  <string name="account_rtp_port_range">Audioporta RTP portiriin</string>
+  <string name="account_tls_verify_server_label">Verifitseeri server</string>
+  <string name="account_tls_verify_client_label">Verifitseeri klient</string>
+  <string name="account_require_client_certificate_label">TLS eeldab kliendi sertifikaati</string>
+  <string name="account_tls_negotiation_timeout_sec">Päringu aegumine (sekundites)</string>
+  <string name="account_rtp_max_port">Maksimaalselt</string>
+  <string name="account_rtp_min_port">Minimaalselt</string>
+  <string name="account_rtp_port_range">RTP audio kasutatav portide vahemik</string>
   <!--restore/backup-->
-  <string name="account_new_device_password">Kirjuta peamõistlus konto avamiseks</string>
-  <string name="error_password_char_count">Vähemalt 6 tähtaeg</string>
-  <string name="error_passwords_not_equals">Passwords ei vasta</string>
+  <string name="account_new_device_password">Kasutajakonto avamiseks sisesta üldine salasõna</string>
+  <string name="error_password_char_count">Vähemalt 6 tähemärki</string>
+  <string name="error_passwords_not_equals">Salasõnad ei klapi</string>
   <string name="export_account_wait_title">Palun oota...</string>
-  <string name="export_account_wait_message">Ekspordi konto andmed</string>
-  <string name="account_export_file">Varuskonto</string>
-  <string name="account_export_file_summary">Kasuta oma konto seadmesse, et hiljem taastada.</string>
-  <string name="account_export_end_decryption_message">Ma ei suutnud teie konto lukustada, kasutades antud parooli.</string>
+  <string name="export_account_wait_message">Ekspordime kasutajakonto andmed</string>
+  <string name="account_export_file">Varunda kasutajakonto</string>
+  <string name="account_export_file_summary">Hilisemaks taastamiseks varunda kasutajakonto oma seadmesse.</string>
+  <string name="account_export_end_decryption_message">Kasutades antud salasõna ei õnnestud sinu kasutajakontot avada.</string>
   <string name="account_export_end_network_title">Võrgu viga</string>
-  <string name="account_export_end_network_message">Võin võrgus konto eksportida.</string>
-  <string name="account_export_end_error_title">Vastused</string>
-  <string name="account_export_end_error_message">Ekspordi konto ei toimunud, toimus tundmatu viga.</string>
-  <string name="account_enter_password">Sisestage parool</string>
-  <string name="account_share_body">Võta ühendust minuga Jami jaotatud sideplatvormis \"%1$s\" kasutades: %2$s</string>
-  <string name="account_share_body_with_username">Võta minuga ühendust ja kasutage \"%1$s\" või minu avalikku kasutajanimi \"%2$s\" Jami levitatud sideplatvormis: %3$s</string>
-  <string name="account_contact_me">Võta ühendust Jamiga!</string>
-  <string name="update_account">Päevendamise konto</string>
-  <string name="account_migration">Teie Jami konto saab ajakohastada. Palun kirjutage oma parool.</string>
-  <string name="ring_account">Jami konto</string>
-  <string name="sip_account">SIP konto</string>
-  <string name="ring_account_identity">Isiku tunnus</string>
-  <string name="account_migration_title_dialog">Kontodeni rände</string>
-  <string name="account_migration_message_dialog">Kas soovite seda operatsiooni teha konto juhtimise ekraanil?</string>
-  <string name="account_update_needed">Vajaduse ajakohastamine</string>
-  <string name="account_cannot_be_found_title">Ma ei leia aru.</string>
-  <string name="account_cannot_be_found_message">Konti ei leidnud Jami võrgustikust. Veenduge, et see ekspordieritakse Jami\'le olemasoleva seadmest ja et krediidiandmed on õiged.</string>
-  <string name="account_sip_cannot_be_registered_message">Saate kontot luua jätkata või oma teavet siin muuta.</string>
-  <string name="account_no_network_title">Ma ei saa võrguga ühendust võtta.</string>
-  <string name="account_no_network_message">Ma ei saanud konto lisada, sest Jami ei saanud ühendust jagatud võrguga.</string>
-  <string name="account_device_added_title">Lisatud konto seadme</string>
-  <string name="account_device_added_message">Sa oled oma Jami kontot selle seadmega edukalt seadnud.</string>
-  <string name="account_device_updated_title">Kontoväline uuendati</string>
-  <string name="account_device_updated_message">Sa oled oma Jami kontot edukalt uuendanud.</string>
-  <string name="account_cannot_be_updated_message">Konto seadme ei saa ajakohastada.</string>
-  <string name="account_sip_success_title">Registreeritud Sip-konto</string>
-  <string name="account_sip_success_message">Te olete oma Sip-kontot edukalt registreerinud.</string>
-  <string name="account_sip_register_anyway">Registreeruge ikkagi.</string>
+  <string name="account_export_end_network_message">Kasutajakonto eksportimine võrku ei õnnestunud. Palun kontrolli võrguühenduse toimivust.</string>
+  <string name="account_export_end_error_title">Viga</string>
+  <string name="account_export_end_error_message">Kasutajakonto eksportimine ei õnnestunud. Tekkis tundmatu viga.</string>
+  <string name="account_enter_password">Sisesta salasõna</string>
+  <string name="account_share_body">Kasutades „%1$s“ suhtle minuga hajutatud suhtlusvõrgus Jami: %2$s</string>
+  <string name="account_share_body_with_username">Kasutades „%1$s“ või minu avalikku kasutajanime „%2$s“ suhtle minuga hajutatud suhtlusvõrgus Jami: %3$s</string>
+  <string name="account_contact_me">Suhtle minuga Jami võrgus!</string>
+  <string name="update_account">Uuenda kasutajakontot</string>
+  <string name="account_migration">Sinu Jami kasutajakontot saab ajakohastada.\nPalun sisesta oma salasõna.</string>
+  <string name="ring_account">Jami kasutajakonto</string>
+  <string name="sip_account">SIP-konto</string>
+  <string name="ring_account_identity">Identiteet</string>
+  <string name="account_migration_title_dialog">Kasutajakonto uuendus</string>
+  <string name="account_migration_message_dialog">Sinu kasutajakonto vajab ajakohastamist. Kas soovid selle tegevuse jaoks avada Kasutajakonto haldusvaate?</string>
+  <string name="account_update_needed">Ajakohastamine on vajalik</string>
+  <string name="account_cannot_be_found_title">Ma ei leia kasutajakontot</string>
+  <string name="account_cannot_be_found_message">Kasutajakontot ei leidu Jami võrgustikust.\nVeendu, et sa eksportisid ta Jami võrku olemasolevast seadmest ning et konto nimi ja salasõna on õiged.</string>
+  <string name="account_sip_cannot_be_registered_message">Sa saad jätkata kasutajakonto loomisega või muuta siinolevat teavet. Lisaks saad hiljem muuta andmeid kasutajakonto seadistustest.</string>
+  <string name="account_no_network_title">Ei õnnestu luua võrguühendust</string>
+  <string name="account_no_network_message">Kasutajakonto lisamine ei õnnestunud, sest Jami ei saanud ühendust hajutatud võrguga. Palun kontrolli oma seadme võrguühenduse toimivust.</string>
+  <string name="account_device_added_title">Kasutajakonto seade on lisatud</string>
+  <string name="account_device_added_message">Sa oled oma Jami kasutajakonto selles seadmes edukalt seadistanud.</string>
+  <string name="account_device_updated_title">Kasutajakonto seade on uuendatud</string>
+  <string name="account_device_updated_message">Sa oled oma Jami kasutajakontot edukalt uuendanud.</string>
+  <string name="account_cannot_be_updated_message">Kasutajakonto seadet ei saa uuendada. Palun kontrolli, et salasõna on õige.</string>
+  <string name="account_sip_success_title">SIP-konto on registreeritud</string>
+  <string name="account_sip_success_message">Sa oled oma SIP-konto edukalt registreerinud.</string>
+  <string name="account_sip_register_anyway">Registreeru ikkagi</string>
   <!--TV-->
-  <string name="account_tv_settings_header">Kontode seaded</string>
-  <string name="account_tv_advance_settings_header">Arenenud seadmed</string>
+  <string name="account_tv_settings_header">Kasutajakonto seadistused</string>
+  <string name="account_tv_advance_settings_header">Täiendavad seadistused</string>
   <string name="account_tv_add_contact">Lisada kontakt</string>
-  <string name="account_tv_advanced_settings">Muuda üldised seaded</string>
-  <string name="account_tv_about">Jami kohta</string>
+  <string name="account_tv_advanced_settings">Muuda üldised seadistusi</string>
+  <string name="account_tv_about">Teave Jami kohta</string>
   <string name="tv_about_version">Versioon</string>
   <string name="tv_about_license">Litsents</string>
   <string name="tv_about_author">Autoriõigused</string>
-  <string name="tv_about_credits">Krediidid</string>
-  <string name="account_link_device">Sõltumine teisest seadmest</string>
-  <string name="account_link_button">Sõltumine võrku kaudu</string>
-  <string name="account_link_archive_button">Sähkord varasemalt</string>
-  <string name="account_link_prompt_pin">Sisesta PIN-aeg</string>
-  <string name="account_new_button">Loe Jami konto</string>
-  <string name="account_link_export_button">Sõlgke uus seadme</string>
+  <string name="tv_about_credits">Tänuavaldused</string>
+  <string name="account_link_device">Loo ühendus teisest seadmest</string>
+  <string name="account_link_button">Loo ühendus võrgu kaudu</string>
+  <string name="account_link_archive_button">Loo ühendus varukoopia abil</string>
+  <string name="account_link_prompt_pin">Sisesta PIN-kood</string>
+  <string name="account_new_button">Loo Jami kasutajakonto</string>
+  <string name="account_link_export_button">Seo uus seade</string>
   <string name="account_link_show_button">Näita %d rohkem sidestatud seadmeid</string>
-  <string name="account_link_hide_button">Varjupaigast ühendatud seadme</string>
-  <string name="account_link_export_info">Kui soovite kasutada konto teiste seadmetel, peate selle esmalt Jami\'le avaldama. See genereerib PIN-kood, mida peate uue seadme sisse sisestama konto seadmiseks. PIN on kehtiv 10 minutit.</string>
-  <string name="account_start_export_button">Loe PIN-i</string>
-  <string name="account_end_export_button">lähedal</string>
-  <string name="account_end_export_infos">Teie PIN on:\n\n%%\n\nProsessi lõpetamiseks peate avama Jami uuel seadmel. Looda uus konto \"Ühendage see seadme kontoga\". Teie PIN on kehtiv 10 minutit.</string>
-  <string name="account_link_export_info_light">Kui soovite kasutada konto teiste seadmetel, peate selle esmalt Jami\'le avaldama. See genereerib PIN-kood, mida peate uue seadme sisse sisestama konto seadmiseks. PIN on kehtiv 10 minutit.</string>
-  <string name="account_export_title">Link konto teiste seadmetega</string>
-  <string name="account_connect_server_button">Liidumine haldusserveriga</string>
-  <string name="account_connect_button">Sõltuv</string>
-  <string name="prompt_server">Jami juhtimisserveri URL</string>
-  <string name="help_credentials_enter">Sisestage oma organisatsioonide tunnused</string>
-  <string name="help_connect_password_enter">Sisestage oma organisatsioon parool</string>
-  <string name="account_connect_prompt_username">Kasutaja nimi</string>
+  <string name="account_link_hide_button">Peida ühendatud seade</string>
+  <string name="account_link_export_info">Kui soovid kasutada seda kontot teistes seadmetes, pead selle esmalt Jami võrgus avaldama. Selle käigus luuakse PIN-kood, mille pead uues seadmes kasutajakonto lisamisel sisestama. PIN-kood on kehtiv 10 minutit.</string>
+  <string name="account_start_export_button">Loo PIN-kood</string>
+  <string name="account_end_export_button">sulge</string>
+  <string name="account_end_export_infos">Sinu PIN-kood on:\n\n%%\n\nTegevuse lõpetamiseks pead avama Jami uues seadmes. Uue konto lisamiseks kasuta valikut „Ühenda see seade olemasoleva kasutajakontoga“. Sinu PIN-kood on kehtiv 10 minutit.</string>
+  <string name="account_link_export_info_light">Kui soovid kasutada seda kontot teistes seadmetes, pead selle esmalt Jami võrgus avaldama. Selle käigus luuakse PIN-kood, mille pead uues seadmes kasutajakonto lisamisel sisestama. PIN-kood on kehtiv 10 minutit.</string>
+  <string name="account_export_title">Ãœhenda kasutajakonto muude seadmetega</string>
+  <string name="account_connect_server_button">Ãœhenda kasutajakonto haldusserveriga</string>
+  <string name="account_connect_button">Ãœhenda</string>
+  <string name="prompt_server">Jami haldusserveri aadress</string>
+  <string name="help_credentials_enter">Sisesta oma organisatsiooni kasutajanimi</string>
+  <string name="help_connect_password_enter">Sisesta oma organisatsiooni salasõna</string>
+  <string name="account_connect_prompt_username">Kasutajanimi</string>
   <!--Name registration-->
   <string name="error_username_empty">Sisesta kasutajanimi</string>
-  <string name="no_registered_name_for_account">Ei ole registreeritud nime</string>
-  <string name="username_available">Kasutaja nimi on saadaval!</string>
-  <string name="register_name">Registreeritud nimi</string>
-  <string name="trying_to_register_name">Püüan nime registreerida.</string>
+  <string name="no_registered_name_for_account">Ei ole registreeritud kasutajanime</string>
+  <string name="username_available">Kasutajanimi on saadaval!</string>
+  <string name="register_name">Registreeri nimi</string>
+  <string name="trying_to_register_name">Püüan nime registreerida</string>
   <string name="registered_username">Registreeritud kasutajanimi</string>
   <string name="register_username">Registreerige avalik kasutajanimi</string>
   <string name="register_recommended">Soovitatav</string>
-  <string name="username_already_taken">Kasutaja nimi juba võetud</string>
-  <string name="invalid_username">Vaevalt kasutajanimi</string>
-  <string name="unknown_error">Tundmatu viga. Palun kontrollige oma võrguühendust!</string>
-  <string name="looking_for_username_availability">Otsime kasutajanimi kättesaadavust...</string>
-  <string name="account_status_connecting">Ãœhendab</string>
-  <string name="account_status_connection_error">Sissevõtte viga</string>
-  <string name="account_status_online">Internetis</string>
-  <string name="account_status_unknown">- Ei ole teada</string>
-  <string name="account_status_offline">OFFLINE</string>
-  <string name="account_status_error">Vastused</string>
+  <string name="username_already_taken">Kasutajanimi on juba võetud</string>
+  <string name="invalid_username">Vigane kasutajanimi</string>
+  <string name="unknown_error">Tundmatu viga. Palun kontrolli oma nutiseadme võrguühendust!</string>
+  <string name="looking_for_username_availability">Uurime kasutajanime kättesaadavust...</string>
+  <string name="account_status_connecting">Ãœhendame</string>
+  <string name="account_status_connection_error">Ãœhenduse viga </string>
+  <string name="account_status_online">Võrgus</string>
+  <string name="account_status_unknown">Pole teada</string>
+  <string name="account_status_offline">Pole võrgus</string>
+  <string name="account_status_error">Viga</string>
   <!--Create account-->
-  <string name="account_creation_home">Tere tulemast Jami\'sse.</string>
-  <string name="account_creation_profile">Loe oma profiil</string>
-  <string name="account_creation_ring">Loe oma Jami konto</string>
-  <string name="account_link_title">Sõlgke see seadme</string>
-  <string name="account_sip_cannot_be_registered">Ma ei saa konto registreerida.</string>
+  <string name="account_creation_home">Tere tulemast kasutama suhtlusrakendust Jami</string>
+  <string name="account_creation_profile">Loo oma profiil</string>
+  <string name="account_creation_ring">Loo oma Jami kasutajakonto</string>
+  <string name="account_link_title">Seosta see nutiseade</string>
+  <string name="account_sip_cannot_be_registered">Kasutajakonto registreerimine ei õnnestu</string>
   <!--Edit profile-->
-  <string name="account_edit_profile">Mu konto muutmine</string>
+  <string name="account_edit_profile">Muma minu kasutajakontot</string>
   <!--Devices-->
-  <string name="account_revoke_device_hint">Sisestage kinnitamiseks salasõna</string>
-  <string name="enter_password">Sisestage parool</string>
-  <string name="revoke_device_title">Kinnitusseadmed</string>
-  <string name="revoke_device_message">Oled kindel, et tahad %1$s tühistada?</string>
+  <string name="account_revoke_device_hint">Kinnitamiseks sisesta salasõna</string>
+  <string name="enter_password">Sisesta salasõna</string>
+  <string name="revoke_device_title">Eemalda seade</string>
+  <string name="revoke_device_message">Kas oled kindel, et tahad %1$s seadme eemaldada?</string>
   <string name="revoke_device_wait_title">Palun oota...</string>
-  <string name="revoke_device_wait_message">Kinnitussevõtuvahend</string>
-  <string name="rename_device_title">Nimetage see seadme ümber</string>
-  <string name="rename_device_message">Valige uue nime, et tuvastada selle seadme oma Jami konto</string>
-  <string name="rename_device_button">Nimetusseadme ümber nimetamine</string>
+  <string name="revoke_device_wait_message">Eemaldame seadet</string>
+  <string name="rename_device_title">Muuda selle seadme nime</string>
+  <string name="rename_device_message">Vali uus nimi selle seadme seostamiseks sinu Jami kasutajakontoga</string>
+  <string name="rename_device_button">Muuda seadme nime</string>
   <string name="account_rename_device_hint">Vali uus seadme nimi</string>
-  <string name="account_device_name_empty">seadme nimi ei saa olla tühi.</string>
-  <string name="account_device_this_indicator">See seadme</string>
-  <string name="account_disabled_indicator">puudega</string>
+  <string name="account_device_name_empty">Seadme nimi ei saa olla tühi</string>
+  <string name="account_device_this_indicator">See seade</string>
+  <string name="account_disabled_indicator">väljalülitatud</string>
   <!--Link a new device-->
-  <string name="error_format_not_supported">See formaat ei toeta.</string>
-  <string name="account_link_device_title">Siduge uus seade</string>
-  <string name="account_link_device_button">Sõltuv</string>
+  <string name="account_link_prompt_pin_manually">Sisesta PIN-kood käsitsi</string>
+  <string name="qr_invalid">See pole Jami autentimiseks mõeldud QR-kood</string>
+  <string name="content_description_checkbox">Sinu näidatud QR-kood on vigane</string>
+  <string name="error_format_not_supported">See vorming pole toetatud</string>
+  <string name="account_link_info">Uues Jami rakenduses kas skaneeri seda QR-koodi või sisesta PIN-kood käsitsi.</string>
+  <string name="account_link_device_title">Seo uus seade</string>
+  <string name="account_link_password">Selle kasutajakonto andmed on krüptitud salasõnaga. PIN-koodi loomiseks palun sisesta oma salasõna.</string>
+  <string name="account_link_generate_button">Loo</string>
+  <string name="account_link_time_valid">See PIN-kood saab olema vigane: %1$s.</string>
+  <string name="account_link_device_info">Oma teisest Jami rakendusest vali „Seo uus seade“ ning kuva QR-koodi või sisesta PIN-kood</string>
+  <string name="account_generate_export_device">Teises seadmes</string>
+  <string name="account_generate_export_info">Paigalda ja käivita Jami ning vali „Impordi teisest seadmest“ ning skaneeri QR-koodi.</string>
+  <string name="content_description_qr_generated">Sinu QR-kood</string>
+  <string name="account_generate_export_invalid">See PIN-kood enam ei kehti. Uue seadme sidumiseks sisesta salasõna ja loo uus PIN-kood.</string>
+  <string name="account_generate_export_invalid_two">See PIN-kood enam ei kehti. Uue seadme sidumiseks loo uus PIN-kood.</string>
+  <string name="help_pin_info">Täida, kui konto on salasõnaga krüptitud</string>
+  <string name="connect_device_scanqr">Skaneeri QR-koodi</string>
+  <string name="connect_device_enterPIN">või sisesta PIN-kood</string>
+  <string name="account_link_device_button">Ãœhenda</string>
   <!--Biometry-->
+  <string name="account_biometry_auth_title">Eemalda Jami kasutajakonto lukustus</string>
+  <string name="account_biometry_auth_message">Oma kasutajakonto avamiseks kasuta biomeetrilist tuvastust</string>
+  <string name="account_biometry_enroll_title">Kas kasutame biomeetrilist tuvastamist?</string>
+  <string name="account_biometry_enroll_message">Sinu nutiseade võimaldab kasutada biomeetrilist tuvastamist
+See pakub täiendava mugava ligipääsu sinu Jami kasutajakontole. Jätkuvalt jääb alles võimalus kasutada salasõna.</string>
+  <string name="account_biometry_enroll_accept">Kasuta biomeetrilist tuvastamist</string>
+  <string name="no_thanks">Tänan, ei</string>
+  <string name="account_biometry_enroll_auth_title">Lisa oma Jami kasutajakontole tuvastamine</string>
+  <string name="account_biometry_enroll_auth_message">Alternatiiviks salasõnale lisa oma kasutajakontole biomeetriline või seadmepõhine tuvastamine</string>
+  <string name="account_auth_error">Viga tuvastamisel: %1$s</string>
+  <string name="account_auth_success">Tuvastamine õnnestus</string>
+  <string name="account_auth_key_error">Kasutajakonto võtme dekrüptimine ei õnnestunud</string>
+  <string name="account_auth_password">Kasuta konto salasõna</string>
 </resources>
diff --git a/jami-android/app/src/main/res/values-et/strings_call.xml b/jami-android/app/src/main/res/values-et/strings_call.xml
index 84b0796d579331867e88f4df430a50290614b180..b447cae16cf5f8f5ebfed65c362e7c9298596a5a 100644
--- a/jami-android/app/src/main/res/values-et/strings_call.xml
+++ b/jami-android/app/src/main/res/values-et/strings_call.xml
@@ -22,20 +22,20 @@ along with this program; if not, write to the Free Software
     <string name="call_error_no_camera_no_microphone">Kõne tühistati. Kaamerat ega mikrofoni ei tuvastatud.</string>
 
     <!-- SipCalls -->
-    <string name="call_human_state_searching">Otsimine</string>
-    <string name="call_human_state_incoming">Sisenevad</string>
-    <string name="call_human_state_connecting">Ãœhendab</string>
+    <string name="call_human_state_searching">Otsime</string>
+    <string name="call_human_state_incoming">Saabuv kõne</string>
+    <string name="call_human_state_connecting">Ãœhendame</string>
     <string name="call_human_state_ringing">Heliseb</string>
-    <string name="call_human_state_current">Rääkimine</string>
+    <string name="call_human_state_current">Kõne on pooleli</string>
     <string name="call_human_state_hungup">Lõpetatud</string>
     <string name="call_human_state_busy">Kinni</string>
     <string name="call_human_state_failure">Ebaõnnestunud</string>
-    <string name="call_human_state_hold">Hoia kinni.</string>
-    <string name="call_human_state_unhold">- Ei, ei.</string>
+    <string name="call_human_state_hold">Pane ootele</string>
+    <string name="call_human_state_unhold">Võta ootelt</string>
     <string name="call_human_state_over">Lõpetatud</string>
     <!-- Conferences -->
     <string name="call_moderator">Moderaator</string>
-    <string name="call_muted">Päris vaikne</string>
+    <string name="call_muted">Summutatud</string>
     <string name="call_handRaised">Märguanne käega</string>
 
 </resources>
\ No newline at end of file
diff --git a/jami-android/app/src/main/res/values-et/strings_content_description.xml b/jami-android/app/src/main/res/values-et/strings_content_description.xml
index 90a5da182aa2a449936c3c87995654f9017f18b1..e03d32a78fd3d391dfb4a59bd837808b553240bf 100644
--- a/jami-android/app/src/main/res/values-et/strings_content_description.xml
+++ b/jami-android/app/src/main/res/values-et/strings_content_description.xml
@@ -1,12 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings for xml content description of images-->
-  <string name="contact_quick_call_description">Kiire helistamine</string>
+  <string name="contact_quick_call_description">Kiirhelistamine</string>
   <string name="contact_picture_description">Kontakti pilt</string>
   <string name="dial_numeric_pad">Valimisklahvistik</string>
-  <string name="contact_unblock">Lükka lahti.</string>
-  <string name="video_plugins">Videovähed</string>
-  <string name="file_download_button">Lase alla</string>
-  <string name="control_play">Mängi</string>
-  <string name="control_pause">Pause</string>
+  <string name="contact_unblock">Eemalda blokeering</string>
+  <string name="video_plugins">Videopluginad</string>
+  <string name="file_download_button">Laadi alla</string>
+  <string name="control_play">Esita</string>
+  <string name="control_replay">Korda esitust</string>
+  <string name="control_pause">Peata</string>
 </resources>
diff --git a/jami-android/app/src/main/res/values-et/strings_preferences.xml b/jami-android/app/src/main/res/values-et/strings_preferences.xml
index fdca37fd7e279aa970b74cc12bdf089a4020a0e7..1d6fa23df8e86d6f90cf2aa39d01413a141d8175 100644
--- a/jami-android/app/src/main/res/values-et/strings_preferences.xml
+++ b/jami-android/app/src/main/res/values-et/strings_preferences.xml
@@ -1,71 +1,74 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="pref_category_network">Võrgu</string>
+  <string name="pref_category_network">Võrk</string>
   <string name="pref_category_contacts">Kontaktid</string>
   <string name="pref_category_video">Video</string>
   <string name="pref_category_system">Süsteem</string>
-  <string name="pref_category_privacy">Isiklus</string>
-  <string name="pref_category_diagnostic">Diagnoostik</string>
-  <string name="pref_mobileData_title">Mobiilsed andmed</string>
-  <string name="pref_mobileData_summary">Lase Jami\'ile kasutada 3G/LTE võrke lisaks Wi-Fi\'le</string>
-  <string name="pref_pushNotifications_title">Push-tunnistused</string>
+  <string name="pref_category_privacy">Privaatsus</string>
+  <string name="pref_category_diagnostic">Diagnostika</string>
+  <string name="pref_mobileData_title">Mobiilne andmeside</string>
+  <string name="pref_mobileData_summary">Lisaks WiFi võrkudel luba, et Jami kasutab 3G/LTE võrke</string>
+  <string name="pref_pushNotifications_title">Tõuketeavitused</string>
   <string name="pref_pushNotif_summary" translatable="false"></string>
-  <string name="pref_pushNotifications_summary">Kasutage Google\'i serverid, et saada kõne/sõnumid taustal</string>
-  <string name="pref_unifiedPush_summary">Kasutage UnifiedPush teenust, et saada kõne/sõnumid taustal</string>
-  <string name="pref_video_advanced_title">Arenenud videoseisundid</string>
-  <string name="pref_video_advanced_summary">Muuda videobitrate, resolutsiooni ning juurdepääsu eksperimentaalseid funktsioone</string>
-  <string name="pref_hd_summary">Võimalda saata HD-video</string>
-  <string name="pref_hwEncode_title">Kasvata kiirendatud koodierimine</string>
-  <string name="pref_hwEncode_summary">Eksperimentaalne funktsioon</string>
-  <string name="pref_videoBitrate_title">Videobitrit</string>
-  <string name="pref_videoBitrate_summary">Valita väljakujäänud videobitrit (KB/s)</string>
-  <string name="pref_videoResolution_title">Videorealuutlikkus</string>
-  <string name="pref_videoResolution_summary">Valita väljakujäänud video resolutsiooni</string>
-  <string name="pref_systemContacts_title">Kasutage süsteemi kontakte</string>
-  <string name="pref_systemContacts_summary">Kasutage süsteemi kontaktide abil kõneleja üksikasju.</string>
-  <string name="pref_systemDialer_title">Järjestluse kõnetes Jami abil</string>
-  <string name="pref_systemDialer_summary">Kasuta Jami\'t, et teha süsteemi kõned, kui võimalik.</string>
-  <string name="pref_startOnBoot_title">Alusta Jami alguses</string>
-  <string name="pref_startOnBoot_summary">Käivita Jami taustal, kui süsteem algab.</string>
+  <string name="pref_pushNotifications_summary">Kõnede ja sõnumite taustateavituste jaoks kasuta Google\'i serverid</string>
+  <string name="pref_unifiedPush_summary">Kõnede ja sõnumite taustateavituste jaoks kasuta UnifiedPush teenust</string>
+  <string name="pref_video_advanced_title">Täiendavad videoseadistused</string>
+  <string name="pref_video_advanced_summary">Muuda video bitikiirust, resolutsiooni ning proovi katselisi seadistusi</string>
+  <string name="pref_hd_summary">Võimalda kõrgresolutsiooniga video saatmist</string>
+  <string name="pref_hwEncode_title">Kasuta video kodeerimisel raudvaralist kiirendamist</string>
+  <string name="pref_hwEncode_summary">Katseline funktsionaalsus</string>
+  <string name="pref_videoBitrate_title">Video bitikiirus</string>
+  <string name="pref_videoBitrate_summary">Vali saadetava meedia jaoks vaikimisi video bitikiirus (KB/s)</string>
+  <string name="pref_videoResolution_title">Video resolutsioon</string>
+  <string name="pref_videoResolution_summary">Vali saadetava meedia jaoks vaikimisi video resolutsioon</string>
+  <string name="pref_systemContacts_title">Kasuta süsteemi kontakte</string>
+  <string name="pref_systemContacts_summary">Teise osapoole andmete kuvamiseks kasuta süsteemi kontakte</string>
+  <string name="pref_systemDialer_title">Tee süsteemi kõned Jami abil</string>
+  <string name="pref_systemDialer_summary">Kui vähegi võimalik kasuta Jami rakendust süsteemi kõnede jaoks</string>
+  <string name="pref_startOnBoot_title">Käivita Jami nutiseadme käivitamisel</string>
+  <string name="pref_startOnBoot_summary">Sinu nutiseadme käivitamisel pane Jami taustal tööle.</string>
   <string name="pref_clearHistory_title">Kustuta ajalugu</string>
-  <string name="pref_clearHistory_summary">Puhasta kõik vestlushistoriad.</string>
-  <string name="pref_notification_title">Teatise nähtavus</string>
-  <string name="pref_notification_summary">Seada rakenduse teated lukku ekraanil nähtavaks.</string>
-  <string name="pref_blackList_title">Blokeeritud nimekiri</string>
-  <string name="pref_blackList_summary">Vaata oma blokeerimata nimekirja.</string>
-  <string name="pref_delete_account_title">Pöörake konto kustutama</string>
-  <string name="pref_delete_account_summary">Kasuta oma konto selle seadmest</string>
-  <string name="pref_persistNotification_title">Käivitamine taustal</string>
-  <string name="pref_persistNotification_summary">Lase käia taustal, et saada helisid ja sõnumid.</string>
-  <string name="pref_newGroup_title">Võimalda rühma kleit</string>
-  <string name="pref_newGroup_summary">Võimalda Jami\'s rühmad luua.</string>
+  <string name="pref_clearHistory_summary">Kustuta kogu vestluste ajalugu. Seda tegevust ei saa tagasi pöörata.</string>
+  <string name="pref_notification_title">Teavituste nähtavus</string>
+  <string name="pref_notification_summary">Seada rakenduse teavituste nähtavust nutiseadme lukustusvaates.</string>
+  <string name="pref_blackList_title">Blokeeritud osapoolte nimekiri</string>
+  <string name="pref_blackList_summary">Vaata oma blokeeritud osapoolte nimekirja.</string>
+  <string name="pref_delete_account_title">Kustuta kasutajakonto</string>
+  <string name="pref_delete_account_summary">Kustuta oma kasutajakonto selle seadmest</string>
+  <string name="pref_persistNotification_title">Luba töötamine taustal</string>
+  <string name="pref_persistNotification_summary">Et saaksid kõnesid ja sõnumeid vastu võta, luba rakendusel töötada taustal.</string>
+  <string name="pref_newGroup_title">Luba rühmavestlused</string>
+  <string name="pref_newGroup_summary">Võimalda Jami rakenduses luua vestlusrühmi.</string>
   <string name="pref_logs_title">Diagnostika logid</string>
-  <string name="pref_logs_summary">Ava diagnostilise logisüsteemi seaded</string>
-  <string name="pref_logs_start">Alusta logging</string>
-  <string name="pref_logs_stop">Lõpeta logamine</string>
-  <string name="pref_typing_title">Võimalda kirjutamise näitajaid</string>
-  <string name="pref_typing_summary">Saada ja saada kirjutamise näitajad, mis näitavad, et sõnumit kirjutatakse.</string>
-  <string name="pref_block_record_title">Püüa blokida ekraanilõpet ja salvestamist</string>
-  <string name="pref_block_record_summary">Peata ekraanilõpetamine või video salvestamine.</string>
-  <string name="pref_link_preview_title">Näita konverentsides linkide esivaateid</string>
-  <string name="pref_link_preview_summary">Eeldusnägemised nõuavad sisu laadimist kolmandate osapoolte serveridest.</string>
+  <string name="pref_logs_summary">Ava diagnostilise logimise seadistused</string>
+  <string name="pref_logs_start">Alusta logimist</string>
+  <string name="pref_logs_stop">Lõpeta logimine</string>
+  <string name="pref_typing_title">Luba trükkimisteatiste kuvamine</string>
+  <string name="pref_typing_summary">Saada ise ja saada trükkimisteatisi, mis näitavad, et teine osapool kirjutab sõnumit.</string>
+  <string name="pref_block_record_title">Blokeeri ekraanitõmmised ja -salvestamine</string>
+  <string name="pref_block_record_summary">Blokeeri ekraanivaatest tõmmiste ja salvestuste tegemine.</string>
+  <string name="pref_link_preview_title">Näita vestlustes linkide eelvaateid</string>
+  <string name="pref_link_preview_summary">Eelvaadete näitamine eeldab sisu laadimist kolmandate osapoolte serveritest.</string>
   <!--Notifications Visibility-->
-  <string name="notification_public">Avalik näita teatised ja nende sisu lukku ekraanil)</string>
-  <string name="notification_private">Isiklikud \n(näita teatised, kuid varjata nende sisu lukku ekraanil) \n</string>
-  <string name="notification_secret">Salajane \n(ei näita teatisi lukku ekraanil)</string>
+  <string name="notification_public">Avalik\n(näita teavitusi ja nende sisu nutiseadme lukustusvaates)\n</string>
+  <string name="notification_private">Privaatne \n(näita teavitusi, aga peida nende sisu nutiseadme lukustusvaates) \n</string>
+  <string name="notification_secret">Salajane\n(ära näita nutiseadme lukustusvaates ei teavitusi ega nende sisu)</string>
   <!--Plugin-->
-  <string name="pref_plugins_title">Plugins</string>
-  <string name="pref_plugins_summary">Võimalda lisad ja seadistada nende parameetrid</string>
-  <string name="fab_plugins_add">Lisada uus lisand</string>
-  <string name="plugin_uninstall_title">Installaadi eemaldamine?</string>
-  <string name="plugin_reset_preferences">Pluginide eelistused</string>
-  <string name="plugin_reset_preferences_summary">Teie plugin-seadmed on oletuslikult</string>
-  <string name="plugin_reset_preferences_ask">Tahad taastada üldised plugin-seadmed?</string>
-  <string name="plugin_reset_account_preferences_ask">Kas soovite konto pluginide seadmeid uuesti seadistada?</string>
-  <string name="plugin_successfully_installed">Plugin <b>%1$s</b> edukalt paigaldatud</string>
+  <string name="pref_plugins_title">Pluginad</string>
+  <string name="pref_plugins_summary">Võimalda pluginad ja seadistada neid</string>
+  <string name="fab_plugins_add">Lisa uus plugin</string>
+  <string name="plugin_uninstall_title">Kas eemaldame plugina?</string>
+  <string name="plugin_reset_preferences">Lähtesta pluginate eelistused</string>
+  <string name="plugin_reset_preferences_summary">Lähtestame sinu pluginate seadistused</string>
+  <string name="plugin_reset_preferences_ask">Kas sa soovid lähtestada pluginate üldised seadistused?</string>
+  <string name="plugin_reset_account_preferences_ask">Kas sa soovid lähtestada pluginate kasutajakontokohased seadistused?</string>
+  <string name="plugin_successfully_installed">Plugin <b>%1$s</b> on edukalt paigaldatud</string>
   <string name="plugin_install_failure">Plugin ei ole paigaldatud: <b>%1$s</b></string>
   <string name="plugin_recent_version_exception">Sul on hilisem versioon: <b>%1$s</b></string>
   <string name="plugin_same_version_exception">Sul on paigaldatud sama versioon <b>%1$s</b></string>
-  <string name="plugin_force_install">sundin installimist</string>
-  <string name="plugin_path_image_add">Lisada uus pilt</string>
+  <string name="plugin_invalid_signature">Plugina <b>%1$s</b> allkiri on vigane</string>
+  <string name="plugin_invalid_authority">Ei õnnestu tuvastada plugina valmistajat: <b>%1$s</b></string>
+  <string name="plugin_invalid_format">Vigane plugina vorming: <b>%1$s</b></string>
+  <string name="plugin_force_install">sunnni\npaigaldamine</string>
+  <string name="plugin_path_image_add">Lisa uus pilt</string>
 </resources>
diff --git a/jami-android/app/src/main/res/values-nl/strings.xml b/jami-android/app/src/main/res/values-nl/strings.xml
index 949add9cc4ddedd5eb366e5236ecb89f8217f8a8..2a9797ca76b8b171259623ce84e4a5bcaa03bdbe 100644
--- a/jami-android/app/src/main/res/values-nl/strings.xml
+++ b/jami-android/app/src/main/res/values-nl/strings.xml
@@ -22,6 +22,7 @@
   <string name="developed_by">Ontwikkeld door</string>
   <string name="designed_by">Ontworpen door</string>
   <string name="ringtones_by">Beltonen door</string>
+  <string name="credits_volunteers">En de vrijwilligers die bijdragen aan dit project!</string>
   <!--RingActivity-->
   <string name="error_no_network">Geen netwerkverbinding</string>
   <string name="error_account_offline">Het account is offline</string>
@@ -44,11 +45,13 @@
   <!--History Fragment-->
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
+  <string name="invitation_card_title">Uitnodigingen ontvangen</string>
   <plurals name="home_conferences_title">
     <item quantity="one">%d gesprek</item>
     <item quantity="other">%d gesprekken</item>
   </plurals>
   <!--ContactList Fragment-->
+  <string name="searchbar_hint">Zoek op naam of gesprek</string>
   <string name="choose_number">Kies een nummer</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
@@ -72,6 +75,7 @@
   <string name="notif_channel_background_service">Achtergronddienst</string>
   <string name="notif_channel_background_service_descr">Maakt het mogelijk om op elk moment oproepen en berichten te ontvangen.</string>
   <string name="notif_group_calls">Oproepen</string>
+  <string name="notif_inprogress_group_call">Oproep bezig</string>
   <string name="notif_background_service">Jami draait momenteel in de achtergrond</string>
   <string name="notif_mark_as_read">Markeren als gelezen</string>
   <string name="notif_dismiss">Negeren</string>
@@ -98,6 +102,7 @@
   <string name="ongoing_call">Lopende oproep</string>
   <string name="hist_in_call">Inkomende oproep van %1$s</string>
   <string name="hist_out_call">Uitgaande oproep van %1$s</string>
+  <string name="call_duration">Duurde %s</string>
   <string name="start_error_title">Jami kan niet opgestart worden!</string>
   <string name="start_error_mic_required">Jami vereist toestemming om de microfoon te kunnen gebruiken.</string>
   <string name="action_call_accept">Oproep aannemen</string>
@@ -119,6 +124,7 @@
   <string name="write_a_message">Schrijf een bericht</string>
   <string name="scan_qr">QR-code scannen</string>
   <string name="qr_code">QR-code</string>
+  <string name="new_swarm">Start Zwerm</string>
   <string name="ab_action_flipcamera">Camera draaien</string>
   <string name="ab_action_hidepreview">Verberg voorbeeld</string>
   <string name="remote_recording">%s aan het opnemen...</string>
@@ -134,6 +140,8 @@
   <string name="conversation_send_audio">Geluidsbericht opnemen</string>
   <string name="conversation_send_video">Videobericht opnemen</string>
   <string name="conversation_share_location">Uw locatie delen</string>
+  <string name="ongoing_group_call">Lopende Oproep</string>
+  <string name="started_call">Oproep gestart</string>
   <string name="in_reply_to">In antwoord op</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Cameramachtiging</string>
@@ -193,6 +201,7 @@
   <string name="conversation_syncing">Download van een gesprek van een peer</string>
   <string name="conversation_blocked">Dit contact is geblokkeerd.</string>
   <string name="conversation_ended">Het gesprek is voorbij.</string>
+  <string name="conversation_message_deleted">%s verwijderde een bericht</string>
   <string name="conversation_reply_you">Jij?</string>
   <string name="conversation_preference_color">Kleur van het gesprek</string>
   <string name="conversation_preference_emoji">Conversatie emoji</string>
@@ -327,6 +336,16 @@
   <string name="tv_send_video">Verstuur Media</string>
   <string name="tv_action_more">Meer</string>
   <string name="conversation_input_speech_hint">Zeg iets...</string>
+  <string name="audio_permission_denied">Verschaf a.u.b. toegang tot de microfoon om Jami audio functies te gebruiken</string>
+  <string name="camera_permission_denied">Verschaf a.u.b. toegang tot de camera om Jami video functies te gebruiken</string>
+  <string name="speech_recogniton_unavailable">Spraak herkenning is niet beschikbaar</string>
+  <string name="audio_permission_rationale_title">Audio-toestemming vereist</string>
+  <string name="camera_permission_rationale_title">Video-toestemming vereist</string>
+  <string name="audio_permission_rationale_message">Jami heeft microfoon-toegang nodig voor spraak-naar-text en audio-opname functies. Het zal in de volgende step gevraagd worden</string>
+  <string name="camera_permission_rationale_message">Jami heeft camera-toegang nodig voor het opnemen van video en video-bellen. Het zal in de volgende step gevraagd worden</string>
+  <string name="unable_to_start_recorder">Niet in staat om de audio opname te starten</string>
+  <string name="error_sharing_file">Fout bij bestandsdeling.</string>
+  <string name="error_opening_file">Fout bij openen bestand.</string>
   <!--Wizard-->
   <string name="wizard_status_recommended">Aanbevolen</string>
   <string name="wizard_status_optional">Optioneel</string>
@@ -375,12 +394,27 @@
   <string name="picker_btn">Selecteer contacten</string>
   <string name="bottomsheet_contact">Neem contact op met Jami\n%1$s</string>
   <string name="bottomsheet_remove">Verwijder uit de zwerm.</string>
+  <string name="error_open_no_app_found">Geen applicatie gevonden om dit bestand te verwerken: %1$s</string>
   <!--JamiId-->
+  <string name="jami_id_copy">Jami-ID Kopiëren</string>
+  <string name="jami_id_share">Jami-ID Delen</string>
   <string name="jami_id_validate">Gebruikersnaam registreren</string>
+  <string name="jami_id_available">De gebruikersnaam is beschikbaar</string>
+  <string name="jami_id_not_available">De gebruikersnaam is niet beschikbaar\n• Maximaal 32 karakters\n•  Speciale karakters toegestaan: streep(-), laag streepje(_)</string>
+  <string name="jami_id_info">• Maximaal 32 karakters\n• Speciale karakters toegestaan: streep(-), laag streepje(_)</string>
   <string name="jami_id_looking_for_availability">Beschikbaarheid van gebruikersnaam wordt gecontroleerd…</string>
   <string name="jami_id_choose_username">Kies een gebruikersnaam</string>
   <!--WelcomeJami-->
   <string name="welcome_jami_title">Welkom bij Jami</string>
+  <string name="welcome_jami_description">Deel uw Jami Identifier zodat u makkelijker bereikbaar bent!</string>
   <!--Donation-->
+  <string name="donation_card_description">Als u van Jami geniet en in onze missie gelooft, zou u een donatie wilen doen?</string>
+  <string name="donation_card_not_now">Niet nu</string>
+  <string name="donation_donate">Doneren</string>
+  <string name="donation_setting_title">Donatie herinnering</string>
+  <string name="donation_setting_description">Donatie herinnering inschakelen</string>
   <!--Plugin-->
+  <string name="unable_to_load">Niet in staat %1$s te laden</string>
+  <string name="load_sucess">%1$s: ingeschakeld</string>
+  <string name="unload_sucess">%1$s: uitgeschakeld</string>
 </resources>
diff --git a/jami-android/app/src/main/res/values-pt-rPT/strings.xml b/jami-android/app/src/main/res/values-pt-rPT/strings.xml
index 67520721cf23552b8df0020d436d59d00e73ea7a..e94fcbcacc43dfc7e46f69791710d3d02d174603 100644
--- a/jami-android/app/src/main/res/values-pt-rPT/strings.xml
+++ b/jami-android/app/src/main/res/values-pt-rPT/strings.xml
@@ -52,13 +52,13 @@
     <item quantity="other">%d conversas</item>
   </plurals>
   <!--ContactList Fragment-->
-  <string name="searchbar_hint">Procurar nome ou conversa...</string>
+  <string name="searchbar_hint">Procurar nome ou conversa…</string>
   <string name="choose_number">Escolher um número</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <!--Notifications-->
-  <string name="notif_missed_incoming_call">Chamadas recebidas perdidas</string>
-  <string name="notif_missed_outgoing_call">Chamadas efetuadas perdidas</string>
+  <string name="notif_missed_incoming_call">Chamada recebida perdida</string>
+  <string name="notif_missed_outgoing_call">Chamada efetuada perdida</string>
   <string name="notif_incoming_call_title">Chamada recebida de %1$s</string>
   <string name="notif_incoming_call">Chamada recebida</string>
   <string name="notif_outgoing_call_title">Chamada efetuada para %1$s</string>
@@ -88,7 +88,7 @@
   <string name="notif_location_title">A partilhar localização com %1$s</string>
   <string name="location_share_contact">%1$s está a partilhar a localização consigo</string>
   <string name="notif_location_multi_title">A partilhar a localização com %1$d contactos</string>
-  <string name="notif_location_remaining">%1$dminutos restantes</string>
+  <string name="notif_location_remaining">%1$d minutos restantes</string>
   <string name="notif_location_action_stop">Parar a partilha de localização</string>
   <string name="location_share_action_start">Iniciar a partilha</string>
   <string name="location_share_action_stop">Parar a partilha</string>
@@ -109,8 +109,8 @@
   <string name="action_call_accept">Atender chamada</string>
   <string name="action_call_accept_audio">Responder em áudio</string>
   <string name="action_call_accept_video">Responder em vídeo</string>
-  <string name="action_call_hold_accept">Colocar em espera e fazer uma chamada em áudio</string>
-  <string name="action_call_hold_accept_video">Colocar em espera e fazer uma chamada em vídeo</string>
+  <string name="action_call_hold_accept">Colocar em espera e fazer uma chamada de áudio</string>
+  <string name="action_call_hold_accept_video">Colocar em espera e fazer uma chamada de vídeo</string>
   <string name="action_call_end_accept">Terminar e atender a chamada</string>
   <string name="action_call_decline">Rejeitar</string>
   <string name="action_call_mic_mute">Silenciar microfone</string>
@@ -150,7 +150,7 @@
   <!--Ringtone activity-->
   <string name="ringtone_error_title">Erro</string>
   <string name="ringtone_error_format_not_supported">Este formato não é suportado.</string>
-  <string name="ringtone_error_size_too_big">Este ficheiro é grande demais. O tamanho máximo é %1$dkB.</string>
+  <string name="ringtone_error_size_too_big">Este ficheiro é grande demais. O tamanho máximo é %1$d kB.</string>
   <string name="ringtone_custom_prompt">Configurar um toque de chamada personalizado</string>
   <string name="ringtone_custom_label">Personalizado</string>
   <string name="ringtone_jami_tones">Toques do Jami</string>
@@ -201,8 +201,8 @@
   <string name="conversation_members">Membros</string>
   <string name="conversation_syncing">A descarregar conversa de um par</string>
   <string name="conversation_blocked">Este contacto está bloqueado.</string>
-  <string name="conversation_ended">Conversa finalizada.</string>
-  <string name="conversation_message_deleted">%s apagou uma mensagem</string>
+  <string name="conversation_ended">A conversa terminou.</string>
+  <string name="conversation_message_deleted">%s eliminou uma mensagem</string>
   <string name="conversation_reply_you">Você</string>
   <string name="conversation_preference_color">Cor da conversação</string>
   <string name="conversation_preference_emoji">Emoji da conversação</string>
@@ -233,7 +233,7 @@
   <string name="wizard_skip">Ignorar</string>
   <string name="hist_contact_invited">Contacto convidado</string>
   <string name="hist_contact_added">Contacto adicionado</string>
-  <string name="hist_contact_left">Contacto saiu</string>
+  <string name="hist_contact_left">O contacto saiu</string>
   <string name="hist_contact_banned">Contacto banido</string>
   <string name="hist_invitation_received">Convite recebido</string>
   <!--Account Summary-->
@@ -247,7 +247,7 @@
   <string name="no_registered_name">Sem nome registado</string>
   <string name="identity">Identidade</string>
   <string name="account">Conta</string>
-  <string name="link_new_device">Associar a um novo dispositivo</string>
+  <string name="link_new_device">Vincular um novo dispositivo</string>
   <string name="devices">Dispositivos vinculados</string>
   <string name="total_devices">Total de dispositivos:</string>
   <!--Share fragment-->
@@ -271,7 +271,7 @@
   <!--Send contact requests-->
   <string name="send_request_button">Enviar</string>
   <string name="send_request_title">Enviar um pedido de contacto</string>
-  <string name="send_request_msg">Deve enviar um pedido de contacto para se comunicar com este utilizador. Enquanto o seu contacto não aceitar o pedido, pode enviar mensagens, mas ele não poderá respondê-las.</string>
+  <string name="send_request_msg">É necessário enviar um pedido de contacto para comunicar com este utilizador. Enquanto o seu contacto não tiver aceite o pedido, pode enviar mensagens, mas ele não poderá responder.</string>
   <!--Blacklist-->
   <string name="no_blocked_contact">Sem contactos bloqueados</string>
   <!--Smartlist-->
@@ -298,10 +298,10 @@
   <string name="file_transfer_status_invalid_pathname">diretório inválido</string>
   <string name="file_transfer_status_unjoinable_peer">contacto indisponível</string>
   <string name="file_transfer_status_cancelled">cancelada</string>
-  <string name="file_transfer_status_error">falhou devido a erro</string>
+  <string name="file_transfer_status_error">falhou devido a um erro</string>
   <string name="file_transfer_status_timed_out">expirou o tempo</string>
-  <string name="file_saved_in">Ficheiro gravado em %s</string>
-  <string name="file_saved_successfully">Ficheiro gravado com sucesso</string>
+  <string name="file_saved_in">Ficheiro guardado em %s</string>
+  <string name="file_saved_successfully">Ficheiro guardado com sucesso</string>
   <string name="file_download">Descarregar</string>
   <string name="no_space_left_on_device">Sem espaço disponível no dispositivo</string>
   <string name="title_media_viewer">Visualizador de média</string>
@@ -401,8 +401,8 @@
   <string name="jami_id_share">Partilhar Jami ID</string>
   <string name="jami_id_validate">Registar nome de utilizador</string>
   <string name="jami_id_available">O nome de utilizador está disponível</string>
-  <string name="jami_id_not_available">O nome de utilizador não está disponível\n- 32 caracteres no máximo\n- Caracteres especiais permitidos: traço (-), traço inferior (_)</string>
-  <string name="jami_id_info">• 32 máximo caracteres\n• Caracteres especiais permitidos: traço (-), traço inferior (_)</string>
+  <string name="jami_id_not_available">O nome de utilizador não está disponível\n• 32 caracteres no máximo\n• Caracteres especiais permitidos: traço (-), traço inferior (_)</string>
+  <string name="jami_id_info">• 32 caracteres no máximo\n• Caracteres especiais permitidos: traço (-), traço inferior (_)</string>
   <string name="jami_id_looking_for_availability">A procurar a disponibilidade do nome de utilizador…</string>
   <string name="jami_id_choose_username">Escolha um nome de utilizador</string>
   <!--WelcomeJami-->
diff --git a/jami-android/app/src/main/res/values-pt-rPT/strings_account.xml b/jami-android/app/src/main/res/values-pt-rPT/strings_account.xml
index d9ae0db217b6d150d29b1799d84b0bbeef226857..ab5bb95cde2786ef1e31c8afc73d82172cbfc52d 100644
--- a/jami-android/app/src/main/res/values-pt-rPT/strings_account.xml
+++ b/jami-android/app/src/main/res/values-pt-rPT/strings_account.xml
@@ -18,9 +18,9 @@
   <string name="action_settings">Configurações</string>
   <string name="error_field_required">Este campo é obrigatório</string>
   <string name="dialog_wait_create">Adicionar conta</string>
-  <string name="dialog_wait_create_details">Por favor aguarde enquanto a sua nova conta é adicionada...</string>
+  <string name="dialog_wait_create_details">Por favor aguarde enquanto a sua nova conta é adicionada…</string>
   <string name="dialog_wait_update">A atualizar a conta</string>
-  <string name="dialog_wait_update_details">Por favor aguarde enquanto a sua nova conta é atualizada...</string>
+  <string name="dialog_wait_update_details">Por favor aguarde enquanto a sua nova conta é atualizada…</string>
   <string name="dialog_warn_ip2ip_account_title">Criar uma conta SIP vazia?</string>
   <string name="dialog_warn_ip2ip_account_message">Está prestes a criar uma conta SIP com nenhum nome de servidor válido.
         Só poderá fazer e receber chamadas diretas de IP.
@@ -67,7 +67,7 @@
   <string name="account_upnp_label">Ativar UPnP</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Plugin Details-->
-  <string name="account_preference_plugin_tab">Complementos</string>
+  <string name="account_preference_plugin_tab">Módulos</string>
   <!--Audio Details-->
   <string name="account_audio_label">Áudio</string>
   <string name="account_preferences_media_tab">Média</string>
@@ -92,9 +92,9 @@
   <string name="account_local_port_label">Porta local</string>
   <string name="account_stun_enable_label">Usar Stun</string>
   <string name="account_stun_server_label">Servidor Stun</string>
-  <string name="account_accept_files">Permitir receber ficheiros automáticamente</string>
+  <string name="account_accept_files">Aceitar automaticamente os ficheiros recebidos</string>
   <string name="account_conversation_settings_title">Configurações de conversa</string>
-  <string name="account_accept_files_max_size">Tamanho máximo de ficheiro a aceitar automáticamente</string>
+  <string name="account_accept_files_max_size">Tamanho máximo de ficheiro a aceitar automaticamente</string>
   <string name="account_accept_files_never">Nunca aceitar automaticamente</string>
   <string name="account_accept_files_always">Aceitar sempre automaticamente</string>
   <string name="size_mb">%1$d MB</string>
@@ -113,7 +113,7 @@
   <string name="account_proxy_server_list_label">URL de lista de proxy DHT</string>
   <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Descoberta de membros locais</string>
-  <string name="account_peer_discovery_enable_label">Ativar a descoberta de membros locais</string>
+  <string name="account_peer_discovery_enable_label">Ativar a descoberta de pares locais</string>
   <string name="account_peer_discovery_enable_summary">Conectar a outros nós de DHT a anunciar na rede local</string>
   <!--Security Details-->
   <string name="account_credentials_label">Credenciais</string>
@@ -121,7 +121,7 @@
   <string name="account_credentials_add">Adicionar credenciais</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Segurança</string>
-  <string name="account_srtp_switch_label">Encriptar fluxo de média (SRTP)</string>
+  <string name="account_srtp_switch_label">Encriptar fluxos de multimédia (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Usar transporte TLS</string>
@@ -144,9 +144,9 @@
   <string name="account_new_device_password">Introduza a palavra-passe principal para desbloquear a conta</string>
   <string name="error_password_char_count">Pelo menos 6 caracteres</string>
   <string name="error_passwords_not_equals">As palavras-passe não são iguais</string>
-  <string name="export_account_wait_title">Por favor aguarde...</string>
+  <string name="export_account_wait_title">Por favor aguarde…</string>
   <string name="export_account_wait_message">Exportar a informação da conta</string>
-  <string name="account_export_file">Cópia de segurança da conta</string>
+  <string name="account_export_file">Fazer uma cópia de segurança da conta</string>
   <string name="account_export_file_summary">Faça uma cópia de segurança da sua conta no seu dispositivo para a restaurar mais tarde.</string>
   <string name="account_export_end_decryption_message">Não foi possível desbloquear a sua conta utilizando a palavra-passe fornecida.</string>
   <string name="account_export_end_network_title">Erro de rede</string>
@@ -182,7 +182,7 @@
   <string name="account_tv_settings_header">Configurações da conta</string>
   <string name="account_tv_advance_settings_header">Configurações avançadas</string>
   <string name="account_tv_add_contact">Adicionar contacto</string>
-  <string name="account_tv_advanced_settings">Mude as configurações gerais</string>
+  <string name="account_tv_advanced_settings">Alterar as configurações gerais</string>
   <string name="account_tv_about">Sobre o Jami</string>
   <string name="tv_about_version">Versão</string>
   <string name="tv_about_license">Licença</string>
@@ -193,17 +193,17 @@
   <string name="account_link_archive_button">Conectar da cópia de segurança</string>
   <string name="account_link_prompt_pin">Introduza o PIN</string>
   <string name="account_new_button">Criar uma conta Jami</string>
-  <string name="account_link_export_button">Associar a um novo dispositivo</string>
+  <string name="account_link_export_button">Vincular um novo dispositivo</string>
   <string name="account_link_show_button">Mostrar %d mais dispositivos vinculados</string>
   <string name="account_link_hide_button">Ocultar dispositivo vinculado</string>
   <string name="account_link_export_info">Para usar esta conta noutros dispositivos, necessita primeiro de expo-lo ao Jami. Isto irá gerar um código PIN que necessita de introduzir no novo dispositivo para configurar a sua conta. O PIN é válido por apenas 10 minutos.</string>
   <string name="account_start_export_button">Gerar código PIN</string>
   <string name="account_end_export_button">fechar</string>
-  <string name="account_end_export_infos">O seu código PIN é:\n\n%%\n\nPara completar o processo, tem de abrir o Jami no novo dispositivo. Crie uma nova conta com \"Associar este dispositivo a uma conta\". O seu código PIN é válido por 10 minutos.</string>
+  <string name="account_end_export_infos">O seu código PIN é:\n\n%%\n\nPara completar o processo, tem de abrir o Jami no novo dispositivo. Crie uma nova conta com \"Vincular este dispositivo a uma conta\". O seu código PIN é válido por 10 minutos.</string>
   <string name="account_link_export_info_light">Para usar esta conta noutros dispositivos, necessita primeiro de expo-lo ao Jami. Isto irá gerar um código PIN que necessita de introduzir no novo dispositivo para configurar a sua conta. O PIN é válido por apenas 10 minutos.</string>
-  <string name="account_export_title">Conectar a conta a outros dispositivos</string>
-  <string name="account_connect_server_button">Ligar ao servidor de gestão</string>
-  <string name="account_connect_button">Ligar</string>
+  <string name="account_export_title">Vincular a conta a outros dispositivos</string>
+  <string name="account_connect_server_button">Conectar ao servidor de gestão</string>
+  <string name="account_connect_button">Conectar</string>
   <string name="prompt_server">URL do servidor de gestão do Jami</string>
   <string name="help_credentials_enter">Introduza as credenciais da sua organização</string>
   <string name="help_connect_password_enter">Introduza a palavra-passe da sua organização</string>
@@ -212,7 +212,7 @@
   <string name="error_username_empty">Introduza um nome de utilizador</string>
   <string name="no_registered_name_for_account">Sem nome registado</string>
   <string name="username_available">Nome de utilizador disponível!</string>
-  <string name="register_name">Nome de registo</string>
+  <string name="register_name">Registar nome</string>
   <string name="trying_to_register_name">A tentar registar o nome</string>
   <string name="registered_username">Nome de utilizador registado</string>
   <string name="register_username">Registar nome de utilizador público</string>
@@ -229,18 +229,18 @@
   <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>
+  <string name="account_creation_profile">Crie o seu perfil</string>
   <string name="account_creation_ring">Crie a sua conta Jami</string>
-  <string name="account_link_title">Associar este dispositivo</string>
+  <string name="account_link_title">Vincular este dispositivo</string>
   <string name="account_sip_cannot_be_registered">Não foi possível registar a conta</string>
   <!--Edit profile-->
-  <string name="account_edit_profile">Editar minha conta</string>
+  <string name="account_edit_profile">Editar a minha conta</string>
   <!--Devices-->
   <string name="account_revoke_device_hint">Introduza a palavra-passe para confirmar</string>
   <string name="enter_password">Introduza a palavra-passe</string>
   <string name="revoke_device_title">Revogar dispositivo</string>
-  <string name="revoke_device_message">Tem certeza que deseja revogar %1$s ?</string>
-  <string name="revoke_device_wait_title">Por favor aguarde...</string>
+  <string name="revoke_device_message">Tem certeza que deseja revogar %1$s?</string>
+  <string name="revoke_device_wait_title">Por favor aguarde…</string>
   <string name="revoke_device_wait_message">A revogar o dispositivo</string>
   <string name="rename_device_title">Alterar o nome deste dispositivo</string>
   <string name="rename_device_message">Escolha um novo nome para identificar este dispositivo na sua conta Jami</string>
@@ -250,20 +250,20 @@
   <string name="account_device_this_indicator">Este dispositivo</string>
   <string name="account_disabled_indicator">desativado</string>
   <!--Link a new device-->
-  <string name="account_link_prompt_pin_manually">Introduzir o PIN manualmente</string>
+  <string name="account_link_prompt_pin_manually">Introduzir PIN manualmente</string>
   <string name="qr_invalid">Não é um código QR de autenticação Jami</string>
   <string name="content_description_checkbox">O seu código QR é válido</string>
   <string name="error_format_not_supported">Este formato não é suportado.</string>
   <string name="account_link_info">Na nova aplicação Jami, digitalize o código QR ou introduza manualmente o PIN.</string>
-  <string name="account_link_device_title">Associar a um novo dispositivo</string>
+  <string name="account_link_device_title">Vincular um novo dispositivo</string>
   <string name="account_link_password">Esta conta é encriptada por palavra-passe, introduza a palavra-passe para gerar o código PIN.</string>
   <string name="account_link_generate_button">Gerar</string>
   <string name="account_link_time_valid">O código PIN não é válido: %1$s.</string>
-  <string name="account_link_device_info">Escolha \"Associar um novo dispositivo\" na outra aplicação Jami para mostrar o código QR ou o PIN</string>
+  <string name="account_link_device_info">Escolha \"Vincular um novo dispositivo\" na outra aplicação Jami para mostrar o código QR ou o PIN</string>
   <string name="account_generate_export_device">No outro dispositivo</string>
   <string name="account_generate_export_info">Instale e inicie o Jami, selecione \"Importar de outro dispositivo\" e leia o código QR.</string>
   <string name="content_description_qr_generated">O seu código QR</string>
-  <string name="account_generate_export_invalid">O PIN já não é válido.\n Introduza a palavra-passe e crie outra para vincular o novo dispositivo.</string>
+  <string name="account_generate_export_invalid">O PIN já não é válido.\n Introduza a palavra-passe e crie outro para vincular o novo dispositivo.</string>
   <string name="account_generate_export_invalid_two">O PIN já não é válido.\nGerar outro para vincular o novo dispositivo.</string>
   <string name="help_pin_info">Preencher se a conta estiver encriptada por palavra-passe</string>
   <string name="connect_device_scanqr">Digitalizar QR</string>
diff --git a/jami-android/app/src/main/res/values-pt-rPT/strings_call.xml b/jami-android/app/src/main/res/values-pt-rPT/strings_call.xml
index 9ab513c36f36d7c8ae83d45b3b0b4fc36d0cc360..b15e7fa3ceb18140d7bd3a7f1f0e4789a1781c35 100644
--- a/jami-android/app/src/main/res/values-pt-rPT/strings_call.xml
+++ b/jami-android/app/src/main/res/values-pt-rPT/strings_call.xml
@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 -->
 <resources>
     <!-- Call error -->
-    <string name="call_error">Ocorreu um erro ao iniciar a chamada.</string>
+    <string name="call_error">"Ocorreu um erro ao iniciar a chamada."</string>
     <string name="call_error_no_microphone">A chamada foi cancelada. Não foi detetado nenhum microfone.</string>
     <string name="call_error_no_camera_no_microphone">A chamada foi cancelada. Não foi detetado nenhum microfone nem câmara.</string>
 
diff --git a/jami-android/app/src/main/res/values-pt-rPT/strings_content_description.xml b/jami-android/app/src/main/res/values-pt-rPT/strings_content_description.xml
index 8ea7c6b7e9005c91b71222b6bab17443b28737b4..cc59f2274efdcb24111843d81909233e4a93b71b 100644
--- a/jami-android/app/src/main/res/values-pt-rPT/strings_content_description.xml
+++ b/jami-android/app/src/main/res/values-pt-rPT/strings_content_description.xml
@@ -5,7 +5,7 @@
   <string name="contact_picture_description">Imagem do contacto</string>
   <string name="dial_numeric_pad">Teclado numérico</string>
   <string name="contact_unblock">Desbloquear</string>
-  <string name="video_plugins">Plugins de vídeo</string>
+  <string name="video_plugins">Módulos de vídeo</string>
   <string name="file_download_button">Descarregar</string>
   <string name="control_play">Reproduzir</string>
   <string name="control_replay">Reproduzir novamente</string>
diff --git a/jami-android/app/src/main/res/values-pt-rPT/strings_preferences.xml b/jami-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
index b7c8818455d5e0e04e33c1f68a9a3f0c9121dfad..61404481826724ac241014fe4ef3b9cca2f2c9be 100644
--- a/jami-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
+++ b/jami-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
@@ -40,7 +40,7 @@
   <string name="pref_newGroup_title">Ativar a conversação em grupo</string>
   <string name="pref_newGroup_summary">Permitir a criação de grupos no Jami.</string>
   <string name="pref_logs_title">Registos de diagnóstico</string>
-  <string name="pref_logs_summary">Abrir definições do registo de diagnóstico</string>
+  <string name="pref_logs_summary">Abrir configurações do registo de diagnóstico</string>
   <string name="pref_logs_start">Iniciar o registo</string>
   <string name="pref_logs_stop">Parar o registo</string>
   <string name="pref_typing_title">Ativar indicadores de digitação</string>
@@ -59,9 +59,9 @@
   <string name="fab_plugins_add">Adicionar um novo módulo</string>
   <string name="plugin_uninstall_title">Desinstalar o módulo?</string>
   <string name="plugin_reset_preferences">Repor as preferências do módulo</string>
-  <string name="plugin_reset_preferences_summary">As definições do módulo serão restauradas</string>
-  <string name="plugin_reset_preferences_ask">Quer restaurar as definições gerais do módulo?</string>
-  <string name="plugin_reset_account_preferences_ask">Quer restaurar as definições do módulo da conta?</string>
+  <string name="plugin_reset_preferences_summary">As configurações do módulo serão restauradas para as de origem</string>
+  <string name="plugin_reset_preferences_ask">Quer restaurar as configurações gerais do módulo?</string>
+  <string name="plugin_reset_account_preferences_ask">Quer restaurar as configurações do módulo da conta?</string>
   <string name="plugin_successfully_installed">Módulo <b>%1$s</b> instalado com êxito</string>
   <string name="plugin_install_failure">Falha ao instalar o módulo: <b>%1$s</b></string>
   <string name="plugin_recent_version_exception">Tem uma versão mais recente de: <b>%1$s</b></string>