diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index 6052c4a..6403617 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings.xml
@@ -2,7 +2,9 @@
 <resources>
   <!--About-->
   <string name="feedback_section">Feedback</string>
+  <string name="report"><u>Schicken Sie uns eine e-Mail</u></string>
   <string name="section_license">Lizenz</string>
+  <string name="sponsor_section">Jami ist freie Software, entwickelt und unterstützt von</string>
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Mitwirken</string>
   <string name="version_section">Version</string>
@@ -10,6 +12,8 @@
   <string name="no_browser_app_installed">Keine Browser-App gefunden, installieren Sie eine, um die Homepage darzustellen</string>
   <string name="email_chooser_title">Senden von E-Mails über...</string>
   <string name="website_chooser_title">Darstellung der Homepage mit...</string>
+  <string name="license">Diese Software wird \"wie sie ist\" ohne Gewährleistung irgendwelcher Art zur Verfügung gestellt. Details finden Sie unter <u>GNU General Public License Version 3 oder später</u></string>
+  <string name="description">Jami ist Freie Software für universelle Kommunikation, die die Freiheiten und die Privatsphäre ihrer Nutzer respektiert.</string>
   <string name="credits">Abspann</string>
   <!--About dialog-->
   <string name="developed_by">Entwickelt von</string>
@@ -31,6 +35,7 @@
   <string name="menu_item_account">Konto verwalten</string>
   <string name="menu_item_settings">Einstellungen</string>
   <string name="menu_item_share">Teile meine RING-ID</string>
+  <string name="menu_item_about">Über Jami</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Nummer wählen</string>
   <!--History Fragment-->
@@ -55,12 +60,21 @@
   <string name="notif_current_call_title">Aktueller Anruf mit %1$s</string>
   <string name="notif_current_call">Aktueller Anruf</string>
   <string name="notif_channel_calls">Anrufe</string>
+  <string name="notif_channel_missed_calls">Verpasste Anrufe</string>
   <string name="notif_channel_messages">Nachrichten</string>
   <string name="notif_channel_requests">Anfragen</string>
   <string name="notif_channel_file_transfer">Dateiübertragung</string>
+  <string name="notif_channel_background_service">Hintergrundprozess</string>
+  <string name="notif_channel_background_service_descr">Ermöglicht den Empfang von Anrufen und Nachrichten zu jeder Zeit.</string>
+  <string name="notif_background_service">Jami läuft momentan im Hintergrund</string>
   <string name="notif_mark_as_read">Als gelesen markieren</string>
+  <string name="notif_dismiss">Abweisen</string>
+  <string name="notif_reply">Antworten</string>
+  <string name="notif_incoming_file_transfer_title">Einkommende Datei von %1$s</string>
   <string name="notif_incoming_file_transfer">Jemand möchte dir eine Datei senden</string>
+  <string name="notif_outgoing_file_transfer_title">Sende Datei an %1$s</string>
   <string name="notif_outgoing_file_transfer">Jemand möchte dir eine Datei senden</string>
+  <string name="notif_incoming_picture">Bild von %1$s</string>
   <string name="action_open">Öffnen</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Sie:</string>
@@ -68,10 +82,16 @@
   <string name="ongoing_call">Aktiver Anruf</string>
   <string name="hist_in_call">Eingehender Anruf von %1$s</string>
   <string name="hist_out_call">Ausgehende Anruf von %1$s</string>
+  <string name="start_error_title">Kann Jami nicht starten!</string>
+  <string name="start_error_mic_required">Jami benötigt Mikrofon-Zugriff.</string>
   <string name="action_call_accept">Annehmen</string>
   <string name="action_call_decline">Ablehnen</string>
+  <string name="action_call_mic_mute">Mikrofon stummschalten</string>
   <string name="ab_action_speakerphone">Lautsprecher aktivieren</string>
-  <string name="ab_action_contact_add">Kontakte hinzufügen</string>
+  <string name="ab_action_contact_add">Kontakt hinzufügen</string>
+  <string name="ab_action_contact_add_question">Zu Kontakten hinzufügen?</string>
+  <string name="hist_contact_added">Kontakt hinzugefügt</string>
+  <string name="hist_invitation_received">Einladung erhalten</string>
   <string name="ab_action_audio_call">Audioanruf</string>
   <string name="ab_action_video_call">Videoanruf</string>
   <string name="ab_action_change_screen_orientation">Ändern der Bildschirmausrichtung</string>
@@ -85,33 +105,57 @@
   <string name="message_failed">Fehlgeschlagen</string>
   <string name="time_just_now">Gerade eben</string>
   <string name="send_file">Datei senden</string>
+  <string name="hist_file_sent">Datei gesendet</string>
+  <string name="hist_file_received">Datei empfangen</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera-Berechtigung</string>
   <string name="permission_dialog_camera_message">Video-Konferenzen benötigen Zugriff auf die Kamera. Bitte erlauben Sie diesen Zugriff.</string>
   <string name="ringtone_error_title">Fehler</string>
   <string name="ringtone_error_format_not_supported">Dieses Format wird nicht unterstützt.</string>
+  <string name="ringtone_error_size_too_big">Diese Datei ist zu groß. Maximal %1$dkB sind erlaubt.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Jami benötigt für diese Funktion die Erlaubnis \"Kontakte lesen\". Bitte zulassen.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Jami benötigt für diese Funktion die Erlaubnis \"Anruf-Log schreiben\". Bitte zulassen.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Scannen Sie den QR-Code des Kontos, das Sie hinzufügen möchten.</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">Verlauf löschen?</string>
+  <string name="clear_history_dialog_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
   <string name="clear_history_completed">Verlauf wurde gelöscht.</string>
   <!--Conversation-->
+  <string name="conversation_details">Kontaktdetails</string>
   <string name="conversation_action_delete_this">Diese Unterhaltung löschen</string>
   <string name="conversation_action_delete_this_title">Diese Unterhaltung löschen?</string>
   <string name="conversation_action_delete_this_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
   <string name="conversation_action_history_clear">Verlauf löschen</string>
+  <string name="conversation_action_history_clear_title">Gesprächsverlauf löschen?</string>
+  <string name="conversation_action_history_clear_message">Das wird den Gesprächsverlauf endgültig löschen.</string>
   <string name="conversation_action_remove_this">Kontakt löschen</string>
+  <string name="conversation_action_remove_this_title">Diesen Kontakt löschen?</string>
+  <string name="conversation_action_remove_this_message">Das wird den Kontakt und den Gesprächsverlauf endgültig löschen.</string>
   <string name="conversation_action_copy_peer_number">Nummer kopieren</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s wurde in die Zwischenablage kopiert.</string>
   <string name="conversation_action_select_peer_number">Nummer auswählen</string>
+  <string name="conversation_action_block_this">Kontakt blockieren</string>
+  <string name="conversation_action_go_to_call">Zu laufendem Gespräch zurückkehren</string>
+  <string name="clip_contact_uri">Kontaktadresse</string>
+  <string name="block_contact_dialog_title">%1$s blockieren?</string>
+  <string name="block_contact_dialog_message">%1$s kann Sie nicht kontaktieren, bis Sie die Blockierung aufheben.</string>
+  <string name="block_contact_completed">%1$s wurde blockiert.</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">%1$s hinzufügen?</string>
   <string name="prompt_new_password">Neues Passwort</string>
   <string name="prompt_new_password_optional">Neues Passwort (optional)</string>
   <string name="prompt_new_password_repeat">Neues Passwort wiederholen</string>
+  <string name="account_create_title">Jami-Konto erstellen</string>
   <string name="prompt_new_username">Neuen Benutzername eingeben</string>
+  <string name="help_password_choose">Wählen Sie ein sicheres Passwort und merken Sie es sich um Ihre Jami-Zugangsdaten zu schützen.</string>
+  <string name="help_password_enter">Geben Sie das Passwort für Ihre Jami-Konto ein.</string>
+  <string name="help_pin_enter">Geben Sie die PIN eines anderen konfigurierten Jami-Kontos ein. Verwenden Sie die Funktion \"Jami-Konto exportieren\", um eine PIN zu erhalten.</string>
   <string name="wizard_next">Weiter</string>
   <string name="wizard_back">Zurück</string>
+  <string name="wizard_skip">Überspringen</string>
   <!--MenuHeaderView-->
   <string name="profile">Mein Profil</string>
   <string name="profile_message_warning">Ihr Profil wird nur mit Ihren Kontakten geteilt</string>
@@ -119,6 +163,7 @@
   <string name="take_a_photo">Mache ein Foto</string>
   <string name="profile_name_hint">Name eingeben (optional)</string>
   <!--Share fragment-->
+  <string name="share_message">Diesen Code mit Jami scannen</string>
   <string name="share_message_no_account">Bitte wählen Sie ein Konto, das Sie teilen wollen.</string>
   <string name="share_your_account_information">Teile meine RING-ID</string>
   <string name="generic_error_migration">Fehler</string>
@@ -129,7 +174,10 @@
   <string name="block">Blockieren</string>
   <string name="contact_request_title">Neue Kontaktanfrage</string>
   <string name="contact_request_msg">Du hast %1$s Kontaktanfragen</string>
-  <string name="no_requests">0 Kontakanfragen</string>
+  <string name="contact_request_account">Für %1$s</string>
+  <string name="no_requests">0 Kontaktanfragen</string>
+  <string name="message_contact_not_trusted_yet">%s ist noch nicht in Ihrer Kontaktliste.\nWollen Sie diese Kontaktanfrage annehmen oder ablehnen?</string>
+  <string name="message_contact_not_trusted">%s ist nicht in Ihrer Kontaktliste.\nEinen neuen Kontakt hinzufügen?</string>
   <!--Send contact requests-->
   <string name="send_request_button">Senden</string>
   <string name="send_request_title">Eine Kontaktanfrage verschicken</string>
@@ -149,4 +197,19 @@
   <string name="not_able_to_write_file">Datei kann nicht geschrieben werden</string>
   <string name="file_transfer_status_created">Initialisiere Dateiübertragung </string>
   <string name="file_transfer_status_unsupported">Nicht unterstützt</string>
+  <string name="file_transfer_status_wait_peer_acceptance">warte auf Bestätigung vom Partner</string>
+  <string name="file_transfer_status_wait_host_acceptance">warte auf Bestätigung vom Host</string>
+  <string name="file_transfer_status_ongoing">Übertragung läuft</string>
+  <string name="file_transfer_status_finished">beendet</string>
+  <string name="file_transfer_status_closed_by_host">vom Host geschlossen</string>
+  <string name="file_transfer_status_closed_by_peer">vom Partner geschlossen</string>
+  <string name="file_transfer_status_invalid_pathname">ungültiger Pfad</string>
+  <string name="file_transfer_status_unjoinable_peer">Partner nicht erreichbar</string>
+  <string name="file_saved_in">Datei gespeichert unter %s</string>
+  <string name="no_space_left_on_device">Kein Speicherplatz mehr frei!</string>
+  <string name="title_media_viewer">Dateibetrachter</string>
+  <string name="menu_file_open">Datei öffnen</string>
+  <string name="menu_file_download">Datei herunterladen</string>
+  <string name="menu_file_delete">Datei löschen</string>
+  <string name="menu_file_share">Datei teilen</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
index 637f6c5..811293c 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
@@ -5,7 +5,9 @@
   <string name="ic_advanced_menu">Erweiterte Einstellungen</string>
   <string name="ic_blacklist_menu">Blockierte Kontakte</string>
   <!--Strings related to account creation-->
+  <string name="add_ring_account_title">Jami-Konto hinzufügen</string>
   <string name="add_sip_account_title">SIP-Konto hinzufügen</string>
+  <string name="ring_account_default_name">Ring-Konto %1$s</string>
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Hostname</string>
   <string name="prompt_username">Benutzername</string>
@@ -16,10 +18,13 @@
   <string name="action_settings">Einstellungen</string>
   <string name="error_field_required">Dieses Feld ist erforderlich</string>
   <string name="dialog_wait_create">Konto wird hinzugefügt</string>
-  <string name="dialog_wait_create_details">Bitte warten Sie während Ihr Konto hinzugefügt wird...</string>
+  <string name="dialog_wait_create_details">Bitte warten Sie, während Ihr Konto hinzugefügt wird...</string>
   <string name="dialog_wait_update">Konto aktualisieren</string>
-  <string name="dialog_wait_update_details">Bitte warten Sie währen Ihr Konto aktualisiert wird...</string>
+  <string name="dialog_wait_update_details">Bitte warten Sie, während Ihr Konto aktualisiert wird...</string>
   <string name="dialog_warn_ip2ip_account_title">Leeres SIP-Konto anlegen?</string>
+  <string name="dialog_warn_ip2ip_account_message">Sie sind im Begriff, ein SIP-Konto ohne gültigen Hostnamen zu erzeugen.
+Sie werden nur Gespräche mit direkten IP-Adressen führen können.
+Sie können Ihr Konto später ändern.</string>
   <string name="account_type_ip2ip">IP Konto</string>
   <string name="help_sip_title">Ihr SIP-Konto hinzufügen</string>
   <string name="help_sip">Richte ein bestehendes SIP-Konto ein.</string>
@@ -29,8 +34,10 @@
   <string name="account_delete_dialog_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Es ist kein Konto registriert</string>
-  <string name="normal_accounts_titles">Kontos</string>
+  <string name="normal_accounts_titles">Konten</string>
+  <string name="normal_devices_titles">Bekannte Geräte, die mit diesem Jami-Konto verbunden sind</string>
   <string name="account_device_revoke">Gerät widerrufen</string>
+  <string name="account_device_revocation_success_title">Erfolg</string>
   <string name="account_device_revocation_wrong_password">Falsches Passwort.</string>
   <string name="account_device_revocation_unknown_device">Unbekanntes Gerät.</string>
   <string name="account_device_revocation_error_unknown">Unbekannter Fehler.</string>
@@ -68,6 +75,9 @@
   <string name="account_turn_server_label">TURN-Server</string>
   <string name="account_turn_username_label">TURN-Benutzername</string>
   <string name="account_turn_password_label">TURN-Kennwort</string>
+  <string name="account_proxy_label">DHT Proxy</string>
+  <string name="account_proxy_enable_label">DHT Proxy verwenden</string>
+  <string name="account_proxy_server_label">DHT Proxy Adresse</string>
   <!--Security Details-->
   <string name="account_credentials_label">Anmeldeinformationen</string>
   <string name="account_credentials_edit">Anmeldeinformationen bearbeiten</string>
@@ -83,33 +93,56 @@
   <string name="account_tls_server_name_label">Servername</string>
   <string name="account_tls_verify_server_label">Server überprüfen</string>
   <string name="account_tls_verify_client_label">Client überprüfen</string>
+  <string name="account_tls_negotiation_timeout_sec">Timeout für TLS-Handshake (sec)</string>
   <string name="account_rtp_max_port">Maximum</string>
   <string name="account_rtp_min_port">Minimum</string>
   <!--restore/backup-->
   <string name="error_password_char_count">Mindestens 6 Zeichen</string>
   <string name="error_passwords_not_equals">Kennwörter stimmen nicht überein</string>
   <string name="export_account_wait_title">Bitte warten...</string>
-  <string name="export_account_wait_message">Veröffentlichen neuer Kontoinformationen</string>
+  <string name="export_account_wait_message">Veröffentliche neue Kontoinformationen...</string>
   <string name="account_export_end_decryption_message">Ihr Konto konnte mit dem angegebenen Passwort nicht entsperrt werden.</string>
   <string name="account_export_end_network_title">Netzwerkfehler</string>
   <string name="account_export_end_error_title">Fehler</string>
   <string name="account_export_end_error_message">Das Konto konnte nicht exportiert werden. Ein unbekannter Fehler ist aufgetreten.</string>
   <string name="account_enter_password">Passwort eingeben</string>
+  <string name="account_contact_me">Kontaktiere mich bei Jami!</string>
   <string name="update_account">Konto aktualisieren</string>
+  <string name="ring_account">Jami-Konto</string>
+  <string name="account_update_needed">Update benötigt</string>
+  <string name="account_cannot_be_found_title">Konto nicht gefunden</string>
+  <string name="account_no_network_title">Kann keine Verbindung zum Netzwerk herstellen</string>
+  <string name="account_sip_success_title">SIP-Konto registriert</string>
   <string name="account_link_button">Dieses Gerät mit einem Ring-Konto verknüpfen</string>
   <string name="account_link_prompt_pin">PIN eingeben</string>
+  <string name="account_new_button">Jami-Konto erstellen</string>
+  <string name="account_link_export_button">Ein anderes Gerät mit diesem Konto verknüpfen</string>
+  <string name="account_link_export_info">Um dieses Konto auf anderen Geräten zu verwenden, müssen Sie es zuerst auf Jami veröffentlichen. Dadurch wird ein PIN-Code erzeugt, den Sie auf dem neuen Gerät bei der Einrichtung des Kontos eingeben müssen. Diese PIN ist für 10 Minuten gültig.</string>
+  <string name="account_start_export_button">PIN generieren</string>
+  <string name="account_end_export_infos">Ihre PIN ist:\n\n%%\n\nUm diesen Vorgang abzuschließen, müssen Sie Jami auf dem neuen Gerät starten. Erzeugen Sie ein neues Konto mittels \"Dieses Gerät mit einem Konto verknüpfen\". Ihre PIN ist für 10 Minuten gültig.</string>
+  <string name="account_link_export_info_light">Um dieses Konto auf anderen Geräten zu verwenden, müssen Sie es zuerst auf Jami veröffentlichen. Dadurch wird ein PIN-Code erzeugt, den Sie auf dem neuen Gerät bei der Einrichtung des Kontos eingeben müssen. Diese PIN ist für 10 Minuten gültig.</string>
+  <string name="account_export_title">Geräte hinzufügen</string>
   <!--Name registration-->
   <string name="error_username_empty">Einen Benutzernamen eingeben</string>
   <string name="username_already_taken">Benutzername bereits vergeben</string>
   <string name="invalid_username">Ungültiger Benutzername</string>
+  <string name="looking_for_username_availability">Prüfe auf Verfügbarkeit des Benutzernamens...</string>
   <string name="account_status_connecting">Verbinden</string>
+  <string name="account_status_connection_error">Fehler beim Verbindungsaufbau</string>
   <string name="account_status_online">Online</string>
   <string name="account_status_unknown">Unbekannt</string>
   <string name="account_status_offline">Offline</string>
   <!--Create account-->
+  <string name="account_creation_home">Willkommen bei Jami</string>
   <!--Edit profile-->
   <!--Devices-->
+  <string name="account_revoke_device_hint">Geben Sie Ihr Passwort zur Bestätigung ein</string>
   <string name="enter_password">Passwort eingeben</string>
   <string name="revoke_device_title">Gerät widerrufen</string>
   <string name="revoke_device_wait_title">Bitte warten...</string>
+  <string name="rename_device_title">Dieses Gerät umbenennen</string>
+  <string name="rename_device_button">Gerät umbenennen</string>
+  <string name="account_rename_device_hint">Wählen Sie einen neuen Gerätenamen</string>
+  <string name="account_device_name_empty">Der Gerätename darf nicht leer sein</string>
+  <string name="account_device_this_indicator">dieses Gerät</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_call.xml b/ring-android/app/src/main/res/values-de-rDE/strings_call.xml
index eb0f204..ef6d7c6 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_call.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_call.xml
@@ -20,6 +20,10 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- Call error -->
+    <string name="call_error_no_microphone">Anruf abgebrochen. Kein Mikrofon erkannt.</string>
+    <string name="call_error_no_camera_no_microphone">Anruf abgebrochen. Kamera oder Mikrofon nicht erkannt.</string>
+
     <!-- SipCalls -->
     <string name="call_human_state_searching">Suche</string>
     <string name="call_human_state_incoming">Eingehend</string>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml b/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
index d220abf..71fdfe1 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
@@ -6,8 +6,20 @@
   <string name="pref_category_system">System</string>
   <string name="pref_category_privacy">Datenschutz</string>
   <string name="pref_mobileData_title">Mobile Daten</string>
+  <string name="pref_mobileData_summary">Jami die Nutzung von 3G/LTE zusätzlich zu WLAN erlauben</string>
+  <string name="pref_pushNotifications_title">Push-Benachrichtigungen</string>
+  <string name="pref_pushNotifications_summary">Google-Server verwenden, um den Empfang von Anrufen/Nachrichten im Hintergrund zu ermöglichen</string>
+  <string name="pref_hd_summary">HD-Videoübertragung aktivieren</string>
+  <string name="pref_hwEncode_title">Hardware-Beschleunigung für den Encoder verwenden</string>
+  <string name="pref_hwEncode_summary">Experimentelle Funktion</string>
   <string name="pref_systemContacts_title">Systemkontakte benutzen</string>
   <string name="pref_systemContacts_summary">Systemkontakte benutzen, um Anruferdetails anzuzeigen.</string>
+  <string name="pref_systemDialer_title">Telefonanrufe auch über Jami abwickeln</string>
+  <string name="pref_systemDialer_summary">Ring auch für normale Telefonanrufe nutzen, sofern möglich.</string>
+  <string name="pref_startOnBoot_title">Jami beim Hochfahren starten</string>
+  <string name="pref_startOnBoot_summary">Jami im Hintergrund ausführen während das System startet.</string>
   <string name="pref_clearHistory_title">Verlauf löschen</string>
   <string name="pref_clearHistory_summary">Löschen der Konversationshistorie. Diese Aktion kann nicht rückgängig gemacht werden.</string>
+  <string name="pref_persistNotification_title">Im Hintergrund ausführen</string>
+  <string name="pref_persistNotification_summary">Ausführung im Hintergrund zulassen, um Anrufe und Nachrichten zu empfangen.</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de/strings.xml b/ring-android/app/src/main/res/values-de/strings.xml
index 386d993..5c0454e 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -65,24 +65,31 @@
   <string name="notif_channel_requests">Anfragen</string>
   <string name="notif_channel_file_transfer">Dateitransfer</string>
   <string name="notif_channel_background_service">Hintergrunddienst</string>
+  <string name="notif_channel_background_service_descr">Ermöglicht den jederzeitigen Empfang von Anrufen und Nachrichten.</string>
+  <string name="notif_background_service">Jami läuft momentan im Hintergrund</string>
   <string name="notif_mark_as_read">Als gelesen markieren</string>
+  <string name="notif_dismiss">Verwerfen</string>
+  <string name="notif_reply">Antworten</string>
   <string name="notif_incoming_file_transfer_title">Eingehende Datei von %1$s</string>
   <string name="notif_incoming_file_transfer">Jemand möchte Ihnen eine Datei schicken</string>
   <string name="notif_outgoing_file_transfer_title">Datei an %1$s senden</string>
   <string name="notif_outgoing_file_transfer">Jemand möchte Ihnen eine Datei schicken</string>
+  <string name="notif_incoming_picture">Bild von %1$s</string>
   <string name="action_open">Öffnen</string>
   <!--Call Fragment-->
-  <string name="you_txt_prefix">Du:</string>
+  <string name="you_txt_prefix">Sie:</string>
   <string name="action_call_hangup">Auflegen</string>
   <string name="ongoing_call">Derzeitiger Anruf</string>
   <string name="hist_in_call">Eingehender Anruf von %1$s</string>
   <string name="hist_out_call">Ausgehender Anruf von %1$s</string>
   <string name="start_error_title">Jami konnte nicht gestartet werden!</string>
+  <string name="start_error_mic_required">Jami benötigt die Erlaubnis, auf das Mikrofon zuzugreifen.</string>
   <string name="action_call_accept">Anruf annehmen</string>
   <string name="action_call_decline">Ablehnen</string>
   <string name="action_call_mic_mute">Mikrofon stummschalten</string>
   <string name="ab_action_speakerphone">Lautsprecher einschalten</string>
   <string name="ab_action_contact_add">Kontakte hinzufügen</string>
+  <string name="ab_action_contact_add_question">Zu Kontakten hinzufügen?</string>
   <string name="hist_contact_added">Kontakt hinzugefügt</string>
   <string name="hist_invitation_received">Einladung erhalten</string>
   <string name="ab_action_audio_call">Audioanruf</string>
@@ -105,27 +112,47 @@
   <string name="permission_dialog_camera_message">Für Video-Konversationen benötigt die Anwendung Zugriff auf die Kamera. Bitte erteilen Sie diese Berechtigung.</string>
   <string name="ringtone_error_title">Fehler</string>
   <string name="ringtone_error_format_not_supported">Dieses Format wird nicht unterstützt.</string>
+  <string name="ringtone_error_size_too_big">Diese Datei ist zu groß. Die maximale Größe ist %1$dkB.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring benötigt die Berechtigung \"Kontaktdaten lesen\" für diese Funktion. Bitte erteilen Sie diese.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring benötigt die Berechtigung \"Anruflisten schreiben\" für diese Funktion. Bitte erteilen Sie diese.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Scannen Sie den QR-Code des Kontos, das Sie hinzufügen möchten.</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">Verlauf löschen?</string>
+  <string name="clear_history_dialog_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
   <string name="clear_history_completed">Der Verlauf wurde gelöscht.</string>
   <!--Conversation-->
+  <string name="conversation_details">Details</string>
   <string name="conversation_action_delete_this">Diese Unterhaltung löschen</string>
   <string name="conversation_action_delete_this_title">Diese Unterhaltung löschen?</string>
   <string name="conversation_action_delete_this_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
   <string name="conversation_action_history_clear">Verlauf leeren</string>
+  <string name="conversation_action_history_clear_title">Gesprächsverlauf löschen?</string>
+  <string name="conversation_action_history_clear_message">Das wird den Gesprächsverlauf endgültig löschen.</string>
   <string name="conversation_action_remove_this">Kontakt löschen</string>
+  <string name="conversation_action_remove_this_title">Diesen Kontakt löschen?</string>
+  <string name="conversation_action_remove_this_message">Das wird den Kontakt und den Gesprächsverlauf endgültig löschen.</string>
   <string name="conversation_action_copy_peer_number">Nummer kopieren</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s in die Zwischenablage kopiert</string>
-  <string name="conversation_action_select_peer_number">Suche eine Nummer aus</string>
+  <string name="conversation_action_select_peer_number">Eine Nummer auswählen</string>
+  <string name="conversation_action_block_this">Kontakt blockieren</string>
   <string name="conversation_action_go_to_call">Zurück zum laufenden Anruf</string>
+  <string name="clip_contact_uri">Kontakt-Addresse</string>
+  <string name="block_contact_dialog_title">%1$s blockieren?</string>
+  <string name="block_contact_dialog_message">%1$s wird nicht in der Lage sein, Sie zu kontaktieren, bis Sie die Blockierung entfernen.</string>
+  <string name="block_contact_completed">%1$s wurde blockiert.</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">%1$s hinzufügen?</string>
   <string name="prompt_new_password">Neues Passwort</string>
   <string name="prompt_new_password_optional">Neues Passwort (optional)</string>
   <string name="prompt_new_password_repeat">Neues Passwort wiederholen</string>
+  <string name="account_create_title">Ein Jami-Konto erstellen</string>
   <string name="prompt_new_username">Neuen Benutzernamen eingeben</string>
+  <string name="help_password_choose">Wählen Sie ein sicheres Passwort, an das Sie sich erinnern können, um ihr Jami-Konto zu schützen.</string>
+  <string name="help_password_enter">Geben Sie ihr Haupt-Jami-Kontopasswort ein</string>
+  <string name="help_pin_enter">Geben Sie die PIN eines anderen konfigurierten Jami-Kontos ein. Benutzen Sie die Funktion \"Exportiere Konto\",bei Jami, um die PIN zu erhalten.</string>
   <string name="wizard_next">Weiter</string>
   <string name="wizard_back">Zurück</string>
   <string name="wizard_skip">Überspringen</string>
@@ -136,6 +163,7 @@
   <string name="take_a_photo">Foto machen</string>
   <string name="profile_name_hint">Name eingeben (optional)</string>
   <!--Share fragment-->
+  <string name="share_message">Diesen Code mit Jami scannen</string>
   <string name="share_message_no_account">Bitte wählen Sie ein Konto aus.</string>
   <string name="share_your_account_information">Teile meine Kontaktinformationen</string>
   <string name="generic_error_migration">Fehler</string>
@@ -148,12 +176,14 @@
   <string name="contact_request_msg">Du hast %1$s Kontaktanfragen</string>
   <string name="contact_request_account">Für %1$s</string>
   <string name="no_requests">0 Kontaktanfragen</string>
+  <string name="message_contact_not_trusted_yet">%s ist noch nicht in Ihrer Kontaktliste.\nDiese Kontaktanfrage annehmen oder ablehnen?</string>
+  <string name="message_contact_not_trusted">%s ist nicht in Ihrer Kontaktliste.\nNeuen Kontakt hinzufügen?</string>
   <!--Send contact requests-->
   <string name="send_request_button">Senden</string>
   <string name="send_request_title">Sende eine Kontaktanfrage</string>
   <string name="send_request_msg">Sie müssen eine Kontaktanfrage senden, um mit diesem Benutzer zu kommunizieren. Solange Ihr Kontakt die Anforderung nicht akzeptiert hat, können Sie Nachrichten senden, aber Ihr Kontakt kann diese nicht beantworten.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 gesperrte Kontakte</string>
+  <string name="no_blocked_contact">0 blockierte Kontakte</string>
   <!--Smartlist-->
   <string name="no_contact_request">Keine Kontaktanfrage gesendet</string>
   <string name="contact_request_sent">Kontaktanfrage gesendet</string>
@@ -164,9 +194,21 @@
   <string name="generic_error">Ein unbekannter Fehler ist aufgetreten</string>
   <!--File Transfer-->
   <string name="invalid_file">Ungültige Datei</string>
+  <string name="not_able_to_write_file">Datei kann nicht geschrieben werden</string>
+  <string name="file_transfer_status_created">Übertragung initialisieren</string>
+  <string name="file_transfer_status_unsupported">nicht unterstützt</string>
+  <string name="file_transfer_status_wait_peer_acceptance">warten auf Annahme durch Partner</string>
+  <string name="file_transfer_status_wait_host_acceptance">warten auf Annahme durch Host</string>
+  <string name="file_transfer_status_ongoing">läuft</string>
   <string name="file_transfer_status_finished">abgeschlossen</string>
+  <string name="file_transfer_status_closed_by_host">vom Host geschlossen</string>
+  <string name="file_transfer_status_closed_by_peer">vom Partner geschlossen</string>
+  <string name="file_transfer_status_invalid_pathname">Ungültiger Pfadname</string>
+  <string name="file_transfer_status_unjoinable_peer">Partner nicht erreichbar</string>
   <string name="file_saved_in">Datei gespeichert in %s</string>
   <string name="no_space_left_on_device">Kein Speicherplatz mehr auf dem Gerät</string>
+  <string name="title_media_viewer">Dateibetrachter</string>
+  <string name="menu_file_open">Datei öffnen</string>
   <string name="menu_file_download">Datei herunterladen</string>
   <string name="menu_file_delete">Datei löschen</string>
   <string name="menu_file_share">Datei teilen</string>
diff --git a/ring-android/app/src/main/res/values-de/strings_account.xml b/ring-android/app/src/main/res/values-de/strings_account.xml
index ae32327..c460c09 100644
--- a/ring-android/app/src/main/res/values-de/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de/strings_account.xml
@@ -133,6 +133,7 @@
   <string name="account_sip_register_anyway">Trotzdem registieren</string>
   <string name="account_link_button">Dieses Gerät mit einem Konto verknüpfen</string>
   <string name="account_link_prompt_pin">PIN eingeben</string>
+  <string name="account_new_button">Ein Jami-Konto erstellen</string>
   <string name="account_link_export_button">Weiteres Gerät mit diesem Konto verknüpfen</string>
   <string name="account_start_export_button">PIN generieren</string>
   <string name="account_end_export_button">Schließen</string>
diff --git a/ring-android/app/src/main/res/values-es/strings.xml b/ring-android/app/src/main/res/values-es/strings.xml
index 4c48d92..88ff1ee 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -141,6 +141,9 @@
   <string name="conversation_action_block_this">Bloquear contacto</string>
   <string name="conversation_action_go_to_call">Volver a la llamada en curso</string>
   <string name="clip_contact_uri">Dirección del contacto</string>
+  <string name="block_contact_dialog_title">¿Bloquear a %1$s?</string>
+  <string name="block_contact_dialog_message">%1$s no podrá cotactar contigo hasta que lo desbloquees.</string>
+  <string name="block_contact_completed">%1$s fue bloqueado.</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Añadir %1$s?</string>
   <string name="prompt_new_password">Contraseña nueva</string>
diff --git a/ring-android/app/src/main/res/values-es/strings_account.xml b/ring-android/app/src/main/res/values-es/strings_account.xml
index ee03a2d..6e802a2 100644
--- a/ring-android/app/src/main/res/values-es/strings_account.xml
+++ b/ring-android/app/src/main/res/values-es/strings_account.xml
@@ -120,6 +120,8 @@
   <string name="account_export_end_error_title">Error</string>
   <string name="account_export_end_error_message">Error al exportar la cuenta. Se ha producido un error desconocido.</string>
   <string name="account_enter_password">Ingresa la contraseña</string>
+  <string name="account_share_body">Contáctame usando \'%1$s\' en Jami, plataforma de comunicación distribuída: %2$s</string>
+  <string name="account_share_body_with_username">Contáctame usando \'%1$s\' o mi nombre de usuario público \'%2$s\' en Jami, plataforma de comunicación distribuída: %3$s</string>
   <string name="account_contact_me">¡Contáctame en Jami!</string>
   <string name="update_account">Actualizar cuenta</string>
   <string name="account_migration">Su cuenta de Jami puede actualizarse.\nPor favor ingrese su contraseña.</string>
diff --git a/ring-android/app/src/main/res/values-es/strings_preferences.xml b/ring-android/app/src/main/res/values-es/strings_preferences.xml
index e5882bb..8a05aca 100644
--- a/ring-android/app/src/main/res/values-es/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-es/strings_preferences.xml
@@ -10,6 +10,8 @@
   <string name="pref_pushNotifications_title">Notificaciones push</string>
   <string name="pref_pushNotifications_summary">Usar servidores de Google para recibir llamadas/mensajes en segundo plano</string>
   <string name="pref_hd_summary">Permitir el envío de vídeo en HD</string>
+  <string name="pref_hwEncode_title">Activar cifrado acelerado</string>
+  <string name="pref_hwEncode_summary">Característica experimental</string>
   <string name="pref_systemContacts_title">Usar contactos del sistema</string>
   <string name="pref_systemContacts_summary">Usar contactos del sistema para mostrar detalles del interlocutor.</string>
   <string name="pref_systemDialer_title">Configurar el sistema para llamar usando Jami</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 0005193..3ed062f 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -54,6 +54,7 @@
   <string name="action_call_decline">Kieltäydy</string>
   <string name="ab_action_speakerphone">Kaiutin päälle</string>
   <string name="ab_action_contact_add">Lisää yhteystietoihin</string>
+  <string name="hist_contact_added">Kontakti lisätty</string>
   <string name="ab_action_audio_call">Äänipuhelu</string>
   <string name="ab_action_video_call">Videopuhelu</string>
   <string name="share_via">Jaa</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 5d7fc22..8a8a0ef 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
@@ -2,6 +2,7 @@
 <resources>
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">Poista</string>
+  <string name="ic_advanced_menu">Edistyneet asetukset</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Lempinimi</string>
   <string name="prompt_hostname">Yhteysosoite</string>
@@ -78,6 +79,7 @@
   <string name="account_no_network_title">Verkkoon ei saada yhteyttä</string>
   <string name="account_link_prompt_pin">Syötä PIN-koodi</string>
   <!--Name registration-->
+  <string name="invalid_username">Käyttäjätunnus ei kelpaa</string>
   <string name="account_status_connecting">Yhdistää</string>
   <string name="account_status_unknown">Tuntematon</string>
   <!--Create account-->
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 ad512ef..ab86eae 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -140,6 +140,9 @@
   <string name="conversation_action_block_this">Bloquer le contact</string>
   <string name="conversation_action_go_to_call">Revenir à l\'appel en cours</string>
   <string name="clip_contact_uri">Adresse du contact</string>
+  <string name="block_contact_dialog_title">Bloquer %1$s ?</string>
+  <string name="block_contact_dialog_message">%1$s ne pourra pas vous contacter tant que vous ne l\'aurez pas débloqué.</string>
+  <string name="block_contact_completed">%1$s a été bloqué.</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Ajouter %1$s ?</string>
   <string name="prompt_new_password">Nouveau mot de passe</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 b9f19b6..d36b83e 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
@@ -120,6 +120,8 @@
   <string name="account_export_end_error_title">Erreur</string>
   <string name="account_export_end_error_message">Impossible d\'exporter le compte. Une erreur inconnue s\'est produite.</string>
   <string name="account_enter_password">Entrez le mot de passe</string>
+  <string name="account_share_body">Contactez-moi en utilisant  \'%1$s\' sur la plateforme de communication distribuée %2$s</string>
+  <string name="account_share_body_with_username">Contactez-moi en utilisant  \'%1$s\' ou mon nom d\'utilisateur public \'%2$s\' sur la plateforme de communication distribuée %3$s</string>
   <string name="account_contact_me">Contactez-moi sur Jami !</string>
   <string name="update_account">Mise à jour du compte </string>
   <string name="account_migration">Votre compte Jami va être mis à jour.\nVeuillez entrer votre mot de passe.</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 b6cbadb..7cbe804 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
@@ -10,6 +10,8 @@
   <string name="pref_pushNotifications_title">Notifications poussées</string>
   <string name="pref_pushNotifications_summary">Utiliser les serveurs Google pour permettre de recevoir des appels et des messages en arrière plan.</string>
   <string name="pref_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_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 7084e11..1cf59c6 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -12,8 +12,8 @@
   <string name="no_browser_app_installed">Nem található webböngésző app. Telepítsen egyet az oldal megtekintéséhez!</string>
   <string name="email_chooser_title">Levél küldése a következővel…</string>
   <string name="website_chooser_title">Weboldal megtekintése a következővel…</string>
-  <string name="license">Ez a szoftver a „jelen állapotában” kerül kiadásra, mindenféle garanciavállalás nélkül. A részletekért lásd a<u>GNU General Public License 3-as vagy későbbi verzióját</u></string>
-  <string name="description">A Jami (GNU csomag, korábban Ring) egy univerzális és elosztott kommunikációs platform, amely tiszteletben tartja a felhasználók szabadságait és magánéletét.</string>
+  <string name="license">Ez a szoftver a „jelen állapotában” kerül kiadásra, mindenféle garanciavállalás nélkül. A részletekért lásd a<u>GNU általános nyilvános engedély 3-as vagy újabb verzióját</u></string>
+  <string name="description">A Jami (GNU csomag, korábban Ring) egy univerzális és elosztott közlés emelvény, amely tiszteletben tartja a felhasználók szabadságait és magánéletét.</string>
   <string name="credits">Készítők</string>
   <!--About dialog-->
   <string name="developed_by">Fejlesztők</string>
@@ -30,7 +30,7 @@
   <string name="drawer_close">Navigációs fiók bezárása</string>
   <!--Sections-->
   <string name="menu_item_home">Főoldal</string>
-  <string name="menu_item_contact_request">Partnerkérelmek</string>
+  <string name="menu_item_contact_request">Kapcsolatkérelmek</string>
   <string name="menu_item_accounts">Fiókok kezelése</string>
   <string name="menu_item_account">Fiók kezelése</string>
   <string name="menu_item_settings">Beállítások</string>
@@ -88,8 +88,8 @@
   <string name="action_call_decline">Elutasítás</string>
   <string name="action_call_mic_mute">Mikrofon elnémítása</string>
   <string name="ab_action_speakerphone">Hangszóró engedélyezése</string>
-  <string name="ab_action_contact_add">Hozzáadás a partnerekhez</string>
-  <string name="ab_action_contact_add_question">Hozzáadja a partnerekhez?</string>
+  <string name="ab_action_contact_add">Hozzáadás a kapcsolatokhoz</string>
+  <string name="ab_action_contact_add_question">Hozzáadja a kapcsolatokhoz?</string>
   <string name="hist_contact_added">Kapcsolat hozzáadva</string>
   <string name="hist_invitation_received">Meghívó érkezett</string>
   <string name="ab_action_audio_call">Hanghívás</string>
@@ -114,7 +114,7 @@
   <string name="ringtone_error_format_not_supported">Ez a formátum nem támogatott</string>
   <string name="ringtone_error_size_too_big">Ez a fájl túl nagy. A maximum méret %1$d kB.</string>
   <!--Read contacts permission-->
-  <string name="permission_dialog_read_contacts_message">A Jaminak szüksége van a „Névjegyek olvasása” engedélyre. Kérjük, engedélyezze.</string>
+  <string name="permission_dialog_read_contacts_message">A Jaminak szüksége van a „Kapcsolatok olvasása” engedélyre. Kérjük, engedélyezze.</string>
   <!--Write call log permission-->
   <string name="permission_dialog_write_call_log_message">A Jaminak szüksége van a „Hívásnapló írása” engedélyre. Kérjük, engedélyezze.</string>
   <!--QRCode Scan-->
@@ -131,15 +131,18 @@
   <string name="conversation_action_history_clear">Előzmények törlése</string>
   <string name="conversation_action_history_clear_title">Törli a beszélgetések előzményeit?</string>
   <string name="conversation_action_history_clear_message">Ez minden bizonnyal törli a beszélgetések előzményeit.</string>
-  <string name="conversation_action_remove_this">Partner törlése</string>
-  <string name="conversation_action_remove_this_title">Törli ezt a partnert?</string>
-  <string name="conversation_action_remove_this_message">Ez törli a partnert és egyértelműen törli a beszélgetés előzményeit.</string>
+  <string name="conversation_action_remove_this">Kapcsolat törlése</string>
+  <string name="conversation_action_remove_this_title">Kapcsolat törlése?</string>
+  <string name="conversation_action_remove_this_message">Ez törli a kapcsolatot és egyértelműen törli a beszélgetés előzményeit.</string>
   <string name="conversation_action_copy_peer_number">Szám másolása</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s a vágólapra másolva</string>
   <string name="conversation_action_select_peer_number">Válasszon egy számot</string>
-  <string name="conversation_action_block_this">Partner letiltása</string>
+  <string name="conversation_action_block_this">Kapcsolat letiltása</string>
   <string name="conversation_action_go_to_call">Visszatérés a folyamatban lévő híváshoz</string>
   <string name="clip_contact_uri">Kapcsolattartási címe</string>
+  <string name="block_contact_dialog_title">%1$sletiltása?</string>
+  <string name="block_contact_dialog_message">%1$s nem lesz képes felvenni veled a kapcsolatot, amíg nincsen feloldva a tiltásod.</string>
+  <string name="block_contact_completed">%1$s tiltva lett.</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Hozzáadja %1$s?</string>
   <string name="prompt_new_password">Új jelszó</string>
@@ -155,7 +158,7 @@
   <string name="wizard_skip">Átugrani</string>
   <!--MenuHeaderView-->
   <string name="profile">Profil</string>
-  <string name="profile_message_warning">A profilja csak a partnereivel kerül megosztásra</string>
+  <string name="profile_message_warning">A profilja csak a kapcsolataival kerül megosztásra</string>
   <string name="open_the_gallery">Galéria megnyitása</string>
   <string name="take_a_photo">Fotó készítése</string>
   <string name="profile_name_hint">Adja meg a nevét (nem kötelező)</string>
@@ -169,23 +172,23 @@
   <string name="accept">Elfogadás</string>
   <string name="refuse">Elutasítás</string>
   <string name="block">Letiltás</string>
-  <string name="contact_request_title">Új partnerkérelem</string>
-  <string name="contact_request_msg">%1$s partnerkérelme van</string>
+  <string name="contact_request_title">Új kapcsolatkérelem</string>
+  <string name="contact_request_msg">%1$s kapcsolatkérelme van</string>
   <string name="contact_request_account">Ehhez: %1$s</string>
-  <string name="no_requests">0 partnerkérelem</string>
+  <string name="no_requests">0 kapcsolatkérelem</string>
   <string name="message_contact_not_trusted_yet">%smég nincs a kapcsolatban Önnel.\nAkkor elfogadja vagy elutasítja ezt a felkérést?</string>
-  <string name="message_contact_not_trusted">%smég nincs a kapcsolatban Önnel.\nÚj partner hozzáadása?</string>
+  <string name="message_contact_not_trusted">%smég nincs a kapcsolatban Önnel.\nÚj kapcsolat hozzáadása?</string>
   <!--Send contact requests-->
   <string name="send_request_button">Elküld</string>
-  <string name="send_request_title">Parnerkérelem küldése</string>
-  <string name="send_request_msg">Küldenie kell egy felkérést, hogy közléshasson ezzel a felhasználóval. Mindaddig, amíg a leendő partner nem fogadta el a felkérést, üzeneteket küldhet Neki, de nem tud vissza válaszolni.</string>
+  <string name="send_request_title">Kapcsolatkérelem küldése</string>
+  <string name="send_request_msg">Küldenie kell egy felkérést, hogy közléshasson ezzel a felhasználóval. Mindaddig, amíg a leendő kapcsolat nem fogadta el a felkérést, üzeneteket küldhet Neki, de nem tud vissza válaszolni.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 letiltott partner</string>
+  <string name="no_blocked_contact">0 letiltott kapcsolat</string>
   <!--Smartlist-->
-  <string name="no_contact_request">Nincs elküldött partnerkérelem</string>
-  <string name="contact_request_sent">Partnerkérelem elküldve</string>
+  <string name="no_contact_request">Nincs elküldött kapcsolatkérelem</string>
+  <string name="contact_request_sent">Kapcsolatkérelem elküldve</string>
   <string name="search_results">Keresési eredmények</string>
-  <string name="tv_contact_row_header">Partnerek</string>
+  <string name="tv_contact_row_header">Kapcsolatok</string>
   <string name="gallery_error_title">Nem található Galéria alkalmazás</string>
   <string name="gallery_error_message">Nem található alkalmazás a készüléken a Galéria megnyitásához</string>
   <string name="generic_error">Ismeretlen hiba történt</string>
@@ -194,14 +197,14 @@
   <string name="not_able_to_write_file">Nem lehet írni a fájlt</string>
   <string name="file_transfer_status_created">az átvitel szignálása</string>
   <string name="file_transfer_status_unsupported">nem támogatott</string>
-  <string name="file_transfer_status_wait_peer_acceptance">várakozó partner elfogadás</string>
+  <string name="file_transfer_status_wait_peer_acceptance">várakozó egyenrangú elfogadás</string>
   <string name="file_transfer_status_wait_host_acceptance">várakozás a fogadó elfogadásra</string>
   <string name="file_transfer_status_ongoing">folyamatban lévő</string>
   <string name="file_transfer_status_finished">befejezett</string>
   <string name="file_transfer_status_closed_by_host">bezárva a fogadóval</string>
-  <string name="file_transfer_status_closed_by_peer">bezárva a partnerel</string>
+  <string name="file_transfer_status_closed_by_peer">bezárva a egyenrangúról</string>
   <string name="file_transfer_status_invalid_pathname">érvénytelen elérési útvonala</string>
-  <string name="file_transfer_status_unjoinable_peer">nem csatlakoztatható partner</string>
+  <string name="file_transfer_status_unjoinable_peer">páratlan</string>
   <string name="file_saved_in">A fájl mentve%s</string>
   <string name="no_space_left_on_device">Nincs hely az eszközön</string>
   <string name="title_media_viewer">Média lejátszó</string>
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 494658c..fff044c 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
@@ -3,7 +3,7 @@
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">Törlés</string>
   <string name="ic_advanced_menu">Haladó beállítások</string>
-  <string name="ic_blacklist_menu">Letiltott partnerek</string>
+  <string name="ic_blacklist_menu">Letiltott kapcsolatok</string>
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Jami fiók hozzáadása</string>
   <string name="add_sip_account_title">SIP fiók hozzáadása</string>
@@ -26,7 +26,7 @@
         Csak közvetlen IP hívásokat tud majd indítani és fogadni.
         A fiókját később is módosíthatja</string>
   <string name="account_type_ip2ip">IP fiók</string>
-  <string name="help_ring">A Jami fiók lehetővé teszi az emberek biztonságos elérését partneren egy teljesen elosztott hálózaton keresztül.</string>
+  <string name="help_ring">A Jami fiók lehetővé teszi az emberek biztonságos elérését kapcsolaton egy teljesen elosztott hálózaton keresztül.</string>
   <string name="help_sip_title">SIP fiók hozzáadása</string>
   <string name="help_sip">Meglévő SIP fiók beállítása.</string>
   <string name="create_sip_account">SIP fiók hozzáadása</string>
@@ -99,7 +99,7 @@
   <string name="account_tls_certificate_file_label">Tanúsítvány fájl</string>
   <string name="account_tls_private_key_file_label">Személyes kulcs fájl</string>
   <string name="account_tls_password_label">Személyes kulcs jelszava</string>
-  <string name="account_tls_method_label">TLS metódus</string>
+  <string name="account_tls_method_label">TLS eljárás</string>
   <string name="account_tls_ciphers_label">TLS kódolások</string>
   <string name="account_tls_server_name_label">Kiszolgáló név</string>
   <string name="account_tls_verify_server_label">A kiszolgáló ellenőrizése </string>
@@ -120,6 +120,8 @@
   <string name="account_export_end_error_title">Hiba</string>
   <string name="account_export_end_error_message">Fiók exportálása nem sikerült. Ismeretlen hiba történt.</string>
   <string name="account_enter_password">A jelszó megadása</string>
+  <string name="account_share_body">Lépjen kapcsolatba velem „%1$s” a Jami elosztott közlés emelvény használatával: %2$s</string>
+  <string name="account_share_body_with_username">Lépjen kapcsolatba velem „%1$s” vagy a nyilvános felhasználónév „%2$s” a Jami elosztott közlés emelvény használatával: %3$s</string>
   <string name="account_contact_me">Lépjen kapcsolatba velem a Jami-n!</string>
   <string name="update_account">Fiók frissítése</string>
   <string name="account_migration">Jami fiókja frissíthető.\ nKérjük hogy, adja meg a jelszavát.</string>
diff --git a/ring-android/app/src/main/res/values-hu/strings_content_description.xml b/ring-android/app/src/main/res/values-hu/strings_content_description.xml
index 970fb54..6292085 100644
--- a/ring-android/app/src/main/res/values-hu/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_content_description.xml
@@ -2,7 +2,7 @@
 <resources>
   <!--Strings for xml content description of images-->
   <string name="contact_quick_call_description">Gyors hívás</string>
-  <string name="contact_picture_description">Fénykép</string>
+  <string name="contact_picture_description">Kapcsolat fényképe</string>
   <string name="dial_numeric_pad">Tárcsázó</string>
   <string name="contact_unblock">Letiltás feloldása</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings_preferences.xml b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
index 57685a8..afb03b0 100644
--- a/ring-android/app/src/main/res/values-hu/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="pref_category_network">Hálózat</string>
-  <string name="pref_category_contacts">Partnerek</string>
+  <string name="pref_category_contacts">Kapcsolatok</string>
   <string name="pref_category_video">Videó</string>
   <string name="pref_category_system">Rendszer</string>
   <string name="pref_category_privacy">Adatvédelem</string>
@@ -10,6 +10,8 @@
   <string name="pref_pushNotifications_title">Leküldéses értesítések</string>
   <string name="pref_pushNotifications_summary">Használja a Google kiszolgálóit a háttérben lévő hívások és üzenetek fogadásához</string>
   <string name="pref_hd_summary">Engedélyezze a HD videó küldését</string>
+  <string name="pref_hwEncode_title">Gyorsított kódolás engedélyezése</string>
+  <string name="pref_hwEncode_summary">Kísérleti jellemző</string>
   <string name="pref_systemContacts_title">Rendszer kapcsolatainak használata</string>
   <string name="pref_systemContacts_summary">A rendszer kapcsolatainak használata a hívó adatainak megjelenítéséhez.</string>
   <string name="pref_systemDialer_title">Helyezzen rendszerhívásokat a Jami programmal</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings.xml b/ring-android/app/src/main/res/values-lt/strings.xml
index 1c18f9c..f9d6972 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -2,6 +2,7 @@
 <resources>
   <!--About-->
   <string name="section_license">Licencija</string>
+  <string name="sponsor_section">Jami yra laisva programinė įranga, kurią kuria ir palaiko</string>
   <string name="copyright_section">Autorių Teisės</string>
   <string name="contribute_section">Talkinti</string>
   <string name="version_section">Versija</string>
@@ -60,6 +61,8 @@
   <string name="notif_channel_messages">Žinutės</string>
   <string name="notif_channel_requests">Užklausos</string>
   <string name="notif_channel_file_transfer">Failų persiuntimas</string>
+  <string name="notif_channel_background_service_descr">Leidžia bet kuriuo metu priimti skambučius ir gauti žinutes.</string>
+  <string name="notif_background_service">Šiuo metu Jami veikia fone</string>
   <string name="notif_mark_as_read">Žymėti kaip skaitytą</string>
   <string name="notif_reply">Atsakyti</string>
   <string name="notif_incoming_file_transfer_title">Gaunamas failas nuo %1$s</string>
@@ -74,6 +77,8 @@
   <string name="ongoing_call">Esamas skambutis</string>
   <string name="hist_in_call">%1$s gaunamasis skambutis</string>
   <string name="hist_out_call">%1$s išsiunčiamasis skambutis</string>
+  <string name="start_error_title">Nepavyksta paleisti Jami!</string>
+  <string name="start_error_mic_required">Jami darbui, reikalingas leidimas naudoti mikrofoną.</string>
   <string name="action_call_decline">Atmesti</string>
   <string name="ab_action_speakerphone">Įjungti garsiakalbį</string>
   <string name="ab_action_contact_add">Pridėti prie kontaktų</string>
@@ -92,6 +97,7 @@
   <string name="time_just_now">Ką tik</string>
   <string name="send_file">Siųsti failą</string>
   <string name="hist_file_sent">Failas išsiųstas</string>
+  <string name="hist_file_received">Failas gautas</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kameros leidimas</string>
   <string name="ringtone_error_title">Klaida</string>
@@ -102,6 +108,8 @@
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Nuskenuokite paskyros, kurią norite pridėti, QR kodą.</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">Išvalyti istoriją?</string>
+  <string name="clear_history_dialog_message">Šio veiksmo neįmanoma bus atšaukti.</string>
   <string name="clear_history_completed">Istorija išvalyta.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Ištrinti šį pokalbį</string>
@@ -109,9 +117,14 @@
   <string name="conversation_action_delete_this_message">Šio veiksmo negalima bus atšaukti.</string>
   <string name="conversation_action_history_clear">Išvalyti istoriją</string>
   <string name="conversation_action_remove_this">Ištrinti kontaktą</string>
+  <string name="conversation_action_remove_this_title">Ištrinti šį kontaktą?</string>
   <string name="conversation_action_copy_peer_number">Kopijuoti numerį</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s nukopijuota į iškarpinę</string>
+  <string name="clip_contact_uri">Kontakto adresas</string>
+  <string name="block_contact_dialog_title">Blokuoti %1$s?</string>
+  <string name="block_contact_dialog_message">%1$s negalės su jumis susisiekti tol, kol neatblokuosite.</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Pridėti %1$s?</string>
   <string name="prompt_new_password">Naujas slaptažodis</string>
   <string name="prompt_new_password_optional">Naujas slaptažodis (nebūtina)</string>
   <string name="prompt_new_password_repeat">Pakartokite naują slaptažodį</string>
@@ -157,6 +170,7 @@
   <string name="file_saved_in">Failas įrašytas į %s</string>
   <string name="no_space_left_on_device">Įrenginyje nebeliko vietos</string>
   <string name="title_media_viewer">Medijos žiūryklė</string>
+  <string name="menu_file_open">Atverti failą</string>
   <string name="menu_file_download">Atsisiųsti failą</string>
   <string name="menu_file_delete">Ištrinti failą</string>
   <string name="menu_file_share">Bendrinti failą</string>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings.xml b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
index 359610a..d1b28bc 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
@@ -1,36 +1,207 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About-->
+  <string name="feedback_section">Opinia</string>
+  <string name="report"><u>Wyślij nam e-mail</u></string>
+  <string name="section_license">Licencja</string>
+  <string name="sponsor_section">Jami jest wolnym oprogramowaniem rozwijanym i wspieranym przez</string>
+  <string name="copyright_section">Prawa autorskie</string>
+  <string name="contribute_section">Współpracuj</string>
+  <string name="version_section">Wersja</string>
+  <string name="no_email_app_installed">Nie znaleziono aplikacji e-mail. Zainstaluj jakąś aby wysłać nam zgłoszenie.</string>
+  <string name="no_browser_app_installed">Nie znaleziono przeglądarki internetowej, zainstaluj jakąś aby zobaczyć tę stronę</string>
+  <string name="email_chooser_title">Wyślij e-mail używając...</string>
+  <string name="website_chooser_title">Zobacz stronę używając..</string>
+  <string name="license">To oprogramowanie jest dostarczane \"tak jak jest\", bez jakiejkolwiek gwarancji. Aby uzyskać szczegółowe informacje, zobacz <u>GNU General Public License wersja 3 lub późniejsza</u></string>
+  <string name="description">Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników.</string>
+  <string name="credits">Podziękowania</string>
   <!--About dialog-->
+  <string name="developed_by">Rozwijany przez</string>
+  <string name="designed_by">Zaprojektowany przez</string>
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">Brak połączenia z siecią</string>
+  <string name="error_mobile_network_available_but_disabled">Proszę w ustawieniach udzielić dostępu do sieci komórkowej.</string>
   <!--AB menus-->
+  <string name="ab_action_chat">Wiadomości tekstowe</string>
   <!--Left Drawer-->
   <!--Accessibility-->
+  <string name="drawer_open">Otwórz boczną szufladę</string>
+  <string name="drawer_close">Zamknij boczną szufladę</string>
   <!--Sections-->
-  <string name="menu_item_about">O Ringu</string>
+  <string name="menu_item_home">Ekran główny</string>
+  <string name="menu_item_contact_request">Zaproszenia</string>
+  <string name="menu_item_accounts">Ustawienia kont</string>
+  <string name="menu_item_account">Zarządzaj kontem</string>
+  <string name="menu_item_settings">Ustawienia</string>
+  <string name="menu_item_share">Udostępnij mój kontakt</string>
+  <string name="menu_item_about">O Jami</string>
   <!--Dialing Fragment-->
+  <string name="dial_number">Wykręć numer</string>
   <!--History Fragment-->
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d Rozmowa</item>
+    <item quantity="few">%d Rozmowy</item>
+    <item quantity="many">%d Rozmowy</item>
+    <item quantity="other">%d Rozmowy</item>
+  </plurals>
   <!--ContactList Fragment-->
+  <string name="searchbar_hint">Wpisz nazwisko albo numer telefonu...</string>
+  <string name="choose_number">Wybierz numer</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Nieodebrane połączenie przychodzące</string>
+  <string name="notif_missed_outgoing_call">Nieodebrane połączenie wychodzące</string>
+  <string name="notif_incoming_call_title">Połączenie przychodzące od %1$s</string>
+  <string name="notif_incoming_call">Połączenie przychodzące</string>
+  <string name="notif_outgoing_call_title">Połączenie wychodzące do %1$s</string>
+  <string name="notif_outgoing_call">Połączenie wychodzące</string>
+  <string name="notif_current_call_title">Aktualna rozmowa z %1$s</string>
+  <string name="notif_current_call">Aktualna rozmowa</string>
+  <string name="notif_channel_calls">Rozmowy</string>
+  <string name="notif_channel_missed_calls">Nieodebrane rozmowy</string>
+  <string name="notif_channel_messages">Wiadomości</string>
+  <string name="notif_channel_requests">Prośby dodania</string>
+  <string name="notif_channel_file_transfer">Transfer pliku</string>
+  <string name="notif_channel_background_service">Usługa w tle</string>
+  <string name="notif_channel_background_service_descr">Pozwala na odbieranie połączeń i wiadomości w dowolnym czasie.</string>
+  <string name="notif_background_service">Jami działa teraz w tle</string>
+  <string name="notif_mark_as_read">Zaznacz jako przeczytane</string>
+  <string name="notif_dismiss">Odrzuć</string>
+  <string name="notif_reply">Odpowiedz</string>
+  <string name="notif_incoming_file_transfer_title">Przychodzący plik od %1$s</string>
+  <string name="notif_incoming_file_transfer">Ktoś chce wysłać Ci plik</string>
+  <string name="notif_outgoing_file_transfer_title">Wysyłanie pliku do %1$s</string>
+  <string name="notif_outgoing_file_transfer">Ktoś chce wysłać Ci plik</string>
+  <string name="notif_incoming_picture">Obrazek od %1$s</string>
+  <string name="action_open">Otwórz</string>
   <!--Call Fragment-->
+  <string name="you_txt_prefix">Ty:</string>
+  <string name="action_call_hangup">Rozłącz się</string>
+  <string name="ongoing_call">Trwa połączenie</string>
+  <string name="hist_in_call">Czas przychodzączego połączenia: %1$s</string>
+  <string name="hist_out_call">Czas wychodzączego połączenia: %1$s</string>
+  <string name="start_error_title">Nie udało się uruchomić Jami!</string>
+  <string name="start_error_mic_required">Jami wymaga zezwolenia na korzystanie z mikrofonu, by działać.</string>
+  <string name="action_call_accept">Odbierz</string>
+  <string name="action_call_decline">Odrzuć</string>
+  <string name="action_call_mic_mute">Wycisz mikrofon</string>
+  <string name="ab_action_speakerphone">Włącz głośnik</string>
+  <string name="ab_action_contact_add">Dodaj do kontaków</string>
+  <string name="ab_action_contact_add_question">Dodać do kontaktów?</string>
+  <string name="hist_contact_added">Kontakt dodany</string>
+  <string name="hist_invitation_received">Otrzymano zaproszenie</string>
+  <string name="ab_action_audio_call">Połączenie głosowe</string>
+  <string name="ab_action_video_call">Połączenie wideo</string>
+  <string name="ab_action_change_screen_orientation">Obróć ekran</string>
+  <string name="share_via">Wyślij przez</string>
+  <string name="write_a_message">Napisz wiadomość</string>
+  <string name="scan_qr">Zeskanuj kod QR</string>
+  <string name="ab_action_flipcamera">Zamień kamerę</string>
   <!--Text messages-->
+  <string name="send_message">Wyślij wiadomość</string>
+  <string name="message_sending">Trwa wysyłanie wiadomości...</string>
+  <string name="message_failed">Nie powiodła się</string>
+  <string name="time_just_now">W tej chwili</string>
+  <string name="send_file">Wyślij plik</string>
+  <string name="hist_file_sent">Plik wysłany</string>
+  <string name="hist_file_received">Otrzymano plik</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Uprawnienia do aparatu</string>
+  <string name="permission_dialog_camera_message">Rozmowy wideo wymagają przyznania uprawnień dla aparatu. Proszę rozważyć udzielenie ich.</string>
+  <string name="ringtone_error_title">Błąd</string>
+  <string name="ringtone_error_format_not_supported">Ten format nie jest obsługiwany.</string>
+  <string name="ringtone_error_size_too_big">Ten plik jest zbyt duży! Maksymalny rozmiar to %1$d kB.</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Zeskanuj kod QR konta, które chcesz dodać.</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">Wyczyścić historię?</string>
+  <string name="clear_history_dialog_message">Tej czynności nie można cofnąć.</string>
+  <string name="clear_history_completed">Historia została wyczyszczona.</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">Usuń tę rozmowę</string>
+  <string name="conversation_action_delete_this_title">Czy usunąć tę rozmowę?</string>
+  <string name="conversation_action_delete_this_message">Tego działania nie można cofnąć.</string>
+  <string name="conversation_action_history_clear">Wyczyść historię</string>
+  <string name="conversation_action_history_clear_title">Wyczyścić historię rozmowy?</string>
+  <string name="conversation_action_history_clear_message">To całkowicie usunie historię rozmowy.</string>
+  <string name="conversation_action_remove_this">Usuń kontakt</string>
+  <string name="conversation_action_remove_this_title">Usunąć ten kontakt?</string>
+  <string name="conversation_action_remove_this_message">To usunie kontakt i całkowicie wyczyści historię rozmowy.</string>
+  <string name="conversation_action_copy_peer_number">Skopiuj numer</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s skopiowany do schowka</string>
+  <string name="conversation_action_select_peer_number">Wybierz numer</string>
+  <string name="conversation_action_block_this">Blokuj kontakt</string>
+  <string name="conversation_action_go_to_call">Powróć do trwającej rozmowy</string>
+  <string name="clip_contact_uri">Kontakty</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Dodać %1$s?</string>
+  <string name="prompt_new_password">Nowe hasło</string>
+  <string name="prompt_new_password_optional">Nowe hasło (opcjonalnie)</string>
+  <string name="prompt_new_password_repeat">Powtórz nowe hasło</string>
+  <string name="prompt_new_username">Wprowadź nową nazwę użytkownika</string>
+  <string name="help_password_choose">Wybierz silne hasło, które zapamiętasz, by chronić swoje konto Jami.</string>
+  <string name="help_password_enter">Wprowadź hasło do głównego konta Jami</string>
+  <string name="wizard_next">Następne</string>
+  <string name="wizard_back">Wstecz</string>
+  <string name="wizard_skip">Pomiń</string>
   <!--MenuHeaderView-->
+  <string name="profile">Mój profil</string>
+  <string name="profile_message_warning">Twój profil jest udostępniany tylko twoim kontaktom</string>
+  <string name="open_the_gallery">Otwórz galerię</string>
+  <string name="take_a_photo">Zrób zdjęcie</string>
+  <string name="profile_name_hint">Podaj swoje imię (opcjonalnie)</string>
   <!--Share fragment-->
+  <string name="share_message_no_account">Wybierz, proszę, konto które chcesz udostępnić.</string>
+  <string name="share_your_account_information">Udostępnij informacje o moim kontakcie</string>
+  <string name="generic_error_migration">Błąd</string>
+  <string name="generic_error_migration_message">Podczas przenoszenia wystąpił błąd</string>
   <!--Pending contact requests-->
+  <string name="accept">Akceptuj</string>
+  <string name="refuse">Odmów</string>
+  <string name="block">Blokuj</string>
+  <string name="contact_request_title">Nowe zaproszenie</string>
+  <string name="contact_request_msg">Masz %1$s zaproszeń do dodania kontaktu</string>
+  <string name="contact_request_account">Dla %1$s</string>
+  <string name="no_requests">Brak zaproszeń</string>
+  <string name="message_contact_not_trusted_yet">%s nie jest jeszcze w kontaktach. Chcesz zaakceptować, czy odrzucić prośbę zaproszenia?</string>
+  <string name="message_contact_not_trusted">%s nie jest jeszcze w kontaktach.\nDodać do kontaktów?</string>
   <!--Send contact requests-->
+  <string name="send_request_button">Wyślij</string>
+  <string name="send_request_title">Wyślij zaproszenie</string>
+  <string name="send_request_msg">Musisz wysłać zaproszenie do kontaktów, by móc komunikować się z tym użytkownikiem. Dopóki użytkownik nie zaakceptuje zaproszenia, możesz wysyłać wiadomości, ale użytkownik nie będzie mógł odpowiadać.</string>
   <!--Blacklist-->
+  <string name="no_blocked_contact">0 zablokowanych kontaktów</string>
   <!--Smartlist-->
+  <string name="no_contact_request">Brak wysłanych zaproszeń</string>
+  <string name="contact_request_sent">Wysłano zaproszenie</string>
+  <string name="search_results">Wyniki wyszukiwania</string>
+  <string name="tv_contact_row_header">Kontakty</string>
+  <string name="gallery_error_title">Nie znaleziono aplikacji Galeria</string>
+  <string name="gallery_error_message">Nie znaleziono aplikacji do otworzenia Galerii</string>
+  <string name="generic_error">Nastąpił nieoczekiwany błąd</string>
   <!--File Transfer-->
+  <string name="invalid_file">Niepoprawny plik</string>
+  <string name="not_able_to_write_file">Nie da się zapisać pliku</string>
+  <string name="file_transfer_status_created">Rozpoczynanie transferu</string>
+  <string name="file_transfer_status_unsupported">niewspierane</string>
+  <string name="file_transfer_status_wait_peer_acceptance">czekanie na zaakceptowanie</string>
+  <string name="file_transfer_status_wait_host_acceptance">czekanie na zaakceptowanie</string>
+  <string name="file_transfer_status_ongoing">trwa połączenie</string>
+  <string name="file_transfer_status_finished">zakończono</string>
+  <string name="file_transfer_status_closed_by_host">zakończono przez hosta</string>
+  <string name="file_transfer_status_closed_by_peer">zakończono przez peera</string>
+  <string name="file_transfer_status_invalid_pathname">nieprawidłowa ścieżka</string>
+  <string name="file_transfer_status_unjoinable_peer">nieosiągalny klient</string>
+  <string name="file_saved_in">Plik zapisano w  %s</string>
+  <string name="no_space_left_on_device">Brak wolnego miejsca</string>
+  <string name="title_media_viewer">Przeglądarka mediów</string>
+  <string name="menu_file_download">Pobierz plik</string>
+  <string name="menu_file_delete">Usuń plik</string>
+  <string name="menu_file_share">Podziel się plikiem</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml b/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml
index b77ca62..3e3709c 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml
@@ -1,21 +1,178 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings related to account edition screen-->
-  <string name="ic_delete_menu">Usun</string>
+  <string name="ic_delete_menu">Usuń</string>
+  <string name="ic_advanced_menu">Ustawienia zaawansowane</string>
+  <string name="ic_blacklist_menu">Zablokowane kontakty</string>
   <!--Strings related to account creation-->
+  <string name="add_ring_account_title">Dodaj konto Jami</string>
+  <string name="add_sip_account_title">Dodaj konto SIP</string>
+  <string name="ring_account_default_name">Konto Ring %1$s</string>
+  <string name="prompt_alias">Nazwa konta</string>
+  <string name="prompt_hostname">Nazwa hosta</string>
+  <string name="prompt_username">Nazwa użytkownika</string>
+  <string name="prompt_password">Hasło</string>
+  <string name="action_create">Stwórz konto</string>
+  <string name="action_create_short">Stwórz</string>
+  <string name="action_register">Zarejestruj</string>
+  <string name="action_settings">Ustawienia</string>
+  <string name="error_field_required">To pole jest wymagane</string>
+  <string name="dialog_wait_create">Dodawanie konta</string>
+  <string name="dialog_wait_create_details">Poczekaj, proszę, aż twoje nowe konto zostanie dodane...</string>
+  <string name="dialog_wait_update">Aktualizowanie konta</string>
+  <string name="dialog_wait_update_details">Poczeka, proszę, aż twoje nowe konto zostanie zaktualizowane</string>
+  <string name="dialog_warn_ip2ip_account_title">Utworzyć puste konto SIP?</string>
+  <string name="dialog_warn_ip2ip_account_message">Zamierzasz założyć konto SIP bez prawidłowego hosta.
+Będziesz mógł nawiązywać i odbierać połączenia wyłącznie od bezpośrednich adresów IP.
+Możesz edytować swoje konto później</string>
+  <string name="account_type_ip2ip">konto IP</string>
+  <string name="help_sip_title">Dodaj twoje konto SIP</string>
+  <string name="help_sip">Skonfiguruj istniejące konto SIP.</string>
+  <string name="create_sip_account">Dodaj konto SIP</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Usuń konto ?</string>
+  <string name="account_delete_dialog_message">Tego działania nie można cofnąć.</string>
   <!--AccountManagementFragment-->
+  <string name="empty_account_list">Nie masz zarejestrowanego konta</string>
+  <string name="normal_accounts_titles">Konta</string>
+  <string name="normal_devices_titles">Znane urządzenia połączone z tym kontem Jami</string>
+  <string name="account_device_revoke">Odwołaj urządzenie</string>
+  <string name="account_device_revocation_success_title">Sukces</string>
+  <string name="account_device_revocation_success">Urządzenie jest odwołane!</string>
+  <string name="account_device_revocation_error_title">Nie można odwołać urządzenia</string>
+  <string name="account_device_revocation_wrong_password">Błędne hasło.</string>
+  <string name="account_device_revocation_unknown_device">Nieznane urządzenie.</string>
+  <string name="account_device_revocation_error_unknown">Nieznany błąd.</string>
   <!--Basic Details-->
+  <string name="account_preferences_basic_tab">Generalne</string>
+  <string name="account_basic_category">Ustawienia Podstawowe</string>
+  <string name="account_alias_label">Nazwa Konta</string>
+  <string name="account_hostname_label">Nazwa hosta</string>
+  <string name="account_bootstrap_label">Bootstrap</string>
+  <string name="account_username_label">Nazwa użytkownika</string>
+  <string name="account_password_label">Hasło</string>
+  <string name="account_optionnal_category">Ustawienia Opcjonalne</string>
+  <string name="account_useragent_label">User Agent</string>
+  <string name="account_autoanswer_label">Automatyczna Odpowiedź</string>
+  <string name="account_upnp_label">Włącz UPnP</string>
+  <string name="account_proxy_field">Pełnomocnik</string>
   <!--Audio Details-->
+  <string name="account_audio_label">Audio</string>
+  <string name="account_preferences_media_tab">Multimedia</string>
+  <string name="account_ringtone_label">Dzwonki</string>
+  <string name="account_ringtone_enabled_label">Aktywuj dzwonki</string>
+  <string name="account_ringtone_path_label">Ścieżka do dzwonka</string>
+  <string name="account_ringtone_custom_label">użyj własnego dzwonka</string>
   <!--Video Details-->
+  <string name="account_video_label">Wideo</string>
+  <string name="account_video_enable">Włącz video</string>
   <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">Zaawansowane</string>
+  <string name="account_dht_public_in_calls_label">Zezwól na wszystkie połączenia/wiadomości</string>
+  <string name="account_registration_exp_label">Rejestracja Wygasła</string>
+  <string name="account_local_interface_label">Lokalny Interfejs</string>
+  <string name="account_local_port_label">Port Lokalny</string>
+  <string name="account_stun_enable_label">Użyj Stun</string>
+  <string name="account_stun_server_label">Serwer Stun</string>
+  <string name="account_turn_enable_label">Użyj TURN</string>
+  <string name="account_turn_server_label">Serwer TURN</string>
+  <string name="account_turn_username_label">Nazwa użytkownika TURN</string>
+  <string name="account_turn_password_label">Hasło TURN</string>
+  <string name="account_published_same_as_local_label">Opublikowano tak samo jak lokalny</string>
+  <string name="account_published_port_label">Opublikowany Port</string>
+  <string name="account_published_address_label">Opublikowany Adres</string>
+  <string name="account_proxy_label">Proxy DHT</string>
+  <string name="account_proxy_enable_label">Używaj proxy DHT</string>
+  <string name="account_proxy_server_label">Adres proxy DHT</string>
   <!--Security Details-->
+  <string name="account_credentials_label">Detale</string>
+  <string name="account_credentials_edit">Edytuj detale</string>
+  <string name="account_credentials_add">Dodaj detale</string>
   <!--SRTP Details-->
+  <string name="account_preferences_security_tab">Zabezpieczenia</string>
   <!--SIP-->
   <!--TLS Details-->
+  <string name="account_tls_transport_switch_label">Korzystaj z transportu TLS</string>
+  <string name="account_tls_port_label">TLS Port Słuchujący</string>
+  <string name="account_tls_certificate_list_label">Autorytety Certyfikatów</string>
+  <string name="account_tls_certificate_file_label">Plik Certyfikatu</string>
+  <string name="account_tls_private_key_file_label">Plik Klucza Prywatnego</string>
+  <string name="account_tls_password_label">Hasło Klucza Prywatnego</string>
+  <string name="account_tls_method_label">Metoda TLS</string>
+  <string name="account_tls_ciphers_label">Szyfry TLS</string>
+  <string name="account_tls_server_name_label">Nazwa Serwera</string>
+  <string name="account_tls_verify_server_label">Zweryfikuj Serwer</string>
+  <string name="account_tls_verify_client_label">Zweryfikuj Klient</string>
+  <string name="account_tls_negotiation_timeout_sec">Limit czasu do negocjacji (w sekundach)</string>
+  <string name="account_rtp_max_port">Maksimum</string>
+  <string name="account_rtp_min_port">Minimum</string>
+  <string name="account_rtp_port_range">Zakres Portów Audio RTP</string>
   <!--restore/backup-->
+  <string name="account_new_device_password">Wprowadź główne hasło aby odblokować konto</string>
+  <string name="error_password_char_count">minimum 6 znaków</string>
+  <string name="error_passwords_not_equals">Hasła nie pasują do siebie</string>
+  <string name="export_account_wait_title">Proszę czekać…</string>
+  <string name="export_account_wait_message">Publikowanie informacji o nowym koncie</string>
+  <string name="account_export_end_decryption_message">Nie można było odblokować twojego konta podanym hasłem.</string>
+  <string name="account_export_end_network_title">Błąd sieci</string>
+  <string name="account_export_end_network_message">Nie można eksportować konta w tej sieci. Sprawdź swoje połączenie.</string>
+  <string name="account_export_end_error_title">Błąd</string>
+  <string name="account_export_end_error_message">Nie można eksportować konta. Wystąpił nieznany błąd.</string>
+  <string name="account_enter_password">Wprowadź hasło</string>
+  <string name="account_contact_me">Skontaktuj się ze mną na Jami !</string>
+  <string name="update_account">Zaktualizuj konto</string>
+  <string name="ring_account">konto Jami</string>
+  <string name="ring_account_identity">Tożsamość</string>
+  <string name="account_migration_title_dialog">Przenoszenie konta</string>
+  <string name="account_migration_message_dialog">Twoje konto musi zostać zaktualizowane. Czy chcesz przejść do ekranu Zarządzania kontem aby przeprowadzić tę operację ?</string>
+  <string name="account_update_needed">Wymagana aktualizacja</string>
+  <string name="account_cannot_be_found_title">Nie można znaleźć konta</string>
+  <string name="account_sip_cannot_be_registered_message">Możesz kontynuować proces tworzenia konta albo edytować informacje w tym miejscu. Późniejsza edycja jest możliwa w ustawieniach konta.</string>
+  <string name="account_no_network_title">Nie można połączyć z siecią</string>
+  <string name="account_device_added_title">Konto dodane do urządzenia</string>
+  <string name="account_device_updated_title">Konto na urządzeniu zaktualizowane</string>
+  <string name="account_cannot_be_updated_message">Nie można zaktualizować konta. Sprawdź swoje hasło.</string>
+  <string name="account_sip_success_title">konto SIP zarejestrowane</string>
+  <string name="account_sip_success_message">Pomyślnie zarejestrowałeś swoje konto SIP.</string>
+  <string name="account_sip_register_anyway">Zarejestruj mimo to</string>
+  <string name="account_link_button">Połącz to urządzenie z kontem</string>
+  <string name="account_link_prompt_pin">Wprowadź PIN</string>
+  <string name="account_link_export_button">Połącz kolejne urządzenie z tym kontem</string>
+  <string name="account_start_export_button">Generuj PIN</string>
+  <string name="account_end_export_button">zamknij</string>
+  <string name="account_export_title">Dodaj urządzenia</string>
   <!--Name registration-->
+  <string name="error_username_empty">Wprowadź nazwę użytkownika</string>
+  <string name="no_registered_name_for_account">Nie znaleziono żadnej nazwy zarejestrowanej dla tego konta </string>
+  <string name="register_name">Zarejestruj nazwę</string>
+  <string name="trying_to_register_name">Trwa próba rejestracji nazwy</string>
+  <string name="registered_username">Zarejestruj nazwę użytkownika</string>
+  <string name="register_username">Zarejestruj publiczny login (zalecane)</string>
+  <string name="username_already_taken">Nazwa użytkownika zajęta</string>
+  <string name="invalid_username">Nieprawidłowa nazwa użytkownika</string>
+  <string name="looking_for_username_availability">Sprawdzanie dostępności nazwy użytkownika...</string>
+  <string name="account_status_connecting">Łączenie</string>
+  <string name="account_status_connection_error">Błąd połączenia</string>
+  <string name="account_status_online">Online</string>
+  <string name="account_status_unknown">Nieznane</string>
+  <string name="account_status_offline">Offline</string>
   <!--Create account-->
+  <string name="account_creation_profile">Stwórz swój profil</string>
+  <string name="account_link_title">Połącz to urządzenie</string>
+  <string name="account_sip_cannot_be_registered">Nie można zarejestrować konta</string>
   <!--Edit profile-->
+  <string name="account_edit_profile">Edytuj swój profil</string>
   <!--Devices-->
+  <string name="account_revoke_device_hint">Wprowadź hasło aby potwierdzić</string>
+  <string name="enter_password">Wprowadź hasło</string>
+  <string name="revoke_device_title">Odwołaj urządzenie</string>
+  <string name="revoke_device_message">Czy na pewno chcesz odwołać %1$s ?</string>
+  <string name="revoke_device_wait_title">Proszę czekać…</string>
+  <string name="revoke_device_wait_message">Odwoływanie urządzenia</string>
+  <string name="rename_device_title">Zmień nazwę tego urządzenia</string>
+  <string name="rename_device_button">Przemianuj urządzenie</string>
+  <string name="account_rename_device_hint">Wybierz nową nazwę dla urządzenia</string>
+  <string name="account_device_name_empty">Nazwa urządzenia nie może być pusta</string>
+  <string name="account_device_this_indicator">to urządzenie</string>
+  <string name="account_disabled_indicator">wyłączone</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_call.xml b/ring-android/app/src/main/res/values-pl-rPL/strings_call.xml
new file mode 100644
index 0000000..0a774a2
--- /dev/null
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings_call.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+
+Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<resources>
+    <!-- Call error -->
+    <string name="call_error_no_microphone">Rozmowa anulowana. Nie wykryto mikrofonu.</string>
+    <string name="call_error_no_camera_no_microphone">Rozmowa anulowana. Nie wykryto kamery lub mikrofonu.</string>
+
+    <!-- SipCalls -->
+    <string name="call_human_state_searching">Wyszukiwanie</string>
+    <string name="call_human_state_incoming">Przychodzące</string>
+    <string name="call_human_state_connecting">Łączenie</string>
+    <string name="call_human_state_ringing">Dzwonienie</string>
+    <string name="call_human_state_current">Rozmawianie</string>
+    <string name="call_human_state_hungup">Koniec</string>
+    <string name="call_human_state_busy">Zajęty</string>
+    <string name="call_human_state_failure">Nie powiodła się</string>
+    <string name="call_human_state_hold">Czekanie</string>
+    <string name="call_human_state_unhold">Wznów</string>
+    <string name="call_human_state_over">Koniec</string>
+    <string name="call_human_state_none">Nic</string>
+    <!-- Conferences -->
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_content_description.xml b/ring-android/app/src/main/res/values-pl-rPL/strings_content_description.xml
new file mode 100644
index 0000000..d8c8734
--- /dev/null
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings_content_description.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings for xml content description of images-->
+  <string name="contact_quick_call_description">Szybkie Połączenie</string>
+  <string name="contact_picture_description">Zdjęcie Kontaktu</string>
+  <string name="dial_numeric_pad">Klawiatura numeryczna</string>
+  <string name="contact_unblock">Odblokuj</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml b/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml
new file mode 100644
index 0000000..f338fdf
--- /dev/null
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_category_network">Sieć</string>
+  <string name="pref_category_contacts">Kontakty</string>
+  <string name="pref_category_video">Wideo</string>
+  <string name="pref_category_system">System</string>
+  <string name="pref_category_privacy">Prywatność</string>
+  <string name="pref_mobileData_title">Dane mobilne</string>
+  <string name="pref_pushNotifications_title">Powiadomienia Push</string>
+  <string name="pref_pushNotifications_summary">Używaj serwerów Google, by umożliwić odbieranie wiadomości i rozmów w tle</string>
+  <string name="pref_hd_summary">Zezwól na wysyłane wideo w jakości HD</string>
+  <string name="pref_systemContacts_title">Użyj kontakty z systemu</string>
+  <string name="pref_systemContacts_summary">Użyj kontakty z systemu aby pokazać detale tego który dzwoni</string>
+  <string name="pref_clearHistory_title">Wyczyść historię</string>
+  <string name="pref_clearHistory_summary">Wyczyść całą historię konwersacji. Ta czynność nie może być cofnięta.</string>
+</resources>
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 761bba8..9423e4c 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
@@ -2,7 +2,9 @@
 <resources>
   <!--About-->
   <string name="feedback_section">Feedback</string>
+  <string name="report"><u>Nos mande um e-mail</u></string>
   <string name="section_license">Licença</string>
+  <string name="sponsor_section">Jami é um software livre desenvolvido e mantido por</string>
   <string name="copyright_section">Direitos de Autor</string>
   <string name="contribute_section">Contribua</string>
   <string name="version_section">Versão</string>
@@ -10,6 +12,9 @@
   <string name="no_browser_app_installed">Nenhum navegador de internet foi encontrado, instale um para acessar esta página</string>
   <string name="email_chooser_title">Enviar e-mail usando...</string>
   <string name="website_chooser_title">Ver site utilizando...</string>
+  <string name="license">Este software é disponibilizado \"no estado\", sem garantia de qualquer tipo. 
+Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recente</u></string>
+  <string name="description">Jami é um software livre para comunicação universal que respeita as liberdades e privacidade de seus usuários.</string>
   <string name="credits">Créditos</string>
   <!--About dialog-->
   <string name="developed_by">Desenvolvido por</string>
@@ -31,6 +36,7 @@
   <string name="menu_item_account">Administrar conta</string>
   <string name="menu_item_settings">Configurações</string>
   <string name="menu_item_share">Compartilhar meu contato</string>
+  <string name="menu_item_about">Sobre Jami</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Disque um número</string>
   <!--History Fragment-->
@@ -59,6 +65,9 @@
   <string name="notif_channel_messages">Mensagens</string>
   <string name="notif_channel_requests">Solicitações</string>
   <string name="notif_channel_file_transfer">Transferência de arquivo</string>
+  <string name="notif_channel_background_service">Serviço de segundo-plano</string>
+  <string name="notif_channel_background_service_descr">Permite receber chamadas e mensagens a qualquer hora.</string>
+  <string name="notif_background_service">Jami está ativo em segundo-plano.</string>
   <string name="notif_mark_as_read">Marcar como lida</string>
   <string name="notif_dismiss">Dispensar</string>
   <string name="notif_reply">Responder</string>
@@ -74,8 +83,11 @@
   <string name="ongoing_call">Chamada em andamento</string>
   <string name="hist_in_call">Recebimento de chamada %1$s</string>
   <string name="hist_out_call">Chamada de saída %1$s</string>
+  <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_decline">Rejeitar</string>
+  <string name="action_call_mic_mute">Desativar microfone</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>
@@ -103,7 +115,9 @@
   <string name="ringtone_error_format_not_supported">Este formato não é suportado.</string>
   <string name="ringtone_error_size_too_big">Este arquivo é grande demais. O tamanho máximo é %1$dkB.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">O Jami precisa da permissão \"Acessar contatos\" para habilitar esta função. Permita, por favor.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">O Jami precisa da permissão \"Escrever registro de chamadas\" para ativar esse recurso. Permita, por favor.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Escanear o Código QR da conta que deseja adicionar.</string>
   <!--Settings-->
@@ -111,6 +125,7 @@
   <string name="clear_history_dialog_message">Esta ação não pode ser desfeita.</string>
   <string name="clear_history_completed">O histórico foi apagado.</string>
   <!--Conversation-->
+  <string name="conversation_details">Detalhes do contato</string>
   <string name="conversation_action_delete_this">Deletar conversa</string>
   <string name="conversation_action_delete_this_title">Deletar esta conversa ?</string>
   <string name="conversation_action_delete_this_message">Esta ação não pode ser desfeita.</string>
@@ -125,12 +140,20 @@
   <string name="conversation_action_select_peer_number">Selecione um número</string>
   <string name="conversation_action_block_this">Bloquear contato</string>
   <string name="conversation_action_go_to_call">Voltar à chamada em andamento</string>
+  <string name="clip_contact_uri">Endereço do contato</string>
+  <string name="block_contact_dialog_title">Bloquear %1$s?</string>
+  <string name="block_contact_dialog_message">%1$snão conseguirá te contactar até que você o desbloqueie.</string>
+  <string name="block_contact_completed">%1$s foi bloqueado.</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Adicionar %1$s?</string>
   <string name="prompt_new_password">Nova senha</string>
   <string name="prompt_new_password_optional">Nova senha (opcional)</string>
   <string name="prompt_new_password_repeat">Repita a nova senha</string>
+  <string name="account_create_title">Criar uma conta no Jami</string>
   <string name="prompt_new_username">Entre novo 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">Entre com a senha da sua conta Jami principal</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>
   <string name="wizard_skip">Pular</string>
@@ -141,6 +164,7 @@
   <string name="take_a_photo">Tirar uma foto</string>
   <string name="profile_name_hint">Insira o seu nome (opcional)</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>
   <string name="share_your_account_information">Compartilhar meus dados de contato</string>
   <string name="generic_error_migration">Erro</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
index 668547a..e09abeb 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
@@ -5,6 +5,7 @@
   <string name="ic_advanced_menu">Configurações avançadas</string>
   <string name="ic_blacklist_menu">Contatos bloqueados</string>
   <!--Strings related to account creation-->
+  <string name="add_ring_account_title">Adicionar conta do Jami</string>
   <string name="add_sip_account_title">Adicionar conta SIP</string>
   <string name="ring_account_default_name">Conta Ring %1$s</string>
   <string name="prompt_alias">Apelido</string>
@@ -25,6 +26,7 @@
         Você só poderá fazer e receber chamadas diretas de IP.
         Pode editar a sua conta mais tarde</string>
   <string name="account_type_ip2ip">IP da conta</string>
+  <string name="help_ring">Uma conta do Jami permite que você entre em contato com pessoas de forma segura em uma rede possoa-a-pessoa totalmente distribuída.</string>
   <string name="help_sip_title">Adicionar sua conta SIP</string>
   <string name="help_sip">Configurar uma conta SIP existente.</string>
   <string name="create_sip_account">Adicionar conta SIP</string>
@@ -34,6 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nenhuma conta registrada</string>
   <string name="normal_accounts_titles">Contas</string>
+  <string name="normal_devices_titles">Dispositivos conhecidos associados à esta conta do Jami</string>
   <string name="account_device_revoke">Revogar dispositivo</string>
   <string name="account_device_revocation_success_title">Sucesso</string>
   <string name="account_device_revocation_success">Dispositivo foi revogado!</string>
@@ -117,25 +120,38 @@
   <string name="account_export_end_error_title">Erro</string>
   <string name="account_export_end_error_message">Não foi possível exportar a conta. Um erro desconhecido ocorreu.</string>
   <string name="account_enter_password">Entre a senha</string>
+  <string name="account_share_body">Entre em contato comigo utilizando \"%1$s\" na plataforma Jami de comunicação distribuída: %2$s</string>
+  <string name="account_share_body_with_username">Entre em contato comigo utilziando \"%1$s\" ou via meu usuário público \"%2$s\" na plataforma Jami de comunicação distribuída: %3$s</string>
+  <string name="account_contact_me">Encontre-me no Jami !</string>
   <string name="update_account">Atualize a conta</string>
+  <string name="account_migration">Sua conta no Jami pode ser atualizada.\nPor favor insira sua senha.</string>
+  <string name="ring_account">Conta Jami</string>
   <string name="ring_account_identity">Identificação</string>
   <string name="account_migration_title_dialog">Migração de conta</string>
   <string name="account_migration_message_dialog">Sua conta precisa ser atualizada. Você deseja ir na tela de administração da conta para fazer isto?</string>
   <string name="account_update_needed">Atualização necessária</string>
   <string name="account_cannot_be_found_title">Não foi possível localizar conta</string>
+  <string name="account_cannot_be_found_message">Não foi possível localizar a conta na rede do Jami.\nCertifique-se de que foi exportada no Jami de um dispositivo existente, e que as informações fornecidas estão corretas.</string>
   <string name="account_sip_cannot_be_registered_message">Você pode continuar com o processo de criação de conta ou editar suas informações aqui. A edição também é possível mais tarde nas configurações de conta.</string>
   <string name="account_no_network_title">Não foi possível conectar-se à rede.</string>
+  <string name="account_no_network_message">Não foi possível adicionar a conta porque o Jami não pôde conectar-se à rede distribuída. Verifique a conexão do seu dispositivo.</string>
   <string name="account_device_added_title">Dispositivo adicionado à conta</string>
+  <string name="account_device_added_message">Você configurou sua conta do Jami neste dispositivo com sucesso.</string>
   <string name="account_device_updated_title">Dispositivo da conta atualizado</string>
+  <string name="account_device_updated_message">Você atualizou sua conta do Jami com sucesso.</string>
   <string name="account_cannot_be_updated_message">Conta do dispositivo não pode ser atualizada. Por favor cheque sua senha.</string>
   <string name="account_sip_success_title">Conta SIP registrada</string>
   <string name="account_sip_success_message">Você registrou sua conta SIP com sucesso.</string>
   <string name="account_sip_register_anyway">Registrar mesmo assim</string>
   <string name="account_link_button">Associar este dispositivo a uma conta</string>
   <string name="account_link_prompt_pin">Entre o PIN</string>
+  <string name="account_new_button">Criar uma conta no Jami</string>
   <string name="account_link_export_button">Associar outro dispositivo à esta conta</string>
+  <string name="account_link_export_info">Para usar esta conta em outros dispositivos, você deve antes expô-la no Jami. Isso gerará um código PIN que você deverá entrar no novo dispositivo para configurar a conta. Este PIN é válido por 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">Seu PIN é:\n\n%%\n\nPara completar o processo, você deve abrir o Jami no novo dispositivo. Crie uma nova conta com \"Associar este dispositivo à uma conta\". Seu PIN é válido por 10 minutos.</string>
+  <string name="account_link_export_info_light">Para usar esta conta em outros dispositivos, você deve antes expô-la no Jami. Isso gerará um código PIN que você deverá entrar no novo dispositivo para configurar a conta. Este PIN é válido por 10 minutos.</string>
   <string name="account_export_title">Adicionar dispositivos</string>
   <!--Name registration-->
   <string name="error_username_empty">Entre um nome de usuário</string>
@@ -153,7 +169,9 @@
   <string name="account_status_unknown">Desconhecido</string>
   <string name="account_status_offline">Offline</string>
   <!--Create account-->
+  <string name="account_creation_home">Bem-vindo ao Jami</string>
   <string name="account_creation_profile">Criar um Perfil</string>
+  <string name="account_creation_ring">Criar sua conta do Jami</string>
   <string name="account_link_title">Conectar este dispositivo</string>
   <string name="account_sip_cannot_be_registered">Impossível registrar conta.</string>
   <!--Edit profile-->
@@ -166,6 +184,7 @@
   <string name="revoke_device_wait_title">Por favor, aguarde...</string>
   <string name="revoke_device_wait_message">Revogando dispositivo</string>
   <string name="rename_device_title">Renomear este dispositivo</string>
+  <string name="rename_device_message">Escolha um novo nome para identificar este dispositivo na sua conta do Jami</string>
   <string name="rename_device_button">Renomear dispositivo</string>
   <string name="account_rename_device_hint">Escolher novo nome de dispositivo</string>
   <string name="account_device_name_empty">Nome do dispositivo não pode estar vazio</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
index 502005a..4849e37 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
@@ -6,11 +6,20 @@
   <string name="pref_category_system">Sistema</string>
   <string name="pref_category_privacy">Privacidade</string>
   <string name="pref_mobileData_title">Dados do Celular</string>
+  <string name="pref_mobileData_summary">Permitir o Jami em redes 3G/LTE além do Wi-Fi</string>
   <string name="pref_pushNotifications_title">Notificações via push</string>
   <string name="pref_pushNotifications_summary">Use os servidores do Google para permitir o recebimento de chamadas/mensagens em segundo plano</string>
   <string name="pref_hd_summary">Habilitar envio de vídeo em HD</string>
+  <string name="pref_hwEncode_title">Ativar codificação acelerada</string>
+  <string name="pref_hwEncode_summary">Função experimental</string>
   <string name="pref_systemContacts_title">Usar contatos do sistema</string>
   <string name="pref_systemContacts_summary">Usar contatos do sistema para mostrar detalhes da chamada</string>
+  <string name="pref_systemDialer_title">Fazer chamadas do sistema usando o Jami</string>
+  <string name="pref_systemDialer_summary">Usar o Jami para chamadas do sistema sempre que possível.</string>
+  <string name="pref_startOnBoot_title">Inicializar o Jami automaticamente com o sistema</string>
+  <string name="pref_startOnBoot_summary">Executar o Jami em segundo-plano ao inicializar o sistema.</string>
   <string name="pref_clearHistory_title">Limpar histórico</string>
   <string name="pref_clearHistory_summary">Limpar todo o histórico de conversas. Esta ação não pode ser desfeita.</string>
+  <string name="pref_persistNotification_title">Executar em segundo-plano</string>
+  <string name="pref_persistNotification_summary">Permitir execução em segundo-plano para receber chamadas e mensagens.</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings.xml b/ring-android/app/src/main/res/values-pt-rPT/strings.xml
index 7b2ddd4..1b61e36 100644
--- a/ring-android/app/src/main/res/values-pt-rPT/strings.xml
+++ b/ring-android/app/src/main/res/values-pt-rPT/strings.xml
@@ -140,6 +140,9 @@
   <string name="conversation_action_block_this">Bloquear contacto</string>
   <string name="conversation_action_go_to_call">Voltar à chamada a decorrer</string>
   <string name="clip_contact_uri">Endereço do contacto</string>
+  <string name="block_contact_dialog_title">Bloquear %1$s?</string>
+  <string name="block_contact_dialog_message">%1$s não poderá contactá-lo até que o desbloqueie.</string>
+  <string name="block_contact_completed">%1$s foi bloqueado.</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Adicionar %1$s?</string>
   <string name="prompt_new_password">Nova palavra-chave</string>
diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml b/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml
index 24babea..ae9864c 100644
--- a/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml
@@ -120,6 +120,8 @@
   <string name="account_export_end_error_title">Erro</string>
   <string name="account_export_end_error_message">Não foi possível exportar a conta. Ocorreu um erro desconhecido.</string>
   <string name="account_enter_password">introduza a palavra-chave</string>
+  <string name="account_share_body">Contacte-me utilizando \'%1$s\' na plataforma de comunicação distribuida Jami: %2$s</string>
+  <string name="account_share_body_with_username">Contacte-me utilizando \'%1$s\' ou o meu nome público de utilizador \'%2$s\' na plataforma de comunicação distribuída Jami: %3$s</string>
   <string name="account_contact_me">Contacte-me no Jami!</string>
   <string name="update_account">Atualizar conta</string>
   <string name="account_migration">A sua conta Jami pode ser atualizada.\nPor favor introduza a sua palavra-chave.</string>
diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml b/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
index 63fb4a6..3b31f29 100644
--- a/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
@@ -10,6 +10,8 @@
   <string name="pref_pushNotifications_title">Notificações push (do servidor)</string>
   <string name="pref_pushNotifications_summary">Usar os servidores da Google para permitir o recebimento de chamadas/mensagens em segundo plano</string>
   <string name="pref_hd_summary">Ativar envio de vídeo em HD</string>
+  <string name="pref_hwEncode_title">Ativar codificação acelerada</string>
+  <string name="pref_hwEncode_summary">Funcionalidade experimental</string>
   <string name="pref_systemContacts_title">Usar contactos do sistema</string>
   <string name="pref_systemContacts_summary">Usar contactos do sistema para mostrar detalhes de quem telefona.</string>
   <string name="pref_systemDialer_title">Fazer chamadas de sistema utilizando o Jami</string>
diff --git a/ring-android/app/src/main/res/values-pt/strings.xml b/ring-android/app/src/main/res/values-pt/strings.xml
index 7b2ddd4..1b61e36 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -140,6 +140,9 @@
   <string name="conversation_action_block_this">Bloquear contacto</string>
   <string name="conversation_action_go_to_call">Voltar à chamada a decorrer</string>
   <string name="clip_contact_uri">Endereço do contacto</string>
+  <string name="block_contact_dialog_title">Bloquear %1$s?</string>
+  <string name="block_contact_dialog_message">%1$s não poderá contactá-lo até que o desbloqueie.</string>
+  <string name="block_contact_completed">%1$s foi bloqueado.</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Adicionar %1$s?</string>
   <string name="prompt_new_password">Nova palavra-chave</string>
diff --git a/ring-android/app/src/main/res/values-pt/strings_account.xml b/ring-android/app/src/main/res/values-pt/strings_account.xml
index ae435d7..677f419 100644
--- a/ring-android/app/src/main/res/values-pt/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt/strings_account.xml
@@ -120,6 +120,8 @@
   <string name="account_export_end_error_title">Erro</string>
   <string name="account_export_end_error_message">Não foi possível exportar a conta. Ocorreu um erro desconhecido.</string>
   <string name="account_enter_password">introduza a palavra-chave</string>
+  <string name="account_share_body">Contacte-me utilizando \'%1$s\' na plataforma de comunicação distribuida Jami: %2$s</string>
+  <string name="account_share_body_with_username">Contacte-me utilizando \'%1$s\' ou o meu nome público de utilizador \'%2$s\' na plataforma de comunicação distribuída Jami: %3$s</string>
   <string name="account_contact_me">Contacte-me no Jami!</string>
   <string name="update_account">Atualizar conta</string>
   <string name="account_migration">A sua conta Jami pode ser atualizada.\nPor favor introduza a sua palavra-chave.</string>
diff --git a/ring-android/app/src/main/res/values-pt/strings_preferences.xml b/ring-android/app/src/main/res/values-pt/strings_preferences.xml
index bb751c6..4f895e7 100644
--- a/ring-android/app/src/main/res/values-pt/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pt/strings_preferences.xml
@@ -10,6 +10,8 @@
   <string name="pref_pushNotifications_title">Notificações push (do servidor)</string>
   <string name="pref_pushNotifications_summary">Usar os servidores da Google para permitir o recebimento de chamadas/mensagens em segundo plano</string>
   <string name="pref_hd_summary">Ativar envio de vídeo em HD</string>
+  <string name="pref_hwEncode_title">Ativar codificação acelerada</string>
+  <string name="pref_hwEncode_summary">Funcionalidade experimental</string>
   <string name="pref_systemContacts_title">Usar contactos do sistema</string>
   <string name="pref_systemContacts_summary">Usar contactos do sistema para mostrar detalhes de quem telefona.</string>
   <string name="pref_systemDialer_title">Fazer chamadas de sistema utilizando o Jami</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 9040511..7f5c536 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
@@ -140,6 +140,9 @@
   <string name="conversation_action_block_this">Bllokojeni kontaktin</string>
   <string name="conversation_action_go_to_call">Rikthehu te thirrja që po bëhej</string>
   <string name="clip_contact_uri">Adresë kontakti</string>
+  <string name="block_contact_dialog_title">Të bllokohet %1$s?</string>
+  <string name="block_contact_dialog_message">%1$s s’do të jetë në gjendje të lidhet me ju, deri sa ta zhbllokoni.</string>
+  <string name="block_contact_completed">%1$s u bllokua.</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Të shtohet %1$s?</string>
   <string name="prompt_new_password">Fjalëkalim i ri</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 c2163d5..01cfa3f 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
@@ -120,6 +120,8 @@
   <string name="account_export_end_error_title">Gabim</string>
   <string name="account_export_end_error_message">S\’u eksportua dot llogaria. Ndodhi një gabim i panjohur.</string>
   <string name="account_enter_password">Jepni fjalëkalimin</string>
+  <string name="account_share_body">Lidhuni me mua duke përdorur \'%1$s\' në platformën Jami të komunikimeve të shpërndara: %2$s</string>
+  <string name="account_share_body_with_username">Lidhuni me mua duke përdorur \'%1$s\' ose emrin tim publik të përdoruesit \'%2$s\' në platformën Jami të komunikimeve të shpërndara: %3$s</string>
   <string name="account_contact_me">Lidhuni me mua në Jami!</string>
   <string name="update_account">Përditësoje llogarinë</string>
   <string name="account_migration">Llogaria juaj Jami mund të përditësohet.\nJu lutemi, jepni fjalëkalimin tuaj.</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
index f6eaa0b..4647ef6 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
@@ -10,6 +10,8 @@
   <string name="pref_pushNotifications_title">Njoftime push</string>
   <string name="pref_pushNotifications_summary">Përdorni shërbyesit Google që të lejoni marrje thirrjesh/mesazhesh në prapaskenë</string>
   <string name="pref_hd_summary">Aktivizoni dërgim videosh HD</string>
+  <string name="pref_hwEncode_title">Aktivizo kodim të përshpejtuar</string>
+  <string name="pref_hwEncode_summary">Veçori eksperimentale</string>
   <string name="pref_systemContacts_title">Përdor kontakte sistemi</string>
   <string name="pref_systemContacts_summary">Për shfaqjen e hollësive të thirrësit përdor kontakte sistemi.</string>
   <string name="pref_systemDialer_title">Kryej thirrje sistemi duke përdoru Jami-n</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 32f751b..d864c3a 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
@@ -2,7 +2,9 @@
 <resources>
   <!--About-->
   <string name="feedback_section">反馈</string>
+  <string name="report"><u>给我们发送邮件</u></string>
   <string name="section_license">许可</string>
+  <string name="sponsor_section">Jami是一个自由软件，开发和支持者为：</string>
   <string name="copyright_section">版权所有</string>
   <string name="contribute_section">贡献</string>
   <string name="version_section">版本</string>
@@ -10,6 +12,8 @@
   <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="description">Jami是一种自由通信软件，它尊重用户的自由和隐私。</string>
   <string name="credits">致谢</string>
   <!--About dialog-->
   <string name="developed_by">开发者</string>
@@ -28,8 +32,10 @@
   <string name="menu_item_home">主页</string>
   <string name="menu_item_contact_request">联系人请求</string>
   <string name="menu_item_accounts">管理帐户</string>
+  <string name="menu_item_account">管理账户</string>
   <string name="menu_item_settings">设置</string>
   <string name="menu_item_share">共享我的通讯录</string>
+  <string name="menu_item_about">关于Jami</string>
   <!--Dialing Fragment-->
   <string name="dial_number">拨号</string>
   <!--History Fragment-->
@@ -53,16 +59,38 @@
   <string name="notif_current_call_title">当前通话：%1$s</string>
   <string name="notif_current_call">当前通话</string>
   <string name="notif_channel_calls">呼叫</string>
+  <string name="notif_channel_missed_calls">未接电话</string>
+  <string name="notif_channel_messages">消息</string>
+  <string name="notif_channel_requests">请求</string>
+  <string name="notif_channel_file_transfer">文件传输</string>
+  <string name="notif_channel_background_service">后台服务</string>
+  <string name="notif_channel_background_service_descr">允许在任何时间接受电话和消息。</string>
+  <string name="notif_background_service">Jami正在后台运行</string>
+  <string name="notif_mark_as_read">标为已读</string>
+  <string name="notif_dismiss">解散</string>
+  <string name="notif_reply">回复</string>
+  <string name="notif_incoming_file_transfer_title">从%1$s收到的文件</string>
+  <string name="notif_incoming_file_transfer">有人想给你发送一个文件</string>
+  <string name="notif_outgoing_file_transfer_title">发送文件到%1$s</string>
+  <string name="notif_outgoing_file_transfer">有人想给你发送一个文件</string>
+  <string name="notif_incoming_picture">来自%1$s的图片</string>
+  <string name="action_open">打开</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">你：</string>
   <string name="action_call_hangup">挂断</string>
   <string name="ongoing_call">正在通话</string>
   <string name="hist_in_call">来电：%1$s</string>
   <string name="hist_out_call">去电：%1$s</string>
+  <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_decline">拒接</string>
+  <string name="action_call_mic_mute">关闭麦克风</string>
   <string name="ab_action_speakerphone">开启扬声器</string>
   <string name="ab_action_contact_add">加入通讯录</string>
+  <string name="ab_action_contact_add_question">添加至通讯录吗？</string>
+  <string name="hist_contact_added">已加入通讯录</string>
+  <string name="hist_invitation_received">已接受邀请</string>
   <string name="ab_action_audio_call">语音通话</string>
   <string name="ab_action_video_call">视频通话</string>
   <string name="ab_action_change_screen_orientation">切换屏幕方向</string>
@@ -75,32 +103,58 @@
   <string name="message_sending">正在发送消息…</string>
   <string name="message_failed">失败</string>
   <string name="time_just_now">刚才</string>
+  <string name="send_file">发送文件</string>
+  <string name="hist_file_sent">文件已发送</string>
+  <string name="hist_file_received">文件已接收</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">摄像头使用权限</string>
   <string name="permission_dialog_camera_message">视频会话需要使用摄像头，请设置相应权限。</string>
   <string name="ringtone_error_title">错误</string>
   <string name="ringtone_error_format_not_supported">不支持的文件格式。</string>
+  <string name="ringtone_error_size_too_big">文件过大。最大支持%1$dKB。</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Jami需要“读取通讯录”权限来启用此功能，请批准。</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Jami需要“写入通话记录”权限才能启用此功能，请批准。</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">扫描您想添加帐户的二维码。</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">清除历史记录？</string>
+  <string name="clear_history_dialog_message">此操作不可撤销。</string>
   <string name="clear_history_completed">已清除历史记录。</string>
   <!--Conversation-->
+  <string name="conversation_details">联系人详情</string>
   <string name="conversation_action_delete_this">删除该会话</string>
   <string name="conversation_action_delete_this_title">删除该会话吗？</string>
   <string name="conversation_action_delete_this_message">该操作不可撤销。</string>
   <string name="conversation_action_history_clear">清除历史记录</string>
+  <string name="conversation_action_history_clear_title">清除对话历史吗？</string>
+  <string name="conversation_action_history_clear_message">这将会清除所有对话记录。</string>
   <string name="conversation_action_remove_this">删除联系人</string>
+  <string name="conversation_action_remove_this_title">删除该联系人？</string>
+  <string name="conversation_action_remove_this_message">这将删除联系人并彻底清除对话历史记录。</string>
   <string name="conversation_action_copy_peer_number">复制号码</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s已复制至剪贴板</string>
   <string name="conversation_action_select_peer_number">选择一个数字</string>
+  <string name="conversation_action_block_this">屏蔽联系人</string>
+  <string name="conversation_action_go_to_call">返回正在进行的通话</string>
+  <string name="clip_contact_uri">联系人地址</string>
+  <string name="block_contact_dialog_title">屏蔽%1$s？</string>
+  <string name="block_contact_dialog_message">你将不能联系%1$s直到你解除屏蔽。</string>
+  <string name="block_contact_completed">%1$s已被屏蔽。</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">添加%1$s？</string>
   <string name="prompt_new_password">新密码</string>
+  <string name="prompt_new_password_optional">新的密码（可选）</string>
   <string name="prompt_new_password_repeat">确认新密码</string>
+  <string name="account_create_title">创建一个Jami账户</string>
   <string name="prompt_new_username">输入新用户名</string>
+  <string name="help_password_choose">为了保护您的Jami帐户，请使用一个强密码并牢记。</string>
+  <string name="help_password_enter">输入您的Jami主帐户密码</string>
+  <string name="help_pin_enter">从其他已配置的Jami帐户输入PIN。使用“导出Jami帐户”功能获取PIN。</string>
   <string name="wizard_next">下一步</string>
   <string name="wizard_back">上一步</string>
+  <string name="wizard_skip">跳过</string>
   <!--MenuHeaderView-->
   <string name="profile">我的帐户资料</string>
   <string name="profile_message_warning">您的帐户资料仅与您的通讯录共享</string>
@@ -108,6 +162,7 @@
   <string name="take_a_photo">拍照</string>
   <string name="profile_name_hint">输入您的名字（可选）</string>
   <!--Share fragment-->
+  <string name="share_message">用Jami扫描此码</string>
   <string name="share_message_no_account">请选择要共享的帐户。</string>
   <string name="share_your_account_information">共享我的通讯信息</string>
   <string name="generic_error_migration">错误</string>
@@ -120,9 +175,12 @@
   <string name="contact_request_msg">您有%1$s个联系人请求</string>
   <string name="contact_request_account">为了 %1$s</string>
   <string name="no_requests">0个联系人请求</string>
+  <string name="message_contact_not_trusted_yet">%s还不是你的联系人。\n你接受还是拒绝此联系人请求？</string>
+  <string name="message_contact_not_trusted">%s不在您的联系人中。\ n添加新联系人？</string>
   <!--Send contact requests-->
   <string name="send_request_button">发送</string>
   <string name="send_request_title">发送联系人请求</string>
+  <string name="send_request_msg">您必须发送联系人请求才能与此用户通信。如果您的联系人未接受该请求，您依然可以发送消息，但他将无法回复。</string>
   <!--Blacklist-->
   <string name="no_blocked_contact">0个屏蔽的联系人</string>
   <!--Smartlist-->
@@ -130,6 +188,27 @@
   <string name="contact_request_sent">联系人请求已发送</string>
   <string name="search_results">搜索结果</string>
   <string name="tv_contact_row_header">通讯录</string>
+  <string name="gallery_error_title">未发现图库应用</string>
+  <string name="gallery_error_message">设备上没有程序用来打开图库</string>
+  <string name="generic_error">发生未知错误</string>
   <!--File Transfer-->
+  <string name="invalid_file">无效文件</string>
+  <string name="not_able_to_write_file">无法写入文件</string>
+  <string name="file_transfer_status_created">正在初始化传送</string>
+  <string name="file_transfer_status_unsupported">不支持</string>
+  <string name="file_transfer_status_wait_peer_acceptance">等待对等节点接受</string>
+  <string name="file_transfer_status_wait_host_acceptance">等待主机接受</string>
+  <string name="file_transfer_status_ongoing">正在进行</string>
+  <string name="file_transfer_status_finished">完成</string>
+  <string name="file_transfer_status_closed_by_host">被主机关闭</string>
+  <string name="file_transfer_status_closed_by_peer">被对等节点关闭</string>
+  <string name="file_transfer_status_invalid_pathname">无效路径</string>
+  <string name="file_transfer_status_unjoinable_peer">无法加入的对等节点</string>
+  <string name="file_saved_in">文件已保存到%s</string>
+  <string name="no_space_left_on_device">设备无剩余空间</string>
+  <string name="title_media_viewer">媒体播放器</string>
+  <string name="menu_file_open">打开文件</string>
+  <string name="menu_file_download">下载文件</string>
+  <string name="menu_file_delete">删除文件</string>
   <string name="menu_file_share">共享文件</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
index d646e73..2723bbd 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
@@ -5,6 +5,7 @@
   <string name="ic_advanced_menu">高级设置</string>
   <string name="ic_blacklist_menu">已屏蔽的联系人</string>
   <!--Strings related to account creation-->
+  <string name="add_ring_account_title">添加Jami账户</string>
   <string name="add_sip_account_title">添加SIP帐户</string>
   <string name="ring_account_default_name">Ring帐户%1$s</string>
   <string name="prompt_alias">别名</string>
@@ -25,6 +26,7 @@
 该帐户拨出或接听通话将只能直接通过IP地址。
 您可以稍后编辑该帐户。</string>
   <string name="account_type_ip2ip">IP帐户</string>
+  <string name="help_ring">Jami帐户允许您通过完全的分布式网络以点对点的方式安全地与其他人员联系。</string>
   <string name="help_sip_title">添加您的SIP帐户</string>
   <string name="help_sip">配置已有的SIP帐户。</string>
   <string name="create_sip_account">添加SIP帐户</string>
@@ -34,6 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">没有已注册账户</string>
   <string name="normal_accounts_titles">帐户</string>
+  <string name="normal_devices_titles">连接到此Jami账户的已知设备</string>
   <string name="account_device_revoke">吊销设备</string>
   <string name="account_device_revocation_success_title">成功</string>
   <string name="account_device_revocation_success">设备已吊销！</string>
@@ -117,25 +120,38 @@
   <string name="account_export_end_error_title">错误</string>
   <string name="account_export_end_error_message">无法导出帐户，发生未知错误。</string>
   <string name="account_enter_password">输入密码</string>
+  <string name="account_share_body">用“%1$s”在Jami分布式通信平台上与我联系：%2$s</string>
+  <string name="account_share_body_with_username">使用“%1$s”或我的公共用户名“%2$s”在Ring分布式通讯平台上联系我：%3$s</string>
+  <string name="account_contact_me">在Jami上联系我！</string>
   <string name="update_account">更新帐户</string>
+  <string name="account_migration">您的Jami帐户可以被更新。\n请输入您的密码。</string>
+  <string name="ring_account">Jami账户</string>
   <string name="ring_account_identity">身份</string>
   <string name="account_migration_title_dialog">帐户迁移</string>
   <string name="account_migration_message_dialog">您的帐户需要被更新。您想前往帐户管理界面进行该操作吗？</string>
   <string name="account_update_needed">需要更新</string>
   <string name="account_cannot_be_found_title">无法找到帐户</string>
+  <string name="account_cannot_be_found_message">在Jami网络上找不到帐户。\n请确保它是从现有设备上的Jami导出的，并且提供的凭据是正确的。</string>
   <string name="account_sip_cannot_be_registered_message">您可以前往下一步或在这里编辑您的信息。帐户创建后，您仍可在帐户设置中进行编辑。</string>
   <string name="account_no_network_title">无法连接至网络</string>
+  <string name="account_no_network_message">无法添加帐户，因为Jami无法连接到分布式网络。检查您设备的连接。</string>
   <string name="account_device_added_title">帐户设备已添加</string>
+  <string name="account_device_added_message">你已在此设备上成功设置了Jami帐户。</string>
   <string name="account_device_updated_title">帐户设备已更新</string>
+  <string name="account_device_updated_message">你的Jami帐户已成功更新。</string>
   <string name="account_cannot_be_updated_message">无法更新帐户设备。请检查您的密码。</string>
   <string name="account_sip_success_title">SIP帐户已注册</string>
   <string name="account_sip_success_message">您已成功注册了您的SIP帐户。</string>
   <string name="account_sip_register_anyway">仍然注册</string>
   <string name="account_link_button">将此设备与一个帐户进行连接</string>
   <string name="account_link_prompt_pin">输入PIN</string>
+  <string name="account_new_button">创建一个Jami账户</string>
   <string name="account_link_export_button">将另一设备与该帐户进行连接</string>
+  <string name="account_link_export_info">要在其他设备上使用此帐户，您必须先在Jami上公开它。这将生成一个PIN码，您必须在新设备上输入该PIN码才能设置帐户。PIN有效期为10分钟。</string>
   <string name="account_start_export_button">生成PIN</string>
   <string name="account_end_export_button">关闭</string>
+  <string name="account_end_export_infos">您的PIN码是：\n\n%%\n\n要完成此过程，您需要在新设备上打开Jami。 使用“将此设备链接到帐户”创建一个新帐户。你的PIN码有效期为10分钟。</string>
+  <string name="account_link_export_info_light">要在其他设备上使用此帐户，您必须先在Jami上公开它。这将生成一个PIN码，您必须在新设备上输入该PIN码才能设置帐户。PIN有效期为10分钟。</string>
   <string name="account_export_title">添加设备</string>
   <!--Name registration-->
   <string name="error_username_empty">输入用户名</string>
@@ -143,6 +159,7 @@
   <string name="register_name">注册名称</string>
   <string name="trying_to_register_name">正在尝试注册用户名</string>
   <string name="registered_username">已注册的用户名</string>
+  <string name="register_username">注册公开用户名（推荐）</string>
   <string name="username_already_taken">用户名已被占用</string>
   <string name="invalid_username">非法用户名</string>
   <string name="looking_for_username_availability">正在检测用户名是否可用…</string>
@@ -152,7 +169,9 @@
   <string name="account_status_unknown">未知</string>
   <string name="account_status_offline">离线</string>
   <!--Create account-->
+  <string name="account_creation_home">欢迎来到Jami</string>
   <string name="account_creation_profile">创建您的帐户资料</string>
+  <string name="account_creation_ring">创建你的Jami帐号</string>
   <string name="account_link_title">连接此设备</string>
   <string name="account_sip_cannot_be_registered">无法注册帐户</string>
   <!--Edit profile-->
@@ -165,6 +184,7 @@
   <string name="revoke_device_wait_title">请稍等…</string>
   <string name="revoke_device_wait_message">正在吊销设备</string>
   <string name="rename_device_title">重命名该设备</string>
+  <string name="rename_device_message">选择一个新名称以在您的Jami帐户中标识此设备</string>
   <string name="rename_device_button">重命名设备</string>
   <string name="account_rename_device_hint">输入新的设备名</string>
   <string name="account_device_name_empty">设备名不可为空</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_call.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_call.xml
index 037a908..139e003 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_call.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_call.xml
@@ -20,6 +20,10 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- Call error -->
+    <string name="call_error_no_microphone">通话已取消。未检测到麦克风。</string>
+    <string name="call_error_no_camera_no_microphone">通话已取消。未检测到摄像头或麦克风。</string>
+
     <!-- SipCalls -->
     <string name="call_human_state_searching">正在搜索</string>
     <string name="call_human_state_incoming">来电</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 4545b7a..2bc47b5 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
@@ -6,8 +6,20 @@
   <string name="pref_category_system">系统</string>
   <string name="pref_category_privacy">隐私</string>
   <string name="pref_mobileData_title">移动数据</string>
+  <string name="pref_mobileData_summary">允许Jami使用3G/LTE网络</string>
+  <string name="pref_pushNotifications_title">推送通知</string>
+  <string name="pref_pushNotifications_summary">使用谷歌服务从而允许在后台接受到电话或消息</string>
+  <string name="pref_hd_summary">启用发送高清视频</string>
+  <string name="pref_hwEncode_title">启用加速编码</string>
+  <string name="pref_hwEncode_summary">实验功能</string>
   <string name="pref_systemContacts_title">使用系统通讯录</string>
   <string name="pref_systemContacts_summary">使用系统通讯录显示呼叫者信息。</string>
+  <string name="pref_systemDialer_title">用Jami代替系统拨号</string>
+  <string name="pref_systemDialer_summary">在可用时使用Jami代替系统通话。</string>
+  <string name="pref_startOnBoot_title">启动时运行Jami</string>
+  <string name="pref_startOnBoot_summary">系统启动时在后台运行Jami。</string>
   <string name="pref_clearHistory_title">清除历史记录</string>
   <string name="pref_clearHistory_summary">清除所有会话历史记录。该操作无法撤销。</string>
+  <string name="pref_persistNotification_title">后台运行</string>
+  <string name="pref_persistNotification_summary">允许在后台运行以接收电话和消息。</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
index 027ec68..1edfc12 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
@@ -139,6 +139,9 @@
   <string name="conversation_action_block_this">阻擋連絡人</string>
   <string name="conversation_action_go_to_call">回到進行中的通話</string>
   <string name="clip_contact_uri">聯絡人地址</string>
+  <string name="block_contact_dialog_title">封鎖 %1$s？</string>
+  <string name="block_contact_dialog_message">直到您解除封鎖前，%1$s 都不能再聯絡您。</string>
+  <string name="block_contact_completed">%1$s 已被封鎖。</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">新增 %1$s？</string>
   <string name="prompt_new_password">新密碼</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 75b2c0d..dba4baf 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
@@ -120,6 +120,8 @@
   <string name="account_export_end_error_title">錯誤</string>
   <string name="account_export_end_error_message">無法匯出帳號。遇到未知的錯誤。</string>
   <string name="account_enter_password">輸入密碼</string>
+  <string name="account_share_body">在 Jami 分散式通訊平臺上使用「%1$s」聯絡我：%2$s</string>
+  <string name="account_share_body_with_username">在 Jami 分散式通訊平臺上使用「%1$s」或是我的公開使用者名稱「%2$s」聯絡我：%3$s</string>
   <string name="account_contact_me">在 Jami 上聯絡我！</string>
   <string name="update_account">更新帳號</string>
   <string name="account_migration">您的 Jami 帳號可以更新。\n請輸入您的密碼。</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
index 5fc5e96..3989e37 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
@@ -10,6 +10,8 @@
   <string name="pref_pushNotifications_title">推播通知</string>
   <string name="pref_pushNotifications_summary">使用 Google 的伺服器以讓您可以在背景收到通話／訊息</string>
   <string name="pref_hd_summary">啟用傳送高畫質視訊</string>
+  <string name="pref_hwEncode_title">啟用加速編碼</string>
+  <string name="pref_hwEncode_summary">實驗性功能</string>
   <string name="pref_systemContacts_title">使用系統聯絡人</string>
   <string name="pref_systemContacts_summary">使用系統聯絡人顯示呼叫方的詳細資料</string>
   <string name="pref_systemDialer_title">使用 Jami 撥打系統的電話功能</string>