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 d772086..c071212 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
@@ -15,9 +15,12 @@
   <string name="license">Tento program je poskytován tak, jak je, bez jakýchkoli záruk. Na podrobnosti se podívejte na znění licence <u>GNU General Public License ve verzi 3 nebo pozdější</u></string>
   <string name="description">Jami je svobodný software určený k univerzální komunikaci, který respektuje svobody a práva uživatelů.</string>
   <string name="credits">Zásluhy</string>
+  <string name="call_service_description">Tato služba je potřebná k tomu, aby vaše hovory mohly běžet na popředí. Je spuštěná jen během hovorů.</string>
+  <string name="data_transfer_service_description">Tato služba je potřebná k zobrazení neustálých oznámení během přenosů souborů. Je spuštěná jen během přenosů souborů.</string>
   <!--About dialog-->
   <string name="developed_by">Vyvíjeno</string>
   <string name="designed_by">Navrženo</string>
+  <string name="ringtones_by">Vyzváněcí tóny od</string>
   <!--RingActivity-->
   <string name="error_no_network">Chybí připojení</string>
   <string name="error_mobile_network_available_but_disabled">Povolte prosím v nastavení přístup k mobilním datům</string>
@@ -28,6 +31,7 @@
   <string name="menu_item_accounts">Spravovat účty</string>
   <string name="menu_item_account">Spravovat účet</string>
   <string name="menu_item_settings">Nastavení</string>
+  <string name="menu_item_plugin_list">Nastavení zásuvných modulů</string>
   <string name="menu_item_share">Sdílet můj kontakt</string>
   <string name="menu_item_about">O Jami</string>
   <!--Dialing Fragment-->
@@ -42,6 +46,7 @@
     <item quantity="other">%d konverzací</item>
   </plurals>
   <!--ContactList Fragment-->
+  <string name="searchbar_hint">Vyhledat jméno nebo telefonní číslo…</string>
   <string name="choose_number">Vyberte číslo</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
@@ -52,12 +57,16 @@
   <string name="notif_incoming_call">Příchozí hovor</string>
   <string name="notif_outgoing_call_title">Odchozí hovor k %1$s</string>
   <string name="notif_outgoing_call">Odchozí hovor</string>
+  <string name="notif_current_call_title">Probíhající hovor s %1$s</string>
   <string name="notif_current_call">Probíhající hovor</string>
+  <string name="notif_channel_call_in_progress">Probíhá hovor</string>
   <string name="notif_channel_calls">Hovory</string>
   <string name="notif_channel_missed_calls">Zmeškané hovory</string>
+  <string name="notif_channel_incoming_calls">Příchozí hovory</string>
   <string name="notif_channel_messages">Zprávy</string>
   <string name="notif_channel_requests">Žádosti</string>
   <string name="notif_channel_file_transfer">Přenos souboru</string>
+  <string name="notif_channel_sync">Synchronizace dat</string>
   <string name="notif_channel_background_service">Služba na pozadí</string>
   <string name="notif_channel_background_service_descr">Umožňuje příjem hovorů a zpráv kdykoli.</string>
   <string name="notif_group_calls">Hovory</string>
@@ -68,6 +77,15 @@
   <string name="notif_incoming_file_transfer_title">Příchozí soubor od %1$s</string>
   <string name="notif_outgoing_file_transfer_title">Posílá se soubor %1$s</string>
   <string name="notif_incoming_picture">Obrázek od %1$s</string>
+  <string name="notif_sync_title">Synchronizuji data…</string>
+  <string name="notif_location_title">Sdílení polohy s %1$s</string>
+  <string name="location_share_contact">%1$s s vámi sdílí polohu</string>
+  <string name="notif_location_multi_title">Sdílení polohy s %1$d kontakty</string>
+  <string name="notif_location_remaining">zbývá %1$d minut</string>
+  <string name="notif_location_action_stop">Přestat sdílet polohu</string>
+  <string name="location_share_action_start">Začít sdílet</string>
+  <string name="location_share_action_stop">Přestat sdílet</string>
+  <string name="location_share_about_title">Informace o mapě</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Vy:</string>
   <string name="action_call_hangup">Zavěsit</string>
@@ -77,8 +95,11 @@
   <string name="start_error_title">Nelze spustit Jami!</string>
   <string name="start_error_mic_required">Aby Jami správně pracoval, vyžaduje přístup k mikrofonu.</string>
   <string name="action_call_accept">Přijmout</string>
+  <string name="action_call_hold_accept">Přidržet a přijmout hovor</string>
+  <string name="action_call_end_accept">Ukončit a přijmout hovor</string>
   <string name="action_call_decline">Odmítnout</string>
   <string name="action_call_mic_mute">Ztlumit mikrofon</string>
+  <string name="action_load_plugin">Načíst zásuvný modul</string>
   <string name="ab_action_speakerphone">Zapnout reproduktor</string>
   <string name="ab_action_contact_add">Přidat do kontaktů</string>
   <string name="ab_action_contact_add_question">Přidat do kontaktů?</string>
@@ -91,6 +112,7 @@
   <string name="write_a_message">Napsat zprávu</string>
   <string name="scan_qr">Skenovat QR kód</string>
   <string name="ab_action_flipcamera">Otočit kameru</string>
+  <string name="ab_action_hidepreview">Skrýt náhled</string>
   <!--Text messages-->
   <string name="send_message">Odeslat zprávu</string>
   <string name="message_sending">Odesílám zprávu…</string>
@@ -99,6 +121,9 @@
   <string name="send_file">Poslat soubor</string>
   <string name="hist_file_sent">Soubor odeslán</string>
   <string name="hist_file_received">Soubor přijat</string>
+  <string name="conversation_send_audio">Nahrávat zvukový klip</string>
+  <string name="conversation_send_video">Nahrávat video klip</string>
+  <string name="conversation_share_location">Sdílet polohu</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Povolení ke kameře</string>
   <string name="permission_dialog_camera_message">Video konverzace vyžadují povolení ke kameře. Prosím zvažte jeho povolení.</string>
@@ -106,13 +131,19 @@
   <string name="ringtone_error_title">Chyba</string>
   <string name="ringtone_error_format_not_supported">Tento formát je nepodporovaný.</string>
   <string name="ringtone_error_size_too_big">Tento soubor je příliš velký. Největší velikost je %1$dkB.</string>
+  <string name="ringtone_custom_prompt">Nastavit vlastní vyzváněcí tón</string>
   <string name="ringtone_custom_label">Vlastní</string>
+  <string name="ringtone_jami_tones">Tóny Jami</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Pro tuto funkci Jami vyžaduje povolení „Číst kontakty“. Povolte jej prosím.</string>
   <!--Write call log permission-->
   <string name="permission_dialog_write_call_log_message">Pro tuto funkci Jami vyžaduje povolení „Zapisovat záznam hovorů“. Povolte jej prosím.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Oskenujte QR kód účtu, který chcete přidat.</string>
+  <string name="title_activity_qrcode">Sdílet můj účet</string>
+  <string name="error_scan_no_camera_permissions">Skener kódů QR potřebuje přístup ke kameře</string>
+  <string name="tab_code">Můj kód</string>
+  <string name="tab_scan">Skenovat kód</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">Vymazat historii?</string>
   <string name="clear_history_dialog_message">Tento krok nelze vrátit zpět.</string>
@@ -133,10 +164,12 @@
   <string name="conversation_action_select_peer_number">Vyberte číslo</string>
   <string name="conversation_action_block_this">Blokovat spojení</string>
   <string name="conversation_action_go_to_call">Vrátit se k probíhajícímu hovoru</string>
+  <string name="conversation_open_file_error">Nebyla nalezena žádná aplikace schopná otevřít tento typ souboru</string>
   <string name="clip_contact_uri">Adresa spojení</string>
   <string name="block_contact_dialog_title">Blokovat %1$s?</string>
   <string name="block_contact_dialog_message">%1$s se s vámi nebude schopen spojit, dokud jej neodblokujete.</string>
   <string name="block_contact_completed">%1$s byl zablokován.</string>
+  <string name="conversation_contact_is_typing">Kontakt píše…</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Přidat %1$s?</string>
   <string name="prompt_new_password">Nové heslo</string>
@@ -146,7 +179,9 @@
   <string name="prompt_new_username">Zadejte nové uživatelské jméno</string>
   <string name="prompt_hint_username">Uživatelské jméno</string>
   <string name="help_password_choose">K ochraně účtu Jami si zvolte silné heslo, které si dovedete zapamatovat.</string>
-  <string name="help_pin_enter">Zadejte PIN z jiného nastaveného účtu Jami. Abyste PIN získali, použijte volbu „vyvést účet u Jami“.</string>
+  <string name="help_password_enter">Zadejte hlavní heslo ke svému účtu Jami.</string>
+  <string name="help_server_enter">Zadejte adresu URL správcovského serveru.</string>
+  <string name="help_pin_enter">Zadejte PIN z jiného nastaveného účtu Jami. Abyste PIN získali, použijte volbu „exportovat účet Jami“.</string>
   <string name="wizard_next">Další</string>
   <string name="wizard_back">Zpět</string>
   <string name="wizard_skip">Přeskočit</string>
@@ -155,6 +190,7 @@
   <string name="profile_message_warning">Váš profil je sdílen jen s vašimi kontakty</string>
   <string name="open_the_gallery">Otevřít galerii</string>
   <string name="take_a_photo">Pořídit fotku</string>
+  <string name="profile_name_hint">Zadejte své jméno</string>
   <!--Share fragment-->
   <string name="share_message">Skenovat tento kód s Jami</string>
   <string name="share_message_no_account">Vyberte, prosím, účet ke sdílení.</string>
@@ -162,6 +198,7 @@
   <string name="share_label">Sdílet</string>
   <string name="generic_error_migration">Chyba</string>
   <string name="generic_error_migration_message">Při převádění došlo k chybě</string>
+  <string name="title_share_with">Sdílet s…</string>
   <!--Pending contact requests-->
   <string name="accept">Přijmout</string>
   <string name="refuse">Odmítnout</string>
@@ -169,16 +206,20 @@
   <string name="contact_request_title">Nová žádost o kontakt</string>
   <string name="contact_request_msg">Máte %1$s žádostí o kontakt</string>
   <string name="contact_request_account">Pro %1$s</string>
+  <string name="no_requests">Nemáte žádné žádosti o kontakt</string>
   <string name="message_contact_not_trusted_yet">%sještě není ve vašich kontaktech.\nPřijmete anebo odmítnete tuto žádost o kontakt?</string>
   <string name="message_contact_not_trusted">%snení ve vašich kontaktech.\nPřidat nové spojení?</string>
   <!--Send contact requests-->
   <string name="send_request_button">Odeslat</string>
   <string name="send_request_title">Poslat žádost o kontakt</string>
+  <string name="send_request_msg">Abyste mohli komunikovat s tímto uživatelem, musíte mu odeslat žádost o kontakt. Do doby, než váš kontakt žádost přijme, mu můžete posílat zprávy, ale on nebude moci odpovídat.</string>
   <!--Blacklist-->
   <string name="no_blocked_contact">Žádné blokované kontakty</string>
   <!--Smartlist-->
   <string name="no_contact_request">Neposlána žádná žádost o kontakt</string>
+  <string name="conversation_placeholder">Zatím nemáte žádné konverzace</string>
   <string name="contact_request_sent">Poslána žádost o kontakt</string>
+  <string name="start_conversation">Začněte konverzaci</string>
   <string name="search_results">Výsledky hledání</string>
   <string name="tv_contact_row_header">Kontakty</string>
   <string name="gallery_error_title">Nenalezena žádná aplikace pro galerii</string>
@@ -197,23 +238,56 @@
   <string name="file_transfer_status_closed_by_peer">zavřeno protějškem</string>
   <string name="file_transfer_status_invalid_pathname">neplatný název cesty</string>
   <string name="file_transfer_status_unjoinable_peer">nepřipojitelný protějšek</string>
+  <string name="file_transfer_status_cancelled">zrušeno</string>
+  <string name="file_transfer_status_error">selhalo kvůli chybě</string>
+  <string name="file_transfer_status_timed_out">vypršel časový limit</string>
   <string name="file_saved_in">Soubor uložen do %s</string>
+  <string name="file_saved_successfully">Soubor byl úspěšně uložen</string>
   <string name="no_space_left_on_device">Na zařízení nezbylo žádné místo</string>
   <string name="title_media_viewer">Prohlížeč záznamů</string>
   <string name="menu_file_open">Otevřít soubor</string>
   <string name="menu_file_download">Stáhnout soubor</string>
+  <string name="menu_file_save">Uložit soubor</string>
   <string name="menu_file_delete">Smazat soubor</string>
   <string name="menu_file_share">Sdílet soubor</string>
   <string name="menu_message_copy">Zkopírovat</string>
+  <string name="menu_message_delete">Smazat zprávu</string>
+  <string name="menu_message_cancel">Zrušit zprávu</string>
   <string name="menu_delete">Odstranit</string>
+  <string name="pref_darkTheme_title">Tmavý motiv</string>
+  <string name="pref_darkTheme_summary">Vždy povolit tmavý motiv namísto použití systémového nastavení</string>
   <!--Bottom Navigation-->
   <string name="navigation_item_conversation">Konverzace</string>
   <string name="navigation_item_contact_request">Žádosti o kontakt</string>
   <string name="navigation_item_account">Účet</string>
+  <string name="search_results_public_directory">Veřejný adresář</string>
   <!--TV-->
+  <string name="tv_send_audio_dialog_message">Poslat zvukovou zprávu?</string>
+  <string name="tv_send_image_dialog_message">Poslat obrázek?</string>
+  <string name="tv_send_video_dialog_message">Poslat video?</string>
+  <string name="tv_media_preview">Náhled</string>
   <string name="tv_audio_play">Přehrát</string>
   <string name="tv_audio_pause">Pozastavit</string>
   <string name="tv_dialog_send">Odeslat</string>
+  <string name="tv_audio_recording">Nahrávám…</string>
+  <string name="tv_send_text">Poslat text</string>
+  <string name="tv_send_audio">Poslat zvuk</string>
+  <string name="tv_send_video">Poslat média</string>
+  <string name="conversation_input_speech_hint">Řekněte něco…</string>
   <!--WIZARD-->
+  <string name="wizard_status_recommended">Doporučeno</string>
+  <string name="wizard_status_optional">Volitelné</string>
+  <string name="wizard_status_required">Vyžadováno</string>
+  <string name="wizard_username_info">Zvolte si uživatelské jméno ke svému účtu</string>
+  <string name="wizard_username_button">Zvolte si uživatelské jméno</string>
+  <string name="wizard_username_skip">Přeskočit volbu uživatelského jména</string>
+  <string name="wizard_password_info">Heslo k účtu</string>
+  <string name="wizard_password_placeholder">Zvolte si heslo k šifrování klíče účtu na tomto zařízení</string>
+  <string name="wizard_password_button">Zvolte si heslo</string>
   <string name="wizard_password_skip">Vytvořit účet</string>
+  <string name="wizard_password_switch">Šifrovat účet heslem</string>
+  <string name="wizard_password_warning">Vezměte na vědomí, že heslo nelze obnovit</string>
+  <string name="wizard_profile_info">Profil je sdílen jen s kontakty</string>
+  <string name="wizard_profile_button">Uložit profil</string>
+  <string name="wizard_profile_skip">Odložit na později</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
index adc95a5..139268c 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
@@ -7,6 +7,7 @@
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Přidat účet Jami</string>
   <string name="add_sip_account_title">Přidat účet SIP</string>
+  <string name="ring_account_default_name">Účet Jami %1$s</string>
   <string name="prompt_alias">Přezdívka</string>
   <string name="prompt_hostname">Hostitelské jméno</string>
   <string name="prompt_username">Uživatelské jméno</string>
@@ -44,6 +45,8 @@
   <string name="account_device_revocation_unknown_device">Neznámé zařízení.</string>
   <string name="account_device_revocation_error_unknown">Neznámá chyba.</string>
   <string name="account_password_change">Změnit heslo</string>
+  <string name="account_password_set">Nastavit heslo</string>
+  <string name="account_password_change_wait_message">Mění se heslo účtu</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Obecné</string>
   <string name="account_basic_category">Základní nastavení</string>
@@ -64,17 +67,26 @@
   <string name="account_ringtone_enabled_label">Zapnout vyzvánění</string>
   <string name="account_ringtone_path_label">Cesta vyzvánění</string>
   <string name="account_ringtone_custom_label">Použít vlastní vyzvánění</string>
+  <string name="account_ringtone_title">Zvolit vyzváněcí tón</string>
+  <string name="account_ringtone_summary">Vyberte vyzváněcí tón nebo zvolte vlastní</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
   <string name="account_video_enable">Povolit video</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Pokročilé</string>
   <string name="account_call_settings_title">Nastavení volání</string>
+  <string name="account_dht_public_in_calls_label">Povolit příchozí hovory od neznámých kontatků</string>
   <string name="account_registration_exp_label">Vypršení registrace</string>
   <string name="account_local_interface_label">Místní rozhraní</string>
   <string name="account_local_port_label">Místní port</string>
   <string name="account_stun_enable_label">Použít Stun</string>
   <string name="account_stun_server_label">Server Stun</string>
+  <string name="account_accept_files">Automaticky přijímat příchozí soubory</string>
+  <string name="account_conversation_settings_title">Nastavení konverzace</string>
+  <string name="account_accept_files_max_size">Největší velikost automaticky přijatého souboru</string>
+  <string name="account_accept_files_never">Nikdy nepřijímat automaticky</string>
+  <string name="account_accept_files_always">Vždy přijímat automaticky</string>
+  <string name="size_mb">%1$d MB</string>
   <string name="account_turn_enable_label">Použít TURN</string>
   <string name="account_turn_server_label">Server TURN</string>
   <string name="account_turn_username_label">Uživatelské jméno TURN</string>
@@ -85,6 +97,8 @@
   <string name="account_proxy_label">Proxy DHT</string>
   <string name="account_proxy_enable_label">Použít proxy DHT</string>
   <string name="account_proxy_server_label">Adresa proxy DHT</string>
+  <string name="account_peer_discovery_label">Zjištění místních klientů</string>
+  <string name="account_peer_discovery_enable_label">Povolit zjištění místních klientů</string>
   <!--Security Details-->
   <string name="account_credentials_label">Ověřovací údaje</string>
   <string name="account_credentials_edit">Upravit ověřovací údaje</string>
@@ -92,6 +106,7 @@
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Zabezpečení</string>
   <string name="account_srtp_switch_label">Šifrovat datový tok (SRTP)</string>
+  <string name="account_srtp_rtp_fallback">Použít RTP v případě selhání SRTP</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Použít Transport TLS</string>
@@ -114,6 +129,7 @@
   <string name="error_password_char_count">Nejméně 6 znaků</string>
   <string name="error_passwords_not_equals">Hesla se neshodují</string>
   <string name="export_account_wait_title">Počkejte prosím…</string>
+  <string name="export_account_wait_message">Exportují se údaje o účtu</string>
   <string name="account_export_file">Zálohovat účet</string>
   <string name="account_export_end_decryption_message">Zadaným heslem nebylo možné váš účet odemknout.</string>
   <string name="account_export_end_network_title">Chyba sítě</string>
@@ -133,7 +149,7 @@
   <string name="account_migration_message_dialog">Vaše účty je potřeba aktualizovat. Chcete jít na obrazovku se správou účtů pro provedení této činnosti?</string>
   <string name="account_update_needed">Nutná aktualizace</string>
   <string name="account_cannot_be_found_title">Nelze nalézt účet</string>
-  <string name="account_cannot_be_found_message">Na síti Jami nebyl účet nalezen.\nUjistěte se, že byl vyveden na Jami z existujícího zařízení a že jsou přihlašovací údaje správné.</string>
+  <string name="account_cannot_be_found_message">Na síti Jami nebyl účet nalezen.\nUjistěte se, že byl exportován na Jami z existujícího zařízení a že jsou přihlašovací údaje správné.</string>
   <string name="account_sip_cannot_be_registered_message">Můžete pokračovat v postupu vytvoření účtu nebo údaje upravit zde. Úpravy jsou možné i později v nastavení účtu.</string>
   <string name="account_no_network_title">Nelze se připojit k síti</string>
   <string name="account_no_network_message">Nebylo možno přidat účet, protože se Jami nedokázal připojit k rozptýlené síti. Prověřte své síťové připojení.</string>
@@ -146,6 +162,9 @@
   <string name="account_sip_success_title">Účet SIP zaregistrován</string>
   <string name="account_sip_success_message">Úspěšně jste zaregistroval účet SIP.</string>
   <string name="account_sip_register_anyway">Přesto zaregistrovat</string>
+  <string name="account_link_device">Připojit z jiného zařízení</string>
+  <string name="account_link_button">Připojit ze sítě</string>
+  <string name="account_link_archive_button">Připojit ze zálohy</string>
   <string name="account_link_prompt_pin">Zadejte PIN</string>
   <string name="account_new_button">Vytvořit účet Jami</string>
   <string name="account_link_export_button">Připojit k tomuto účtu další zařízení</string>
@@ -155,16 +174,22 @@
   <string name="account_end_export_infos">Váš PIN je:\n\n%%\n\nK dokončení tohoto procesu otevřete Jami na novém zařízení. Přihlaste se k účtu pomocí „Připojit toto zařízení k účtu“. Váš PIN zůstává platný 10 minut.</string>
   <string name="account_link_export_info_light">Pro použití tohoto účtu na dalších zařízeních jej musíte nejdříve vystavit na Jami. Tím se vytvoří kód PIN, který musíte pro nastavení účtu zadat na novém zařízení. PIN zůstává platný po 0 minut.</string>
   <string name="account_export_title">Přidat zařízení</string>
+  <string name="account_connect_server_button">Připojit se ke správcovského serveru.</string>
+  <string name="account_connect_button">Připojit</string>
+  <string name="prompt_server">Adresa URL správcovského serveru Jami</string>
   <string name="account_connect_prompt_username">Uživatelské jméno</string>
   <!--Name registration-->
   <string name="error_username_empty">Zadejte uživatelské jméno</string>
   <string name="no_registered_name_for_account">Pro tento účet nenalezeno žádné registrované jméno</string>
+  <string name="username_available">Uživatelské jméno je dostupné!</string>
   <string name="register_name">Zaregistrovat jméno</string>
   <string name="trying_to_register_name">Pokus o registraci jména</string>
   <string name="registered_username">Registrované uživatelské jméno</string>
   <string name="register_username">Zaregistrovat veřejné uživatelské jméno</string>
+  <string name="register_recommended">Doporučeno</string>
   <string name="username_already_taken">Uživatelské jméno je již obsazené</string>
   <string name="invalid_username">Neplatné uživatelské jméno</string>
+  <string name="unknown_error">Neznámá chyba. Prosím zkontrolujte své připojení k síti!</string>
   <string name="looking_for_username_availability">Zjišťuje se dostupnost uživatelského jména…</string>
   <string name="account_status_connecting">Spojování</string>
   <string name="account_status_connection_error">Chyba spojení</string>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml
index 9a911cf..390578a 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml
@@ -5,4 +5,5 @@
   <string name="contact_picture_description">Obrázek Kontaktu</string>
   <string name="dial_numeric_pad">Číselná klávesnice</string>
   <string name="contact_unblock">Odblokovat</string>
+  <string name="video_plugins">Zásuvné Moduly Videa</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
index f7c0753..92c1da4 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
@@ -7,18 +7,38 @@
   <string name="pref_category_privacy">Soukromí</string>
   <string name="pref_mobileData_title">Mobilní data</string>
   <string name="pref_mobileData_summary">Povolit Jami na 3G/LTE sítích dodatečně k WiFi</string>
+  <string name="pref_pushNotifications_title">Oznámení Push</string>
   <string name="pref_pushNotifications_summary">Použít servery Google pro umožnění přijímání hovorů/zpráv na pozadí</string>
-  <string name="pref_hd_summary">Povolit posílání obrazu ve vysokém rozlišení (HD)</string>
+  <string name="pref_video_advanced_title">Pokročilá nastavení videa</string>
+  <string name="pref_video_advanced_summary">Upravit přenosovou rychlost a rozlišení videa, povolit pokusné funkce.</string>
+  <string name="pref_hd_summary">Povolit posílání videa ve vysokém rozlišení (HD)</string>
   <string name="pref_hwEncode_title">Povolit  zrychlené kódování</string>
   <string name="pref_hwEncode_summary">Pokusná funkce</string>
+  <string name="pref_videoBitrate_title">Přenosová rychlost videa</string>
+  <string name="pref_videoBitrate_summary">Vybrat výchozí přenosovou rychlost odchozího videa (kB/s)</string>
+  <string name="pref_videoResolution_title">Rozlišení videa</string>
+  <string name="pref_videoResolution_summary">Vybrat výchozí rozlišení odchozího videa</string>
   <string name="pref_systemContacts_title">Použít systémové kontakty</string>
   <string name="pref_systemContacts_summary">Použít systémové kontakty pro zobrazení údajů volajícího.</string>
-  <string name="pref_systemDialer_title">Vykonávat systémové hovory skrze Jami</string>
-  <string name="pref_systemDialer_summary">Použít Jami k vykonání systémových hovorů, když to bude možné.</string>
+  <string name="pref_systemDialer_title">Uskutečňovat systémové hovory skrze Jami</string>
+  <string name="pref_systemDialer_summary">Použít Jami k uskutečňování systémových hovorů, když to bude možné.</string>
   <string name="pref_startOnBoot_title">Spustit Jami po zapnutí</string>
-  <string name="pref_startOnBoot_summary">Spustit Jami na pozadí systému po jeho spuštění.</string>
+  <string name="pref_startOnBoot_summary">Spustit Jami na pozadí po spuštění systému.</string>
   <string name="pref_clearHistory_title">Vymazat historii</string>
+  <string name="pref_clearHistory_summary">Vymaže celou historii konverzací. Tento úkon nelze vrátit zpět.</string>
   <string name="pref_persistNotification_title">Běžet na pozadí</string>
   <string name="pref_persistNotification_summary">Umožnit běh na pozadí pro příjem hovorů a zpráv.</string>
   <!--Plugin-->
+  <string name="pref_plugins_title">Zásuvné moduly</string>
+  <string name="pref_plugins_summary">Povolit zásuvné moduly a nastavit jejich parametry</string>
+  <string name="fab_plugins_add">Přidat nový zásuvný modul</string>
+  <string name="plugin_uninstall_title">Odinstalovat zásuvný modul?</string>
+  <string name="plugin_reset_preferences">Resetovat předvolby zásuvných modulů</string>
+  <string name="plugin_reset_preferences_summary">Vaše nastavení zásuvných modulů budou obnovena na výchozí hodnoty</string>
+  <string name="plugin_reset_preferences_ask">Chcete resetovat nastavení zásuvných modulů?</string>
+  <string name="plugin_successfully_installed">Zásuvný modul <b>%1$s</b> byl úspěšně nainstalován</string>
+  <string name="plugin_install_failure">Instalace zásuvného modulu <b>%1$s</b> selhala</string>
+  <string name="plugin_recent_version_exception">Máte novější verzi <b>%1$s</b></string>
+  <string name="plugin_same_version_exception">Máte nainstalovanou stejnou verzi <b>%1$s</b></string>
+  <string name="plugin_force_install">vynutit instalaci</string>
 </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 affa16e..5903c08 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
@@ -83,6 +83,7 @@
   <string name="notif_location_action_stop">اشتراک مکان را متوقف کنید</string>
   <string name="location_share_action_start">شروع اشتراک‌گذاری</string>
   <string name="location_share_action_stop">توقف اشتراک‌گذاری</string>
+  <string name="location_share_about_title">اطلاعات نقشه</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">شما:</string>
   <string name="action_call_hangup">قطع‌کردن</string>
@@ -92,6 +93,8 @@
   <string name="start_error_title">نمی‌توان جمی را راه‌اندازی کرد!</string>
   <string name="start_error_mic_required">جمی برای کار به مجوز میکروفون نیاز دارد.</string>
   <string name="action_call_accept">پذیرش تماس</string>
+  <string name="action_call_hold_accept">این را نگه‌دار و تماس بعدی را بپذیر</string>
+  <string name="action_call_end_accept">این را قطع کن و تماس بعدی را بپذیر</string>
   <string name="action_call_decline">ردکردن</string>
   <string name="action_call_mic_mute">قطع میکروفون</string>
   <string name="action_load_plugin">بارگذاری افزونه</string>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
index 944767b..a221288 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
@@ -82,6 +82,7 @@
   <string name="account_stun_enable_label">استفاده از Stun</string>
   <string name="account_stun_server_label">سرور Stun</string>
   <string name="account_accept_files">پذیرش خودکار فایل‌های ورودی</string>
+  <string name="account_conversation_settings_title">تنظیمات گفتگو</string>
   <string name="account_accept_files_max_size">بیشینه اندازه فایل برای پذیرش خودکار</string>
   <string name="account_accept_files_never">هرگز به صورت خودکار قبول نکن</string>
   <string name="account_accept_files_always">همواره به صورت خودکار پذیرش کن</string>
@@ -122,6 +123,7 @@
   <string name="account_tls_server_name_label">نام سرور</string>
   <string name="account_tls_verify_server_label">تأیید سرور</string>
   <string name="account_tls_verify_client_label">تأیید مشتری</string>
+  <string name="account_require_client_certificate_label">TLS نیاز به گواهی‌نامه کارخواه دارد</string>
   <string name="account_tls_negotiation_timeout_sec">مهلت مذاکره (ثانیه)</string>
   <string name="account_rtp_max_port">بیشینه</string>
   <string name="account_rtp_min_port">کمینه</string>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
index ea95c25..a57487a 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
@@ -14,6 +14,10 @@
   <string name="pref_hd_summary">فعال‌سازی ارسال ویدیوی HD</string>
   <string name="pref_hwEncode_title">فعال‌سازی کدگذاری شتاب‌داده</string>
   <string name="pref_hwEncode_summary">ویژگی آزمایشی</string>
+  <string name="pref_videoBitrate_title">نرخ بیت ویدیو</string>
+  <string name="pref_videoBitrate_summary">انتخاب نرخ بیت پیش‌فرض ویدیوی خروجی (کیلوبایت بر ثانیه)</string>
+  <string name="pref_videoResolution_title">وضوح ویدیو</string>
+  <string name="pref_videoResolution_summary">انتخاب وضوح پیش‌فرض ویدیوی خروجی</string>
   <string name="pref_systemContacts_title">استفاده از مخاطبان سیستم</string>
   <string name="pref_systemContacts_summary">استفاده از مخاطبان سیستم برای نمایش جزییات تماس‌گیرنده.</string>
   <string name="pref_systemDialer_title">انجام تماس‌های سیستم با استفاده از جمی</string>
diff --git a/ring-android/app/src/main/res/values-fi/strings.xml b/ring-android/app/src/main/res/values-fi/strings.xml
index f8984bc..8e4cecd 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -93,6 +93,8 @@
   <string name="start_error_title">Jamia ei voitu käynnistää!</string>
   <string name="start_error_mic_required">Jami vaatii mikrofonin käyttöoikeuden toimiakseen.</string>
   <string name="action_call_accept">Vastaanota puhelu</string>
+  <string name="action_call_hold_accept">Pitoon ja tee puhelu</string>
+  <string name="action_call_end_accept">Lopeta ja tee puhelu</string>
   <string name="action_call_decline">Kieltäydy</string>
   <string name="action_call_mic_mute">Mykistä mikrofoni</string>
   <string name="action_load_plugin">Lataa lisäosa</string>
diff --git a/ring-android/app/src/main/res/values-fi/strings_account.xml b/ring-android/app/src/main/res/values-fi/strings_account.xml
index b4f5d37..620d2f7 100644
--- a/ring-android/app/src/main/res/values-fi/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fi/strings_account.xml
@@ -80,6 +80,7 @@
   <string name="account_stun_enable_label">Käytä Stun</string>
   <string name="account_stun_server_label">Stun palvelin</string>
   <string name="account_accept_files">Hyväksy saapuvat tiedostot automaattisesti</string>
+  <string name="account_conversation_settings_title">Keskustelun asetukset</string>
   <string name="account_accept_files_max_size">Automaattisesti hyväksyttävän tiedostokoon enimmäismäärä</string>
   <string name="account_accept_files_never">Älä koskaan hyväksy automaattisesti</string>
   <string name="account_accept_files_always">Hyväksy aina automaattisesti</string>
diff --git a/ring-android/app/src/main/res/values-fr/strings.xml b/ring-android/app/src/main/res/values-fr/strings.xml
index 322b931..8536b89 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -83,6 +83,7 @@
   <string name="notif_location_action_stop">Arrêter le partage de position</string>
   <string name="location_share_action_start">Démarrer le partage</string>
   <string name="location_share_action_stop">Arrêter le partage</string>
+  <string name="location_share_about_title">Information sur la carte</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Vous :</string>
   <string name="action_call_hangup">Raccrochez</string>
@@ -92,6 +93,8 @@
   <string name="start_error_title">Jami n\'arrive pas à se lancer !</string>
   <string name="start_error_mic_required">Jami demande pour fonctionner votre autorisation d\'utiliser votre microphone .</string>
   <string name="action_call_accept">Répondre</string>
+  <string name="action_call_hold_accept">Mettre en attente et prendre l\'appel</string>
+  <string name="action_call_end_accept">Raccrocher et prendre l\'appel</string>
   <string name="action_call_decline">Décliner</string>
   <string name="action_call_mic_mute">Rendre votre microphone muet</string>
   <string name="action_load_plugin">Charger le module d\'extension</string>
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 7608199..06f8e97 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
@@ -82,6 +82,7 @@
   <string name="account_stun_enable_label">Utiliser STUN</string>
   <string name="account_stun_server_label">Serveur STUN</string>
   <string name="account_accept_files">Accepter les fichiers entrants automatiquement</string>
+  <string name="account_conversation_settings_title">Paramètres des conversations</string>
   <string name="account_accept_files_max_size">Accepter automatiquement les fichiers de taille maximum</string>
   <string name="account_accept_files_never">Ne jamais accepter automatiquement</string>
   <string name="account_accept_files_always">Toujours accepter automatiquement
@@ -124,6 +125,7 @@
   <string name="account_tls_server_name_label">Serveur pour connections sortantes</string>
   <string name="account_tls_verify_server_label">TLS Verify Server</string>
   <string name="account_tls_verify_client_label">TLS Verify Client</string>
+  <string name="account_require_client_certificate_label">Le protocole TLS exige un certificat client</string>
   <string name="account_tls_negotiation_timeout_sec">Negotiation Timeout (sec)</string>
   <string name="account_rtp_max_port">Maximum</string>
   <string name="account_rtp_min_port">Minimum</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 c84ef3a..e0a5472 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
@@ -14,6 +14,10 @@
   <string name="pref_hd_summary">Activer l\'envoi de vidéo HD</string>
   <string name="pref_hwEncode_title">Activer l\'encodage matériel</string>
   <string name="pref_hwEncode_summary">Fonctionnalité expérimentale</string>
+  <string name="pref_videoBitrate_title">Débit binaire de la vidéo</string>
+  <string name="pref_videoBitrate_summary">Choisissez le débit binaire de la vidéo sortante par défaut (KB/s)</string>
+  <string name="pref_videoResolution_title">Résolution de la vidéo</string>
+  <string name="pref_videoResolution_summary">Choisissez la résolution sortante de la vidéo par défaut</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 Jami par défaut pour les appels</string>
diff --git a/ring-android/app/src/main/res/values-hu/strings.xml b/ring-android/app/src/main/res/values-hu/strings.xml
index 0a32e44..2cbb280 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -80,7 +80,7 @@
   <string name="location_share_contact">%1$s megosztja veled a tartózkodási helyét</string>
   <string name="notif_location_multi_title">Tartózkodási hely megosztása velük: %1$d</string>
   <string name="notif_location_remaining">%1$d perc van hátra</string>
-  <string name="notif_location_action_stop">Tarzózkodási hely megosztásának leállítása</string>
+  <string name="notif_location_action_stop">Tartózkodási hely megosztásának leállítása</string>
   <string name="location_share_action_start">Megosztás indítása</string>
   <string name="location_share_action_stop">Megosztás leállítása</string>
   <string name="location_share_about_title">Térkép adatai</string>
@@ -93,6 +93,8 @@
   <string name="start_error_title">Nem lehet elindítani Jami-t!</string>
   <string name="start_error_mic_required">A Jami működéséhez szükséges a mikrofont elérés engedélyezése.</string>
   <string name="action_call_accept">Hívás fogadása</string>
+  <string name="action_call_hold_accept">Tartás és bejövő hívás fogadása</string>
+  <string name="action_call_end_accept">Hívás befejezése és bejövő hívás fogadása</string>
   <string name="action_call_decline">Elutasítás</string>
   <string name="action_call_mic_mute">Mikrofon elnémítása</string>
   <string name="action_load_plugin">Beépülő modul betöltése</string>
diff --git a/ring-android/app/src/main/res/values-hu/strings_account.xml b/ring-android/app/src/main/res/values-hu/strings_account.xml
index 7ac74d3..d7bcd46 100644
--- a/ring-android/app/src/main/res/values-hu/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_account.xml
@@ -82,6 +82,7 @@
   <string name="account_stun_enable_label">STUN használata</string>
   <string name="account_stun_server_label">STUN-kiszolgáló</string>
   <string name="account_accept_files">A bejövő fájlok automatikus elfogadása</string>
+  <string name="account_conversation_settings_title">Beszélgetés beállításai</string>
   <string name="account_accept_files_max_size">Az automatikus elfogadás legnagyobb fájlmérete</string>
   <string name="account_accept_files_never">Soha sem fogadja el automatikusan</string>
   <string name="account_accept_files_always">Mindig fogadja el automatikusan</string>
@@ -97,8 +98,8 @@
   <string name="account_proxy_enable_label">DHT proxy használata</string>
   <string name="account_proxy_server_label">DHT proxy címe</string>
   <string name="account_proxy_server_list_label">DHT proxy lista URL-je</string>
-  <string name="account_peer_discovery_label">Helyi partnerfelfedezés</string>
-  <string name="account_peer_discovery_enable_label">Helyi pertnerfelfedezés engedélyezése</string>
+  <string name="account_peer_discovery_label">Helyi partner felderítése</string>
+  <string name="account_peer_discovery_enable_label">Helyi partner felderítése engedélyezése</string>
   <string name="account_peer_discovery_enable_summary">Csatlakozás más DHT-csomópontokhoz, amelyek a helyi hálózaton hirdetnek</string>
   <!--Security Details-->
   <string name="account_credentials_label">Hitelesítő adatok</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
index d973aa9..c03c533 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
@@ -82,6 +82,7 @@
   <string name="account_stun_enable_label">Usa Stun</string>
   <string name="account_stun_server_label">Server Stun</string>
   <string name="account_accept_files">Accetta i file in arrivo automaticamente</string>
+  <string name="account_conversation_settings_title">Impostazioni di conversazione</string>
   <string name="account_accept_files_max_size">Dimensione massima del file da accettare automaticamente</string>
   <string name="account_accept_files_never">Non accettare mai automaticamente</string>
   <string name="account_accept_files_always">Accetta sempre automaticamente</string>
@@ -122,6 +123,7 @@
   <string name="account_tls_server_name_label">Nome Server</string>
   <string name="account_tls_verify_server_label">Verifica Server</string>
   <string name="account_tls_verify_client_label">Verifica Client</string>
+  <string name="account_require_client_certificate_label">TLS Richiede certificato Client</string>
   <string name="account_tls_negotiation_timeout_sec">Timeout negoziazione (sec)</string>
   <string name="account_rtp_max_port">Massimo</string>
   <string name="account_rtp_min_port">Minimo</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
index 1e630f8..e6ceb1e 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
@@ -14,6 +14,10 @@
   <string name="pref_hd_summary">Abilita l\'invio di video HD</string>
   <string name="pref_hwEncode_title">Attiva la codifica accelerata</string>
   <string name="pref_hwEncode_summary">Funzioni sperimentali</string>
+  <string name="pref_videoBitrate_title">Video bitrate</string>
+  <string name="pref_videoBitrate_summary">Seleziona il bitrate video in uscita predefinito (KB/s)</string>
+  <string name="pref_videoResolution_title">Risoluzione video</string>
+  <string name="pref_videoResolution_summary">Seleziona la risoluzione video in uscita predefinita</string>
   <string name="pref_systemContacts_title">Usa la rubrica</string>
   <string name="pref_systemContacts_summary">Usa i contatti della rubrica per mostrare i dettagli del chiamante</string>
   <string name="pref_systemDialer_title">Effettua le chiamate usando Jami</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 eed2691..f0fe881 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
@@ -32,6 +32,7 @@
   <string name="menu_item_accounts">Gerenciar contas</string>
   <string name="menu_item_account">Administrar conta</string>
   <string name="menu_item_settings">Configurações</string>
+  <string name="menu_item_plugin_list">Configurações dos complementos</string>
   <string name="menu_item_share">Compartilhar meu contato</string>
   <string name="menu_item_about">Sobre Jami</string>
   <!--Dialing Fragment-->
@@ -83,6 +84,7 @@
   <string name="notif_location_action_stop">Parar de compartilhar a localização</string>
   <string name="location_share_action_start">Começar a compartilhar</string>
   <string name="location_share_action_stop">Parar de compartilhar</string>
+  <string name="location_share_about_title">Informações do mapa</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Você:</string>
   <string name="action_call_hangup">Desligar</string>
@@ -92,8 +94,11 @@
   <string name="start_error_title">Não é possível iniciar o Jami!</string>
   <string name="start_error_mic_required">O Jami requer permissão para uso do microfone para funcionar.</string>
   <string name="action_call_accept">Atender chamada</string>
+  <string name="action_call_hold_accept">Coloque em espera e receba chamada</string>
+  <string name="action_call_end_accept">Finalizar e receba chamada</string>
   <string name="action_call_decline">Rejeitar</string>
   <string name="action_call_mic_mute">Desativar microfone</string>
+  <string name="action_load_plugin">Carregue complemento</string>
   <string name="ab_action_speakerphone">Habilitar viva-voz</string>
   <string name="ab_action_contact_add">Adicionar aos contatos</string>
   <string name="ab_action_contact_add_question">Adicionar aos contatos?</string>
@@ -106,6 +111,7 @@
   <string name="write_a_message">Escrever uma mensagem</string>
   <string name="scan_qr">Escanear Código QR</string>
   <string name="ab_action_flipcamera">Virar câmera</string>
+  <string name="ab_action_hidepreview">Oculta visualização</string>
   <!--Text messages-->
   <string name="send_message">Enviar mensagem</string>
   <string name="message_sending">Enviando mensagem...</string>
@@ -172,6 +178,8 @@
   <string name="prompt_new_username">Entre novo nome de usuário</string>
   <string name="prompt_hint_username">Nome de usuário</string>
   <string name="help_password_choose">Escolha uma senha difícil que você poderá lembrar para proteger a sua conta Jami. </string>
+  <string name="help_password_enter">Digite a senha principal da sua conta Jami.</string>
+  <string name="help_server_enter">Digite URL do servidor de gerenciamento.</string>
   <string name="help_pin_enter">Entre com o PIN de uma outra conta Jami já configurada. Utilize a opção \"exportar conta do Jami\" para obter um novo PIN.</string>
   <string name="wizard_next">Próximo</string>
   <string name="wizard_back">Voltar</string>
@@ -181,6 +189,7 @@
   <string name="profile_message_warning">Seu perfil é compartilhado apenas com seus contatos</string>
   <string name="open_the_gallery">Abrir a galeria</string>
   <string name="take_a_photo">Tirar uma foto</string>
+  <string name="profile_name_hint">Digite seu nome</string>
   <!--Share fragment-->
   <string name="share_message">Digitalize este código com Jami</string>
   <string name="share_message_no_account">Por favor selecione uma conta para compartilhar.</string>
@@ -196,6 +205,7 @@
   <string name="contact_request_title">Nova requisição de contato</string>
   <string name="contact_request_msg">Você tem %1$s requisição de contato</string>
   <string name="contact_request_account">Para %1$s</string>
+  <string name="no_requests">Você não tem nenhum pedido de contato</string>
   <string name="message_contact_not_trusted_yet">%s não está em seus contatos ainda.\nVocê aceita ou recusa esta solicitação de contato?</string>
   <string name="message_contact_not_trusted">%s não está em seus contatos.\nDeseja adicionar novo contato?</string>
   <!--Send contact requests-->
@@ -206,6 +216,7 @@
   <string name="no_blocked_contact">Nenhum contato bloqueado</string>
   <!--Smartlist-->
   <string name="no_contact_request">Nenhuma solicitação de contato enviada</string>
+  <string name="conversation_placeholder">Você ainda não tem conversas</string>
   <string name="contact_request_sent">Solicitação de contato enviada</string>
   <string name="start_conversation">Iniciar conversa</string>
   <string name="search_results">Resultados da Busca</string>
@@ -263,5 +274,19 @@
   <string name="tv_send_video">Enviar Mídia</string>
   <string name="conversation_input_speech_hint">Fale algo...</string>
   <!--WIZARD-->
+  <string name="wizard_status_recommended">Recomendado</string>
+  <string name="wizard_status_optional">Opcional</string>
+  <string name="wizard_status_required">Requerido</string>
+  <string name="wizard_username_info">Escolha nome de usuário para sua conta</string>
+  <string name="wizard_username_button">Escolha nome de usuário</string>
+  <string name="wizard_username_skip">Pular a escolha do nome do usuário</string>
+  <string name="wizard_password_info">Senha da conta</string>
+  <string name="wizard_password_placeholder">Escolha uma senha para criptografar a chave da conta neste dispositivo</string>
+  <string name="wizard_password_button">Escolha senha</string>
   <string name="wizard_password_skip">Criar conta</string>
+  <string name="wizard_password_switch">Criptografar conta com senha</string>
+  <string name="wizard_password_warning">Note que a senha não pode ser recuperada</string>
+  <string name="wizard_profile_info">O perfil só é compartilhado com contatos</string>
+  <string name="wizard_profile_button">Salvar perfil</string>
+  <string name="wizard_profile_skip">Pular e fazer depois</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
index bb585b8..5e2931e 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
@@ -187,6 +187,7 @@
   <string name="trying_to_register_name">Tentando registrar nome</string>
   <string name="registered_username">Nome de usuário registrado</string>
   <string name="register_username">Registrar nome de usuário público</string>
+  <string name="register_recommended">Recomendado</string>
   <string name="username_already_taken">Nome de usuário já em uso</string>
   <string name="invalid_username">Nome de usuário inválido</string>
   <string name="unknown_error">Erro desconhecido. Por favor, verifique sua conexão de rede!</string>
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings.xml b/ring-android/app/src/main/res/values-ro-rRO/strings.xml
index 6531a05..dca4a84 100644
--- a/ring-android/app/src/main/res/values-ro-rRO/strings.xml
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings.xml
@@ -94,6 +94,8 @@
   <string name="start_error_title">Jami nu se deschide !</string>
   <string name="start_error_mic_required">Jami trebuie să folosească microfonul ca să funcționeze.</string>
   <string name="action_call_accept">Răspunde</string>
+  <string name="action_call_hold_accept">Așteptare și răspunde la apel</string>
+  <string name="action_call_end_accept">Închide și răspunde la apel</string>
   <string name="action_call_decline">Refuză</string>
   <string name="action_call_mic_mute">Oprește microfonul</string>
   <string name="action_load_plugin">Pornește Extensia</string>
@@ -120,7 +122,7 @@
   <string name="hist_file_received">Fișier primit</string>
   <string name="conversation_send_audio">Înregistrează un mesaj vocal</string>
   <string name="conversation_send_video">Înregistrează un mesaj video</string>
-  <string name="conversation_share_location">Distribuie poziția ta</string>
+  <string name="conversation_share_location">Distribuie poziția</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permisiune pentru videocameră</string>
   <string name="permission_dialog_camera_message">Conversațiile video au nevoie de acces la videocameră pentru a funcționa. Dacă vrei, activeaz-o.</string>
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml b/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml
index 885057e..7bd8380 100644
--- a/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml
@@ -26,7 +26,7 @@
         Vei putea face și primi doar apeluri IP directe.
         Îți vei putea modifica contul mai tîrziu</string>
   <string name="account_type_ip2ip">Cont IP</string>
-  <string name="help_ring">Un cont Jami îți permite să comunici cu alții în siguranță, în peer to peer, printr-o rețea complet distribuită.</string>
+  <string name="help_ring">Un cont Jami îți permite să comunici direct cu alții, în siguranță, fără server, printr-o rețea complet distribuită.</string>
   <string name="help_sip_title">Adaugă contul tău SIP</string>
   <string name="help_sip">Configurează un cont SIP existent.</string>
   <string name="create_sip_account">Adaugă un cont SIP</string>
@@ -82,6 +82,7 @@
   <string name="account_stun_enable_label">Folosește STUN</string>
   <string name="account_stun_server_label">Server STUN</string>
   <string name="account_accept_files">Acceptă automat fișierele primite</string>
+  <string name="account_conversation_settings_title">Reglările conversației</string>
   <string name="account_accept_files_max_size">Dimensiunea maximă a fișierului acceptat automat</string>
   <string name="account_accept_files_never">Nu accepta niciodată automat</string>
   <string name="account_accept_files_always">Acceptă mereu automat</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings.xml b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
index a789201..b488803 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
@@ -93,6 +93,8 @@
   <string name="start_error_title">S\’niset dot Jami!</string>
   <string name="start_error_mic_required">Që të funksionojë, Jami lyp leje për mikrofonin.</string>
   <string name="action_call_accept">Pranoje thirrjen</string>
+  <string name="action_call_hold_accept">Mbaje dhe bëje thirrje</string>
+  <string name="action_call_end_accept">Përfundoje dhe bëje thirrje</string>
   <string name="action_call_decline">Hidhe tej</string>
   <string name="action_call_mic_mute">Heshtoje mikrofonin</string>
   <string name="action_load_plugin">Ngarkoje Shtojcën</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
index 5a0141e..619795d 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
@@ -82,6 +82,7 @@
   <string name="account_stun_enable_label">Përdor Stun</string>
   <string name="account_stun_server_label">Shërbyes Stun</string>
   <string name="account_accept_files">Lejo automatikisht kartela ardhëse </string>
+  <string name="account_conversation_settings_title">Rregullime bisedash</string>
   <string name="account_accept_files_max_size">Madhësi maksimum kartelash për t’u pranuar automatikisht</string>
   <string name="account_accept_files_never">Mos i prano kurrë automatikisht</string>
   <string name="account_accept_files_always">Pranoji përherë automatikisht</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index c3adb46..f18c0fe 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
@@ -12,7 +12,7 @@
   <string name="no_browser_app_installed">未找到浏览器，请安装后再重试浏览该网页。</string>
   <string name="email_chooser_title">使用…发送邮件</string>
   <string name="website_chooser_title">使用…浏览网站</string>
-  <string name="license">本软件由版权持有人及其他责任者“按原样”提供，不提供任何形式的担保。详细信息请参阅<u>GNU 通用公共许可证版本 3 或更新</u></string>
+  <string name="license">本软件由版权持有人及其他责任者“按原样”提供，不提供任何形式的担保。详细信息请参阅 <u>GNU 通用公共许可证版本 3 或更新</u></string>
   <string name="description">Jami 是一种自由通信软件，它尊重用户的自由和隐私。</string>
   <string name="credits">致谢</string>
   <string name="call_service_description">这项服务对于保持您的通话在前台运行是必要的。它仅在您通话时运行。</string>
@@ -92,6 +92,8 @@
   <string name="start_error_title">无法启动 Jami！</string>
   <string name="start_error_mic_required">Jami 需要麦克风权限以正常工作。</string>
   <string name="action_call_accept">接听</string>
+  <string name="action_call_hold_accept">保持并呼叫</string>
+  <string name="action_call_end_accept">结束并呼叫</string>
   <string name="action_call_decline">拒接</string>
   <string name="action_call_mic_mute">关闭麦克风</string>
   <string name="action_load_plugin">加载插件</string>
@@ -195,7 +197,7 @@
   <string name="generic_error_migration_message">账户迁移时发生错误</string>
   <string name="title_share_with">分享给...</string>
   <!--Pending contact requests-->
-  <string name="accept">接听</string>
+  <string name="accept">接受</string>
   <string name="refuse">拒接</string>
   <string name="block">屏蔽</string>
   <string name="contact_request_title">新联系人请求</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
index e899d04..b3253f8 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
@@ -26,12 +26,12 @@
         这样的话，您只能拨打和接听 ip 通话。
         您可以稍后编辑该账户。</string>
   <string name="account_type_ip2ip">IP 账户</string>
-  <string name="help_ring">Jami 账户允许您通过完全的分布式网络以点对点的方式安全地与其他人员联系。</string>
+  <string name="help_ring">使用 Jami 账户您可以通过完全分布式的网络以点对点的方式安全地与其他人联系。</string>
   <string name="help_sip_title">添加您的 SIP 账户</string>
   <string name="help_sip">配置已有的 SIP 账户。</string>
   <string name="create_sip_account">添加 SIP 账户</string>
   <!--Strings related to account deletion-->
-  <string name="account_delete_dialog_title">删除账户吗？</string>
+  <string name="account_delete_dialog_title">是否删除账户？</string>
   <string name="account_delete_dialog_message">该操作不可撤销。</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">没有已注册账户</string>
@@ -82,6 +82,7 @@
   <string name="account_stun_enable_label">使用 Stun</string>
   <string name="account_stun_server_label">Stun 服务器</string>
   <string name="account_accept_files">自动接收传入的文件</string>
+  <string name="account_conversation_settings_title">会话设置</string>
   <string name="account_accept_files_max_size">允许自动接收文件的最大大小</string>
   <string name="account_accept_files_never">从不自动接收</string>
   <string name="account_accept_files_always">总是自动接收</string>
@@ -212,7 +213,7 @@
   <string name="account_revoke_device_hint">输入密码以确认</string>
   <string name="enter_password">输入密码</string>
   <string name="revoke_device_title">吊销设备</string>
-  <string name="revoke_device_message">确定吊销设备%1$s吗？</string>
+  <string name="revoke_device_message">您确定要吊销设备 %1$s 吗？</string>
   <string name="revoke_device_wait_title">请稍等…</string>
   <string name="revoke_device_wait_message">正在吊销设备</string>
   <string name="rename_device_title">重命名该设备</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
index f242ae0..75a2901 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
@@ -15,9 +15,9 @@
   <string name="pref_hwEncode_title">启用加速编码</string>
   <string name="pref_hwEncode_summary">实验性功能</string>
   <string name="pref_videoBitrate_title">视频比特率</string>
-  <string name="pref_videoBitrate_summary">选择默认出站视频比特率 (KB/s)</string>
+  <string name="pref_videoBitrate_summary">选择默认传出视频比特率 (KB/s)</string>
   <string name="pref_videoResolution_title">视频分辨率</string>
-  <string name="pref_videoResolution_summary">选择默认出站视频分辨率</string>
+  <string name="pref_videoResolution_summary">选择默认传出视频分辨率</string>
   <string name="pref_systemContacts_title">使用系统通讯录</string>
   <string name="pref_systemContacts_summary">使用系统通讯录显示呼叫者信息。</string>
   <string name="pref_systemDialer_title">用 Jami 代替系统拨号</string>
@@ -30,7 +30,7 @@
   <string name="pref_persistNotification_summary">允许在后台运行以接收电话和消息。</string>
   <!--Plugin-->
   <string name="pref_plugins_title">插件</string>
-  <string name="pref_plugins_summary">启用擦肩并设置它们的参数</string>
+  <string name="pref_plugins_summary">启用插件并设置它们的参数</string>
   <string name="fab_plugins_add">添加一个新插件</string>
   <string name="plugin_uninstall_title">卸载插件？</string>
   <string name="plugin_reset_preferences">重置插件设置</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
index f3d4e3a..e091629 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
@@ -92,6 +92,8 @@
   <string name="start_error_title">無法啟動 Jami！</string>
   <string name="start_error_mic_required">Jami 需要麥克風權限以正常運作。</string>
   <string name="action_call_accept">打電話</string>
+  <string name="action_call_hold_accept">保留並接聽通話</string>
+  <string name="action_call_end_accept">結束並接聽通話</string>
   <string name="action_call_decline">拒絕</string>
   <string name="action_call_mic_mute">麥克風靜音</string>
   <string name="action_load_plugin">載入外掛程式</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
index 7710faf..c4effff 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
@@ -82,6 +82,7 @@
   <string name="account_stun_enable_label">使用 Stun</string>
   <string name="account_stun_server_label">Stun 伺服器</string>
   <string name="account_accept_files">自動接受傳入的檔案</string>
+  <string name="account_conversation_settings_title">對話設定</string>
   <string name="account_accept_files_max_size">自動接受的最大檔案大小</string>
   <string name="account_accept_files_never">永不自動接受</string>
   <string name="account_accept_files_always">永遠自動接受</string>